From d495e97e5f55c02486d8bb205e23aea5760c359f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 04 三月 2024 13:51:40 +0800
Subject: [PATCH] 整理
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 aefed9d..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
@@ -402,18 +402,18 @@
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())
&& !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()));
- if(StringUtils.isNotBlank(dto.getExtEventPictureURL())){
dto.setExtEventPictureURL(dataMap.get(Constants.FTP_RESOURCE_PATH).getCode()
+dataMap.get(Constants.DEVICE_EVENT_IMG).getCode()
+dto.getExtEventPictureURL());
- }
}
+ }else{
+ dto.setExtEventPictureURL(null);
}
dto.setEventTypeName(HKConstants.EventTypes.getName(dto.getEventType())) ;
try {
--
Gitblit v1.9.3