From cb6874174975a370cb60f1557704c9d49a05f9e6 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期五, 05 一月 2024 08:59:40 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java | 117 +++++++++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 90 insertions(+), 27 deletions(-) diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java index aa7858e..3a3ff3e 100644 --- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java +++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java @@ -8,6 +8,7 @@ import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; import com.doumee.core.utils.Constants; +import com.doumee.core.utils.DateUtil; import com.doumee.core.utils.Utils; import com.doumee.dao.admin.request.DeviceEventQuery; import com.doumee.dao.admin.response.DeviceEventDTO; @@ -19,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; @@ -32,6 +34,8 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; @@ -299,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()); @@ -310,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; } // 瀵瑰浘鐗囪繘琛屽垽鏂鐞� @@ -369,7 +427,12 @@ }else if(Constants.formatIntegerNum(dto.getEventType()) == HKConstants.EventTypes.DOOR_FACE_AUTH_FAIL.getKey()){ dto.setEventTypeName(HKConstants.EventTypes.DOOR_FACE_AUTH_FAIL.getName()); } - newDeviceEventDTOS.add(dto); + try { + dto.setHappenTime(DateUtil.timeEscape(dto.getHappenTime())); + } catch (ParseException e) { + e.printStackTrace(); + } + newDeviceEventDTOS.add(dto); } return newDeviceEventDTOS; } -- Gitblit v1.9.3