From e521fe9f2852dd008f176e462bf8ad3e5267e68f Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期二, 23 四月 2024 10:57:08 +0800
Subject: [PATCH] 最新版本
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java | 158 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 105 insertions(+), 53 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..81bae2b 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,17 +8,16 @@
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;
import com.doumee.dao.business.DeviceEventMapper;
import com.doumee.dao.business.join.DeviceEventJoinMapper;
-import com.doumee.dao.business.model.Company;
-import com.doumee.dao.business.model.Device;
-import com.doumee.dao.business.model.DeviceEvent;
-import com.doumee.dao.business.model.Member;
+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.DeviceEventVo;
import com.doumee.dao.system.vo.SystemDictDataListVO;
import com.doumee.service.business.DeviceEventService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -32,6 +31,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;
@@ -257,7 +258,7 @@
queryWrapper.lambda().eq(DeviceEvent::getIssuingAuthority, pageWrap.getModel().getIssuingAuthority());
}
if (pageWrap.getModel().getName() != null) {
- queryWrapper.lambda().eq(DeviceEvent::getName, pageWrap.getModel().getName());
+ queryWrapper.lambda().like(DeviceEvent::getName, pageWrap.getModel().getName());
}
if (pageWrap.getModel().getSex() != null) {
queryWrapper.lambda().eq(DeviceEvent::getSex, pageWrap.getModel().getSex());
@@ -299,6 +300,59 @@
@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("");
+ }
+ eventVo.setEventTypeName(HKConstants.EventTypes.getName(obj.getEventType())) ;
+ 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,66 +364,64 @@
//鏄惁鍖呭惈鑻辨枃
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);
- 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());
+ .leftJoin(Company.class,Company::getId,Member::getCompanyId)
+ .leftJoin(Device.class,Device::getHkId,DeviceEvent::getSrcParentIndex)
+ .selectAll(DeviceEvent.class)
+ .selectAs(Member::getName,DeviceEventDTO::getPersonName)
+ .selectAs(Member::getId,DeviceEventDTO::getMemberId)
+ .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.and(StringUtils.isNotBlank(pageWrap.getModel().getKeyWords()),w->
+ w.like(Member::getName,pageWrap.getModel().getKeyWords()).or().like(Member::getPhone,pageWrap.getModel().getKeyWords()))
+ .eq(StringUtils.equals(pageWrap.getModel().getPersonType(),Constants.TWO+""),
+ Member::getType,
+ pageWrap.getModel().getPersonType())
+ .eq(Objects.nonNull(pageWrap.getModel().getEventType()),
+ DeviceEvent::getEventType,
+ pageWrap.getModel().getEventType())
+ .like(Objects.nonNull(pageWrap.getModel().getCompanyName()),Company::getName,
+ pageWrap.getModel().getCompanyName())
+ .ge(Objects.nonNull(pageWrap.getModel().getStartTime()),
+ DeviceEvent::getCreateDate,
+ pageWrap.getModel().getStartTime())
+ .le(Objects.nonNull(pageWrap.getModel().getEndTime()),
+ DeviceEvent::getCreateDate,
+ pageWrap.getModel().getEndTime())
+ .isNull(StringUtils.isNotBlank(pageWrap.getModel().getPersonType()) && !StringUtils.equals(pageWrap.getModel().getPersonType(),Constants.TWO+""),Member::getId)//闄や簡鍐呴儴浜哄憳閮芥槸澶栨潵璁垮
+ .orderByDesc(DeviceEvent::getCreateDate);
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;
}
// 瀵瑰浘鐗囪繘琛屽垽鏂鐞�
private List<DeviceEventDTO> newDeviceEvent(List<DeviceEventDTO> DeviceEventDTOList) {
List<DeviceEventDTO> newDeviceEventDTOS = new ArrayList<>();
+ List<String> codes = Arrays.asList(Constants.FTP_RESOURCE_PATH,Constants.DEVICE_EVENT_IMG);
+ List<SystemDictData> list = systemDictDataMapper.list(codes);
+ Map<String,SystemDictData> dataMap = list.stream().collect(Collectors.toMap(SystemDictData::getLabel, Function.identity()));
for (DeviceEventDTO dto:DeviceEventDTOList) {
- if(StringUtils.isNotBlank(dto.getExtEventPictureURL())) {
- String extEventPictureURL = dto.getExtEventPictureURL();
- // 浣跨敤split("/")灏哢RL鎸夌収"/"杩涜鍒嗗壊鎴愬涓儴鍒�
- String[] parts = extEventPictureURL.split("\\\\");
- String newStr = parts[0];
- boolean number = Validator.isNumber(newStr);
- if(number) {
- List<String> codes = Arrays.asList(Constants.FTP_RESOURCE_PATH,Constants.DEVICE_EVENT_IMG);
- List<SystemDictData> list = systemDictDataMapper.list(codes);
+ if(StringUtils.isNotBlank(dto.getExtEventPictureURL())
+ && !dto.getExtEventPictureURL().startsWith(HKConstants.IMG_INDEX)
+ && !dto.getExtEventPictureURL().startsWith(HKConstants.IMG_INDEX_ERROR)) {
if(null != list && list.size() > 0) {
- Map<String,SystemDictData> dataMap = list.stream().collect(Collectors.toMap(SystemDictData::getLabel, Function.identity()));
- dto.setExtEventPictureURL(dataMap.get(Constants.FTP_RESOURCE_PATH).getCode()
- +dataMap.get(Constants.DEVICE_EVENT_IMG).getCode()
- +dto.getExtEventPictureURL());
+ dto.setExtEventPictureURL(dataMap.get(Constants.FTP_RESOURCE_PATH).getCode()
+ +dataMap.get(Constants.DEVICE_EVENT_IMG).getCode()
+ +dto.getExtEventPictureURL());
}
- }else {
- dto.setExtEventPictureURL(null);
- }
+ }else{
+ dto.setExtEventPictureURL(null);
}
- if(Constants.formatIntegerNum(dto.getEventType()) == HKConstants.EventTypes.DOOR_FACE_AUTH_SUCCESS.getKey()){
- dto.setEventTypeName(HKConstants.EventTypes.DOOR_FACE_AUTH_SUCCESS.getName());
- }else if(Constants.formatIntegerNum(dto.getEventType()) == HKConstants.EventTypes.DOOR_FACE_AUTH_FAIL.getKey()){
- dto.setEventTypeName(HKConstants.EventTypes.DOOR_FACE_AUTH_FAIL.getName());
+ dto.setEventTypeName(HKConstants.EventTypes.getName(dto.getEventType())) ;
+ try {
+ dto.setHappenTime(DateUtil.timeEscape(dto.getHappenTime()));
+ } catch (ParseException e) {
+ e.printStackTrace();
}
- newDeviceEventDTOS.add(dto);
+ newDeviceEventDTOS.add(dto);
}
return newDeviceEventDTOS;
}
--
Gitblit v1.9.3