配置信息对接调整提交

lishuai

2023-12-26 1293d3dba10c4e291dfbce4c936f952875557edb

配置信息对接调整提交

 server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/CarEventDTO.java

@@ -78,7 +78,7 @@
    private String personPhone;

    @ApiModelProperty(value = "人员类型")
    private String personType;
    private Integer personType;

    @ApiModelProperty(value = "人员身份证号")
    private String personIdcardDecode;

 server/dmvisit_service/src/main/java/com/doumee/dao/system/vo/CarEventVo.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,51 @@
package com.doumee.dao.system.vo;

import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel("车辆事件视图")
public class CarEventVo {

    @ApiModelProperty(value = "车牌号")
    @ExcelColumn(name="车牌号")
    private String plateNos;

    @ApiModelProperty(value = "人员类型")
    @ExcelColumn(name="归属用户类型")
    private String typeName;

    @ApiModelProperty(value = "姓名")
    @ExcelColumn(name="姓名")
    private String personName;

    @ApiModelProperty(value = "手机号")
    @ExcelColumn(name="手机号")
    private String personPhone;

    @ApiModelProperty(value = "人员组织公司")
    @ExcelColumn(name="公司/部门")
    private String personCompanyName;

    @ApiModelProperty(value = "停车库名称")
    @ExcelColumn(name="停车库名称")
    private String parkName;

    @ApiModelProperty(value = "出入口名称")
    @ExcelColumn(name="出入口名称")
    private String gateName;

    @ApiModelProperty(value = "事件类型名称")
    @ExcelColumn(name="事件类型")
    private String eventTypeName;

    @ApiModelProperty(value = "进出场类型，0：进场，1：出场    ", example = "1")
    @ExcelColumn(name="出入类型")
    private Integer inoutType;

    @ApiModelProperty(value = "事件发生时间（设备时间")
    @ExcelColumn(name="事件时间")
    private String happenTime;
}

 server/dmvisit_service/src/main/java/com/doumee/service/business/CarEventService.java

@@ -5,6 +5,8 @@
import com.doumee.dao.admin.request.VisitEventQuery;
import com.doumee.dao.admin.response.CarEventDTO;
import com.doumee.dao.business.model.CarEvent;
import com.doumee.dao.system.vo.CarEventVo;

import java.util.List;

/**
@@ -103,4 +105,11 @@
     * @return PageData<CarEvent>
     */
    PageData<CarEventDTO> findVisitCarPage(PageWrap<CarEvent> pageWrap);

    /**
     * å¯¼å‡º
     * @param pageWrap åˆ†é¡µå¯¹è±¡
     * @return PageData<CarEventVo>
     */
    List<CarEventVo> findPageExcel(PageWrap<CarEvent> pageWrap);
}

 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java

@@ -17,6 +17,7 @@
import com.doumee.dao.business.model.*;
import com.doumee.dao.system.SystemDictDataMapper;
import com.doumee.dao.system.model.SystemDictData;
import com.doumee.dao.system.vo.CarEventVo;
import com.doumee.service.business.CarEventService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -275,6 +276,55 @@

    @Override
    public PageData<CarEventDTO> findVisitCarPage(PageWrap<CarEvent> pageWrap) {
        IPage<CarEventDTO> carEventDTOIPage = getDataInfo(pageWrap);
        if(null != carEventDTOIPage && carEventDTOIPage.getRecords().size() > 0) {
            carEventDTOIPage.setRecords(newCarEventDTO(carEventDTOIPage.getRecords()));
        }
        return PageData.from(carEventDTOIPage);
    }


    public List<CarEventVo> findPageExcel(PageWrap<CarEvent> pageWrap) {
        IPage<CarEventDTO> carEventExcel= getDataInfo(pageWrap);
        List<CarEventVo> newDataList = new ArrayList<>();
        if(null != carEventExcel && carEventExcel.getRecords().size() > 0) {
            carEventExcel.getRecords().stream().forEach(obj->{
                CarEventVo vo = new CarEventVo();
                if(Constants.formatIntegerNum(obj.getEventType()) == HKConstants.EventTypes.PARK_LINE_IN.getKey()){
                    vo.setEventTypeName(HKConstants.EventTypes.PARK_LINE_IN.getName());
                }else if(Constants.formatIntegerNum(obj.getEventType()) == HKConstants.EventTypes.PARK_PASS_IN.getKey()){
                    vo.setEventTypeName(HKConstants.EventTypes.PARK_PASS_IN.getName());
                }else if(Constants.formatIntegerNum(obj.getEventType()) == HKConstants.EventTypes.PARK_LINE_OUT.getKey()){
                    vo.setEventTypeName(HKConstants.EventTypes.PARK_LINE_OUT.getName());
                }else{
                    vo.setEventTypeName(HKConstants.EventTypes.PARK_PASS_OUT.getName());
                }
                if(null != obj.getPersonType()) {
                    if(Constants.ZERO == obj.getPersonType()){
                        vo.setTypeName(Constants.Status.LW_FK.getDes());
                    }else if(Constants.ONE == obj.getPersonType()) {
                        vo.setTypeName(Constants.Status.PT_FK.getDes());
                    }else {
                        vo.setTypeName(Constants.Status.NB_FK.getDes());
                    }
                }else {
                    vo.setTypeName("");
                }
                vo.setPlateNos(obj.getPlateNos());
                vo.setPersonName(obj.getPersonName());
                vo.setPersonPhone(obj.getPersonPhone());
                vo.setPersonCompanyName(obj.getPersonCompanyName());
                vo.setParkName(obj.getParkName());
                vo.setGateName(obj.getGateName());
                vo.setInoutType(obj.getInoutType());
                vo.setHappenTime(obj.getHappenTime());
                newDataList.add(vo);
            });
        }
        return newDataList;
    }

    private IPage<CarEventDTO> getDataInfo(PageWrap<CarEvent> pageWrap) {
        //是否是数字
        boolean number = Validator.isNumber(pageWrap.getModel().getKeyWords());
        //是否包含中文
@@ -287,41 +337,38 @@
        Utils.MP.blankToNull(pageWrap.getModel());

        queryWrapper.leftJoin(Cars.class,Cars::getCode,CarEvent::getPlateNos)
                    .leftJoin(Member.class,Member::getId,Cars::getMemberId)
                    .leftJoin(Company.class,Company::getId,Member::getCompanyId);
                .leftJoin(Member.class,Member::getId,Cars::getMemberId)
                .leftJoin(Company.class,Company::getId,Member::getCompanyId);
        queryWrapper.selectAll(CarEvent.class)
                    .selectAs(Member::getType,CarEventDTO::getPersonType)
                    .selectAs(Member::getPhone,CarEventDTO::getPersonPhone)
                    .selectAs(Member::getIdcardDecode,CarEventDTO::getPersonIdcardDecode)
                    .selectAs(Member::getName,CarEventDTO::getPersonName)
                    .selectAs(Company::getName,CarEventDTO::getPersonCompanyName);
                .selectAs(Member::getType,CarEventDTO::getPersonType)
                .selectAs(Member::getPhone,CarEventDTO::getPersonPhone)
                .selectAs(Member::getIdcardDecode,CarEventDTO::getPersonIdcardDecode)
                .selectAs(Member::getName,CarEventDTO::getPersonName)
                .selectAs(Company::getName,CarEventDTO::getPersonCompanyName);
        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getPlateNos()),
                                CarEvent::getPlateNos,
                                pageWrap.getModel().getPlateNos())
                    .like(number,
                            Member::getPhone,
                            pageWrap.getModel().getKeyWords())
                    .like((b || hasWord),
                            Member::getPhone,
                            pageWrap.getModel().getKeyWords())
                    .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),
                            Company::getName,
                            pageWrap.getModel().getCompanyName())
                    .eq(StringUtils.isNotBlank(pageWrap.getModel().getMemberType()),
                            Member::getType,
                            pageWrap.getModel().getMemberType())
                    .eq(Objects.nonNull(pageWrap.getModel().getEventType()),
                            CarEvent::getEventType,
                            pageWrap.getModel().getEventType())
                    .ge(Objects.nonNull(pageWrap.getModel().getStartTime()),
                            CarEvent::getCreateDate, pageWrap.getModel().getStartTime())
                    .le(Objects.nonNull(pageWrap.getModel().getEndTime()),
                            CarEvent::getCreateDate, pageWrap.getModel().getEndTime());
                CarEvent::getPlateNos,
                pageWrap.getModel().getPlateNos())
                .like(number,
                        Member::getPhone,
                        pageWrap.getModel().getKeyWords())
                .like((b || hasWord),
                        Member::getPhone,
                        pageWrap.getModel().getKeyWords())
                .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),
                        Company::getName,
                        pageWrap.getModel().getCompanyName())
                .eq(StringUtils.isNotBlank(pageWrap.getModel().getMemberType()),
                        Member::getType,
                        pageWrap.getModel().getMemberType())
                .eq(Objects.nonNull(pageWrap.getModel().getEventType()),
                        CarEvent::getEventType,
                        pageWrap.getModel().getEventType())
                .ge(Objects.nonNull(pageWrap.getModel().getStartTime()),
                        CarEvent::getCreateDate, pageWrap.getModel().getStartTime())
                .le(Objects.nonNull(pageWrap.getModel().getEndTime()),
                        CarEvent::getCreateDate, pageWrap.getModel().getEndTime());
        IPage<CarEventDTO> carEventDTOIPage = carEventJoinMapper.selectJoinPage(page, CarEventDTO.class, queryWrapper);
        if(null != carEventDTOIPage && carEventDTOIPage.getRecords().size() > 0) {
            carEventDTOIPage.setRecords(newCarEventDTO(carEventDTOIPage.getRecords()));
        }
        return PageData.from(carEventDTOIPage);
        return carEventDTOIPage;
    }

    private List<CarEventDTO> newCarEventDTO(List<CarEventDTO> newCarEventDTOList) {
@@ -346,4 +393,5 @@
        });
        return newDataList;
    }

}