From 1305d0aa469fe7330fd2f8e9fbb10d95042571be Mon Sep 17 00:00:00 2001 From: zhangfeng <1603559716@qq.com> Date: 星期一, 10 十月 2022 12:33:36 +0800 Subject: [PATCH] 应急系统和事故管理统计接口 --- emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyCountController.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 57 insertions(+), 2 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 ababe29..1eeab81 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,11 +1,12 @@ 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.commons.vo.SearchResultVO; -import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyDrillExecuteCountRespDTO; -import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencySuppliesCountRespDTO; +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.EmergencySuppliesCountQuery; import com.gkhy.safePlatform.emergency.rpc.api.model.dto.req.EmergencyExecuteNumRPCReq; @@ -74,4 +75,58 @@ 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 EmergencyExecuteTimeRespDTO getLastTimeByDeptIds(@RequestBody JSONObject jsonObject){ + Long deptId = jsonObject.getLong("deptId"); + return emergencyCountService.getLastTimeByDeptIds(deptId); + } + + /** + * 根据指定和年份统计演练数据 + * @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