From 8219cdfcb825b6d75c3a235a7e5195c8cac9a2ea Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: Tue, 06 Sep 2022 11:32:14 +0800
Subject: [PATCH] 统计接口rpc

---
 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyCountServiceImpl.java |   47 +++++++++++++++++++++++++++++++----------------
 1 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyCountServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyCountServiceImpl.java
index e865b2a..5ad92ea 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyCountServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyCountServiceImpl.java
@@ -55,15 +55,17 @@
         emergencyExecuteTimeRPCResp.setDeptLevel(depInfoRPCRespDTO.getDepLevel());
 
         getSingleTimeData(emergencyExecuteTimeRPCResp);
-        return new SearchResultVO<>(
+        SearchResultVO searchResultVO = new SearchResultVO<>(
                 false,
                 null,
                 null,
                 null,
-                1L,
+                null,
                 emergencyExecuteTimeRPCResp,
                 ResultCodes.OK
         );
+        searchResultVO.setCount(1);
+        return searchResultVO;
     }
 
     @Override
@@ -81,15 +83,20 @@
             getSingleTimeData(emergencyExecuteTimeRPCResp);
             list.add(emergencyExecuteTimeRPCResp);
         }
-        return new SearchResultVO<>(
+
+        SearchResultVO searchResultVO = new SearchResultVO<>(
                 false,
                 null,
                 null,
                 null,
-                (long) list.size(),
+                null,
                 list,
                 ResultCodes.OK
         );
+        if (!list.isEmpty()){
+            searchResultVO.setCount(list.size());
+        }
+        return searchResultVO;
     }
 
     private void getSingleTimeData(EmergencyExecuteTimeRPCResp emergencyExecuteTimeRPCResp){
@@ -97,7 +104,7 @@
         String lastTime = emergencyDrillExecuteInfoService.selectEmergencyDrillExecuteIntervalTimeByDeptId(emergencyExecuteTimeRPCResp.getDeptId());
         if (StringUtils.isNotBlank(lastTime)){
             emergencyExecuteTimeRPCResp.setLastTime(lastTime);
-            emergencyExecuteTimeRPCResp.setDays(TimeUtils.differentDays(lastTime, TimeUtils.formatDate(new Date())));
+//            emergencyExecuteTimeRPCResp.setDays(TimeUtils.differentDays(lastTime, TimeUtils.formatDate(new Date())));
         }
     }
 
@@ -115,15 +122,17 @@
 
         getSingleNumData(emergencyExecuteNumRPCResp,query);
 
-        return new SearchResultVO<>(
+        SearchResultVO searchResultVO = new SearchResultVO<>(
                 false,
                 null,
                 null,
                 null,
-                1L,
+                null,
                 emergencyExecuteNumRPCResp,
                 ResultCodes.OK
         );
+        searchResultVO.setCount(1);
+        return searchResultVO;
     }
 
     @Override
@@ -142,23 +151,28 @@
             getSingleNumData(emergencyExecuteNumRPCResp,query);
             list.add(emergencyExecuteNumRPCResp);
         }
-        return new SearchResultVO<>(
+
+        SearchResultVO searchResultVO = new SearchResultVO<>(
                 false,
                 null,
                 null,
                 null,
-                (long) list.size(),
+                null,
                 list,
                 ResultCodes.OK
         );
+        if (!list.isEmpty()){
+            searchResultVO.setCount(list.size());
+        }
+        return searchResultVO;
     }
 
     private void getSingleNumData(EmergencyExecuteNumRPCResp emergencyExecuteNumRPCResp,EmergencyExecuteNumRPCReq query){
         List<Long> deptIds = new ArrayList<>();
         deptIds.add(emergencyExecuteNumRPCResp.getDeptId());
 
-        List<Map<String,String>> mapList = new ArrayList<>();
-        List<EmergencyDrillExecuteCountData> emergencyDrillExecuteCountDataList = new ArrayList<>();
+        List<Map<String,Integer>> mapList = new ArrayList<>();
+        List<EmergencyDrillExecuteCountRPC> emergencyDrillExecuteCountDataList = new ArrayList<>();
 
         String startTime ;
         String endTime ;
@@ -166,7 +180,7 @@
             // 查该年度12个月份的
             startTime = TimeUtils.getYearFirst(query.getYear());
             endTime = TimeUtils.getYearLast(query.getYear());
-            emergencyDrillExecuteCountDataList= emergencyDrillExecuteInfoService.selectByMonthAndDept(startTime, endTime, deptIds);
+            emergencyDrillExecuteCountDataList= emergencyDrillExecuteInfoService.selectByMonthAndDeptForIntegerMonth(startTime, endTime, deptIds);
         }else{
             // 查该年度指定月份的
             startTime = TimeUtils.getMonthFirst(query.getYear(),query.getMonth());
@@ -174,10 +188,11 @@
             emergencyDrillExecuteCountDataList= emergencyDrillExecuteInfoService.selectByDayAndDept(startTime, endTime, deptIds);
         }
         if (!emergencyDrillExecuteCountDataList.isEmpty()){
-            for (EmergencyDrillExecuteCountData emergencyDrillExecuteCountData : emergencyDrillExecuteCountDataList){
-                Map<String ,String> map = new HashMap<>();
-                map.put("name",emergencyDrillExecuteCountData.getName());
-                map.put("num",emergencyDrillExecuteCountData.getNum().toString());
+            for (EmergencyDrillExecuteCountRPC emergencyDrillExecuteCountRPC : emergencyDrillExecuteCountDataList){
+                Map<String ,Integer> map = new HashMap<>();
+                // 名称+数据 1如果为查询的是年：返回的name为月份 2如果查询的是月，返回的name为天
+                map.put("name",emergencyDrillExecuteCountRPC.getName());
+                map.put("num",emergencyDrillExecuteCountRPC.getNum());
                 mapList.add(map);
             }
         }

--
Gitblit v1.9.2