添加查看火灾类型接口

mhfire-controller/src/main/java/com/bizmatics/mhfire/controller/web/AlFsdAllControllerWeb.java

@@ -9,9 +9,9 @@ import org.springframework.web.bind.annotation.*;
 import java.util.Date;
 
 /**
+ * 行政许可-消防安检申报总
  * @author yq
  * @date 2021/5/25 17:14
- * 行政许可-消防安检申报总
  */
 @RestController
 @RequestMapping("/alFsdAll")

mhfire-controller/src/main/java/com/bizmatics/mhfire/controller/web/AlertControllerWeb.java

@@ -15,9 +15,9 @@ import java.util.Date;
 import java.util.List;
 
 /**
+ * 警情模块
  * @author yq
  * @date 2021/5/31 10:05
- * 警情模块
  */
 @RestController
 @RequestMapping("/alert")

mhfire-controller/src/main/java/com/bizmatics/mhfire/controller/web/FireSiteControllerWeb.java

@@ -14,9 +14,9 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.List;
 
 /**
+ * 消防站点
  * @author yq
  * @date 2021/5/31 10:13
- * 消防站点
  */
 @RestController
 @RequestMapping("/fireSite")

mhfire-controller/src/main/java/com/bizmatics/mhfire/controller/web/FireStatisticsControllerWeb.java

@@ -17,9 +17,9 @@ import java.util.Date;
 import java.util.List;
 
 /**
+ * 火灾详情
  * @author yq
  * @date 2021/5/31 10:20
- * 火灾详情
  */
 @RestController
 @RequestMapping("/fireStatistics")
@@ -34,12 +34,14 @@ public class FireStatisticsControllerWeb {
      * 根据年份和地址查看12月份的火灾统计
      * @param year 年份
      * @param address 地址
+     * @param fireType 火灾类别
      * @return
      */
     @GetMapping("fireCountByData")
     public ApiResult<List<Integer>> getFireCountByData(@RequestParam Integer year,
-                                                       @RequestParam(required = false)String address){
-        return ApiResult.success(fireStatisticsService.getFireCountByData(year, address));
+                                                       @RequestParam(required = false)String address,
+                                                       @RequestParam(required = false)String fireType){
+        return ApiResult.success(fireStatisticsService.getFireCountByData(year, address,fireType));
     }
 
 
@@ -97,4 +99,13 @@ public class FireStatisticsControllerWeb {
                                                              @RequestParam(required = false)String address){
         return ApiResult.success(fireStatisticsService.getGroupByLevel(startTime,endTime,address));
     }
+
+    /**
+     * 火灾类型
+     * @return
+     */
+    @GetMapping("fireType")
+    public ApiResult<List<String>> getFireType(){
+        return ApiResult.success(fireStatisticsService.getFireType());
+    }
 }

mhfire-controller/src/main/java/com/bizmatics/mhfire/controller/web/FireWaterControllerWeb.java

@@ -14,9 +14,9 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.Date;
 
 /**
+ * 水源模块
  * @author yq
  * @date 2021/5/31 9:35
- * 水源模块
  */
 @RestController
 @RequestMapping("/fireWater")

mhfire-controller/src/main/java/com/bizmatics/mhfire/controller/web/ReportComplaintControllerWeb.java

@@ -13,9 +13,9 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.Date;
 
 /**
+ * 举报投诉
  * @author yq
  * @date 2021/5/31 9:21
- * 举报投诉
  */
 @RestController
 @RequestMapping("/reportComplaint")

mhfire-controller/src/main/java/com/bizmatics/mhfire/controller/web/SiAeAllControllerWeb.java

@@ -10,9 +10,9 @@ import java.util.Date;
 import java.util.List;
 
 /**
+ * 监督检查行政执法总记录
  * @author yq
  * @date 2021/5/25 16:19
- * 监督检查行政执法总记录
  */
 @RestController
 @RequestMapping("siaeall")

mhfire-controller/src/main/java/com/bizmatics/mhfire/controller/web/UnitBeOnDutyControllerWeb.java

@@ -9,9 +9,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
+ * 支队值班
  * @author yq
  * @date 2021/5/31 9:28
- * 支队值班
  */
 @RestController
 @RequestMapping("unitBeOnDuty")

mhfire-controller/src/main/java/com/bizmatics/mhfire/controller/web/UnitControllerWeb.java

@@ -9,9 +9,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 /**
+ * 单位信息
  * @author yq
  * @date 2021/5/28 17:44
- * 单位信息
  */
 @RestController
 @RequestMapping("/unit")

mhfire-controller/src/main/resources/smart-doc.json

@@ -1,6 +1,6 @@
 {
   "outPath":"./src/main/resources/static/doc",
-  "serverUrl": "http://127.0.0.1:8082/ajhgz",
+  "serverUrl": "http://172.16.120.155:8083",
   "isStrict": false,
   "coverOld": true,
   "allInOne": true,

mhfire-service/src/main/java/com/bizmatics/mhfire/service/FireStatisticsService.java

@@ -22,7 +22,7 @@ public interface FireStatisticsService {
      * @param address
      * @return
      */
-    List<Integer> getFireCountByData(Integer year,String address);
+    List<Integer> getFireCountByData(Integer year,String address,String fireType);
 
 
     /**
@@ -62,4 +62,11 @@ public interface FireStatisticsService {
     List<FireLevelRatioVO> getGroupByLevel(Date startTime, Date endTime, String address);
 
 
+    /**
+     * 火灾分类
+     * @return
+     */
+    List<String> getFireType();
+
+
 }

mhfire-service/src/main/java/com/bizmatics/mhfire/service/impl/FireStatisticsServiceImpl.java

@@ -29,7 +29,7 @@ public class FireStatisticsServiceImpl implements FireStatisticsService {
     @Autowired
     private UnitService unitService;
     @Override
-    public List<Integer> getFireCountByData(Integer year, String address) {
+    public List<Integer> getFireCountByData(Integer year, String address,String fireType) {
         List<Integer> list = new ArrayList<>();
         Date date = new Date();
         for (int i = 0; i < 12; i++) {
@@ -38,7 +38,7 @@ public class FireStatisticsServiceImpl implements FireStatisticsService {
             System.out.println(DateUtils.format(setMonths,"yyyy-MM-dd HH:mm:ss"));
             Date firstDayOfMonth = DateUtils.getFirstDayOfMonth(setMonths);
             Date lastDayOfMonth = DateUtils.getLastDayOfMonth(setMonths);
-            list.add(fireStatisticsMapper.selectCount(firstDayOfMonth, lastDayOfMonth, address,null));
+            list.add(fireStatisticsMapper.selectCount(firstDayOfMonth, lastDayOfMonth, address,fireType));
         }
         return list;
     }
@@ -92,6 +92,11 @@ public class FireStatisticsServiceImpl implements FireStatisticsService {
         return list;
     }
 
+    @Override
+    public List<String> getFireType() {
+        return fireStatisticsMapper.groupByCause();
+    }
+
     public FireStatisticsPO enhanceFireStatisticsPo(Map<String,Object> map){
         FireStatisticsPO fireStatisticsPo = new FireStatisticsPO();
         fireStatisticsPo.setId(map.get("火灾序号").toString());