From d015cc0b48ca51a2b93b6c60c91dc352a104b1e7 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 23 九月 2024 10:41:50 +0800
Subject: [PATCH] 删除密码加密

---
 emergency/emergency-rpc-provider/src/main/java/com/gkhy/safePlatform/emergency/rpc/provider/EmergencyRpcProvider.java |   61 +++++++++++++++++++++++-------
 1 files changed, 47 insertions(+), 14 deletions(-)

diff --git a/emergency/emergency-rpc-provider/src/main/java/com/gkhy/safePlatform/emergency/rpc/provider/EmergencyRpcProvider.java b/emergency/emergency-rpc-provider/src/main/java/com/gkhy/safePlatform/emergency/rpc/provider/EmergencyRpcProvider.java
index bcc3210..1ae5b51 100644
--- a/emergency/emergency-rpc-provider/src/main/java/com/gkhy/safePlatform/emergency/rpc/provider/EmergencyRpcProvider.java
+++ b/emergency/emergency-rpc-provider/src/main/java/com/gkhy/safePlatform/emergency/rpc/provider/EmergencyRpcProvider.java
@@ -27,6 +27,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @DubboService
 public class EmergencyRpcProvider implements EmergencyRpcAPi {
@@ -127,15 +128,20 @@
         return result;
     }
     @Override
-    public ResultVO<EmergencyExecuteTimeRPCRespDTO> getExecuteLastTimeByDeptIds(Long depId) {
-        ResultVO<EmergencyExecuteTimeRPCRespDTO> result = new ResultVO<>(ResultCodes.OK);
+    public ResultVO<List<EmergencyExecuteDepLevelLasTimeRPCRespDTO>> getExecuteLastTimeByDeptIds(Long depId) {
+        ResultVO<List<EmergencyExecuteDepLevelLasTimeRPCRespDTO>> result = new ResultVO<>(ResultCodes.OK);
         try{
-            EmergencyExecuteTimeRPCRespDTO lastTimeRPCResp = new EmergencyExecuteTimeRPCRespDTO();
-            EmergencyExecuteTimeRespDTO timeRespDTO = emergencyCountService.getLastTimeByDeptIds(depId);
-            if(null != timeRespDTO){
-                BeanUtils.copyProperties(timeRespDTO,lastTimeRPCResp);
+            List<EmergencyExecuteDepLevelLasTimeRespDTO> lasTimeRespDTOS = emergencyCountService.getLastTimeByDeptIds(depId);
+            List<EmergencyExecuteDepLevelLasTimeRPCRespDTO> timeRPCRespDTOS = new ArrayList<>();
+
+            for(EmergencyExecuteDepLevelLasTimeRespDTO timeRespDTO:lasTimeRespDTOS){
+                if(timeRespDTO != null){
+                    EmergencyExecuteDepLevelLasTimeRPCRespDTO timeRPCRespDTO = new EmergencyExecuteDepLevelLasTimeRPCRespDTO();
+                    BeanUtils.copyProperties(timeRespDTO,timeRPCRespDTO);
+                    timeRPCRespDTOS.add(timeRPCRespDTO);
+                }
             }
-            result.setData(lastTimeRPCResp);
+            result.setData(timeRPCRespDTOS);
         }catch (EmergencyException e){
             result.setCode(e.getCode());
             result.setMsg(e.getMessage());
@@ -171,20 +177,24 @@
     }
 
     @Override
-    public ResultVO<EmergencyExecuteLastTimeRPCRespDTO> getExecuteLastTimeByDeptIdsAndTime(EmergencydrillTimeRPCReq query) {
-        ResultVO<EmergencyExecuteLastTimeRPCRespDTO> result = new ResultVO<>(ResultCodes.OK);
+    public ResultVO<List<EmergencyExecuteDepLevelLasTimeRPCRespDTO>> getExecuteLastTimeByDeptIdsAndTime(EmergencydrillTimeRPCReq query) {
+        ResultVO<List<EmergencyExecuteDepLevelLasTimeRPCRespDTO>> result = new ResultVO<>(ResultCodes.OK);
         EmergencyDrillTimeQuery timeQuery = new EmergencyDrillTimeQuery();
         timeQuery.setDeptId(query.getDeptId());
         timeQuery.setYear(query.getYear());
         timeQuery.setMonth(query.getMonth());
 
         try{
-            EmergencyExecuteLastTimeRPCRespDTO lastTimeRPCResp = new EmergencyExecuteLastTimeRPCRespDTO();
-            EmergencyExecuteLastTimeRespDTO timeRespDTO = emergencyCountService.getLastPracticeTimeByDeptIdsAndTime(timeQuery);
-            if(null != timeRespDTO){
-                BeanUtils.copyProperties(timeRespDTO,lastTimeRPCResp);
+            List<EmergencyExecuteDepLevelLasTimeRPCRespDTO> levelLasTimeRPCRespDTOS = new ArrayList<>();
+            List<EmergencyExecuteDepLevelLasTimeRespDTO> lasTimeRespDTOS = emergencyCountService.getLastPracticeTimeByDeptIdsAndTime(timeQuery);
+            for(EmergencyExecuteDepLevelLasTimeRespDTO lastTimeRPCRespDTO :lasTimeRespDTOS){
+                if(null != lastTimeRPCRespDTO){
+                    EmergencyExecuteDepLevelLasTimeRPCRespDTO levelLasTimeRPCRespDTO = new EmergencyExecuteDepLevelLasTimeRPCRespDTO();
+                    BeanUtils.copyProperties(lastTimeRPCRespDTO,levelLasTimeRPCRespDTO);
+                    levelLasTimeRPCRespDTOS.add(levelLasTimeRPCRespDTO);
+                }
             }
-            result.setData(lastTimeRPCResp);
+            result.setData(levelLasTimeRPCRespDTOS);
         }catch (EmergencyException e){
             result.setCode(e.getCode());
             result.setMsg(e.getMessage());
@@ -305,5 +315,28 @@
         return result;
     }
 
+    @Override
+    public ResultVO<List<EmergencySuppliesInfoRPCRespDTO>> getEmergencySupplies() {
+        ResultVO<List<EmergencySuppliesInfoRPCRespDTO>> result = new ResultVO<>(ResultCodes.OK);
+        try{
+            List<EmergencySuppliesInfoRespDTO> emergencySupplies = emergencySuppliesService.getEmergencySupplies();
+            List<EmergencySuppliesInfoRPCRespDTO> collect = new ArrayList<>();
+            for (EmergencySuppliesInfoRespDTO emergencySupply : emergencySupplies) {
+                EmergencySuppliesInfoRPCRespDTO emergencySupplyDTO = new EmergencySuppliesInfoRPCRespDTO();
+                BeanUtils.copyProperties(emergencySupply, emergencySupplyDTO);
+                collect.add(emergencySupplyDTO);
+            }
+            result.setData(collect);
+        }catch (EmergencyException e){
+            result.setCode(e.getCode());
+            result.setMsg(e.getMessage());
+        }catch (Exception e) {
+            e.printStackTrace();
+            result.setCode(EmergencyResultCodes.ERROR.getCode());
+            result.setMsg(EmergencyResultCodes.ERROR.getDesc());
+        }
+        return result;
+    }
+
 
 }

--
Gitblit v1.9.2