From 53e7dce8d55487cbac64e4374ec9aa1b52a6c6ed Mon Sep 17 00:00:00 2001
From: SZH <szh_hello@163.com>
Date: 星期四, 09 三月 2023 21:16:43 +0800
Subject: [PATCH] 解决npe问题
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyCountServiceImpl.java | 435 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 427 insertions(+), 8 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 5ad92ea..24c9560 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
@@ -11,13 +11,17 @@
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.commons.vo.SearchResultVO;
import com.gkhy.safePlatform.emergency.entity.*;
+import com.gkhy.safePlatform.emergency.enums.DepartmentLevelEnum;
import com.gkhy.safePlatform.emergency.enums.EmergencyResultCodes;
import com.gkhy.safePlatform.emergency.excepiton.EmergencyException;
import com.gkhy.safePlatform.emergency.model.dto.resp.*;
+import com.gkhy.safePlatform.emergency.query.EmergencyDrillCountQuery;
import com.gkhy.safePlatform.emergency.query.EmergencyDrillExecuteCountQuery;
+import com.gkhy.safePlatform.emergency.query.EmergencyDrillTimeQuery;
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,10 +32,11 @@
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.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.stream.Collectors;
@Service("emergencyCountService")
public class EmergencyCountServiceImpl implements EmergencyCountService {
@@ -53,6 +58,7 @@
emergencyExecuteTimeRPCResp.setDeptId(depInfoRPCRespDTO.getDepId());
emergencyExecuteTimeRPCResp.setDeptName(depInfoRPCRespDTO.getDepName());
emergencyExecuteTimeRPCResp.setDeptLevel(depInfoRPCRespDTO.getDepLevel());
+ emergencyExecuteTimeRPCResp.setParentDepId(depInfoRPCRespDTO.getParentDepId());
getSingleTimeData(emergencyExecuteTimeRPCResp);
SearchResultVO searchResultVO = new SearchResultVO<>(
@@ -79,6 +85,7 @@
emergencyExecuteTimeRPCResp.setDeptId(depInfoRPCRespDTO.getDepId());
emergencyExecuteTimeRPCResp.setDeptName(depInfoRPCRespDTO.getDepName());
emergencyExecuteTimeRPCResp.setDeptLevel(depInfoRPCRespDTO.getDepLevel());
+ emergencyExecuteTimeRPCResp.setParentDepId(depInfoRPCRespDTO.getParentDepId());
getSingleTimeData(emergencyExecuteTimeRPCResp);
list.add(emergencyExecuteTimeRPCResp);
@@ -119,6 +126,7 @@
emergencyExecuteNumRPCResp.setDeptId(depInfoRPCRespDTO.getDepId());
emergencyExecuteNumRPCResp.setDeptName(depInfoRPCRespDTO.getDepName());
emergencyExecuteNumRPCResp.setDeptLevel(depInfoRPCRespDTO.getDepLevel());
+ emergencyExecuteNumRPCResp.setParentDepId(depInfoRPCRespDTO.getParentDepId());
getSingleNumData(emergencyExecuteNumRPCResp,query);
@@ -147,6 +155,7 @@
emergencyExecuteNumRPCResp.setDeptId(depInfoRPCRespDTO.getDepId());
emergencyExecuteNumRPCResp.setDeptName(depInfoRPCRespDTO.getDepName());
emergencyExecuteNumRPCResp.setDeptLevel(depInfoRPCRespDTO.getDepLevel());
+ emergencyExecuteNumRPCResp.setParentDepId(depInfoRPCRespDTO.getParentDepId());
getSingleNumData(emergencyExecuteNumRPCResp,query);
list.add(emergencyExecuteNumRPCResp);
@@ -167,36 +176,52 @@
return searchResultVO;
}
+
+
private void getSingleNumData(EmergencyExecuteNumRPCResp emergencyExecuteNumRPCResp,EmergencyExecuteNumRPCReq query){
List<Long> deptIds = new ArrayList<>();
deptIds.add(emergencyExecuteNumRPCResp.getDeptId());
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.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()){
+ List<EmergencyExecuteNumDetailRPCResp> detailList =new ArrayList<>();
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);
+
+ 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) {
@@ -319,5 +344,399 @@
ResultCodes.OK
);
}
+ /**********************************重构****************************************************/
+ /**
+ * 查询部门最后一次演练时间
+ * @param deptId
+ * @return
+ */
+ @Override
+ public EmergencyExecuteTimeRespDTO getLastTimeByDeptId(Long deptId) {
+ if(null == deptId){
+ throw new EmergencyException(EmergencyResultCodes.SUPPLIES_PARAM_NULL);
+ }
+
+ //通过RPC获取部门相关数据
+ DepInfoRPCRespDTO depInfoRPCRespDTO = getDepInfoByDepId(deptId);
+ // 查询该部门最后一次演练时间
+ String lastTime = emergencyDrillExecuteInfoService.getLastTimeByDeptId(deptId);
+ //填充数据
+ EmergencyExecuteTimeRespDTO respDTO = new EmergencyExecuteTimeRespDTO();
+ respDTO.setDepId(depInfoRPCRespDTO.getDepId());
+ respDTO.setDepLevel(depInfoRPCRespDTO.getDepLevel());
+ respDTO.setLastPricticeTime(StringUtils.isBlank(lastTime) == true ? "" : lastTime);
+
+ return respDTO;
+ }
+
+ /**
+ * 查询部门及其子级部门最后一次演练时间
+ * 后面按部门等级划分
+ */
+ public List<EmergencyExecuteDepLevelLasTimeRespDTO> getLastTimeByDeptIds(Long deptId){
+
+ if(null == deptId){
+ throw new EmergencyException(EmergencyResultCodes.SUPPLIES_PARAM_NULL);
+ }
+ //通过RPC获取部门相关数据
+ List<DepInfoRPCRespDTO> depInfoList = getDepListInfoByDepId(deptId);
+ //过滤获取部门id
+ List<Long> deptIdList = depInfoList
+ .stream()
+ .map(dep -> dep.getDepId())
+ .collect(Collectors.toList());
+ // 查询该部门ids最后一次演练时间
+ List<EmergencyDrillExecuteLastTimeDO> executeLastTimeDOS = emergencyDrillExecuteInfoService.getLastTimeByDeptIds(deptIdList);
+ List<EmergencyExecuteDepLevelLasTimeRespDTO> depLevelRespDTOList = new ArrayList<>();
+ //循环部门等级
+ for(DepartmentLevelEnum departmentLevelEnum : DepartmentLevelEnum.values()){
+ //数据填充
+ EmergencyExecuteDepLevelLasTimeRespDTO depLevelRespDTO = new EmergencyExecuteDepLevelLasTimeRespDTO();
+ depLevelRespDTO.setDepLevel(departmentLevelEnum.getCode());
+
+ //该等级下的部门数据
+ List<DepInfoRPCRespDTO> selectDepList = depInfoList
+ .stream()
+ .filter(dep -> dep.getDepLevel().equals(departmentLevelEnum.getCode()))
+ .collect(Collectors.toList());
+ //获取该部门等级下部门演练数据
+ List<EmergencyDrillExecuteLastTimeDO> selectExeList = executeLastTimeDOS
+ .stream()
+ .filter(exe -> selectDepList.stream().map(dep -> dep.getDepId()).collect(Collectors.toList()).contains(exe.getDeptId()))
+ .collect(Collectors.toList());
+ //获取该等级最后一次演练时间
+ String lastTime = getLastPracticeTime(selectExeList);
+ depLevelRespDTO.setLastPricateTime(lastTime);
+ depLevelRespDTOList.add(depLevelRespDTO);
+ }
+ return depLevelRespDTOList;
+ }
+ //获取最大日期
+ private String getLastPracticeTime(List<EmergencyDrillExecuteLastTimeDO> selectExeList){
+ String lastTime = "";
+ if(selectExeList.size()>0){
+ SimpleDateFormat sdft = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ Collections.sort(selectExeList, new Comparator<EmergencyDrillExecuteLastTimeDO>(){
+ @Override
+ public int compare(EmergencyDrillExecuteLastTimeDO timeDO01, EmergencyDrillExecuteLastTimeDO timeDO02) {
+
+ int flag = -1;
+ try {
+ Date date1 = sdft.parse(timeDO01.getLastTime());
+ Date date2 = sdft.parse(timeDO02.getLastTime());
+ if(date1.before(date2)){
+ flag=1;
+ }
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ return flag;
+ } //compare
+ });
+ EmergencyDrillExecuteLastTimeDO lastTimeDO = selectExeList.get(0);
+ lastTime = lastTimeDO.getLastTime();
+ }
+ return lastTime;
+ }
+ @Override
+ public EmergencyExecuteLastTimeRespDTO getLastPracticeTimeByDeptIdAndTime(EmergencyDrillTimeQuery query) {
+ if(null == query.getDeptId()){
+ throw new EmergencyException(EmergencyResultCodes.SUPPLIES_PARAM_NULL,"部门id不可为空");
+ }
+ if(null == query.getYear()){
+ throw new EmergencyException(EmergencyResultCodes.SUPPLIES_PARAM_NULL,"年份不可为空");
+ }
+ //通过RPC获取部门相关数据
+ DepInfoRPCRespDTO depInfoRPCRespDTO = getDepInfoByDepId(query.getDeptId());
+ //开始时间结束时间
+ String startTime;
+ String endTime;
+ if(null == query.getMonth()){//年
+ startTime = TimeUtils.getYearFirst(query.getYear());
+ endTime = TimeUtils.getYearLast(query.getYear());
+ }else{//月
+ startTime = TimeUtils.getMonthFirst(query.getYear(),query.getMonth());
+ endTime = TimeUtils.getMonthLast(query.getYear(),query.getMonth());
+ }
+ // 查询该部门最后一次演练时间
+ String lastTime = emergencyDrillExecuteInfoService.getLastTimeByDeptIdAndTime(query.getDeptId(), startTime,endTime);
+ //填充数据
+ EmergencyExecuteLastTimeRespDTO respDTO = new EmergencyExecuteLastTimeRespDTO();
+ respDTO.setDepId(depInfoRPCRespDTO.getDepId());
+ respDTO.setDepLevel(depInfoRPCRespDTO.getDepLevel());
+ respDTO.setYear(query.getYear());
+ respDTO.setMonth(query.getMonth());
+ respDTO.setLastPricticeTime(StringUtils.isBlank(lastTime) == true ? "" : lastTime);
+ return respDTO;
+ }
+
+ @Override
+ public List<EmergencyExecuteDepLevelLasTimeRespDTO> getLastPracticeTimeByDeptIdsAndTime(EmergencyDrillTimeQuery query) {
+ if(null == query.getDeptId()){
+ throw new EmergencyException(EmergencyResultCodes.SUPPLIES_PARAM_NULL,"部门id不可为空");
+ }
+ if(null == query.getYear()){
+ throw new EmergencyException(EmergencyResultCodes.SUPPLIES_PARAM_NULL,"年份不可为空");
+ }
+ //通过RPC获取部门相关数据
+ List<DepInfoRPCRespDTO> depInfoList = getDepListInfoByDepId(query.getDeptId());
+ //过滤获取部门id
+ List<Long> deptIdList = depInfoList
+ .stream()
+ .map(dep -> dep.getDepId())
+ .collect(Collectors.toList());
+ //开始时间结束时间
+ String startTime;
+ String endTime;
+ if(null == query.getMonth()){//年
+ startTime = TimeUtils.getYearFirst(query.getYear());
+ endTime = TimeUtils.getYearLast(query.getYear());
+ }else{//月
+ startTime = TimeUtils.getMonthFirst(query.getYear(),query.getMonth());
+ endTime = TimeUtils.getMonthLast(query.getYear(),query.getMonth());
+ }
+ // 查询该部门ids最后一次演练时间
+ List<EmergencyDrillExecuteLastTimeDO> executeLastTimeDOS = emergencyDrillExecuteInfoService.getLastTimeByDeptIdsAndTime(deptIdList,startTime,endTime);
+ List<EmergencyExecuteDepLevelLasTimeRespDTO> depLevelRespDTOList = new ArrayList<>();
+ //循环部门等级
+ for(DepartmentLevelEnum departmentLevelEnum : DepartmentLevelEnum.values()){
+ //数据填充
+ EmergencyExecuteDepLevelLasTimeRespDTO depLevelRespDTO = new EmergencyExecuteDepLevelLasTimeRespDTO();
+ depLevelRespDTO.setDepLevel(departmentLevelEnum.getCode());
+ depLevelRespDTO.setYear(query.getYear());
+ depLevelRespDTO.setMonth(query.getMonth());
+ //该等级下的部门数据
+ List<DepInfoRPCRespDTO> selectDepList = depInfoList
+ .stream()
+ .filter(dep -> dep.getDepLevel().equals(departmentLevelEnum.getCode()))
+ .collect(Collectors.toList());
+ //获取该部门等级下部门演练数据
+ List<EmergencyDrillExecuteLastTimeDO> selectExeList = executeLastTimeDOS
+ .stream()
+ .filter(exe -> selectDepList.stream().map(dep -> dep.getDepId()).collect(Collectors.toList()).contains(exe.getDeptId()))
+ .collect(Collectors.toList());
+ //获取该等级最后一次演练时间
+ String lastTime = getLastPracticeTime(selectExeList);
+ depLevelRespDTO.setLastPricateTime(lastTime);
+ depLevelRespDTOList.add(depLevelRespDTO);
+ }
+
+ return depLevelRespDTOList;
+ }
+ /**
+ * 根据部门id和指定年份 统计演练数据
+ *
+ */
+ public StatisticsDepLevelYearExecuteRespDTO getCountByDeptIdAndYear(EmergencyDrillCountQuery query){
+ if(null == query.getDeptId()){
+ throw new EmergencyException(EmergencyResultCodes.SUPPLIES_PARAM_NULL,"部门id不可为空");
+ }
+ if(null == query.getYear()){
+ throw new EmergencyException(EmergencyResultCodes.SUPPLIES_PARAM_NULL,"年份不可为空");
+ }
+ //通过RPC获取部门相关数据
+ DepInfoRPCRespDTO depInfoRPCRespDTO = getDepInfoByDepId(query.getDeptId());
+ //填充数据
+ StatisticsDepLevelYearExecuteRespDTO respDTO = new StatisticsDepLevelYearExecuteRespDTO();
+ respDTO.setDepLevel(depInfoRPCRespDTO.getDepLevel());
+ respDTO.setYear(query.getYear());
+ //获取指定部门指定时间下的应急数据
+ List<EmergencyExecuteCountDO> executeCountDOList = emergencyDrillExecuteInfoService.getCountByDeptIdAndYear(query.getYear(),query.getDeptId());
+ //声明月份
+ int allMonth = 12;
+ //判断是否是当前年分
+// if(query.getYear().equals(TimeUtils.getCurrentYear())){
+// allMonth = TimeUtils.getCurrentMonth();
+// }
+ //总数量
+ int totalCount = 0;
+ List<StatisticsMonthExecuteCountRespDTO> executeCountRespDTOList = new ArrayList<>();
+ //循环月份
+ for(int i = 1;i <= allMonth; i++){
+ StatisticsMonthExecuteCountRespDTO executeCountRespDTO = new StatisticsMonthExecuteCountRespDTO();
+ executeCountRespDTO.setYear(query.getYear());
+ executeCountRespDTO.setMonth(i);
+ //获取当月数据
+ int month = i;
+ List<EmergencyExecuteCountDO> selectMonthList = executeCountDOList
+ .stream()
+ .filter(ac -> ac.getMonth().equals(month))
+ .collect(Collectors.toList());
+ if(selectMonthList.size()>0){
+ executeCountRespDTO.setCount(selectMonthList.get(0).getCount());
+ totalCount += selectMonthList.get(0).getCount();
+ }else{
+ executeCountRespDTO.setCount(0);
+ }
+ executeCountRespDTOList.add(executeCountRespDTO);
+ }
+ respDTO.setYearTotalCount(totalCount);
+ respDTO.setMonthExecuteCountList(executeCountRespDTOList);
+ return respDTO;
+ }
+
+ /**
+ * 根据指定部门、月份 统计演练数据
+ * @param query
+ * @return
+ */
+ @Override
+ public StatisticsDepLevelMonthEexcuteRespDTO getCountByDeptIdAndMonth(EmergencyDrillCountQuery query) {
+ if(null == query.getDeptId()){
+ throw new EmergencyException(EmergencyResultCodes.SUPPLIES_PARAM_NULL,"部门id不可为空");
+ }
+ if(null == query.getYear()){
+ throw new EmergencyException(EmergencyResultCodes.SUPPLIES_PARAM_NULL,"年份不可为空");
+ }
+ if(null == query.getMonth()){
+ throw new EmergencyException(EmergencyResultCodes.SUPPLIES_PARAM_NULL,"月份不可为空");
+ }
+ //通过RPC获取部门相关数据
+ DepInfoRPCRespDTO depInfoRPCRespDTO = getDepInfoByDepId(query.getDeptId());
+ //获取指定月份的演练数据
+ EmergencyExecuteCountDO executeCountDO = emergencyDrillExecuteInfoService.getCountByDeptIdAndMonth(query.getYear(),query.getMonth(), query.getDeptId());
+ //填充数据
+ StatisticsDepLevelMonthEexcuteRespDTO respDTO = new StatisticsDepLevelMonthEexcuteRespDTO();
+ respDTO.setDepLevel(depInfoRPCRespDTO.getDepLevel());
+ respDTO.setMonth(query.getMonth());
+ respDTO.setExecuteCount(executeCountDO.getCount());
+ return respDTO;
+ }
+
+ /**
+ * 根据部门id及其子级部门和指定年份 统计演练数据
+ *
+ */
+ public List<StatisticsDepLevelYearExecuteRespDTO> getCountByDeptIdsAndYear(EmergencyDrillCountQuery query){
+ if(null == query.getDeptId()){
+ throw new EmergencyException(EmergencyResultCodes.SUPPLIES_PARAM_NULL,"部门id不可为空");
+ }
+ if(null == query.getYear()){
+ throw new EmergencyException(EmergencyResultCodes.SUPPLIES_PARAM_NULL,"年份不可为空");
+ }
+ //通过RPC获取部门相关数据
+ List<DepInfoRPCRespDTO> depInfoList = getDepListInfoByDepId(query.getDeptId());
+ //过滤获取部门id
+ List<Long> deptIds = depInfoList
+ .stream()
+ .map(dep -> dep.getDepId())
+ .collect(Collectors.toList());
+ //开始时间结束时间
+ String startTime = TimeUtils.getYearFirst(query.getYear());
+ String endTime = TimeUtils.getYearLast(query.getYear());
+ //获取指定部门指定时间下的应急数据
+ List<EmergencyExecuteCountDO> executeCountDOList = emergencyDrillExecuteInfoService.getCountByDeptIdsAndTime(startTime,endTime,deptIds);
+
+ List<StatisticsDepLevelYearExecuteRespDTO> respDTOList = new ArrayList<>();
+ //循环部门等级
+ for(DepartmentLevelEnum departmentLevelEnum : DepartmentLevelEnum.values()){
+ //填充部门级别数据
+ StatisticsDepLevelYearExecuteRespDTO respDTO = new StatisticsDepLevelYearExecuteRespDTO();
+ respDTO.setDepLevel(departmentLevelEnum.getCode());
+ respDTO.setYear(query.getYear());
+
+ //获取该部门级别下面的相关部门
+ List<DepInfoRPCRespDTO> selectDepList = depInfoList
+ .stream()
+ .filter(dep -> dep.getDepLevel().equals(departmentLevelEnum.getCode()))
+ .collect(Collectors.toList());
+ //获取该部门级别下相关部门演练数据
+ List<EmergencyExecuteCountDO> selectExeList = executeCountDOList
+ .stream()
+ .filter(exe -> selectDepList.stream().map(dep -> dep.getDepId()).collect(Collectors.toList()).contains(exe.getDeptId()))
+ .collect(Collectors.toList());
+
+ List<StatisticsMonthExecuteCountRespDTO> monthExecuteCountList = new ArrayList<>();
+
+ //声明月份
+ int allMonth = 12;
+ //声明一年总数量
+ int yearTotalCount =0;
+ //判断是否是当前年分
+// if(query.getYear().equals(TimeUtils.getCurrentYear())){
+// allMonth = TimeUtils.getCurrentMonth();
+// }
+ //12个月份
+ for(int i = 1;i <= allMonth;i++){
+ //数量
+ int count = 0;
+ //循环
+ for(EmergencyExecuteCountDO executeCountDO : selectExeList){
+ if(executeCountDO.getMonth() == i){
+ count += executeCountDO.getCount();
+ yearTotalCount += executeCountDO.getCount();
+ }
+ }
+ StatisticsMonthExecuteCountRespDTO executeCountRespDTO = new StatisticsMonthExecuteCountRespDTO();
+ executeCountRespDTO.setYear(query.getYear());
+ executeCountRespDTO.setMonth(i);
+ executeCountRespDTO.setCount(count);
+ monthExecuteCountList.add(executeCountRespDTO);
+ }
+ respDTO.setMonthExecuteCountList(monthExecuteCountList);
+ respDTO.setYearTotalCount(yearTotalCount);
+ respDTOList.add(respDTO);
+ }
+ return respDTOList;
+ }
+ /**
+ * 根据部门id及其子级部门和指定者月份 统计演练数据
+ *
+ */
+ @Override
+ public List<StatisticsDepLevelMonthEexcuteRespDTO> getCountByDeptIdsAndMonth(EmergencyDrillCountQuery query) {
+ if(null == query.getDeptId()){
+ throw new EmergencyException(EmergencyResultCodes.SUPPLIES_PARAM_NULL,"部门id不可为空");
+ }
+ if(null == query.getYear()){
+ throw new EmergencyException(EmergencyResultCodes.SUPPLIES_PARAM_NULL,"年份不可为空");
+ }
+ if(null == query.getMonth()){
+ throw new EmergencyException(EmergencyResultCodes.SUPPLIES_PARAM_NULL,"月份不可为空");
+ }
+ //通过RPC获取部门相关数据
+ List<DepInfoRPCRespDTO> depInfoList = getDepListInfoByDepId(query.getDeptId());
+ //过滤获取部门id
+ List<Long> deptIds = depInfoList
+ .stream()
+ .map(dep -> dep.getDepId())
+ .collect(Collectors.toList());
+ //开始时间结束时间
+ String startTime = TimeUtils.getMonthFirst(query.getYear(),query.getMonth());
+ String endTime = TimeUtils.getMonthLast(query.getYear(),query.getMonth());
+ //获取演练数据
+ List<EmergencyExecuteCountDO> executeCountDOList = emergencyDrillExecuteInfoService.getCountByDeptIdsAndTime(startTime,endTime,deptIds);
+ List<StatisticsDepLevelMonthEexcuteRespDTO> respDTOList = new ArrayList<>();
+ //循环部门等级
+ for(DepartmentLevelEnum departmentLevelEnum : DepartmentLevelEnum.values()) {
+ //填充部门级别数据
+ StatisticsDepLevelMonthEexcuteRespDTO respDTO = new StatisticsDepLevelMonthEexcuteRespDTO();
+ respDTO.setDepLevel(departmentLevelEnum.getCode());
+ respDTO.setMonth(query.getMonth());
+
+ //获取该部门级别下面的相关部门
+ List<DepInfoRPCRespDTO> selectDepList = depInfoList
+ .stream()
+ .filter(dep -> dep.getDepLevel().equals(departmentLevelEnum.getCode()))
+ .collect(Collectors.toList());
+ //获取该部门级别下相关部门演练数据
+ List<EmergencyExecuteCountDO> selectExeList = executeCountDOList
+ .stream()
+ .filter(exe -> selectDepList.stream().map(dep -> dep.getDepId()).collect(Collectors.toList()).contains(exe.getDeptId()))
+ .collect(Collectors.toList());
+ //数量
+ int count = 0;
+ //循环
+ for(EmergencyExecuteCountDO executeCountDO : selectExeList){
+ count += executeCountDO.getCount();
+ }
+ respDTO.setExecuteCount(count);
+ respDTOList.add(respDTO);
+ }
+ return respDTOList;
+ }
+
+
+
}
--
Gitblit v1.9.2