From 39739e34af928aae204c55db7974213c9b938c5a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 21 二月 2024 18:33:14 +0800
Subject: [PATCH] 整理
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java
index a90c2bf..11ae971 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java
@@ -257,11 +257,7 @@
eventVo.setPersonCompanyName(obj.getPersonCompanyName());
eventVo.setCarNo(obj.getCarNo());
eventVo.setBeVisitedPersonName(obj.getBeVisitedPersonName()+"-"+obj.getBeVisitedPersonOrg());
- if(Constants.formatIntegerNum(obj.getEventType()) == HKConstants.EventTypes.VISIT_SIGN_IN.getKey()){
- eventVo.setEventTypeName(HKConstants.EventTypes.VISIT_SIGN_IN.getName());
- }else if(Constants.formatIntegerNum(obj.getEventType()) == HKConstants.EventTypes.VISIT_SIGN_OUT.getKey()){
- eventVo.setEventTypeName(HKConstants.EventTypes.VISIT_SIGN_OUT.getName());
- }
+ eventVo.setEventTypeName(HKConstants.EventTypes.getName(obj.getEventType()));
eventVo.setHappenTime(obj.getHappenTime());
voList.add(eventVo);
});
@@ -315,14 +311,17 @@
Map<String,SystemDictData> dataMap = list.stream().collect(Collectors.toMap(SystemDictData::getLabel, Function.identity()));
List<VisitEventDTO> newDataList = new ArrayList<>();
VisitEventDTOList.stream().forEach(obj->{
- obj.setCaptureUrl(dataMap.get(Constants.FTP_RESOURCE_PATH).getCode()
- +dataMap.get(Constants.MEMBER_IMG).getCode()
- +obj.getCaptureUrl());
- if(Constants.formatIntegerNum(obj.getEventType()) == HKConstants.EventTypes.VISIT_SIGN_IN.getKey()){
- obj.setEventTypeName(HKConstants.EventTypes.VISIT_SIGN_IN.getName());
- }else if(Constants.formatIntegerNum(obj.getEventType()) == HKConstants.EventTypes.VISIT_SIGN_OUT.getKey()){
- obj.setEventTypeName(HKConstants.EventTypes.VISIT_SIGN_OUT.getName());
+
+ if(StringUtils.isNotBlank( obj.getCaptureUrl())
+ && !obj.getCaptureUrl().startsWith(HKConstants.IMG_INDEX)
+ && !obj.getCaptureUrl().startsWith(HKConstants.IMG_INDEX_ERROR)) {
+ if(null != list && list.size() > 0) {
+ obj.setCaptureUrl(dataMap.get(Constants.FTP_RESOURCE_PATH).getCode()
+ +dataMap.get(Constants.MEMBER_IMG).getCode()
+ +obj.getCaptureUrl());
+ }
}
+ obj.setEventTypeName(HKConstants.EventTypes.getName(obj.getEventType())) ;
newDataList.add(obj);
});
return newDataList;
--
Gitblit v1.9.3