From 17f8dd032fc267b38cdddc88de416aeab2600f90 Mon Sep 17 00:00:00 2001
From: zhangfeng <1603559716@qq.com>
Date: 星期三, 21 九月 2022 14:38:23 +0800
Subject: [PATCH] 根据物资类型分类-应急物资列表
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyCountServiceImpl.java | 73 ++++++++++++++++++++++++++----------
1 files changed, 53 insertions(+), 20 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..94c034b 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
@@ -18,6 +18,7 @@
import com.gkhy.safePlatform.emergency.query.EmergencySuppliesCountQuery;
import com.gkhy.safePlatform.emergency.rpc.api.model.dto.req.EmergencyExecuteNumRPCReq;
import com.gkhy.safePlatform.emergency.rpc.api.model.dto.req.EmergencyExecuteTimeRPCReq;
+import com.gkhy.safePlatform.emergency.rpc.api.model.dto.resp.EmergencyExecuteNumDetailRPCResp;
import com.gkhy.safePlatform.emergency.rpc.api.model.dto.resp.EmergencyExecuteNumRPCResp;
import com.gkhy.safePlatform.emergency.rpc.api.model.dto.resp.EmergencyExecuteTimeRPCResp;
import com.gkhy.safePlatform.emergency.service.EmergencyCountService;
@@ -28,7 +29,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import sun.security.pkcs11.wrapper.CK_SSL3_KEY_MAT_OUT;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -53,17 +53,20 @@
emergencyExecuteTimeRPCResp.setDeptId(depInfoRPCRespDTO.getDepId());
emergencyExecuteTimeRPCResp.setDeptName(depInfoRPCRespDTO.getDepName());
emergencyExecuteTimeRPCResp.setDeptLevel(depInfoRPCRespDTO.getDepLevel());
+ emergencyExecuteTimeRPCResp.setParentDepId(depInfoRPCRespDTO.getParentDepId());
getSingleTimeData(emergencyExecuteTimeRPCResp);
- return new SearchResultVO<>(
+ SearchResultVO searchResultVO = new SearchResultVO<>(
false,
null,
null,
null,
- 1L,
+ null,
emergencyExecuteTimeRPCResp,
ResultCodes.OK
);
+ searchResultVO.setCount(1);
+ return searchResultVO;
}
@Override
@@ -77,19 +80,25 @@
emergencyExecuteTimeRPCResp.setDeptId(depInfoRPCRespDTO.getDepId());
emergencyExecuteTimeRPCResp.setDeptName(depInfoRPCRespDTO.getDepName());
emergencyExecuteTimeRPCResp.setDeptLevel(depInfoRPCRespDTO.getDepLevel());
+ emergencyExecuteTimeRPCResp.setParentDepId(depInfoRPCRespDTO.getParentDepId());
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 +106,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())));
}
}
@@ -112,18 +121,21 @@
emergencyExecuteNumRPCResp.setDeptId(depInfoRPCRespDTO.getDepId());
emergencyExecuteNumRPCResp.setDeptName(depInfoRPCRespDTO.getDepName());
emergencyExecuteNumRPCResp.setDeptLevel(depInfoRPCRespDTO.getDepLevel());
+ emergencyExecuteNumRPCResp.setParentDepId(depInfoRPCRespDTO.getParentDepId());
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
@@ -138,50 +150,71 @@
emergencyExecuteNumRPCResp.setDeptId(depInfoRPCRespDTO.getDepId());
emergencyExecuteNumRPCResp.setDeptName(depInfoRPCRespDTO.getDepName());
emergencyExecuteNumRPCResp.setDeptLevel(depInfoRPCRespDTO.getDepLevel());
+ emergencyExecuteNumRPCResp.setParentDepId(depInfoRPCRespDTO.getParentDepId());
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 ;
+ Integer distType;
if (query.getMonth()==null){
+ distType=1;
// 查该年度12个月份的
startTime = TimeUtils.getYearFirst(query.getYear());
endTime = TimeUtils.getYearLast(query.getYear());
- emergencyDrillExecuteCountDataList= emergencyDrillExecuteInfoService.selectByMonthAndDept(startTime, endTime, deptIds);
+ emergencyDrillExecuteCountDataList= emergencyDrillExecuteInfoService.selectByMonthAndDeptForIntegerMonth(startTime, endTime, deptIds);
}else{
// 查该年度指定月份的
+ distType=2;
startTime = TimeUtils.getMonthFirst(query.getYear(),query.getMonth());
endTime = TimeUtils.getMonthLast(query.getYear(),query.getMonth());
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());
- mapList.add(map);
+ List<EmergencyExecuteNumDetailRPCResp> detailList =new ArrayList<>();
+ for (EmergencyDrillExecuteCountRPC emergencyDrillExecuteCountRPC : emergencyDrillExecuteCountDataList){
+
+ EmergencyExecuteNumDetailRPCResp emergencyExecuteNumDetailRPCResp = new EmergencyExecuteNumDetailRPCResp();
+
+ emergencyExecuteNumDetailRPCResp.setTime(emergencyDrillExecuteCountRPC.getName());
+ emergencyExecuteNumDetailRPCResp.setDistType(distType);
+ emergencyExecuteNumDetailRPCResp.setYear(query.getYear());
+ if (distType==1){
+ emergencyExecuteNumDetailRPCResp.setMonth(emergencyDrillExecuteCountRPC.getName());
+ }
+ if (distType==2){
+ emergencyExecuteNumDetailRPCResp.setMonth(query.getMonth());
+ emergencyExecuteNumDetailRPCResp.setDay(emergencyDrillExecuteCountRPC.getName());
+ }
+ emergencyExecuteNumDetailRPCResp.setNum(emergencyDrillExecuteCountRPC.getNum());
+ detailList.add(emergencyExecuteNumDetailRPCResp);
}
+ emergencyExecuteNumRPCResp.setDetail(detailList);
}
- emergencyExecuteNumRPCResp.setData(mapList);
+
}
private DepInfoRPCRespDTO getDepInfoByDepId(Long deptId) {
--
Gitblit v1.9.2