From aed1ef97d6ae1d3961b9a57c767758c9d34e1b93 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 04 三月 2024 14:01:15 +0800
Subject: [PATCH] ERP接口
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java | 57 +++++++++++++++++++++++----------------------------------
1 files changed, 23 insertions(+), 34 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 3a3ff3e..9513fdc 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
@@ -14,10 +14,7 @@
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;
@@ -343,11 +340,7 @@
}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());
- }
+ eventVo.setEventTypeName(HKConstants.EventTypes.getName(obj.getEventType())) ;
try {
eventVo.setHappenTime(DateUtil.timeEscape(obj.getHappenTime()));
} catch (ParseException e) {
@@ -375,25 +368,30 @@
.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.like(number, Member::getPhone, pageWrap.getModel().getKeyWords())
- .like((b||hasWord),Member::getName, pageWrap.getModel().getKeyWords())
- .eq(StringUtils.isNotBlank(pageWrap.getModel().getPersonType()),
+ 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());
+ 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);
return deviceEventDTOIPage;
@@ -402,31 +400,22 @@
// 瀵瑰浘鐗囪繘琛屽垽鏂鐞�
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) {
--
Gitblit v1.9.3