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/controller/EmergencyCountController.java | 121 +++++++++++++++++++++++++++++++++++++--
1 files changed, 113 insertions(+), 8 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyCountController.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyCountController.java
index a7f75a6..bd0dd04 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyCountController.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyCountController.java
@@ -1,12 +1,19 @@
package com.gkhy.safePlatform.emergency.controller;
+import com.alibaba.fastjson.JSONObject;
import com.gkhy.safePlatform.commons.query.PageQuery;
import com.gkhy.safePlatform.commons.utils.PageUtils;
import com.gkhy.safePlatform.commons.vo.ResultVO;
-import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyDrillExecuteCountRespDTO;
-import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyDrillExecutePageRespDTO;
-import com.gkhy.safePlatform.emergency.query.EmergencyDrillExecuteQuery;
+import com.gkhy.safePlatform.commons.vo.SearchResultVO;
+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.EmergencyExecuteNumRPCResp;
+import com.gkhy.safePlatform.emergency.rpc.api.model.dto.resp.EmergencyExecuteTimeRPCResp;
import com.gkhy.safePlatform.emergency.service.EmergencyCountService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -28,16 +35,114 @@
return emergencyCountService.countEmergencyDrillExecute(query);
}
-/* *//**
+ /**
* 应急物资统计图
- *//*
+ */
@RequestMapping(value = "/emergencySupplies/count" ,method = RequestMethod.POST)
- private ResultVO<List<EmergencyDrillExecutePageRespDTO>> list (@RequestBody PageQuery<EmergencyDrillExecuteQuery> pageQuery){
+ private ResultVO<List<EmergencySuppliesCountRespDTO>> list (@RequestBody PageQuery<EmergencySuppliesCountQuery> pageQuery){
PageUtils.checkCheck(pageQuery);
- return emergencyDrillExecuteService.selectEmergencyDrillExecuteList(pageQuery);
- }*/
+ return emergencyCountService.countEmergencySupplies(pageQuery);
+ }
+ /**
+ * 应急演练次数统计图
+ */
+ @RequestMapping(value = "/getTimeByDeptId",method = RequestMethod.POST)
+ public SearchResultVO<EmergencyExecuteTimeRPCResp> getTimeByDeptId(@RequestBody EmergencyExecuteTimeRPCReq query){
+ return emergencyCountService.getTimeByDeptId(query);
+ }
+ /**
+ * 应急演练次数统计图
+ */
+ @RequestMapping(value = "/getTimeByDeptIds",method = RequestMethod.POST)
+ public SearchResultVO<List<EmergencyExecuteTimeRPCResp>> getTimeByDeptIds(@RequestBody EmergencyExecuteTimeRPCReq query){
+ return emergencyCountService.getTimeByDeptIds(query);
+ }
+ /**
+ * 应急演练次数统计图
+ */
+ @RequestMapping(value = "/getNumByDeptId",method = RequestMethod.POST)
+ public SearchResultVO<EmergencyExecuteNumRPCResp> getNumByDeptId(@RequestBody EmergencyExecuteNumRPCReq query){
+ return emergencyCountService.getNumByDeptId(query);
+ }
+
+ /**
+ * 应急演练次数统计图
+ */
+ @RequestMapping(value = "/getNumByDeptIds",method = RequestMethod.POST)
+ public SearchResultVO<List<EmergencyExecuteNumRPCResp>> getNumByDeptIds(@RequestBody EmergencyExecuteNumRPCReq query){
+ return emergencyCountService.getNumByDeptIds(query);
+ }
+
+ /***************************重构******************************/
+
+ /**
+ * 根据部门id查询最后一次完成应急演练的时间
+ */
+ @RequestMapping(value = "/getLastTimeByDeptId",method = RequestMethod.POST)
+ public EmergencyExecuteTimeRespDTO getLastTimeByDeptId(@RequestBody JSONObject jsonObject){
+ Long deptId = jsonObject.getLong("deptId");
+ return emergencyCountService.getLastTimeByDeptId(deptId);
+ }
+ /**
+ * 根据部门以及子级部门查询最后一次完成应急演练的时间
+ */
+ @RequestMapping(value = "/getLastTimeByDeptIds",method = RequestMethod.POST)
+ public List<EmergencyExecuteDepLevelLasTimeRespDTO> getLastTimeByDeptIds(@RequestBody JSONObject jsonObject){
+ Long deptId = jsonObject.getLong("deptId");
+ return emergencyCountService.getLastTimeByDeptIds(deptId);
+ }
+
+ /**
+ * 根据部门id，年份月份，查询最后一次完成应急演练的时间
+ */
+ @RequestMapping(value = "/getLastTimeByDeptIdAndTime",method = RequestMethod.POST)
+ public EmergencyExecuteLastTimeRespDTO getLastTimeByDeptIdAndTime(@RequestBody EmergencyDrillTimeQuery query){
+ return emergencyCountService.getLastPracticeTimeByDeptIdAndTime(query);
+ }
+ /**
+ * 根据部门以及子级部门，年份月份，查询最后一次完成应急演练的时间
+ */
+ @RequestMapping(value = "/getLastTimeByDeptIdsAndTime",method = RequestMethod.POST)
+ public List<EmergencyExecuteDepLevelLasTimeRespDTO> getLastTimeByDeptIdsAndTime(@RequestBody EmergencyDrillTimeQuery query){
+ return emergencyCountService.getLastPracticeTimeByDeptIdsAndTime(query);
+ }
+
+ /**
+ * 根据指定和年份统计演练数据
+ * @param query
+ * @return
+ */
+ @RequestMapping(value = "/getCountByDeptIdAndYear",method = RequestMethod.POST)
+ public StatisticsDepLevelYearExecuteRespDTO getCountByDeptIdAndYear(@RequestBody EmergencyDrillCountQuery query){
+ return emergencyCountService.getCountByDeptIdAndYear(query);
+ }
+
+ /**
+ * 根据部门，指定月份 统计演练次数
+ * @param query
+ * @return
+ */
+ @RequestMapping(value = "/getCountByDeptIdAndMonth",method = RequestMethod.POST)
+ public StatisticsDepLevelMonthEexcuteRespDTO getCountByDeptIdAndMonth(@RequestBody EmergencyDrillCountQuery query){
+ return emergencyCountService.getCountByDeptIdAndMonth(query);
+ }
+
+ @RequestMapping(value = "/getCountByDeptIdsAndYear",method = RequestMethod.POST)
+ public List<StatisticsDepLevelYearExecuteRespDTO> getCountByDeptIdsAndYear(@RequestBody EmergencyDrillCountQuery query){
+ return emergencyCountService.getCountByDeptIdsAndYear(query);
+ }
+
+ /**
+ * 根据部门以及其子级部门，指定月份 统计演练次数
+ * @param query
+ * @return
+ */
+ @RequestMapping(value = "/getCountByDeptIdsAndMonth",method = RequestMethod.POST)
+ public List<StatisticsDepLevelMonthEexcuteRespDTO> getCountByDeptIdsAndMonth(@RequestBody EmergencyDrillCountQuery query){
+ return emergencyCountService.getCountByDeptIdsAndMonth(query);
+ }
}
--
Gitblit v1.9.2