web模块完善

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

@@ -4,9 +4,9 @@ import com.bizmatics.common.core.bean.ApiResult;
 import com.bizmatics.mhfire.service.AlFsdAllService;
 import com.bizmatics.mhfire.service.vo.AlFsdAllVO;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
 
 /**
  * @author yq
@@ -23,11 +23,13 @@ public class AlFsdAllControllerWeb {
 
     /**
      * 获取行政许可的检查，受理，出文数量
-     * @param
+     * @param startTime 开始时间
+     * @param endTime 结束时间
      * @return
      */
-    @PostMapping("/alFsdAllNumber")
-    private ApiResult<AlFsdAllVO> alFsdAllNumber(){
-        return ApiResult.success(alFsdAllService.getAlFsdAllNumber());
+    @GetMapping("/alFsdAllNumber")
+    private ApiResult<AlFsdAllVO> alFsdAllNumber(@RequestParam(required = false) Date startTime,
+                                                 @RequestParam(required = false) Date endTime){
+        return ApiResult.success(alFsdAllService.getAlFsdAllNumber(startTime,endTime));
     }
 }

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

@@ -0,0 +1,81 @@
+package com.bizmatics.mhfire.controller.web;
+
+import com.bizmatics.common.core.bean.ApiResult;
+import com.bizmatics.common.core.bean.CommonPage;
+import com.bizmatics.mhfire.service.AlertService;
+import com.bizmatics.mhfire.service.vo.AlertStatisticsVO;
+import com.bizmatics.mhfire.service.vo.AlertVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author yq
+ * @date 2021/5/31 10:05
+ * 警情模块
+ */
+@RestController
+@RequestMapping("/alert")
+public class AlertControllerWeb {
+
+    @Autowired
+    private AlertService alertService;
+
+
+    /**
+     * 查询当天24小时警情
+     *
+     * @return
+     */
+    @GetMapping("/alertStatisticsByHouse")
+    public ApiResult<List<AlertStatisticsVO>> getAlertStatisticsByHouse() {
+        return ApiResult.success(alertService.getAlertStatisticsByHouse());
+    }
+
+
+    /**
+     * 查询每年12个月警情
+     *
+     * @return
+     */
+    @GetMapping("/alertStatisticsByMonth")
+    public ApiResult<List<AlertStatisticsVO>> getAlertStatisticsByMonth() {
+        return ApiResult.success(alertService.getAlertStatisticsByMonth());
+    }
+
+
+    /**
+     * 警情详细信息
+     *
+     * @param current   页数
+     * @param size      条数
+     * @param startTime 开始时间
+     * @param endTime   结束时间
+     * @return
+     */
+    @GetMapping("/page")
+    public ApiResult<CommonPage<AlertVO>> page(@RequestParam Integer current,
+                                               @RequestParam Integer size,
+                                               @RequestParam(required = false) Date startTime,
+                                               @RequestParam(required = false) Date endTime) {
+        return ApiResult.success(alertService.page(current, size, startTime, endTime));
+    }
+
+    /**
+     * 查询不同警情(社会救助，警情，火灾)的占比
+     *
+     * @param startTime 开始时间
+     * @param endTime   结束时间
+     * @return
+     */
+    @GetMapping("/alertStatistics")
+    public ApiResult<List<AlertStatisticsVO>> getAlertStatistics(@RequestParam(required = false) Date startTime,
+                                                                 @RequestParam(required = false) Date endTime) {
+        return ApiResult.success(alertService.getAlertStatistics(startTime, endTime));
+    }
+}

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

@@ -0,0 +1,65 @@
+package com.bizmatics.mhfire.controller.web;
+
+import com.bizmatics.common.core.bean.ApiResult;
+import com.bizmatics.common.core.bean.CommonPage;
+import com.bizmatics.mhfire.service.FireSiteService;
+import com.bizmatics.mhfire.service.vo.FireSiteDutyVO;
+import com.bizmatics.mhfire.service.vo.FireSiteVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @author yq
+ * @date 2021/5/31 10:13
+ * 消防站点
+ */
+@RestController
+@RequestMapping("/fireSite")
+public class FireSiteControllerWeb {
+
+    @Autowired
+    private FireSiteService fireSiteService;
+
+
+    /**
+     * 分页
+     * @param current 页数
+     * @param size 条数
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @return
+     */
+    @GetMapping("/page")
+    public ApiResult<CommonPage<FireSiteVO>> page(@RequestParam Integer current,
+                                                  @RequestParam Integer size,
+                                                  @RequestParam(required = false)String startTime,
+                                                  @RequestParam(required = false)String endTime){
+        return ApiResult.success(fireSiteService.page(current, size, startTime, endTime));
+    }
+
+
+    /**
+     * get one
+     * @param id id
+     * @return
+     */
+    @GetMapping("/one")
+    public ApiResult<FireSiteVO> getOne(@RequestParam String id){
+        return ApiResult.success(fireSiteService.getOne(id));
+    }
+
+    /**
+     * 站点执勤实力
+     * @param fireSiteId
+     * @return
+     */
+    @GetMapping("/fireSiteDuty")
+    public ApiResult<List<FireSiteDutyVO>> getFireSiteDuty(@RequestParam String fireSiteId){
+        return ApiResult.success(fireSiteService.getFireSiteDuty(fireSiteId));
+    }
+}

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

@@ -0,0 +1,98 @@
+package com.bizmatics.mhfire.controller.web;
+
+import com.bizmatics.common.core.bean.ApiResult;
+import com.bizmatics.common.core.bean.CommonPage;
+import com.bizmatics.mhfire.persistence.mapper.po.FireStatisticsPO;
+import com.bizmatics.mhfire.service.FireStatisticsService;
+import com.bizmatics.mhfire.service.vo.FireLevelRatioVO;
+import com.bizmatics.mhfire.service.vo.FireUnitPoliceVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @author yq
+ * @date 2021/5/31 10:20
+ * 火灾详情
+ */
+@RestController
+@RequestMapping("/fireStatistics")
+public class FireStatisticsControllerWeb {
+
+
+    @Autowired
+    private FireStatisticsService fireStatisticsService;
+
+
+    /**
+     * 根据年份和地址查看12月份的火灾统计
+     * @param year 年份
+     * @param address 地址
+     * @return
+     */
+    @GetMapping("fireCountByData")
+    public ApiResult<List<Integer>> getFireCountByData(@RequestParam Integer year,
+                                                       @RequestParam(required = false)String address){
+        return ApiResult.success(fireStatisticsService.getFireCountByData(year, address));
+    }
+
+
+    /**
+     * 分页
+     * @param current 页数
+     * @param size 条数
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @param address 地址
+     * @return
+     */
+    @GetMapping("page")
+    public ApiResult<CommonPage<FireStatisticsPO>> page(@RequestParam Integer current,
+                                                        @RequestParam Integer size,
+                                                        @RequestParam(required = false)String startTime,
+                                                        @RequestParam(required = false)String endTime,
+                                                        @RequestParam(required = false)String address){
+        return ApiResult.success(fireStatisticsService.page(current, size, startTime, endTime, address));
+    }
+
+
+    /**
+     * getOne
+     * @param id
+     * @return
+     */
+    @GetMapping("one")
+    public ApiResult<FireStatisticsPO> getOne(@RequestParam String id){
+        return ApiResult.success(fireStatisticsService.getOne(id));
+    }
+
+
+    /**
+     * 火灾-单位-出警信息
+     * @param id
+     * @return
+     */
+    @GetMapping("fireUnitPolice")
+    public ApiResult<FireUnitPoliceVO> getFireUnitPolice(@RequestParam String id){
+        return ApiResult.success(fireStatisticsService.getFireUnitPolice(id));
+    }
+
+
+    /**
+     * 火灾原因占比
+     * @param startTime 开始时间
+     * @param endTime   结束时间
+     * @param address   地址
+     * @return
+     */
+    @GetMapping("fireCauseRatio")
+    public ApiResult<List<FireLevelRatioVO>> getGroupByLevel(@RequestParam(required = false) String startTime,
+                                                             @RequestParam(required = false)String endTime,
+                                                             @RequestParam(required = false)String address){
+        return ApiResult.success(fireStatisticsService.getGroupByLevel(startTime,endTime,address));
+    }
+}

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

@@ -0,0 +1,68 @@
+package com.bizmatics.mhfire.controller.web;
+
+import com.bizmatics.common.core.bean.ApiResult;
+import com.bizmatics.common.core.bean.CommonPage;
+import com.bizmatics.mhfire.persistence.mapper.po.FireWaterPO;
+import com.bizmatics.mhfire.service.FireWaterService;
+import com.bizmatics.mhfire.service.vo.FireWaterStatisticsVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Date;
+
+/**
+ * @author yq
+ * @date 2021/5/31 9:35
+ * 水源模块
+ */
+@RestController
+@RequestMapping("/fireWater")
+public class FireWaterControllerWeb {
+    @Autowired
+    private FireWaterService fireWaterService;
+
+
+
+
+    /**
+     * 获取水源详细信息
+     * @param id 水源id
+     * @return
+     */
+    @GetMapping("/one")
+    public ApiResult<FireWaterPO> getOne(@RequestParam String id){
+        return ApiResult.success(fireWaterService.getOne(id));
+    }
+
+
+    /**
+     * 分页
+     * @param current 页数
+     * @param size  条数
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @return
+     */
+    @GetMapping("/page")
+    public ApiResult<CommonPage<FireWaterPO>> page(@RequestParam Integer current,
+                                                   @RequestParam Integer size,
+                                                   @RequestParam(required = false)Date startTime,
+                                                   @RequestParam(required = false)Date endTime){
+        return ApiResult.success(fireWaterService.page(current,size,startTime,endTime));
+    }
+
+    /**
+     * 水源统计
+     * @param startTime 开始时间
+     * @param endTime   结束时间
+     * @return
+     */
+    @GetMapping("/fireWaterStatistics")
+    public ApiResult<FireWaterStatisticsVO> getFireWaterStatistics(@RequestParam(required = false) Date startTime,
+                                                                   @RequestParam(required = false) Date endTime){
+        return ApiResult.success(fireWaterService.getFireWaterStatistics(startTime,endTime));
+    }
+}

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

@@ -0,0 +1,58 @@
+package com.bizmatics.mhfire.controller.web;
+
+import com.bizmatics.common.core.bean.ApiResult;
+import com.bizmatics.mhfire.service.ReportComplaintService;
+import com.bizmatics.mhfire.service.vo.ReportComplaintVO;
+import com.bizmatics.mhfire.service.vo.ReportStatisticsVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Date;
+
+/**
+ * @author yq
+ * @date 2021/5/31 9:21
+ * 举报投诉
+ */
+@RestController
+@RequestMapping("/reportComplaint")
+public class ReportComplaintControllerWeb {
+
+
+    @Autowired
+    private ReportComplaintService reportComplaintService;
+
+
+
+    /**
+     * 举报投诉分类汇总
+     * @param startTime 开始时间
+     * @param endTime   结束时间
+     * @return
+     */
+    @GetMapping("/reportStatistics")
+    public ApiResult<ReportStatisticsVO> getReportStatistics(@RequestParam(required = false) Date startTime,
+                                                             @RequestParam(required = false) Date endTime){
+        return ApiResult.success(reportComplaintService.getReportStatistics(startTime, endTime));
+    }
+
+    /**
+     * 举报情况信息
+     * @return
+     */
+    /**
+     * 举报情况信息
+     * @param startTime 开始时间
+     * @param endTime   结束时间
+     * @return
+     */
+    @GetMapping("/reportComplaint")
+    public ApiResult<ReportComplaintVO> getReportComplaint(@RequestParam(required = false) Date startTime,
+                                                           @RequestParam(required = false) Date endTime){
+        return ApiResult.success(reportComplaintService.getReportComplaint(startTime, endTime));
+    }
+
+}

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

@@ -4,9 +4,7 @@ import com.bizmatics.common.core.bean.ApiResult;
 import com.bizmatics.mhfire.service.SiAeAllService;
 import com.bizmatics.mhfire.service.vo.SiAeAllVO;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -26,12 +24,13 @@ public class SiAeAllControllerWeb {
 
     /**
      * 行政执法总记录汇总
-     * @param startTime
-     * @param endTime
+     * @param startTime 开始时间
+     * @param endTime 结束时间
      * @return
      */
-    @PostMapping("/siAeAllCollect")
-    public ApiResult<List<SiAeAllVO>> aeAllCollect(String startTime,String endTime){
+    @GetMapping("/siAeAllCollect")
+    public ApiResult<List<SiAeAllVO>> aeAllCollect(@RequestParam(required = false) String startTime,
+                                                   @RequestParam(required = false) String endTime){
         return ApiResult.success(aeAllService.getAeAllCollect(startTime,endTime));
     }
 }

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

@@ -0,0 +1,33 @@
+package com.bizmatics.mhfire.controller.web;
+
+import com.bizmatics.common.core.bean.ApiResult;
+import com.bizmatics.mhfire.persistence.mapper.po.UnitBeOnDutyPO;
+import com.bizmatics.mhfire.service.UnitBeOnDutyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+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")
+public class UnitBeOnDutyControllerWeb {
+
+    @Autowired
+    private UnitBeOnDutyService unitBeOnDutyService;
+
+
+    /**
+     * 今日值班表
+     * @return
+     */
+    @GetMapping("/one")
+    public ApiResult<UnitBeOnDutyPO> getOne(){
+        return ApiResult.success(unitBeOnDutyService.gerOneByToday());
+    }
+
+}

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

@@ -6,8 +6,7 @@ import com.bizmatics.mhfire.persistence.mapper.po.UnitPO;
 import com.bizmatics.mhfire.service.UnitService;
 import com.bizmatics.mhfire.service.vo.UnitAlCheckVO;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * @author yq
@@ -26,29 +25,35 @@ public class UnitControllerWeb {
      * 获取单个单位信息
      * @return
      */
-    public ApiResult<UnitPO> getOne(UnitPO unitPo){
+    @GetMapping("/one")
+    public ApiResult<UnitPO> getOne(@RequestBody UnitPO unitPo){
         return ApiResult.success(unitService.getOne(unitPo));
     }
 
     /**
      * 分页
-     * @param current
-     * @param size
+     * @param current 页数
+     * @param size 条数
      * @return
      */
-    public ApiResult<CommonPage<UnitPO>> page(Integer current, Integer size){
+    @GetMapping("/page")
+    public ApiResult<CommonPage<UnitPO>> page(@RequestParam Integer current,
+                                              @RequestParam Integer size){
         return ApiResult.success(unitService.page(current,size));
     }
 
 
     /**
      * 单位信息及执法情况和历史检查记录
-     * @param unitId
-     * @param startTime
-     * @param endTime
+     * @param unitId  单位ID
+     * @param startTime 开始时间
+     * @param endTime 结束时间
      * @return
      */
-    public ApiResult<UnitAlCheckVO> getUnitAlCheck(String unitId, String startTime, String endTime){
+    @GetMapping("/unitAlCheck")
+    public ApiResult<UnitAlCheckVO> getUnitAlCheck(@RequestParam String unitId,
+                                                   @RequestParam(required = false) String startTime,
+                                                   @RequestParam(required = false) String endTime){
         return ApiResult.success(unitService.getUnitAlCheck(unitId,startTime,endTime));
     }
 }

mhfire-mapping/src/main/java/com/bizmatics/mhfire/persistence/mapper/FireWaterMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.Date;
 import java.util.Map;
 
 /**
@@ -32,8 +33,8 @@ public interface FireWaterMapper {
      * @return
      */
     Page<Map<String,Object>> page(IPage<Map<String,Object>> page,
-                                  @Param("startTime") String startTime,
-                                  @Param("endTime")String endTime);
+                                  @Param("startTime") Date startTime,
+                                  @Param("endTime")Date endTime);
 
 
     /**
@@ -45,5 +46,7 @@ public interface FireWaterMapper {
      */
     Integer selectCountByWaterNature(@Param("waterType") String waterType,
                                      @Param("waterNature") String waterNature,
-                                     @Param("getWaterType") String getWaterType);
+                                     @Param("getWaterType") String getWaterType,
+                                     @Param("startTime") Date startTime,
+                                     @Param("endTime") Date endTime);
 }

mhfire-mapping/src/main/resources/mapper/mysql/FireWaterMapper.xml

@@ -8,10 +8,10 @@
     <select id="page" resultType="java.util.Map">
         select * from jbzb-syxx
         <where>
-            <if test="startTime != null and startTime !=''">
+            <if test="startTime != null">
                 and sy.BDP_AUDIT >= #{startTime}
             </if>
-            <if test="endTime !=null and endTime !=''">
+            <if test="endTime !=null">
                 and sy.BDP_AUDIT &lt;= #{endTime}
             </if>
         </where>
@@ -29,6 +29,12 @@
             <if test="getWaterType !=null and getWaterType != ''">
                 and sy.取水形式 = #{getWaterType}
             </if>
+            <if test="startTime !=null">
+                and sy.BDP_AUDIT >= #{startTime}
+            </if>
+            <if test="endTime !=null">
+                and sy.BDP_AUDIT &lt;= #{endTime}
+            </if>
         </where>
     </select>
 </mapper>

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

@@ -2,6 +2,8 @@ package com.bizmatics.mhfire.service;
 
 import com.bizmatics.mhfire.service.vo.AlFsdAllVO;
 
+import java.util.Date;
+
 /**
  * @author yq
  * @date 2021/5/25 16:49
@@ -15,5 +17,5 @@ public interface AlFsdAllService {
      * @param
      * @return
      */
-    AlFsdAllVO getAlFsdAllNumber();
+    AlFsdAllVO getAlFsdAllNumber(Date startTime,Date endTime);
 }

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

@@ -5,6 +5,7 @@ import com.bizmatics.mhfire.service.vo.AlertStatisticsVO;
 import com.bizmatics.mhfire.service.vo.AlertVO;
 import com.bizmatics.mhfire.service.vo.FireSiteVO;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -38,7 +39,7 @@ public interface AlertService {
      * @param endTime
      * @return
      */
-    CommonPage<AlertVO> page(Integer current, Integer size, String startTime, String endTime);
+    CommonPage<AlertVO> page(Integer current, Integer size, Date startTime, Date endTime);
 
     /**
      * 查询不同警情(社会救助，警情，火灾)的占比
@@ -46,7 +47,7 @@ public interface AlertService {
      * @param endTime
      * @return
      */
-    List<AlertStatisticsVO> getAlertStatistics(String startTime,String endTime);
+    List<AlertStatisticsVO> getAlertStatistics(Date startTime, Date endTime);
 
 
 }

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

@@ -5,6 +5,8 @@ import com.bizmatics.common.core.bean.CommonPage;
 import com.bizmatics.mhfire.persistence.mapper.po.FireWaterPO;
 import com.bizmatics.mhfire.service.vo.FireWaterStatisticsVO;
 
+import java.util.Date;
+
 /**
  * @author yq
  * @date 2021/5/27 16:16
@@ -29,12 +31,12 @@ public interface FireWaterService {
      * @param endTime
      * @return
      */
-    CommonPage<FireWaterPO> page(Integer current, Integer size, String startTime, String endTime);
+    CommonPage<FireWaterPO> page(Integer current, Integer size, Date startTime, Date endTime);
 
 
     /**
      * 水源统计
      * @return
      */
-    FireWaterStatisticsVO getFireWaterStatistics();
+    FireWaterStatisticsVO getFireWaterStatistics(Date startTime, Date endTime);
 }

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

@@ -3,6 +3,8 @@ package com.bizmatics.mhfire.service;
 import com.bizmatics.mhfire.service.vo.ReportComplaintVO;
 import com.bizmatics.mhfire.service.vo.ReportStatisticsVO;
 
+import java.util.Date;
+
 /**
  * @author yq
  * @date 2021/5/28 16:58
@@ -15,12 +17,12 @@ public interface ReportComplaintService {
      * 举报投诉分类汇总
      * @return
      */
-    ReportStatisticsVO getReportStatistics();
+    ReportStatisticsVO getReportStatistics(Date startTime, Date endTime);
 
     /**
      * 举报情况信息
      * @return
      */
-    ReportComplaintVO getReportComplaint();
+    ReportComplaintVO getReportComplaint(Date startTime, Date endTime);
 
 }

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

@@ -17,6 +17,10 @@ public interface UnitBeOnDutyService {
     UnitBeOnDutyPO getOne(String id);
 
 
-
+    /**
+     * 获取今日值班表
+     * @return
+     */
+    UnitBeOnDutyPO gerOneByToday();
 
 }

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

@@ -4,6 +4,8 @@ import com.bizmatics.mhfire.service.AlFsdAllService;
 import com.bizmatics.mhfire.service.vo.AlFsdAllVO;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+
 /**
  * @author yq
  * @date 2021/5/25 16:49
@@ -11,8 +13,9 @@ import org.springframework.stereotype.Service;
 @Service
 public class AlFsdAllServiceImpl implements AlFsdAllService {
     @Override
-    public AlFsdAllVO getAlFsdAllNumber() {
+    public AlFsdAllVO getAlFsdAllNumber(Date startTime, Date endTime) {
         //TODO 现有的数据库有不知道来自于哪些表
-        return null;
+        AlFsdAllVO alFsdAllVo = new AlFsdAllVO();
+        return alFsdAllVo;
     }
 }

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

@@ -52,7 +52,7 @@ public class AlertServiceImpl implements AlertService {
     }
 
     @Override
-    public CommonPage<AlertVO> page(Integer current, Integer size, String startTime, String endTime) {
+    public CommonPage<AlertVO> page(Integer current, Integer size, Date startTime, Date endTime) {
         Page<Map<String, Object>> page = new Page<>(current, size);
 
         List<AlertVO> list = new ArrayList<>();
@@ -61,7 +61,7 @@ public class AlertServiceImpl implements AlertService {
     }
 
     @Override
-    public List<AlertStatisticsVO> getAlertStatistics(String startTime, String endTime) {
+    public List<AlertStatisticsVO> getAlertStatistics(Date startTime, Date endTime) {
         List<AlertStatisticsVO> list = new ArrayList<>();
         //TODO 数据来源于其他平台
         return list;

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

@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -29,7 +30,7 @@ public class FireWaterServiceImpl implements FireWaterService {
     }
 
     @Override
-    public CommonPage<FireWaterPO> page(Integer current, Integer size, String startTime, String endTime) {
+    public CommonPage<FireWaterPO> page(Integer current, Integer size, Date startTime, Date endTime) {
         List<FireWaterPO> list = new ArrayList<>();
         Page<Map<String, Object>> page = new Page<>(current, size);
         page = fireWaterMapper.page(page, startTime, endTime);
@@ -38,26 +39,26 @@ public class FireWaterServiceImpl implements FireWaterService {
     }
 
     @Override
-    public FireWaterStatisticsVO getFireWaterStatistics() {
+    public FireWaterStatisticsVO getFireWaterStatistics(Date startTime, Date endTime) {
         FireWaterStatisticsVO fireWaterStatisticsVO = new FireWaterStatisticsVO();
         fireWaterStatisticsVO.setMunicipalFireCode(
-                fireWaterMapper.selectCountByWaterNature("消火栓","市政",null));
+                fireWaterMapper.selectCountByWaterNature("消火栓","市政",null,startTime,endTime));
         fireWaterStatisticsVO.setCommunityFireCode(
-                fireWaterMapper.selectCountByWaterNature("消火栓","社区",null));
+                fireWaterMapper.selectCountByWaterNature("消火栓","社区",null,startTime,endTime));
         fireWaterStatisticsVO.setUnitFireCode(
-                fireWaterMapper.selectCountByWaterNature("消火栓","单位",null));
+                fireWaterMapper.selectCountByWaterNature("消火栓","单位",null,startTime,endTime));
         fireWaterStatisticsVO.setNaturalWater(
-                fireWaterMapper.selectCountByWaterNature("天然水源",null,null));
+                fireWaterMapper.selectCountByWaterNature("天然水源",null,null,startTime,endTime));
         fireWaterStatisticsVO.setMunicipalWater(
-                fireWaterMapper.selectCountByWaterNature(null,"市政",null));
+                fireWaterMapper.selectCountByWaterNature(null,"市政",null,startTime,endTime));
         fireWaterStatisticsVO.setResidentWater(
-                fireWaterMapper.selectCountByWaterNature(null,"居民",null));
+                fireWaterMapper.selectCountByWaterNature(null,"居民",null,startTime,endTime));
         fireWaterStatisticsVO.setUnitWater(
-                fireWaterMapper.selectCountByWaterNature(null,"单位",null));
+                fireWaterMapper.selectCountByWaterNature(null,"单位",null,startTime,endTime));
         fireWaterStatisticsVO.setMunicipalGetWater(
-                fireWaterMapper.selectCountByWaterNature(null,null,"市政"));
+                fireWaterMapper.selectCountByWaterNature(null,null,"市政",startTime,endTime));
         fireWaterStatisticsVO.setLandGetWater(
-                fireWaterMapper.selectCountByWaterNature(null,null,"地上"));
+                fireWaterMapper.selectCountByWaterNature(null,null,"地上",startTime,endTime));
         return fireWaterStatisticsVO;
     }
 

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

@@ -6,6 +6,8 @@ import com.bizmatics.mhfire.service.vo.ReportComplaintVO;
 import com.bizmatics.mhfire.service.vo.ReportStatisticsVO;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+
 /**
  * @author yq
  * @date 2021/5/28 17:27
@@ -13,14 +15,14 @@ import org.springframework.stereotype.Service;
 @Service
 public class ReportComplaintServiceImpl implements ReportComplaintService {
     @Override
-    public ReportStatisticsVO getReportStatistics() {
+    public ReportStatisticsVO getReportStatistics(Date startTime, Date endTime) {
         ReportStatisticsVO reportStatisticsVo = new ReportStatisticsVO();
         //TODO 从其他平台获取
         return reportStatisticsVo;
     }
 
     @Override
-    public ReportComplaintVO getReportComplaint() {
+    public ReportComplaintVO getReportComplaint(Date startTime, Date endTime) {
         ReportComplaintVO reportComplaintVo = new ReportComplaintVO();
         //TODO 从其他平台获取
         return reportComplaintVo;

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

@@ -22,6 +22,12 @@ public class UnitBeOnDutyServiceImpl implements UnitBeOnDutyService {
         return enhanceUnitBeOnDutyPo(unitBeOnDutyMapper.getOne(id));
     }
 
+    @Override
+    public UnitBeOnDutyPO gerOneByToday() {
+        //TODO 获取今日的值班情况
+        return null;
+    }
+
 
     public UnitBeOnDutyPO enhanceUnitBeOnDutyPo(Map<String,Object> unitBeOnDutyMap){
         UnitBeOnDutyPO unitBeOnDutyPo = new UnitBeOnDutyPO();