导出字段对接调整提交

lishuai

2023-12-27 ed53388ed935a0fac6a0b829af63456c38eee4e6

导出字段对接调整提交

 server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceEventController.java

@@ -8,6 +8,7 @@
import com.doumee.core.model.PageData;
import com.doumee.dao.admin.response.DeviceEventDTO;
import com.doumee.dao.business.model.DeviceEvent;
import com.doumee.dao.system.vo.DeviceEventVo;
import com.doumee.service.business.DeviceEventService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -79,7 +80,7 @@
    @PostMapping("/exportExcel")
    //@RequiresPermissions("business:deviceevent:exportExcel")
    public void exportExcel (@RequestBody PageWrap<DeviceEvent> pageWrap, HttpServletResponse response) {
        ExcelExporter.build(DeviceEvent.class).export(deviceEventService.findPage(pageWrap).getRecords(), "门禁事件推送记录表", response);
        ExcelExporter.build(DeviceEventVo.class).export(deviceEventService.findDeviceEventExcel(pageWrap), "门禁事件推送记录表", response);
    }

    @ApiOperation("根据ID查询")

 server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java

@@ -305,7 +305,11 @@
        /** ç”¨æˆ·ç±»åž‹ **/
        LW_FK(0,"劳务访客"),
        PT_FK(1,"普通访客"),
        NB_FK(2,"内部人员");
        NB_FK(2,"内部人员"),

        /** è¿›åœºç±»åž‹ **/
        OUT(0,"出"),
        IN(1,"进");

        private  Integer value;
        private  String des;

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

@@ -108,7 +108,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/DeviceEventVo.java

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

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

@Data
@ApiModel("门禁出入事件")
public class DeviceEventVo {

    @ApiModelProperty(value = "人员类型")
    @ExcelColumn(name = "人员类型")
    private String personTypeName;

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

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

    @ApiModelProperty(value = "身份证号码")
    @ExcelColumn(name = "身份证号码")
    private String personIdcardDecode;

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

    @ApiModelProperty(value = "门禁名称")
    @ExcelColumn(name = "门禁名称")
    private String devName;

    @ApiModelProperty(value = "门禁点名称")
    @ExcelColumn(name = "门禁点名称")
    private String srcName;

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

    @ApiModelProperty(value = "进出方向 1-进 0-出 -1:未知 è¦æ±‚：进门读卡器拨码设置为1，出门读卡器拨码设置为2")
    @ExcelColumn(name = "出入类型")
    private String extEventInOutName;

    @ApiModelProperty(value = "事件发生时间（设备时间")
    @ExcelColumn(name = "事件时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private String happenTime;


}

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

@@ -5,6 +5,8 @@
import com.doumee.dao.admin.request.DeviceEventQuery;
import com.doumee.dao.admin.response.DeviceEventDTO;
import com.doumee.dao.business.model.DeviceEvent;
import com.doumee.dao.system.vo.DeviceEventVo;

import java.util.List;

/**
@@ -104,4 +106,11 @@
     * @return PageData<DeviceEvent>
     */
    PageData<DeviceEventDTO> findDeviceEventDTOPage(PageWrap<DeviceEvent> pageWrap);

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

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

@@ -20,6 +20,7 @@
import com.doumee.dao.business.model.Member;
import com.doumee.dao.system.SystemDictDataMapper;
import com.doumee.dao.system.model.SystemDictData;
import com.doumee.dao.system.vo.DeviceEventVo;
import com.doumee.dao.system.vo.SystemDictDataListVO;
import com.doumee.service.business.DeviceEventService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -302,6 +303,63 @@
    @Override
    public PageData<DeviceEventDTO> findDeviceEventDTOPage(PageWrap<DeviceEvent> pageWrap) {

        IPage<DeviceEventDTO> deviceEventDTOIPage = getDataInfo(pageWrap);
        if(null != deviceEventDTOIPage && deviceEventDTOIPage.getRecords().size() > 0) {
            deviceEventDTOIPage.setRecords(newDeviceEvent(deviceEventDTOIPage.getRecords()));
        }
        return PageData.from(deviceEventDTOIPage);
    }

    @Override
    public List<DeviceEventVo> findDeviceEventExcel(PageWrap<DeviceEvent> pageWrap) {
        IPage<DeviceEventDTO> deviceEventExcel = getDataInfo(pageWrap);
        List<DeviceEventVo> voList = new ArrayList<>();
        if(null != deviceEventExcel && deviceEventExcel.getRecords().size() > 0) {
            deviceEventExcel.getRecords().stream().forEach(obj-> {
                DeviceEventVo eventVo = new DeviceEventVo();
                if(null != obj.getPersonType()) {
                    if(Constants.ZERO == obj.getPersonType()){
                        eventVo.setPersonTypeName(Constants.Status.LW_FK.getDes());
                    }else if(Constants.ONE == obj.getPersonType()) {
                        eventVo.setPersonTypeName(Constants.Status.PT_FK.getDes());
                    }else {
                        eventVo.setPersonTypeName(Constants.Status.NB_FK.getDes());
                    }
                }else {
                    eventVo.setPersonTypeName("");
                }
                eventVo.setPersonName(obj.getPersonName());
                eventVo.setPersonPhone(obj.getPersonName());
                eventVo.setPersonIdcardDecode(obj.getPersonIdcardDecode());
                eventVo.setPersonCompanyName(obj.getPersonCompanyName());
                eventVo.setDevName(obj.getDevName());
                eventVo.setSrcName(obj.getSrcName());
                if(null != obj.getExtEventInOut()) {
                    if(Constants.ZERO == obj.getExtEventInOut()){
                        eventVo.setExtEventInOutName(Constants.Status.OUT.getDes());
                    }else if(Constants.ONE == obj.getPersonType()) {
                        eventVo.setExtEventInOutName(Constants.Status.PT_FK.getDes());
                    }
                }else {
                    eventVo.setExtEventInOutName("");
                }
                if (Constants.formatIntegerNum(obj.getEventType()) == HKConstants.EventTypes.DOOR_FACE_AUTH_SUCCESS.getKey()) {
                    eventVo.setEventTypeName(HKConstants.EventTypes.DOOR_FACE_AUTH_SUCCESS.getName());
                } else if (Constants.formatIntegerNum(obj.getEventType()) == HKConstants.EventTypes.DOOR_FACE_AUTH_FAIL.getKey()) {
                    eventVo.setEventTypeName(HKConstants.EventTypes.DOOR_FACE_AUTH_FAIL.getName());
                }
                try {
                    eventVo.setHappenTime(DateUtil.timeEscape(obj.getHappenTime()));
                } catch (ParseException e) {
                    e.printStackTrace();
                }
                voList.add(eventVo);
            });
        }
        return voList;
    }

    private IPage<DeviceEventDTO> getDataInfo(PageWrap<DeviceEvent> pageWrap) {
        IPage<DeviceEvent> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        MPJLambdaWrapper<DeviceEvent> queryWrapper = new MPJLambdaWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());
@@ -313,35 +371,32 @@
        //是否包含英文
        boolean hasWord = ReUtil.contains(PatternPool.WORD, pageWrap.getModel().getKeyWords());
        queryWrapper.leftJoin(Member.class,Member::getHkId,DeviceEvent::getExtEventPersonNo)
                    .leftJoin(Company.class,Company::getId,Member::getCompanyId)
                    .leftJoin(Device.class,Device::getHkId,DeviceEvent::getSrcParentIndex)
                    .selectAll(DeviceEvent.class)
                    .selectAs(Member::getName,DeviceEventDTO::getPersonName)
                    .selectAs(Member::getType,DeviceEventDTO::getPersonType)
                    .selectAs(Member::getPhone,DeviceEventDTO::getPersonPhone)
                    .selectAs(Member::getIdcardDecode,DeviceEventDTO::getPersonIdcardDecode)
                    .selectAs(Device::getName,DeviceEventDTO::getDevName)
                    .selectAs(Company::getName,DeviceEventDTO::getPersonCompanyName);
                .leftJoin(Company.class,Company::getId,Member::getCompanyId)
                .leftJoin(Device.class,Device::getHkId,DeviceEvent::getSrcParentIndex)
                .selectAll(DeviceEvent.class)
                .selectAs(Member::getName,DeviceEventDTO::getPersonName)
                .selectAs(Member::getType,DeviceEventDTO::getPersonType)
                .selectAs(Member::getPhone,DeviceEventDTO::getPersonPhone)
                .selectAs(Member::getIdcardDecode,DeviceEventDTO::getPersonIdcardDecode)
                .selectAs(Device::getName,DeviceEventDTO::getDevName)
                .selectAs(Company::getName,DeviceEventDTO::getPersonCompanyName);
        queryWrapper.like(number, Member::getPhone, pageWrap.getModel().getKeyWords())
                    .like((b||hasWord),Member::getName, pageWrap.getModel().getKeyWords())
                    .eq(StringUtils.isNotBlank(pageWrap.getModel().getPersonType()),
                                                Member::getType,
                                                pageWrap.getModel().getPersonType())
                    .eq(Objects.nonNull(pageWrap.getModel().getEventType()),
                                                DeviceEvent::getEventType,
                                                pageWrap.getModel().getEventType())
                    .ge(Objects.nonNull(pageWrap.getModel().getStartTime()),
                                                DeviceEvent::getCreateDate,
                                                pageWrap.getModel().getStartTime())
                    .le(Objects.nonNull(pageWrap.getModel().getEndTime()),
                                                DeviceEvent::getCreateDate,
                                                pageWrap.getModel().getEndTime());
                .like((b||hasWord),Member::getName, pageWrap.getModel().getKeyWords())
                .eq(StringUtils.isNotBlank(pageWrap.getModel().getPersonType()),
                        Member::getType,
                        pageWrap.getModel().getPersonType())
                .eq(Objects.nonNull(pageWrap.getModel().getEventType()),
                        DeviceEvent::getEventType,
                        pageWrap.getModel().getEventType())
                .ge(Objects.nonNull(pageWrap.getModel().getStartTime()),
                        DeviceEvent::getCreateDate,
                        pageWrap.getModel().getStartTime())
                .le(Objects.nonNull(pageWrap.getModel().getEndTime()),
                        DeviceEvent::getCreateDate,
                        pageWrap.getModel().getEndTime());
        queryWrapper.orderByDesc(DeviceEvent::getHappenTime);
        IPage<DeviceEventDTO> deviceEventDTOIPage = deviceEventJoinMapper.selectJoinPage(page, DeviceEventDTO.class, queryWrapper);
        if(null != deviceEventDTOIPage && deviceEventDTOIPage.getRecords().size() > 0) {
            deviceEventDTOIPage.setRecords(newDeviceEvent(deviceEventDTOIPage.getRecords()));
        }
        return PageData.from(deviceEventDTOIPage);
        return deviceEventDTOIPage;
    }

    // å¯¹å›¾ç‰‡è¿›è¡Œåˆ¤æ–­å¤„理