From 4915493db5013f4e0857ac7127616781732c2d6c Mon Sep 17 00:00:00 2001
From: zhangf <1603559716@qq.com>
Date: 星期四, 09 五月 2024 09:54:10 +0800
Subject: [PATCH] spi统计

---
 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencySuppliesServiceImpl.java |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencySuppliesServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencySuppliesServiceImpl.java
index b05a09b..5caaf2c 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencySuppliesServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencySuppliesServiceImpl.java
@@ -25,6 +25,8 @@
 import com.gkhy.safePlatform.emergency.service.EmergencySuppliesService;
 import com.gkhy.safePlatform.emergency.service.baseService.*;
 import org.apache.dubbo.config.annotation.DubboReference;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -36,6 +38,7 @@
 @Service("emergencySuppliesService")
 public class EmergencySuppliesServiceImpl implements EmergencySuppliesService {
 
+    private static final Logger log = LoggerFactory.getLogger(EmergencySuppliesServiceImpl.class);
     @Autowired
     private EmergencySuppliesInfoService emergencySuppliesInfoService;
 
@@ -284,19 +287,21 @@
 
     public List<EmergencySuppliesInfoRespDTO> getEmergencySupplies(){
         List<EmergencySuppliesInfo> allEmergencySupplies = emergencySuppliesInfoService.getAllEmergencySupplies();
-        List<EmergencySuppliesInfoRespDTO> collect = allEmergencySupplies.stream().map(es -> {
+        List<EmergencySuppliesInfoRespDTO> collect = new ArrayList<>();
+        for (EmergencySuppliesInfo allEmergencySupply : allEmergencySupplies) {
             EmergencySuppliesInfoRespDTO e = new EmergencySuppliesInfoRespDTO();
-            BeanUtils.copyProperties(es,e);
-            e.setClassificationName(EmergencySuppliesClassificationEnum.getByCode(es.getClassification()).getValue());
-            ResultVO<DepInfoRPCRespDTO> rpcResult = accountDepartmentService.getDepInfoByDepId(es.getDepartmentId());
+            BeanUtils.copyProperties(allEmergencySupply,e);
+            String value = EmergencySuppliesClassificationEnum.getByCode(allEmergencySupply.getClassification()).getValue();
+            e.setClassificationName(StringUtils.isEmpty(value) ? "" : value);
+            ResultVO<DepInfoRPCRespDTO> rpcResult = accountDepartmentService.getDepInfoByDepId(allEmergencySupply.getDepartmentId());
             if (rpcResult != null && rpcResult.getCode().equals(ResultCodes.OK.getCode())) {
                 if (rpcResult.getData() != null) {
                     DepInfoRPCRespDTO dep = (DepInfoRPCRespDTO) rpcResult.getData();
                     e.setDepartmentName(dep.getDepName());
                 }
             }
-            return e;
-        }).collect(Collectors.toList());
+            collect.add(e);
+        }
         return collect;
 
     }

--
Gitblit v1.9.2