From 63fa498d66c928e0802010dae9f8f9dab4876b2f Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期二, 26 十二月 2023 14:25:18 +0800
Subject: [PATCH] 导出字段显示
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java | 271 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 235 insertions(+), 36 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 ca36257..aa7858e 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
@@ -1,31 +1,58 @@
package com.doumee.service.business.impl;
+import cn.hutool.core.lang.PatternPool;
+import cn.hutool.core.lang.Validator;
+import cn.hutool.core.util.PhoneUtil;
+import cn.hutool.core.util.ReUtil;
+import com.doumee.core.haikang.model.HKConstants;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
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.system.SystemDictDataMapper;
+import com.doumee.dao.system.model.SystemDictData;
+import com.doumee.dao.system.vo.SystemDictDataListVO;
import com.doumee.service.business.DeviceEventService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.sun.org.apache.xerces.internal.xs.StringList;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import java.util.List;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
/**
* 闂ㄧ浜嬩欢鎺ㄩ�佽褰曡〃Service瀹炵幇
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Service
public class DeviceEventServiceImpl implements DeviceEventService {
@Autowired
private DeviceEventMapper deviceEventMapper;
+
+
+ @Autowired
+ private DeviceEventJoinMapper deviceEventJoinMapper;
+
+ @Autowired
+ private SystemDictDataMapper systemDictDataMapper;
@Override
public Integer create(DeviceEvent deviceEvent) {
@@ -83,7 +110,7 @@
QueryWrapper<DeviceEvent> wrapper = new QueryWrapper<>(deviceEvent);
return deviceEventMapper.selectList(wrapper);
}
-
+
@Override
public PageData<DeviceEvent> findPage(PageWrap<DeviceEvent> pageWrap) {
IPage<DeviceEvent> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
@@ -112,52 +139,146 @@
if (pageWrap.getModel().getRemark() != null) {
queryWrapper.lambda().eq(DeviceEvent::getRemark, pageWrap.getModel().getRemark());
}
- if (pageWrap.getModel().getCompanyId() != null) {
- queryWrapper.lambda().eq(DeviceEvent::getCompanyId, pageWrap.getModel().getCompanyId());
+ if (pageWrap.getModel().getEventId() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getEventId, pageWrap.getModel().getEventId());
}
- if (pageWrap.getModel().getFaceImg() != null) {
- queryWrapper.lambda().eq(DeviceEvent::getFaceImg, pageWrap.getModel().getFaceImg());
+ if (pageWrap.getModel().getEventType() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getEventType, pageWrap.getModel().getEventType());
}
- if (pageWrap.getModel().getImgurl() != null) {
- queryWrapper.lambda().eq(DeviceEvent::getImgurl, pageWrap.getModel().getImgurl());
+ if (pageWrap.getModel().getSrcType() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getSrcType, pageWrap.getModel().getSrcType());
}
- if (pageWrap.getModel().getType() != null) {
- queryWrapper.lambda().eq(DeviceEvent::getType, pageWrap.getModel().getType());
+ if (pageWrap.getModel().getHappenTime() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getHappenTime, pageWrap.getModel().getHappenTime());
+ }
+ if (pageWrap.getModel().getSrcIndex() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getSrcIndex, pageWrap.getModel().getSrcIndex());
+ }
+ if (pageWrap.getModel().getSrcName() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getSrcName, pageWrap.getModel().getSrcName());
+ }
+ if (pageWrap.getModel().getStatus() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getStatus, pageWrap.getModel().getStatus());
+ }
+ if (pageWrap.getModel().getTimeout() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getTimeout, pageWrap.getModel().getTimeout());
+ }
+ if (pageWrap.getModel().getExtAccessChannel() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getExtAccessChannel, pageWrap.getModel().getExtAccessChannel());
+ }
+ if (pageWrap.getModel().getExtEventAlarmInID() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getExtEventAlarmInID, pageWrap.getModel().getExtEventAlarmInID());
+ }
+ if (pageWrap.getModel().getExtEventAlarmOutID() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getExtEventAlarmOutID, pageWrap.getModel().getExtEventAlarmOutID());
+ }
+ if (pageWrap.getModel().getExtEventCardNo() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getExtEventCardNo, pageWrap.getModel().getExtEventCardNo());
+ }
+ if (pageWrap.getModel().getExtEventCaseID() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getExtEventCaseID, pageWrap.getModel().getExtEventCaseID());
+ }
+ if (pageWrap.getModel().getExtEventCode() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getExtEventCode, pageWrap.getModel().getExtEventCode());
+ }
+ if (pageWrap.getModel().getExtEventDoorID() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getExtEventDoorID, pageWrap.getModel().getExtEventDoorID());
+ }
+ if (pageWrap.getModel().getExtEventIDCardPictureURL() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getExtEventIDCardPictureURL, pageWrap.getModel().getExtEventIDCardPictureURL());
+ }
+ if (pageWrap.getModel().getExtEventInOut() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getExtEventInOut, pageWrap.getModel().getExtEventInOut());
+ }
+ if (pageWrap.getModel().getExtEventLocalControllerID() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getExtEventLocalControllerID, pageWrap.getModel().getExtEventLocalControllerID());
+ }
+ if (pageWrap.getModel().getExtEventMainDevID() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getExtEventMainDevID, pageWrap.getModel().getExtEventMainDevID());
+ }
+ if (pageWrap.getModel().getExtEventPersonNo() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getExtEventPersonNo, pageWrap.getModel().getExtEventPersonNo());
+ }
+ if (pageWrap.getModel().getExtEventReaderKind() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getExtEventReaderKind, pageWrap.getModel().getExtEventReaderKind());
+ }
+ if (pageWrap.getModel().getExtEventReaderID() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getExtEventReaderID, pageWrap.getModel().getExtEventReaderID());
+ }
+ if (pageWrap.getModel().getExtEventPictureURL() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getExtEventPictureURL, pageWrap.getModel().getExtEventPictureURL());
+ }
+ if (pageWrap.getModel().getSvrIndexCode() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getSvrIndexCode, pageWrap.getModel().getSvrIndexCode());
+ }
+ if (pageWrap.getModel().getExtEventReportChannel() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getExtEventReportChannel, pageWrap.getModel().getExtEventReportChannel());
+ }
+ if (pageWrap.getModel().getExtEventRoleID() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getExtEventRoleID, pageWrap.getModel().getExtEventRoleID());
+ }
+ if (pageWrap.getModel().getExtEventEubDevID() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getExtEventEubDevID, pageWrap.getModel().getExtEventEubDevID());
+ }
+ if (pageWrap.getModel().getExtEventEwipNum() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getExtEventEwipNum, pageWrap.getModel().getExtEventEwipNum());
+ }
+ if (pageWrap.getModel().getExtEventType() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getExtEventType, pageWrap.getModel().getExtEventType());
+ }
+ if (pageWrap.getModel().getExtEventVerifyID() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getExtEventVerifyID, pageWrap.getModel().getExtEventVerifyID());
+ }
+ if (pageWrap.getModel().getExtEventWhiteListNo() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getExtEventWhiteListNo, pageWrap.getModel().getExtEventWhiteListNo());
+ }
+ if (pageWrap.getModel().getExtReceiveTime() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getExtReceiveTime, pageWrap.getModel().getExtReceiveTime());
+ }
+ if (pageWrap.getModel().getSeq() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getSeq, pageWrap.getModel().getSeq());
+ }
+ if (pageWrap.getModel().getUserType() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getUserType, pageWrap.getModel().getUserType());
+ }
+ if (pageWrap.getModel().getAddress() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getAddress, pageWrap.getModel().getAddress());
+ }
+ if (pageWrap.getModel().getBirth() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getBirth, pageWrap.getModel().getBirth());
+ }
+ if (pageWrap.getModel().getEndDate() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getEndDate, pageWrap.getModel().getEndDate());
+ }
+ if (pageWrap.getModel().getIdNum() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getIdNum, pageWrap.getModel().getIdNum());
+ }
+ if (pageWrap.getModel().getIssuingAuthority() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getIssuingAuthority, pageWrap.getModel().getIssuingAuthority());
}
if (pageWrap.getModel().getName() != null) {
queryWrapper.lambda().eq(DeviceEvent::getName, pageWrap.getModel().getName());
}
- if (pageWrap.getModel().getBirthday() != null) {
- queryWrapper.lambda().ge(DeviceEvent::getBirthday, Utils.Date.getStart(pageWrap.getModel().getBirthday()));
- queryWrapper.lambda().le(DeviceEvent::getBirthday, Utils.Date.getEnd(pageWrap.getModel().getBirthday()));
+ if (pageWrap.getModel().getSex() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getSex, pageWrap.getModel().getSex());
}
- if (pageWrap.getModel().getPhone() != null) {
- queryWrapper.lambda().eq(DeviceEvent::getPhone, pageWrap.getModel().getPhone());
+ if (pageWrap.getModel().getStartDate() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getStartDate, pageWrap.getModel().getStartDate());
}
- if (pageWrap.getModel().getIdcardNo() != null) {
- queryWrapper.lambda().eq(DeviceEvent::getIdcardNo, pageWrap.getModel().getIdcardNo());
+ if (pageWrap.getModel().getTermOfValidity() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getTermOfValidity, pageWrap.getModel().getTermOfValidity());
}
- if (pageWrap.getModel().getIdcardDecode() != null) {
- queryWrapper.lambda().eq(DeviceEvent::getIdcardDecode, pageWrap.getModel().getIdcardDecode());
+ if (pageWrap.getModel().getAccessChannel() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getAccessChannel, pageWrap.getModel().getAccessChannel());
}
- if (pageWrap.getModel().getCode() != null) {
- queryWrapper.lambda().eq(DeviceEvent::getCode, pageWrap.getModel().getCode());
+ if (pageWrap.getModel().getEntryTimes() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getEntryTimes, pageWrap.getModel().getEntryTimes());
}
- if (pageWrap.getModel().getClasses() != null) {
- queryWrapper.lambda().eq(DeviceEvent::getClasses, pageWrap.getModel().getClasses());
+ if (pageWrap.getModel().getExitTimes() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getExitTimes, pageWrap.getModel().getExitTimes());
}
- if (pageWrap.getModel().getEventDate() != null) {
- queryWrapper.lambda().ge(DeviceEvent::getEventDate, Utils.Date.getStart(pageWrap.getModel().getEventDate()));
- queryWrapper.lambda().le(DeviceEvent::getEventDate, Utils.Date.getEnd(pageWrap.getModel().getEventDate()));
- }
- if (pageWrap.getModel().getMemberId() != null) {
- queryWrapper.lambda().eq(DeviceEvent::getMemberId, pageWrap.getModel().getMemberId());
- }
- if (pageWrap.getModel().getEventCode() != null) {
- queryWrapper.lambda().eq(DeviceEvent::getEventCode, pageWrap.getModel().getEventCode());
- }
- if (pageWrap.getModel().getInoutType() != null) {
- queryWrapper.lambda().eq(DeviceEvent::getInoutType, pageWrap.getModel().getInoutType());
+ if (pageWrap.getModel().getTotalTimes() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getTotalTimes, pageWrap.getModel().getTotalTimes());
}
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
@@ -174,4 +295,82 @@
QueryWrapper<DeviceEvent> wrapper = new QueryWrapper<>(deviceEvent);
return deviceEventMapper.selectCount(wrapper);
}
+
+ @Override
+ public PageData<DeviceEventDTO> findDeviceEventDTOPage(PageWrap<DeviceEvent> pageWrap) {
+
+ IPage<DeviceEvent> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ MPJLambdaWrapper<DeviceEvent> queryWrapper = new MPJLambdaWrapper<>();
+ Utils.MP.blankToNull(pageWrap.getModel());
+
+ //鏄惁鏄暟瀛�
+ boolean number = Validator.isNumber(pageWrap.getModel().getKeyWords());
+ //鏄惁鍖呭惈涓枃
+ boolean b = Validator.hasChinese(pageWrap.getModel().getKeyWords());
+ //鏄惁鍖呭惈鑻辨枃
+ 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());
+ 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);
+ }
+
+ // 瀵瑰浘鐗囪繘琛屽垽鏂鐞�
+ private List<DeviceEventDTO> newDeviceEvent(List<DeviceEventDTO> DeviceEventDTOList) {
+ List<DeviceEventDTO> newDeviceEventDTOS = new ArrayList<>();
+ 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(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());
+ }
+ }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());
+ }
+ newDeviceEventDTOS.add(dto);
+ }
+ return newDeviceEventDTOS;
+ }
}
--
Gitblit v1.9.3