根据需求出接口

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

@@ -1,119 +0,0 @@
-package com.bizmatics.mhfire.controller.web;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.bizmatics.common.core.bean.ApiResult;
-import com.bizmatics.common.core.bean.PageRequest;
-import com.bizmatics.common.core.util.BeanMapperUtils;
-import com.bizmatics.mhfire.service.AjhgzService;
-import com.bizmatics.mhfire.service.vo.UnitMessageRequest;
-import com.bizmatics.mhfire.service.vo.WaterDetailRequest;
-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;
-
-import ma.glasnost.orika.metadata.Type;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author yq
- * @date 2021/5/14 15:29
- */
-@RestController
-@RequestMapping("ajhgz")
-public class AjhgzControllerWeb {
-
-
-    @Autowired
-    private AjhgzService ajhgzService;
-
-
-    @GetMapping("ajhgzPage")
-    public ApiResult<Page<Map<String,Object>>> ajhgzPage(){
-
-        return ApiResult.success(ajhgzService.ajhgaPage(new PageRequest()));
-    }
-
-    @GetMapping("hzdcHzsgsmjlAllPage")
-    public ApiResult<Page<Map<String,Object>>> hzdcHzsgsmjlAllPage(){
-        return ApiResult.success(ajhgzService.hzdcHzsgsmjlAllPage(new PageRequest()));
-    }
-    @GetMapping("hzdcHztjbPage")
-    public ApiResult<Page<Map<String,Object>>> hzdcHztjbPage(){
-        return ApiResult.success(ajhgzService.hzdcHztjbPage(new PageRequest()));
-    }
-    @GetMapping("hzdcJyhzsgrdsPage")
-    public ApiResult<Page<Map<String,Object>>> hzdcJyhzsgrdsPage(){
-        return ApiResult.success(ajhgzService.hzdcJyhzsgrdsPage(new PageRequest()));
-    }
-    @GetMapping("hzdcYbhzsgrdsPage")
-    public ApiResult<Page<Map<String,Object>>> hzdcYbhzsgrdsPage(){
-        return ApiResult.success(ajhgzService.hzdcYbhzsgrdsPage(new PageRequest()));
-    }
-    @GetMapping("jbzbDwxxAllPage")
-    public ApiResult<Page<Map<String,Object>>> jbzbDwxxAllPage(){
-        return ApiResult.success(ajhgzService.jbzbDwxxAllPage(new PageRequest()));
-    }
-    @GetMapping("jbzbJdglxmAllPage")
-    public ApiResult<Page<Map<String,Object>>> jbzbJdglxmAllPage(){
-        return ApiResult.success(ajhgzService.jbzbJdglxmAllPage(new PageRequest()));
-    }
-    @GetMapping("jbzbSyxxPage")
-    public ApiResult<Page<Map<String,Object>>> jbzbSyxxPage(){
-        return ApiResult.success(ajhgzService.jbzbSyxxPage(new PageRequest()));
-    }
-    @GetMapping("jbzbZbbPage")
-    public ApiResult<Page<Map<String,Object>>> jbzbZbbPage(){
-        return ApiResult.success(ajhgzService.jbzbZbbPage(new PageRequest()));
-    }
-    @GetMapping("jdjcXfjdjcjlPage")
-    public ApiResult<Page<Map<String,Object>>> jdjcXfjdjcjlPage(){
-        return ApiResult.success(ajhgzService.jdjcXfjdjcjlPage(new PageRequest()));
-    }
-    @GetMapping("jdjcXzzftjAllPage")
-    public ApiResult<Page<Map<String,Object>>> jdjcXzzftjAllPage(){
-        return ApiResult.success(ajhgzService.jdjcXzzftjAllPage(new PageRequest()));
-    }
-    @GetMapping("xzcfXzcfqkbPage")
-    public ApiResult<Page<Map<String,Object>>> xzcfXzcfqkbPage(){
-        return ApiResult.success(ajhgzService.xzcfXzcfqkbPage(new PageRequest()));
-    }
-    @GetMapping("xzxkAjhgzPage")
-    public ApiResult<Page<Map<String,Object>>> xzxkAjhgzPage(){
-        return ApiResult.success(ajhgzService.xzxkAjhgzPage(new PageRequest()));
-    }
-    @GetMapping("xzxkAqjcpzPage")
-    public ApiResult<Page<Map<String,Object>>> xzxkAqjcpzPage(){
-        return ApiResult.success(ajhgzService.xzxkAqjcpzPage(new PageRequest()));
-    }
-    @GetMapping("xzxkBhgzPage")
-    public ApiResult<Page<Map<String,Object>>> xzxkBhgzPage(){
-        return ApiResult.success(ajhgzService.xzxkBhgzPage(new PageRequest()));
-    }
-    @GetMapping("xzxkShtssbbPage")
-    public ApiResult<Page<Map<String,Object>>> xzxkShtssbbPage(){
-        return ApiResult.success(ajhgzService.xzxkShtssbbPage(new PageRequest()));
-    }
-    @GetMapping("xzxkShyspzPage")
-    public ApiResult<Page<Map<String,Object>>> xzxkShyspzPage(){
-        return ApiResult.success(ajhgzService.xzxkShyspzPage(new PageRequest()));
-    }
-    @GetMapping("xzxkShysyjsPage")
-    public ApiResult<Page<Map<String,Object>>> xzxkShysyjsPage(){
-        return ApiResult.success(ajhgzService.xzxkShysyjsPage(new PageRequest()));
-    }
-
-    @GetMapping("xzxkXfajsbbPage")
-    public ApiResult<Page<Map<String,Object>>> xzxkXfajsbbPage(){
-        return ApiResult.success(ajhgzService.xzxkXfajsbbPage(new PageRequest()));
-    }
-
-    public static void main(String[] args) {
-        WaterDetailRequest waterDetailRequest = new WaterDetailRequest();
-        waterDetailRequest.setWaterAddress("!111");
-        Map<String,Object> map = new HashMap<>();
-        map.put("waterAddress","1111111111");
-
-    }
-}

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

@@ -0,0 +1,34 @@
+package com.bizmatics.mhfire.controller.web;
+
+import com.bizmatics.common.core.bean.ApiResult;
+import com.bizmatics.mhfire.persistence.mapper.vo.AlFsdAllRequest;
+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;
+
+/**
+ * @author yq
+ * @date 2021/5/25 17:14
+ * 行政许可-消防安检申报总
+ */
+@RestController
+@RequestMapping("alFsdAll")
+public class AlFsdAllControllerWeb {
+
+    @Autowired
+    private AlFsdAllService alFsdAllService;
+
+
+    /**
+     * 获取行政许可的检查，受理，出文数量
+     * @param alFsdAllRequest
+     * @return
+     */
+    @PostMapping("alFsdAllNumber")
+    private ApiResult<AlFsdAllVO> alFsdAllNumber(AlFsdAllRequest alFsdAllRequest){
+        return ApiResult.success(alFsdAllService.getAlFsdAllNumber(alFsdAllRequest));
+    }
+}

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

@@ -0,0 +1,37 @@
+package com.bizmatics.mhfire.controller.web;
+
+import com.bizmatics.common.core.bean.ApiResult;
+import com.bizmatics.mhfire.persistence.mapper.vo.SiAeAllRequest;
+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 java.util.List;
+
+/**
+ * @author yq
+ * @date 2021/5/25 16:19
+ * 监督检查行政执法总记录
+ */
+@RestController
+@RequestMapping("siaeall")
+public class SiAeAllControllerWeb {
+
+
+    @Autowired
+    public SiAeAllService aeAllService;
+
+
+    /**
+     * 行政执法总记录汇总
+     * @param siAeAllRequest
+     * @return
+     */
+    @PostMapping("/siAeAllCollect")
+    public ApiResult<List<SiAeAllVO>> aeAllCollect(SiAeAllRequest siAeAllRequest){
+        return ApiResult.success(aeAllService.getAeAllCollect(siAeAllRequest));
+    }
+}

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

@@ -1,76 +0,0 @@
-package com.bizmatics.mhfire.persistence.mapper;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-import java.util.Map;
-
-/**
- * @author yq
- * @date 2021/5/14 13:37
- */
-@Repository
-public interface AjhgzMapper {
-
-
-    Page<Map<String,Object>> ajhgzPage(Page<Map<String,Object>> page,
-                     @Param("xmName") String xmName);
-
-
-    Page<Map<String,Object>> hzdcHzsgsmjlAllPage(Page<Map<String,Object>> page,
-                                             @Param("xmName") String xmName);
-
-
-    Page<Map<String,Object>> hzdcHztjbPage(Page<Map<String,Object>> page);
-
-
-    Page<Map<String,Object>> hzdcJyhzsgrdsPage(Page<Map<String,Object>> page);
-
-
-    Page<Map<String,Object>> hzdcYbhzsgrdsPage(Page<Map<String,Object>> page);
-
-
-    Page<Map<String,Object>> jbzbDwxxAllPage(Page<Map<String,Object>> page);
-
-
-
-    Page<Map<String,Object>> jbzbJdglxmAllPage(Page<Map<String,Object>> page);
-
-
-    Page<Map<String,Object>> jbzbSyxxPage(Page<Map<String,Object>> page);
-
-
-    Page<Map<String,Object>> jbzbZbbPage(Page<Map<String,Object>> page);
-
-
-    Page<Map<String,Object>> jdjcXfjdjcjlPage(Page<Map<String,Object>> page);
-
-
-    Page<Map<String,Object>> jdjcXzzftjAllPage(Page<Map<String,Object>> page);
-
-
-    Page<Map<String,Object>> xzcfXzcfqkbPage(Page<Map<String,Object>> page);
-
-
-    Page<Map<String,Object>> xzxkAjhgzPage(Page<Map<String,Object>> page);
-
-
-    Page<Map<String,Object>> xzxkAqjcpzPage(Page<Map<String,Object>> page);
-
-
-
-    Page<Map<String,Object>> xzxkBhgzPage(Page<Map<String,Object>> page);
-
-
-    Page<Map<String,Object>> xzxkShtssbbPage(Page<Map<String,Object>> page);
-
-
-    Page<Map<String,Object>> xzxkShyspzPage(Page<Map<String,Object>> page);
-
-    Page<Map<String,Object>> xzxkShysyjsPage(Page<Map<String,Object>> page);
-
-
-    Page<Map<String,Object>> xzxkXfajsbbPage(Page<Map<String,Object>> page);
-
-}

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

@@ -0,0 +1,11 @@
+package com.bizmatics.mhfire.persistence.mapper;
+
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author yq
+ * @date 2021/5/25 16:53
+ */
+@Repository
+public interface AlFsdAllMapper {
+}

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

@@ -0,0 +1,11 @@
+package com.bizmatics.mhfire.persistence.mapper;
+
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author yq
+ * @date 2021/5/25 17:01
+ */
+@Repository
+public interface AlFsdDisgreeMapper {
+}

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

@@ -0,0 +1,11 @@
+package com.bizmatics.mhfire.persistence.mapper;
+
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author yq
+ * @date 2021/5/25 16:53
+ */
+@Repository
+public interface AlFsdSeqMapper {
+}

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

@@ -0,0 +1,24 @@
+package com.bizmatics.mhfire.persistence.mapper;
+
+
+import com.bizmatics.mhfire.persistence.mapper.vo.SiAeAllRequest;
+import org.springframework.stereotype.Repository;
+
+import java.util.Map;
+
+/**
+ * @author yq
+ * @date 2021/5/25 15:35
+ */
+
+@Repository
+public interface SiAeAllMapper {
+
+
+    /**
+     * 监督检查行政执法汇总
+     * @param siAeAllRequest
+     * @return
+     */
+    Map<String,Integer> selectAeAllCollect(SiAeAllRequest siAeAllRequest);
+}

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

@@ -0,0 +1,16 @@
+package com.bizmatics.mhfire.persistence.mapper.vo;
+
+import lombok.Data;
+
+/**
+ * @author yq
+ * @date 2021/5/25 17:06
+ */
+@Data
+public class AlFsdAllRequest {
+
+    /**
+     * 公用请求
+     */
+    private CommonRequest commonRequest;
+}

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

@@ -0,0 +1,22 @@
+package com.bizmatics.mhfire.persistence.mapper.vo;
+
+import lombok.Data;
+
+/**
+ * @author yq
+ * @date 2021/5/25 13:47
+ */
+@Data
+public class CommonRequest {
+
+
+    /**
+     * 开始时间
+     */
+    private String startTime;
+
+    /**
+     * 结束时间
+     */
+    private String endTime;
+}

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

@@ -0,0 +1,19 @@
+package com.bizmatics.mhfire.persistence.mapper.vo;
+
+import com.bizmatics.common.core.bean.PageRequest;
+import lombok.Data;
+
+/**
+ * @author yq
+ * @date 2021/5/19 15:39
+ * 行政执法总表
+ */
+@Data
+public class SiAeAllRequest {
+
+    /**
+     * 公用的请求参数
+     */
+    private CommonRequest commonRequest;
+
+}

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

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.bizmatics.mhfire.persistence.mapper.AjhgzMapper">
-
-
-    <select id="ajhgzPage" resultType="java.util.Map">
-        SELECT * FROM `mhfire`.`ajhgz` where `法律文书ID` = 'C6AE805BB72C41E1A097B9C958180A53'
-    </select>
-    <select id="hzdcHzsgsmjlAllPage" resultType="java.util.Map">
-        SELECT * FROM `mhfire`.`hzdc-hzsgsmjl-all`
-    </select>
-    <select id="hzdcHztjbPage" resultType="java.util.Map">
-        SELECT * FROM `mhfire`.`hzdc-hztjb`
-    </select>
-    <select id="hzdcJyhzsgrdsPage" resultType="java.util.Map">
-        SELECT * FROM `mhfire`.`hzdc-jyhzsgrds`
-    </select>
-    <select id="hzdcYbhzsgrdsPage" resultType="java.util.Map">
-        SELECT * FROM `mhfire`.`hzdc-ybhzsgrds`
-    </select>
-    <select id="jbzbDwxxAllPage" resultType="java.util.Map">
-        SELECT * FROM `mhfire`.`jbzb-dwxx-all`
-    </select>
-    <select id="jbzbJdglxmAllPage" resultType="java.util.Map">
-        SELECT * FROM `mhfire`.`jbzb-jdglxm-all`
-    </select>
-    <select id="jbzbSyxxPage" resultType="java.util.Map">
-        SELECT * FROM `mhfire`.`jbzb-syxx`
-    </select>
-    <select id="jbzbZbbPage" resultType="java.util.Map">
-        SELECT * FROM `mhfire`.`jbzb-zbb`
-    </select>
-    <select id="jdjcXfjdjcjlPage" resultType="java.util.Map">
-        SELECT * FROM `mhfire`.`jdjc-xfjdjcjl`
-    </select>
-    <select id="jdjcXzzftjAllPage" resultType="java.util.Map">
-        SELECT * FROM `mhfire`.`jdjc-xzzftj-all`
-    </select>
-    <select id="xzcfXzcfqkbPage" resultType="java.util.Map">
-        SELECT * FROM `mhfire`.`xzcf-xzcfqkb`
-    </select>
-    <select id="xzxkAjhgzPage" resultType="java.util.Map">
-        SELECT * FROM `mhfire`.`xzxk-ajhgz`
-    </select>
-    <select id="xzxkAqjcpzPage" resultType="java.util.Map">
-        SELECT * FROM `mhfire`.`xzxk-aqjcpz`
-    </select>
-    <select id="xzxkBhgzPage" resultType="java.util.Map">
-        SELECT * FROM `mhfire`.`xzxk-bhgz`
-    </select>
-    <select id="xzxkShtssbbPage" resultType="java.util.Map">
-        SELECT * FROM `mhfire`.`xzxk-shtssbb`
-    </select>
-    <select id="xzxkShyspzPage" resultType="java.util.Map">
-        SELECT * FROM `mhfire`.`xzxk-shyspz`
-    </select>
-    <select id="xzxkXfajsbbPage" resultType="java.util.Map">
-        SELECT * FROM `mhfire`.`xzxk-xfajsbb`
-    </select>
-    <select id="xzxkShysyjsPage" resultType="java.util.Map">
-        SELECT * FROM `mhfire`.`xzxk-shysyjs`
-    </select>
-</mapper>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.bizmatics.mhfire.persistence.mapper.AlFsdAllMapper">
+
+</mapper>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.bizmatics.mhfire.persistence.mapper.AlFsdDisgreeMapper">
+
+</mapper>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.bizmatics.mhfire.persistence.mapper.AlFsdSeqMapper">
+
+</mapper>

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

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.bizmatics.mhfire.persistence.mapper.SiAeAllMapper">
+    <select id="selectAeAllCollect" resultType="java.util.Map">
+        select
+        sum(`检查单位（家、次）`) as checkUnit,
+        sum(`发现火灾隐患或违法行为（处）`) as findFireDanger,
+        sum(`督促整改火灾隐患或违法行为`) as rectifyFireDanger,
+        sum(`当场处罚罚款金额`) as fineMoney,
+        sum(`发责令改正通知书`) as beganChange,
+        sum(`发处罚决定书（份）`) as punish,
+        sum(`责令“三停”`) threeStop,
+        sum(`发临时查封决定书（份）`) as seal
+        FROM `jdjc-xzzftj-all`
+        where ChgTime >= '2012-03-25 05:17:11' and ChgTime  &lt;= '2012-03-25 05:18:11'
+    </select>
+</mapper>

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

@@ -1,166 +0,0 @@
-package com.bizmatics.mhfire.service;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.bizmatics.common.core.bean.PageRequest;
-
-import java.util.Map;
-
-/**
- * @author yq
- * @date 2021/5/14 13:36
- */
-public interface AjhgzService  {
-
-    /**
-     * ajhgzPage
-     * @param pageRequest
-     * @return
-     */
-    Page<Map<String,Object>> ajhgaPage(PageRequest pageRequest);
-
-
-    /**
-     * hzdc-hzsgsmjl-all page
-     * @param pageRequest
-     * @return
-     */
-    Page<Map<String,Object>> hzdcHzsgsmjlAllPage(PageRequest pageRequest);
-
-
-    /**
-     * hzdc-hztjb page
-     * @param pageRequest
-     * @return
-     */
-    Page<Map<String,Object>> hzdcHztjbPage(PageRequest pageRequest);
-
-
-
-    /**
-     * hzdc-jyhzsgrds page
-     * @param pageRequest
-     * @return
-     */
-    Page<Map<String,Object>> hzdcJyhzsgrdsPage(PageRequest pageRequest);
-
-
-    /**
-     * hzdc-ybhzsgrds page
-     * @param pageRequest
-     * @return
-     */
-    Page<Map<String,Object>> hzdcYbhzsgrdsPage(PageRequest pageRequest);
-
-
-    /**
-     * jbzb-dwxx-all page
-     * @param pageRequest
-     * @return
-     */
-    Page<Map<String,Object>> jbzbDwxxAllPage(PageRequest pageRequest);
-
-
-    /**
-     * jbzb-jdglxm-all page
-     * @param pageRequest
-     * @return
-     */
-    Page<Map<String,Object>> jbzbJdglxmAllPage(PageRequest pageRequest);
-
-
-    /**
-     * jbzb-syxx page
-     * @param pageRequest
-     * @return
-     */
-    Page<Map<String,Object>> jbzbSyxxPage(PageRequest pageRequest);
-
-
-    /**
-     * jbzb-zbb page
-     * @param pageRequest
-     * @return
-     */
-    Page<Map<String,Object>> jbzbZbbPage(PageRequest pageRequest);
-
-
-    /**
-     * jdjc-xfjdjcjl page
-     * @param pageRequest
-     * @return
-     */
-    Page<Map<String,Object>> jdjcXfjdjcjlPage(PageRequest pageRequest);
-
-
-    /**
-     * jdjc-xzzftj-all page
-     * @param pageRequest
-     * @return
-     */
-    Page<Map<String,Object>> jdjcXzzftjAllPage(PageRequest pageRequest);
-
-
-    /**
-     * xzcf-xzcfqkb page
-     * @param pageRequest
-     * @return
-     */
-    Page<Map<String,Object>> xzcfXzcfqkbPage(PageRequest pageRequest);
-
-
-    /**
-     * xzxk-ajhgz page
-     * @param pageRequest
-     * @return
-     */
-    Page<Map<String,Object>> xzxkAjhgzPage(PageRequest pageRequest);
-
-
-    /**
-     * xzxk-aqjcpz page
-     * @param pageRequest
-     * @return
-     */
-    Page<Map<String,Object>> xzxkAqjcpzPage(PageRequest pageRequest);
-
-
-    /**
-     * xzxk-bhgz page
-     * @param pageRequest
-     * @return
-     */
-    Page<Map<String,Object>> xzxkBhgzPage(PageRequest pageRequest);
-
-
-    /**
-     * xzxkShtssbbPage
-     * @param pageRequest
-     * @return
-     */
-    Page<Map<String,Object>> xzxkShtssbbPage(PageRequest pageRequest);
-
-
-    /**
-     * xzxk-shyspz page
-     * @param pageRequest
-     * @return
-     */
-    Page<Map<String,Object>> xzxkShyspzPage(PageRequest pageRequest);
-
-
-    /**
-     * xzxk-shysyjs page
-     * @param pageRequest
-     * @return
-     */
-    Page<Map<String,Object>> xzxkShysyjsPage(PageRequest pageRequest);
-
-
-    /**
-     * xzxk-xfajsbb page
-     * @param pageRequest
-     * @return
-     */
-    Page<Map<String,Object>> xzxkXfajsbbPage(PageRequest pageRequest);
-
-}

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

@@ -0,0 +1,21 @@
+package com.bizmatics.mhfire.service;
+
+import com.bizmatics.mhfire.persistence.mapper.vo.AlFsdAllRequest;
+import com.bizmatics.mhfire.service.vo.AlFsdAllVO;
+import com.bizmatics.mhfire.service.vo.SiAeAllVO;
+
+/**
+ * @author yq
+ * @date 2021/5/25 16:49
+ * 行政许可-消防安检申报总表
+ */
+public interface AlFsdAllService {
+
+
+    /**
+     * 获取行政许可的检查，受理，出文数量
+     * @param alFsdAllRequest
+     * @return
+     */
+    AlFsdAllVO getAlFsdAllNumber(AlFsdAllRequest alFsdAllRequest);
+}

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

@@ -0,0 +1,9 @@
+package com.bizmatics.mhfire.service;
+
+/**
+ * @author yq
+ * @date 2021/5/25 17:00
+ * 行政许可-消防安检申报不同意
+ */
+public interface AlFsdDisagreeService {
+}

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

@@ -0,0 +1,9 @@
+package com.bizmatics.mhfire.service;
+
+/**
+ * @author yq
+ * @date 2021/5/25 16:51
+ * 行政许可-安全检查合格证
+ */
+public interface AlFsdSeqService {
+}

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

@@ -0,0 +1,22 @@
+package com.bizmatics.mhfire.service;
+
+import com.bizmatics.mhfire.persistence.mapper.vo.SiAeAllRequest;
+import com.bizmatics.mhfire.service.vo.SiAeAllVO;
+
+import java.util.List;
+
+/**
+ * @author yq
+ * @date 2021/5/25 15:29
+ * 监督检查行政执法总记录
+ */
+public interface SiAeAllService {
+
+
+    /**
+     * 行政执法总记录汇总
+     * @param siAeAllRequest
+     * @return
+     */
+    List<SiAeAllVO> getAeAllCollect(SiAeAllRequest siAeAllRequest);
+}

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

@@ -1,156 +0,0 @@
-package com.bizmatics.mhfire.service.impl;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.bizmatics.common.core.bean.PageRequest;
-import com.bizmatics.mhfire.persistence.mapper.AjhgzMapper;
-import com.bizmatics.mhfire.service.AjhgzService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.Map;
-
-/**
- * @author yq
- * @date 2021/5/14 13:36
- */
-@Service
-public class AjhgzServiceImpl implements AjhgzService {
-
-    @Autowired
-    private AjhgzMapper ajhgzMapper;
-
-
-    @Override
-    public Page<Map<String, Object>> ajhgaPage(PageRequest pageRequest) {
-
-        Page<Map<String, Object>> page = new Page<>(0, 10);
-        page = ajhgzMapper.ajhgzPage(page, "C6AE805BB72C41E1A097B9C958180A53");
-        return page;
-    }
-
-    @Override
-    public Page<Map<String, Object>> hzdcHzsgsmjlAllPage(PageRequest pageRequest) {
-        Page<Map<String, Object>> page = new Page<>(0, 10);
-        page = ajhgzMapper.hzdcHzsgsmjlAllPage(page, "C6AE805BB72C41E1A097B9C958180A53");
-        return page;
-    }
-
-    @Override
-    public Page<Map<String, Object>> hzdcHztjbPage(PageRequest pageRequest) {
-        Page<Map<String, Object>> page = new Page<>(0, 10);
-        page = ajhgzMapper.hzdcHztjbPage(page);
-        return page;
-    }
-
-    @Override
-    public Page<Map<String, Object>> hzdcJyhzsgrdsPage(PageRequest pageRequest) {
-        Page<Map<String, Object>> page = new Page<>(0, 10);
-        page = ajhgzMapper.hzdcJyhzsgrdsPage(page);
-        return page;
-    }
-
-    @Override
-    public Page<Map<String, Object>> hzdcYbhzsgrdsPage(PageRequest pageRequest) {
-        Page<Map<String, Object>> page = new Page<>(0, 10);
-        page = ajhgzMapper.hzdcYbhzsgrdsPage(page);
-        return page;
-    }
-
-    @Override
-    public Page<Map<String, Object>> jbzbDwxxAllPage(PageRequest pageRequest) {
-        Page<Map<String, Object>> page = new Page<>(0, 10);
-        page = ajhgzMapper.jbzbDwxxAllPage(page);
-        return page;
-    }
-
-    @Override
-    public Page<Map<String, Object>> jbzbJdglxmAllPage(PageRequest pageRequest) {
-        Page<Map<String, Object>> page = new Page<>(0, 10);
-        page = ajhgzMapper.jbzbJdglxmAllPage(page);
-        return page;
-    }
-
-    @Override
-    public Page<Map<String, Object>> jbzbSyxxPage(PageRequest pageRequest) {
-        Page<Map<String, Object>> page = new Page<>(0, 10);
-        page = ajhgzMapper.jbzbSyxxPage(page);
-        return page;
-    }
-
-    @Override
-    public Page<Map<String, Object>> jbzbZbbPage(PageRequest pageRequest) {
-        Page<Map<String, Object>> page = new Page<>(0, 10);
-        page = ajhgzMapper.jbzbZbbPage(page);
-        return page;
-    }
-
-    @Override
-    public Page<Map<String, Object>> jdjcXfjdjcjlPage(PageRequest pageRequest) {
-        Page<Map<String, Object>> page = new Page<>(0, 10);
-        page = ajhgzMapper.jdjcXfjdjcjlPage(page);
-        return page;
-    }
-
-    @Override
-    public Page<Map<String, Object>> jdjcXzzftjAllPage(PageRequest pageRequest) {
-        Page<Map<String, Object>> page = new Page<>(0, 10);
-        page = ajhgzMapper.jdjcXzzftjAllPage(page);
-        return page;
-    }
-
-    @Override
-    public Page<Map<String, Object>> xzcfXzcfqkbPage(PageRequest pageRequest) {
-        Page<Map<String, Object>> page = new Page<>(0, 10);
-        page = ajhgzMapper.xzcfXzcfqkbPage(page);
-        return page;
-    }
-
-    @Override
-    public Page<Map<String, Object>> xzxkAjhgzPage(PageRequest pageRequest) {
-        Page<Map<String, Object>> page = new Page<>(0, 10);
-        page = ajhgzMapper.xzxkAjhgzPage(page);
-        return page;
-    }
-
-    @Override
-    public Page<Map<String, Object>> xzxkAqjcpzPage(PageRequest pageRequest) {
-        Page<Map<String, Object>> page = new Page<>(0, 10);
-        page = ajhgzMapper.xzxkAqjcpzPage(page);
-        return page;
-    }
-
-    @Override
-    public Page<Map<String, Object>> xzxkBhgzPage(PageRequest pageRequest) {
-        Page<Map<String, Object>> page = new Page<>(0, 10);
-        page = ajhgzMapper.xzxkBhgzPage(page);
-        return page;
-    }
-
-    @Override
-    public Page<Map<String, Object>> xzxkShtssbbPage(PageRequest pageRequest) {
-        Page<Map<String, Object>> page = new Page<>(0, 10);
-        page = ajhgzMapper.xzxkShtssbbPage(page);
-        return page;
-    }
-
-    @Override
-    public Page<Map<String, Object>> xzxkShyspzPage(PageRequest pageRequest) {
-        Page<Map<String, Object>> page = new Page<>(0, 10);
-        page = ajhgzMapper.xzxkShyspzPage(page);
-        return page;
-    }
-
-    @Override
-    public Page<Map<String, Object>> xzxkShysyjsPage(PageRequest pageRequest) {
-        Page<Map<String, Object>> page = new Page<>(0, 10);
-        page = ajhgzMapper.xzxkShysyjsPage(page);
-        return page;
-    }
-
-    @Override
-    public Page<Map<String, Object>> xzxkXfajsbbPage(PageRequest pageRequest) {
-        Page<Map<String, Object>> page = new Page<>(0, 10);
-        page = ajhgzMapper.xzxkXfajsbbPage(page);
-        return page;
-    }
-}

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

@@ -0,0 +1,19 @@
+package com.bizmatics.mhfire.service.impl;
+
+import com.bizmatics.mhfire.persistence.mapper.vo.AlFsdAllRequest;
+import com.bizmatics.mhfire.service.AlFsdAllService;
+import com.bizmatics.mhfire.service.vo.AlFsdAllVO;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author yq
+ * @date 2021/5/25 16:49
+ */
+@Service
+public class AlFsdAllServiceImpl implements AlFsdAllService {
+    @Override
+    public AlFsdAllVO getAlFsdAllNumber(AlFsdAllRequest alFsdAllRequest) {
+        //TODO
+        return null;
+    }
+}

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

@@ -0,0 +1,12 @@
+package com.bizmatics.mhfire.service.impl;
+
+import com.bizmatics.mhfire.service.AlFsdDisagreeService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author yq
+ * @date 2021/5/25 17:00
+ */
+@Service
+public class AlFsdDisagreeServiceImpl implements AlFsdDisagreeService {
+}

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

@@ -0,0 +1,10 @@
+package com.bizmatics.mhfire.service.impl;
+
+import com.bizmatics.mhfire.service.AlFsdSeqService;
+
+/**
+ * @author yq
+ * @date 2021/5/25 16:51
+ */
+public class AlFsdSeqServiceImpl implements AlFsdSeqService {
+}

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

@@ -0,0 +1,36 @@
+package com.bizmatics.mhfire.service.impl;
+
+import com.bizmatics.mhfire.persistence.mapper.SiAeAllMapper;
+import com.bizmatics.mhfire.service.SiAeAllService;
+import com.bizmatics.mhfire.persistence.mapper.vo.SiAeAllRequest;
+import com.bizmatics.mhfire.service.vo.SiAeAllVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author yq
+ * @date 2021/5/25 15:29
+ */
+@Service
+public class SiAeAllServiceImpl implements SiAeAllService {
+
+    @Autowired
+    private SiAeAllMapper siAeAllMapper;
+    @Override
+    public List<SiAeAllVO> getAeAllCollect(SiAeAllRequest siAeAllRequest) {
+        List<SiAeAllVO> allVOS = new ArrayList<>();
+        Map<String, Integer> aeAllCollect = siAeAllMapper.selectAeAllCollect(siAeAllRequest);
+        //TODO 获取同比和环比时间
+        for (String type:aeAllCollect.keySet()) {
+            SiAeAllVO siAeAllVO = new SiAeAllVO();
+            siAeAllVO.setCheckType(type);
+            siAeAllVO.setNumber(aeAllCollect.get(type));
+            allVOS.add(siAeAllVO);
+        }
+        return allVOS;
+    }
+}

mhfire-service/src/main/java/com/bizmatics/mhfire/service/vo/AdministrativeEnforcementAllRequest.java

@@ -1,23 +0,0 @@
-package com.bizmatics.mhfire.service.vo;
-
-import com.bizmatics.common.core.bean.PageRequest;
-import lombok.Data;
-
-/**
- * @author yq
- * @date 2021/5/19 15:39
- * 行政执法总表
- */
-@Data
-public class AdministrativeEnforcementAllRequest {
-
-    /**
-     * 分页
-     */
-    private PageRequest pageRequest;
-
-    /**
-     * 单位id
-     */
-    private String unitId;
-}

mhfire-service/src/main/java/com/bizmatics/mhfire/service/vo/AdministrativePunishRequest.java

@@ -1,19 +0,0 @@
-package com.bizmatics.mhfire.service.vo;
-
-import com.bizmatics.common.core.bean.PageRequest;
-import lombok.Data;
-
-/**
- * @author yq
- * @date 2021/5/19 15:46
- * 行政处罚记录
- */
-@Data
-public class AdministrativePunishRequest {
-
-    /**
-     * 分页
-     */
-    private PageRequest pageRequest;
-
-}

mhfire-service/src/main/java/com/bizmatics/mhfire/service/vo/AlFsdAllVO.java

@@ -0,0 +1,28 @@
+package com.bizmatics.mhfire.service.vo;
+
+import lombok.Data;
+
+/**
+ * @author yq
+ * @date 2021/5/25 17:08
+ * 行政许可-消防安检申报总表
+ */
+@Data
+public class AlFsdAllVO {
+
+    /**
+     * 受理数
+     */
+    private Integer acceptNumber;
+
+    /**
+     * 检查数
+     */
+    private Integer checkNumber;
+
+
+    /**
+     * 出文数
+     */
+    private Integer articleNumber;
+}

mhfire-service/src/main/java/com/bizmatics/mhfire/service/vo/AuditAcceptDeclareRequest.java

@@ -1,23 +0,0 @@
-package com.bizmatics.mhfire.service.vo;
-
-import com.bizmatics.common.core.bean.PageRequest;
-import lombok.Data;
-
-/**
- * @author yq
- * @date 2021/5/19 15:59
- * 审核验收申报总表
- */
-@Data
-public class AuditAcceptDeclareRequest {
-
-    /**
-     * 分页
-     */
-    private PageRequest pageRequest;
-
-    /**
-     * 单位名称
-     */
-    private String unitName;
-}

mhfire-service/src/main/java/com/bizmatics/mhfire/service/vo/AuditAcceptIdeaRequest.java

@@ -1,29 +0,0 @@
-package com.bizmatics.mhfire.service.vo;
-
-import com.bizmatics.common.core.bean.PageRequest;
-import lombok.Data;
-
-/**
- * @author yq
- * @date 2021/5/19 16:11
- * 审核验收意见书
- */
-@Data
-public class AuditAcceptIdeaRequest {
-
-    /**
-     * 分页
-     */
-    private PageRequest pageRequest;
-
-    /**
-     * 单位名称
-     */
-    private String unitName;
-
-
-    /**
-     * 是否合格
-     */
-    private String qualifiedFlag;
-}

mhfire-service/src/main/java/com/bizmatics/mhfire/service/vo/AuditAcceptVoucherRequest.java

@@ -1,23 +0,0 @@
-package com.bizmatics.mhfire.service.vo;
-
-import com.bizmatics.common.core.bean.PageRequest;
-import lombok.Data;
-
-/**
- * @author yq
- * @date 2021/5/19 16:06
- * 审核验收凭证
- */
-@Data
-public class AuditAcceptVoucherRequest {
-
-    /**
-     * 分页
-     */
-    private PageRequest pageRequest;
-
-    /**
-     * 单位id
-     */
-    private String unitId;
-}

mhfire-service/src/main/java/com/bizmatics/mhfire/service/vo/DisagreeUseRequest.java

@@ -1,23 +0,0 @@
-package com.bizmatics.mhfire.service.vo;
-
-import com.bizmatics.common.core.bean.PageRequest;
-import lombok.Data;
-
-/**
- * @author yq
- * @date 2021/5/19 15:57
- * 不同意使用
- */
-@Data
-public class DisagreeUseRequest {
-
-    /**
-     * 分页
-     */
-    private PageRequest pageRequest;
-
-    /**
-     * 单位id
-     */
-    private String unitId;
-}

mhfire-service/src/main/java/com/bizmatics/mhfire/service/vo/FireCheckDeclareAllRequest.java

@@ -1,29 +0,0 @@
-package com.bizmatics.mhfire.service.vo;
-
-import com.bizmatics.common.core.bean.PageRequest;
-import lombok.Data;
-
-/**
- * @author yq
- * @date 2021/5/19 16:16
- * 消防安检申报总表
- */
-@Data
-public class FireCheckDeclareAllRequest {
-
-    /**
-     * 分页
-     */
-    private PageRequest pageRequest;
-
-
-    /**
-     * 单位地址
-     */
-    private String unitAddress;
-
-    /**
-     * 单位id
-     */
-    private String unitId;
-}

mhfire-service/src/main/java/com/bizmatics/mhfire/service/vo/FireGradeAllRequest.java

@@ -1,27 +0,0 @@
-package com.bizmatics.mhfire.service.vo;
-
-import com.bizmatics.common.core.bean.PageRequest;
-import lombok.Data;
-
-/**
- * @author yq
- * @date 2021/5/19 14:23
- *火灾事故说明总记录 请求
- */
-@Data
-public class FireGradeAllRequest {
-    /**
-     * 分页
-     */
-    private PageRequest pageRequest;
-
-    /**
-     * 起火地址
-     */
-    private String fireAddress;
-
-    /**
-     * 起火单位(个人)
-     */
-    private String fireUnit;
-}

mhfire-service/src/main/java/com/bizmatics/mhfire/service/vo/FireGradeFirmlyRequest.java

@@ -1,29 +0,0 @@
-package com.bizmatics.mhfire.service.vo;
-
-import com.bizmatics.common.core.bean.PageRequest;
-import lombok.Data;
-
-/**
- * @author yq
- * @date 2021/5/19 14:50
- * 火灾事故认定书
- */
-@Data
-public class FireGradeFirmlyRequest {
-
-    /**
-     * 分页
-     */
-    private PageRequest pageRequest;
-
-    /**
-     * 起火地址
-     */
-    private String fireAddress;
-
-    /**
-     * 起火单位
-     */
-    private String fireUint;
-
-}

mhfire-service/src/main/java/com/bizmatics/mhfire/service/vo/FireSimpleGradeFirmlyRequest.java

@@ -1,29 +0,0 @@
-package com.bizmatics.mhfire.service.vo;
-
-import com.bizmatics.common.core.bean.PageRequest;
-import lombok.Data;
-
-/**
- * @author yq
- * @date 2021/5/19 14:44
- *  简易火灾事故认定书 请求
- */
-@Data
-public class FireSimpleGradeFirmlyRequest {
-
-    /**
-     * 分页
-     */
-    private PageRequest pageRequest;
-
-    /**
-     * 起火地址
-     */
-    private String fireAddress;
-
-    /**
-     * 起火单位
-     */
-    private String fireUnit;
-
-}

mhfire-service/src/main/java/com/bizmatics/mhfire/service/vo/FireStatisticsRequest.java

@@ -1,28 +0,0 @@
-package com.bizmatics.mhfire.service.vo;
-
-import com.bizmatics.common.core.bean.PageRequest;
-import lombok.Data;
-
-/**
- * @author yq
- * @date 2021/5/19 14:38
- * 火灾统计表 请求
- */
-@Data
-public class FireStatisticsRequest {
-
-    /**
-     * 分页
-     */
-    private PageRequest pageRequest;
-
-    /**
-     * 起火时间
-     */
-    private String fireStartDate;
-
-    /**
-     * 起火地点
-     */
-    private String fireAddress;
-}

mhfire-service/src/main/java/com/bizmatics/mhfire/service/vo/FireSuperviseRequest.java

@@ -1,39 +0,0 @@
-package com.bizmatics.mhfire.service.vo;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.bizmatics.common.core.bean.PageRequest;
-import lombok.Data;
-
-/**
- * @author yq
- * @date 2021/5/19 15:35
- * 消防监督检查记录
- */
-@Data
-public class FireSuperviseRequest {
-
-    /**
-     * 分页
-     */
-    private PageRequest pageRequest;
-
-    /**
-     * 单位名称
-     */
-    private String unitName;
-
-    /**
-     * 单位地址
-     */
-    private String unitAddress;
-
-    /**
-     * 开始时间
-     */
-    private String startTime;
-
-    /**
-     * 结束时间
-     */
-    private String endTime;
-}

mhfire-service/src/main/java/com/bizmatics/mhfire/service/vo/OperatorRequest.java

@@ -1,33 +0,0 @@
-package com.bizmatics.mhfire.service.vo;
-
-import lombok.Data;
-
-/**
- * @author yq
- * @date 2021/5/19 15:21
- * 值班人员
- */
-@Data
-public class OperatorRequest {
-
-
-    /**
-     * 机构名称
-     */
-    private String organizationName;
-
-    /**
-     * 所属单位id
-     */
-    private String belongUnitId;
-
-    /**
-     * 值班人员id
-     */
-    private String operatorId;
-
-    /**
-     * 值班人员名称
-     */
-    private String operatorName;
-}

mhfire-service/src/main/java/com/bizmatics/mhfire/service/vo/SecurityCheckQualifiedRequest.java

@@ -1,31 +0,0 @@
-package com.bizmatics.mhfire.service.vo;
-
-import com.bizmatics.common.core.bean.PageRequest;
-import lombok.Data;
-
-/**
- * @author yq
- * @date 2021/5/19 15:50
- * 安全检查合格证
- */
-@Data
-public class SecurityCheckQualifiedRequest {
-
-    /**
-     * 分页
-     */
-    private PageRequest pageRequest;
-
-
-    /**
-     * 场所形成
-     */
-    private String siteName;
-
-    /**
-     * 场所地址
-     */
-    private String siteAddress;
-
-
-}

mhfire-service/src/main/java/com/bizmatics/mhfire/service/vo/SecurityCheckVoucherRequest.java

@@ -1,28 +0,0 @@
-package com.bizmatics.mhfire.service.vo;
-
-import com.bizmatics.common.core.bean.PageRequest;
-import lombok.Data;
-
-/**
- * @author yq
- * @date 2021/5/19 15:53
- * 安全检查凭证
- */
-@Data
-public class SecurityCheckVoucherRequest {
-
-    /**
-     * 分页
-     */
-    private PageRequest pageRequest;
-
-    /**
-     * 单位
-     */
-    private String unitId;
-
-    /**
-     * 单位名称
-     */
-    private String unitName;
-}

mhfire-service/src/main/java/com/bizmatics/mhfire/service/vo/SiAeAllVO.java

@@ -0,0 +1,32 @@
+package com.bizmatics.mhfire.service.vo;
+
+import lombok.Data;
+
+/**
+ * @author yq
+ * @date 2021/5/25 15:02
+ * 监督检查-行政执法总表
+ */
+@Data
+public class SiAeAllVO {
+
+    /**
+     * 检查类型
+     */
+    private String checkType;
+
+    /**
+     * 数量
+     */
+    private Integer number;
+
+    /**
+     * 环比
+     */
+    private Double linkRelativeRatio ;
+
+    /**
+     * 同比
+     */
+    private Double sameRatio;
+}

mhfire-service/src/main/java/com/bizmatics/mhfire/service/vo/SuperviseProjectAllRequest.java

@@ -1,36 +0,0 @@
-package com.bizmatics.mhfire.service.vo;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.bizmatics.common.core.bean.PageRequest;
-import lombok.Data;
-
-/**
- * @author yq
- * @date 2021/5/19 15:14
- * 监督管理项目全表
- */
-@Data
-public class SuperviseProjectAllRequest {
-
-    /**
-     * 分页
-     */
-    private PageRequest pageRequest;
-
-    /**
-     * 项目名称
-     */
-    private String projectName;
-
-    /**
-     * 项目单位地址
-     */
-    private String projectAddress;
-
-    /**
-     * 监管单位类别
-     */
-    private String superviseUnitType;
-
-
-}

mhfire-service/src/main/java/com/bizmatics/mhfire/service/vo/UnitMessageRequest.java

@@ -1,35 +0,0 @@
-package com.bizmatics.mhfire.service.vo;
-
-import com.bizmatics.common.core.bean.PageRequest;
-import lombok.Data;
-
-/**
- * @author yq
- * @date 2021/5/19 15:10
- * 单位信息
- */
-@Data
-public class UnitMessageRequest {
-
-    /**
-     * 分页
-     */
-    private PageRequest pageRequest;
-
-    /**
-     * 单位地址
-     */
-    private String unitAddress;
-
-    /**
-     * 单位名称
-     */
-    private String unitName;
-
-    /**
-     * 单位类型
-     */
-    private String unitType;
-
-
-}

mhfire-service/src/main/java/com/bizmatics/mhfire/service/vo/WaterDetailRequest.java

@@ -1,33 +0,0 @@
-package com.bizmatics.mhfire.service.vo;
-
-import com.bizmatics.common.core.bean.PageRequest;
-import lombok.Data;
-
-/**
- * @author yq
- * @date 2021/5/19 15:18
- * 水源信息
- */
-@Data
-public class WaterDetailRequest {
-
-    /**
-     * 分页信息
-     */
-    private PageRequest pageRequest;
-
-    /**
-     * 水源名称
-     */
-    private String waterName;
-
-    /**
-     * 水源类型
-     */
-    private String waterType;
-
-    /**
-     * 水源地址
-     */
-    private String waterAddress;
-}