From 759bbb8ee99665382a689fa90277a9b2279238da Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 19 八月 2022 19:04:02 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into master

---
 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyCountController.java |   40 ++++++++++++++++++++++++++++++++++++++++
 1 files changed, 40 insertions(+), 0 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
new file mode 100644
index 0000000..1430965
--- /dev/null
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyCountController.java
@@ -0,0 +1,40 @@
+package com.gkhy.safePlatform.emergency.controller;
+
+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.EmergencySuppliesCountRespDTO;
+import com.gkhy.safePlatform.emergency.query.EmergencyDrillExecuteCountQuery;
+import com.gkhy.safePlatform.emergency.query.EmergencySuppliesCountQuery;
+import com.gkhy.safePlatform.emergency.service.EmergencyCountService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/emergencyCount")
+public class EmergencyCountController {
+
+    @Autowired
+    private EmergencyCountService emergencyCountService;
+
+    /**
+     * 应急演练次数统计图
+     */
+    @RequestMapping(value = "/emergencyDrillExecute/count",method = RequestMethod.POST)
+    public ResultVO<EmergencyDrillExecuteCountRespDTO> countEmergencyDrillExecute(@RequestBody EmergencyDrillExecuteCountQuery query){
+        return emergencyCountService.countEmergencyDrillExecute(query);
+    }
+
+    /**
+     * 应急物资统计图
+     */
+    @RequestMapping(value = "/emergencySupplies/count" ,method = RequestMethod.POST)
+    private ResultVO<List<EmergencySuppliesCountRespDTO>> list (@RequestBody PageQuery<EmergencySuppliesCountQuery> pageQuery){
+        PageUtils.checkCheck(pageQuery);
+        return  emergencyCountService.countEmergencySupplies(pageQuery);
+    }
+
+}

--
Gitblit v1.9.2