解决冲突

pom.xml

@@ -19,6 +19,7 @@
     <module>service-backend</module>
     <module>service-website</module>
     <module>service-iot</module>
+    <module>service-fire</module>
   </modules>
 
 

service-system/pom.xml → service-fire/pom.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>usky-modules</artifactId>
         <groupId>com.usky</groupId>
@@ -7,13 +8,11 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>service-system</artifactId>
-
+    <artifactId>service-fire</artifactId>
     <packaging>pom</packaging>
-    <version>0.0.1</version>
 
     <modules>
-        <module>service-system-biz</module>
-        <module>service-system-api</module>
+        <module>service-fire-biz</module>
+        <module>service-fire-api</module>
     </modules>
 </project>

service-system/service-system-api/pom.xml → service-fire/service-fire-api/pom.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>service-system</artifactId>
+        <artifactId>service-fire</artifactId>
         <groupId>com.usky</groupId>
         <version>0.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>service-system-api</artifactId>
+    <artifactId>service-fire-api</artifactId>
     <!-- SpringCloud Openfeign -->
     <dependencies>
         <dependency>

service-fire/service-fire-api/src/main/java/com/usky/fire/RemoteUserService.java

@@ -0,0 +1,28 @@
+package com.usky.fire;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.fire.domain.SysUserVO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+@FeignClient(contextId = "remoteUserService", value = "usky-demo")
+public interface RemoteUserService {
+
+
+
+    @GetMapping("/byUserName")
+    ApiResult<List<SysUserVO>> getByUserName(@RequestParam("userName") String userName);
+
+
+    @PostMapping("/byUserName")
+    ApiResult<List<SysUserVO>> add(@RequestBody SysUserVO sysUserVO);
+
+
+    @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    ApiResult<String> upload(@RequestPart(value = "file") MultipartFile file);
+}

service-fire/service-fire-api/src/main/java/com/usky/fire/domain/SysUserVO.java

@@ -0,0 +1,105 @@
+package com.usky.fire.domain;
+
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class SysUserVO {
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 部门ID
+     */
+    private Long deptId;
+
+    /**
+     * 用户账号
+     */
+    private String userName;
+
+    /**
+     * 用户昵称
+     */
+    private String nickName;
+
+    /**
+     * 用户类型（00系统用户）
+     */
+    private String userType;
+
+    /**
+     * 用户邮箱
+     */
+    private String email;
+
+    /**
+     * 手机号码
+     */
+    private String phonenumber;
+
+    /**
+     * 用户性别（0男 1女 2未知）
+     */
+    private String sex;
+
+    /**
+     * 头像地址
+     */
+    private String avatar;
+
+    /**
+     * 密码
+     */
+    private String password;
+
+    /**
+     * 帐号状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    private String delFlag;
+
+    /**
+     * 最后登录IP
+     */
+    private String loginIp;
+
+    /**
+     * 最后登录时间
+     */
+    private LocalDateTime loginDate;
+
+    /**
+     * 创建者
+     */
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新者
+     */
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
+}

service-fire/service-fire-api/src/main/java/com/usky/fire/factory/RemoteUserFallbackFactory.java

@@ -0,0 +1,48 @@
+package com.usky.fire.factory;
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.exception.BusinessException;
+import com.usky.fire.RemoteUserService;
+import com.usky.fire.domain.SysUserVO;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+
+/**
+ * 用户服务降级处理
+ *
+ * @author ruoyi
+ */
+@Component
+public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserService>
+{
+    private static final Logger log = LoggerFactory.getLogger(RemoteUserFallbackFactory.class);
+
+    @Override
+    public RemoteUserService create(Throwable throwable)
+    {
+        log.error("用户服务调用失败:{}", throwable.getMessage());
+        return new RemoteUserService() {
+            @Override
+            public ApiResult<List<SysUserVO>> getByUserName(String userName) {
+                throw new BusinessException(throwable.getMessage());
+            }
+
+            @Override
+            public ApiResult<List<SysUserVO>> add(SysUserVO sysUserVO) {
+                throw new BusinessException(throwable.getMessage());
+            }
+
+            @Override
+            public ApiResult<String> upload(MultipartFile file) {
+                throw new BusinessException(throwable.getMessage());
+            }
+        };
+    }
+}

service-system/service-system-biz/pom.xml → service-fire/service-fire-biz/pom.xml

@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>service-system</artifactId>
+        <artifactId>service-fire</artifactId>
         <groupId>com.usky</groupId>
         <version>0.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>service-system-biz</artifactId>
+    <artifactId>service-fire-biz</artifactId>
     <dependencies>
-
-
         <dependency>
             <groupId>com.usky</groupId>
             <artifactId>common-cloud-starter</artifactId>
@@ -22,9 +20,57 @@
             <scope>test</scope>
         </dependency>
         <!-- Pagehelper -->
+<!--        <dependency>-->
+<!--            <groupId>com.github.pagehelper</groupId>-->
+<!--            <artifactId>pagehelper-spring-boot-starter</artifactId>-->
+<!--        </dependency>-->
+        <dependency>
+            <groupId>com.usky</groupId>
+            <artifactId>ruoyi-common-core</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.github.pagehelper</groupId>
+                    <artifactId>pagehelper-spring-boot-starter</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.usky</groupId>
+            <artifactId>service-system-api</artifactId>
+            <version>0.0.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.usky</groupId>
+            <artifactId>usky-common-tenant</artifactId>
+            <version>0.0.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.afterturn</groupId>
+            <artifactId>easypoi-spring-boot-starter</artifactId>
+            <version>4.1.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-websocket</artifactId>
+        </dependency>
+
+        <!--MQTT依赖-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-integration</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.integration</groupId>
+            <artifactId>spring-integration-mqtt</artifactId>
+        </dependency>
+
         <dependency>
-            <groupId>com.github.pagehelper</groupId>
-            <artifactId>pagehelper-spring-boot-starter</artifactId>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk15on</artifactId>
+            <version>1.54</version>
         </dependency>
 
     </dependencies>

service-system/service-system-biz/src/main/java/com/usky/system/RuoYiSystemApplication.java → service-fire/service-fire-biz/src/main/java/com/usky/fire/RuoYiSystemApplication.java

@@ -1,4 +1,4 @@
-package com.usky.system;
+package com.usky.fire;
 
 
 import org.mybatis.spring.annotation.MapperScan;
@@ -6,7 +6,6 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.EnableAspectJAutoProxy;
 
 /**
  * 系统模块
@@ -15,17 +14,16 @@ import org.springframework.context.annotation.EnableAspectJAutoProxy;
  */
 
 
-@EnableAspectJAutoProxy(proxyTargetClass = true, exposeProxy = true)
-@EnableFeignClients(basePackages = {"com.usky"})
-@MapperScan(value = "com.usky.system.mapper")
-@ComponentScan(basePackages = {"com.usky"})
+@EnableFeignClients(basePackages = "com.usky")
+@MapperScan(value = "com.usky.fire.mapper")
+@ComponentScan("com.usky")
 @SpringBootApplication
 public class RuoYiSystemApplication
 {
     public static void main(String[] args)
     {
         SpringApplication.run(RuoYiSystemApplication.class, args);
-        System.out.println("(♥◠‿◠)ﾉﾞ  永天系统模块启动成功   ლ(´ڡ`ლ)ﾞ  \n" +
+        System.out.println("(♥◠‿◠)ﾉﾞ  永天测试模块启动成功   ლ(´ڡ`ლ)ﾞ  \n" +
                 " .-------.       ____     __        \n" +
                 " |  _ _   \\      \\   \\   /  /    \n" +
                 " | ( ' )  |       \\  _. /  '       \n" +

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/MybatisGeneratorUtils.java

@@ -0,0 +1,108 @@
+package com.usky.fire.controller;//package com.usky.fire.controller;//package com.usky.dm.controller.web.business;//package com.usky.dm.controller.web;
+
+
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.baomidou.mybatisplus.generator.AutoGenerator;
+import com.baomidou.mybatisplus.generator.InjectionConfig;
+import com.baomidou.mybatisplus.generator.config.*;
+import com.baomidou.mybatisplus.generator.config.po.TableInfo;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author yq
+ * @date 2021/7/6 11:42
+ */
+public class MybatisGeneratorUtils {
+    public static void main(String[] args) {
+
+            shell("service-fire","service-fire-biz");
+    }
+
+    private static void shell(String parentName,String model) {
+
+        AutoGenerator mpg = new AutoGenerator();
+        //1、全局配置
+        GlobalConfig gc = new GlobalConfig();
+//        File file = new File(model);
+//        String path = file.getAbsolutePath();
+        String projectPath = System.getProperty("user.dir");
+        projectPath+="/"+parentName;
+        projectPath+="/"+model;
+        gc.setOutputDir(projectPath+ "/src/main/java");  //生成路径(一般都是生成在此项目的src/main/java下面)
+        //修改为自己的名字
+        gc.setAuthor("JCB"); //设置作者
+        gc.setOpen(false);
+        gc.setFileOverride(true); //第二次生成会把第一次生成的覆盖掉
+        gc.setServiceName("%sService"); //生成的service接口名字首字母是否为I，这样设置就没有
+        gc.setBaseResultMap(true); //生成resultMap
+        mpg.setGlobalConfig(gc);
+
+        //2、数据源配置
+        //修改数据源
+        DataSourceConfig dsc = new DataSourceConfig();
+        dsc.setUrl("jdbc:mysql://172.16.120.165:3306/usky-fire?useUnicode=true&serverTimezone=GMT&useSSL=false&characterEncoding=utf8");
+        dsc.setDriverName("com.mysql.jdbc.Driver");
+        dsc.setUsername("usky");
+        dsc.setPassword("Yt#75Usky");
+        mpg.setDataSource(dsc);
+
+        // 3、包配置
+        PackageConfig pc = new PackageConfig();
+        pc.setParent("com.usky.fire");
+        pc.setController("controller.web");
+        pc.setEntity("domain");
+        pc.setMapper("mapper");
+        pc.setService("service");
+        pc.setServiceImpl("service.impl");
+//        pc.setXml("mapper.fire");
+        //pc.setModuleName("test");
+        mpg.setPackageInfo(pc);
+
+        // 4、策略配置
+        StrategyConfig strategy = new StrategyConfig();
+        strategy.setNaming(NamingStrategy.underline_to_camel);
+        strategy.setColumnNaming(NamingStrategy.underline_to_camel);
+        strategy.setSuperMapperClass("com.usky.common.mybatis.core.CrudMapper");
+        strategy.setSuperServiceClass("com.usky.common.mybatis.core.CrudService");
+        strategy.setSuperServiceImplClass("com.usky.common.mybatis.core.AbstractCrudService");
+        // strategy.setTablePrefix("t_"); // 表名前缀
+        strategy.setEntityLombokModel(true); //使用lombok
+        //修改自己想要生成的表
+        strategy.setInclude("dem_on_duty");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
+        mpg.setStrategy(strategy);
+
+        // 关闭默认 xml 生成，调整生成 至 根目录
+        //修改对应的模块名称
+        TemplateConfig tc = new TemplateConfig();
+        // 自定义配置
+        InjectionConfig cfg = new InjectionConfig() {
+            @Override
+            public void initMap() {
+                // to do nothing
+            }
+        };
+        //如果模板引擎是 velocity
+        String templatePath = "/templates/mapper.xml.vm";
+        // 自定义输出配置
+        List<FileOutConfig> focList = new ArrayList<>();
+        // 自定义配置会被优先输出
+        String finalProjectPath = projectPath;
+        focList.add(new FileOutConfig(templatePath) {
+            @Override
+            public String outputFile(TableInfo tableInfo) {
+                // 自定义输出文件名 ， 如果你 Entity 设置了前后缀、此处注意 xml 的名称会跟着发生变化！！
+                return finalProjectPath + "/src/main/resources/mapper/fire" + "/"
+                        + tableInfo.getEntityName() + "Mapper" + StringPool.DOT_XML;
+            }
+        });
+        cfg.setFileOutConfigList(focList);
+        mpg.setCfg(cfg);
+        tc.setXml(null);
+        mpg.setTemplate(tc);
+        //5、执行
+        mpg.execute();
+    }
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/AlarmDetectorController.java

@@ -0,0 +1,62 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.influx.core.InfluxDbUtils;
+import com.usky.fire.service.AlarmDetectorService;
+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.Map;
+
+/**
+ * <p>
+ * 独立式无线探测器告警 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-08-08
+ */
+@RestController
+@RequestMapping("/alarmDetector")
+public class AlarmDetectorController {
+
+    @Autowired
+    private AlarmDetectorService alarmDetectorService;
+
+    @Autowired
+    private InfluxDbUtils influxDbUtils;
+
+    /**
+     * 物联网数据查询-左上实时数据查询
+     *
+     * @param field      字段名称
+     * @param deviceCode 单位编号
+     * @return
+     */
+    @GetMapping("leftData")
+    public ApiResult<Map<String, Object>> leftData(@RequestParam(value = "field") String field,
+                                                   @RequestParam(value = "deviceCode") String deviceCode) {
+        return ApiResult.success(alarmDetectorService.leftData(field, deviceCode));
+    }
+
+
+    /**
+     * 物联网数据查询-右上侧统计图
+     *
+     * @param field      字段名称
+     * @param deviceCode 单位编号
+     * @return
+     */
+    @GetMapping("statisticalChartData")
+    public ApiResult<Map<String, Object>> statisticalChartData(@RequestParam(value = "field") String field,
+                                                               @RequestParam(value = "deviceCode") String deviceCode) {
+        return ApiResult.success(alarmDetectorService.statisticalChartData(field, deviceCode));
+    }
+
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/AlarmElectricalFireController.java

@@ -0,0 +1,128 @@
+package com.usky.fire.controller.web;
+
+
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
+import com.usky.fire.service.AlarmElectricalFireService;
+import com.usky.fire.service.vo.AlarmHiddenDangerVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 电气火灾隐患告警 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-08-18
+ */
+@RestController
+@RequestMapping("/alarmElectricalFire")
+public class AlarmElectricalFireController {
+
+    @Autowired
+    private AlarmElectricalFireService alarmElectricalFireService;
+
+    /**
+     * 事件管理-隐患管理-不同类型隐患-列表查询
+     *
+     * @param systemType     系统类型(2.自动喷水灭火系统 3.消防给水及消火栓系统 4.防排烟系统 5.电气火灾系统 6.消防视频监控系统)
+     * @param companyName    单位名称
+     * @param handlingStatus 处理状态（0、未处理 1、已处理）
+     * @param startDate      开始时间 格式：yyyy-MM-dd HH:mm:ss
+     * @param endDate        结束时间 格式：yyyy-MM-dd HH:mm:ss
+     * @param pageNum        当前页
+     * @param pageSize       每页条数
+     * @return
+     */
+    @GetMapping("alarmHiddenDangerList")
+    public ApiResult<CommonPage<AlarmHiddenDangerVo>> alarmHiddenDangerList(@RequestParam(value = "systemType") Integer systemType,
+                                                                            @RequestParam(value = "companyName", required = false) String companyName,
+                                                                            @RequestParam(value = "handlingStatus", required = false) Integer handlingStatus,
+                                                                            @RequestParam(value = "startDate", required = false) String startDate,
+                                                                            @RequestParam(value = "endDate", required = false) String endDate,
+                                                                            @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                                            @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
+        return ApiResult.success(alarmElectricalFireService.alarmHiddenDangerList(systemType, companyName, handlingStatus, startDate, endDate, pageNum, pageSize));
+    }
+
+    /**
+     * 事件管理-隐患管理-不同类型隐患-左侧数据统计
+     *
+     * @param systemType  系统类型(2.自动喷水灭火系统 3.消防给水及消火栓系统 4.防排烟系统 5.电气火灾系统 6.消防视频监控系统)
+     * @param companyName 单位名称
+     * @param startDate   开始时间 格式：yyyy-MM-dd HH:mm:ss
+     * @param endDate     结束时间 格式：yyyy-MM-dd HH:mm:ss
+     * @return
+     */
+    @GetMapping("hiddenDangerStatistics")
+    public ApiResult<Map<String, Object>> hiddenDangerStatistics(@RequestParam(value = "systemType") Integer systemType,
+                                                                 @RequestParam(value = "companyName", required = false) String companyName,
+                                                                 @RequestParam(value = "startDate", required = false) String startDate,
+                                                                 @RequestParam(value = "endDate", required = false) String endDate) {
+        return ApiResult.success(alarmElectricalFireService.hiddenDangerStatistics(systemType, companyName, startDate, endDate));
+    }
+
+
+    /**
+     * 事件管理-隐患管理-不同类型隐患-统计图数据查询
+     *
+     * @param systemType 系统类型(2.自动喷水灭火系统 3.消防给水及消火栓系统 4.防排烟系统 5.电气火灾系统 6.消防视频监控系统)
+     * @param startDate  开始时间 格式：yyyy-MM-dd HH:mm:ss
+     * @param endDate    结束时间 格式：yyyy-MM-dd HH:mm:ss
+     * @return
+     */
+    @GetMapping("hiddenDangerStatisticalChart")
+    public ApiResult<Map<String, Object>> hiddenDangerStatisticalChart(@RequestParam(value = "systemType") Integer systemType,
+                                                                       @RequestParam(value = "startDate", required = false) String startDate,
+                                                                       @RequestParam(value = "endDate", required = false) String endDate) {
+        return ApiResult.success(alarmElectricalFireService.hiddenDangerStatisticalChart(systemType, startDate, endDate));
+    }
+
+    /**
+     * 事件管理-隐患管理-不同类型隐患-告警处理
+     *
+     * @param alarmHiddenDangerVo
+     * @return
+     */
+    @Log(title = "隐患管理-告警处理", businessType = BusinessType.UPDATE)
+    @PutMapping("updateHiddenDanger")
+    public ApiResult<Void> updateHiddenDanger(@RequestBody AlarmHiddenDangerVo alarmHiddenDangerVo) {
+        alarmElectricalFireService.updateHiddenDanger(alarmHiddenDangerVo);
+        return ApiResult.success();
+    }
+
+    /**
+     * 事件管理-隐患管理-不同类型隐患-导出
+     *
+     * @param response
+     * @param systemType     系统类型(2.自动喷水灭火系统 3.消防给水及消火栓系统 4.防排烟系统 5.电气火灾系统 6.消防视频监控系统)
+     * @param companyName    单位名称
+     * @param handlingStatus 处理状态（0、未处理 1、已处理）
+     * @param startDate      开始时间 格式：yyyy-MM-dd HH:mm:ss
+     * @param endDate        结束时间 格式：yyyy-MM-dd HH:mm:ss
+     * @param exportTitle    标题
+     * @throws IOException
+     */
+    @PostMapping("alarmHiddenDangerListExport")
+    public void export(HttpServletResponse response,
+                       @RequestParam(value = "systemType") Integer systemType,
+                       @RequestParam(value = "companyName", required = false) String companyName,
+                       @RequestParam(value = "handlingStatus", required = false) Integer handlingStatus,
+                       @RequestParam(value = "startDate", required = false) String startDate,
+                       @RequestParam(value = "endDate", required = false) String endDate,
+                       @RequestParam(value = "exportTitle") String exportTitle) throws IOException {
+        List<AlarmHiddenDangerVo> list = alarmElectricalFireService.alarmHiddenDangerListOne(systemType, companyName, handlingStatus, startDate, endDate);
+        ExcelUtil<AlarmHiddenDangerVo> util = new ExcelUtil<AlarmHiddenDangerVo>(AlarmHiddenDangerVo.class);
+        util.exportExcel(response, list, exportTitle, exportTitle);
+    }
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/AlarmFireController.java

@@ -0,0 +1,135 @@
+package com.usky.fire.controller.web;
+
+
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
+import com.usky.fire.domain.AlarmFire;
+import com.usky.fire.service.AlarmFireService;
+import com.usky.fire.service.vo.AlarmFireVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 事件管理-火警告警处置
+ *
+ * @author JCB
+ * @since 2022-07-29
+ */
+@RestController
+@RequestMapping("/alarmFire")
+public class AlarmFireController {
+
+    @Autowired
+    private AlarmFireService alarmFireService;
+
+    /**
+     * 事件管理-火警告警处置/隐患报警处理-火灾报警处置/故障告警处置-列表查询
+     *
+     * @param companyName    单位名称
+     * @param handlingStatus 处理状态（0、未处理 1、已处理）
+     * @param startDate      开始时间 格式：yyyy-MM-dd HH:mm:ss
+     * @param endDate        结束时间 格式：yyyy-MM-dd HH:mm:ss
+     * @param pageNum        当前页
+     * @param pageSize       每页条数
+     * @param alarmType      告警类型（2 火警、4 故障、16 监管、100 火警隐患等）
+     * @return
+     */
+    @GetMapping("alarmFireLowerList")
+    public ApiResult<CommonPage<AlarmFireVo>> alarmFireLowerList(@RequestParam(value = "companyName", required = false) String companyName,
+                                                                 @RequestParam(value = "handlingStatus", required = false) Integer handlingStatus,
+                                                                 @RequestParam(value = "alarmType", required = false) String alarmType,
+                                                                 @RequestParam(value = "startDate", required = false) String startDate,
+                                                                 @RequestParam(value = "endDate", required = false) String endDate,
+                                                                 @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                                 @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
+        return ApiResult.success(alarmFireService.alarmFireLowerList(companyName, handlingStatus, startDate, endDate, pageNum, pageSize, alarmType));
+    }
+
+
+    /**
+     * 事件管理-火警告警处置/隐患报警处理-火灾报警处置/故障告警处置-左侧数据统计
+     *
+     * @param alarmType 告警类型（2 火警、4 故障、16 监管等）
+     * @return
+     */
+    @GetMapping("fireStatistics")
+    public ApiResult<Map<String, Object>> fireStatistics(@RequestParam(value = "companyName", required = false) String companyName,
+                                                         @RequestParam(value = "alarmType", required = false) String alarmType,
+                                                         @RequestParam(value = "startDate", required = false) String startDate,
+                                                         @RequestParam(value = "endDate", required = false) String endDate) {
+        return ApiResult.success(alarmFireService.fireStatistics(companyName, alarmType, startDate, endDate));
+    }
+
+
+    /**
+     * 事件管理-火警告警处置/隐患报警处理-火灾报警处置/故障告警处置-数据统计图
+     *
+     * @param alarmType 告警类型（2 火警、4 故障、16 监管、100火警隐患等）
+     * @param startDate 开始时间  格式：yyyy-MM-dd HH:mm:ss
+     * @param endDate   结束时间  格式：yyyy-MM-dd HH:mm:ss
+     * @return
+     */
+    @GetMapping("fireStatisticalChart")
+    public ApiResult<Map<String, Object>> fireStatisticalChart(@RequestParam(value = "alarmType", required = false) String alarmType,
+                                                               @RequestParam(value = "startDate", required = false) String startDate,
+                                                               @RequestParam(value = "endDate", required = false) String endDate) {
+        return ApiResult.success(alarmFireService.fireStatisticalChart(alarmType, startDate, endDate));
+    }
+
+
+    /**
+     * 事件管理-火警告警处置/隐患报警处理-火灾报警处置/故障告警处置-告警处理
+     *
+     * @param alarmFire
+     * @return
+     */
+    @Log(title = "告警处理", businessType = BusinessType.UPDATE)
+    @PutMapping("updateAlarmFire")
+    public ApiResult<Void> updateAlarmFire(@RequestBody AlarmFire alarmFire) {
+        alarmFireService.updateAlarmFire(alarmFire);
+        return ApiResult.success();
+    }
+
+
+    /**
+     * 事件管理-/火警告警处置/隐患报警处理-火灾报警处置/故障告警处置-导出
+     *
+     * @param companyName    单位名称
+     * @param handlingStatus 处理状态（0、未处理 1、已处理）
+     * @param alarmType      告警类型（2 火警、4 故障、16 监管等）
+     * @param startDate      开始时间 格式：yyyy-MM-dd HH:mm:ss
+     * @param endDate        结束时间 格式：yyyy-MM-dd HH:mm:ss
+     * @param exportTitle    文件名
+     * @throws IOException
+     */
+//    @GetMapping("alarmFireLowerListExport")
+//    public ApiResult<String> export(@RequestParam(value = "companyName", required = false) String companyName,
+//                                    @RequestParam(value = "handlingStatus", required = false) Integer handlingStatus,
+//                                    @RequestParam(value = "alarmType", required = false) String alarmType,
+//                                    @RequestParam(value = "startDate", required = false) String startDate,
+//                                    @RequestParam(value = "endDate", required = false) String endDate,
+//                                    @RequestParam(value = "exportTitle", required = false) String exportTitle) {
+//        return ApiResult.success(alarmFireService.alarmFireExport(companyName, handlingStatus, startDate, endDate, alarmType, exportTitle));
+//    }
+    @PostMapping("alarmFireLowerListExport")
+    public void export(HttpServletResponse response,
+                       @RequestParam(value = "companyName", required = false) String companyName,
+                       @RequestParam(value = "handlingStatus", required = false) Integer handlingStatus,
+                       @RequestParam(value = "alarmType", required = false) String alarmType,
+                       @RequestParam(value = "startDate", required = false) String startDate,
+                       @RequestParam(value = "endDate", required = false) String endDate,
+                       @RequestParam(value = "exportTitle") String exportTitle) throws IOException {
+        List<AlarmFireVo> list = alarmFireService.alarmFireLowerListExport(companyName, handlingStatus, startDate, endDate, alarmType);
+        ExcelUtil<AlarmFireVo> util = new ExcelUtil<AlarmFireVo>(AlarmFireVo.class);
+        util.exportExcel(response, list, exportTitle, exportTitle);
+    }
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/AlarmHydrantWaterController.java

@@ -0,0 +1,21 @@
+package com.usky.fire.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 消防给水及消火栓隐患告警 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-08-18
+ */
+@Controller
+@RequestMapping("/alarmHydrantWater")
+public class AlarmHydrantWaterController {
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/AlarmSmokeControlController.java

@@ -0,0 +1,21 @@
+package com.usky.fire.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 防排烟隐患告警 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-08-18
+ */
+@Controller
+@RequestMapping("/alarmSmokeControl")
+public class AlarmSmokeControlController {
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/AlarmSprayWaterController.java

@@ -0,0 +1,21 @@
+package com.usky.fire.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 自动喷水灭火隐患告警 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-08-18
+ */
+@Controller
+@RequestMapping("/alarmSprayWater")
+public class AlarmSprayWaterController {
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/AlarmVideoController.java

@@ -0,0 +1,21 @@
+package com.usky.fire.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 视频监控隐患告警 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-08-18
+ */
+@Controller
+@RequestMapping("/alarmVideo")
+public class AlarmVideoController {
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/AppPatrolInspectionController.java

@@ -0,0 +1,167 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
+import com.usky.fire.domain.PatrolInspectionSite;
+import com.usky.fire.service.PatrolInspectionPlanSonService;
+import com.usky.fire.service.vo.PatrolInspectionPlanSonVo;
+import com.usky.fire.service.vo.PatrolInspectionRecordVo;
+import com.usky.fire.service.vo.PatrolInspectionSiteVo;
+import com.usky.fire.service.vo.PlanRecordVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * APP-巡检
+ *
+ * @author JCB
+ * @since 2022-07-12
+ */
+@RestController
+@RequestMapping("/appPatrolInspection")
+public class AppPatrolInspectionController {
+
+    @Autowired
+    private PatrolInspectionPlanSonService patrolInspectionPlanSonService;
+
+    /**
+     * App-巡检自查-/首页/巡检计划-统计
+     *
+     * @param currentDate 时间 格式：yyyy-MM-dd
+     * @return
+     */
+    @GetMapping("appPlanStatistics")
+    public ApiResult<Map<String, Object>> appPlanStatistics(@RequestParam(value = "currentDate", required = false) String currentDate) {
+        return ApiResult.success(patrolInspectionPlanSonService.appPlanStatistics(currentDate));
+    }
+
+    /**
+     * App-巡检自查-巡检计划
+     *
+     * @param currentDate 日期 格式：yyyy-MM-dd
+     * @param sort        排序 （正序：ASC 倒序：DESC）
+     * @return
+     */
+    @GetMapping("patrolInspectionPlan")
+    public ApiResult<List<PatrolInspectionPlanSonVo>> patrolInspectionPlan(@RequestParam(value = "currentDate", required = false) String currentDate,
+                                                                           @RequestParam(value = "sort", required = false, defaultValue = "DESC") String sort) {
+        return ApiResult.success(patrolInspectionPlanSonService.patrolInspectionPlan(currentDate, sort));
+    }
+
+    /**
+     * 手机端-巡检自检-巡检计划-扫码查询计划
+     *
+     * @param siteNubmber 地点号码
+     * @return
+     */
+    @GetMapping("planList")
+    public ApiResult<List<PatrolInspectionPlanSonVo>> planList(@RequestParam(value = "siteNubmber") String siteNubmber) {
+        return ApiResult.success(patrolInspectionPlanSonService.planList(siteNubmber));
+    }
+
+
+    /**
+     * 手机端-巡检自检-巡检扫码地点详情
+     *
+     * @param siteId      地点ID
+     * @param siteNubmber 地点号码
+     * @param planSonId   子计划Id
+     * @return
+     */
+    @GetMapping("siteDetails")
+    public ApiResult<Map<String, Object>> siteDetails(@RequestParam(value = "siteId", required = false, defaultValue = "0") Integer siteId,
+                                                      @RequestParam(value = "siteNubmber", required = false) String siteNubmber,
+                                                      @RequestParam(value = "planSonId", required = false) Integer planSonId) {
+        return ApiResult.success(patrolInspectionPlanSonService.siteDetails(siteId, siteNubmber, planSonId));
+    }
+
+    /**
+     * 手机端-巡检自检-巡检上报-提交
+     *
+     * @param planRecordVo
+     * @return
+     */
+    @Log(title = "移动端-巡检上报", businessType = BusinessType.UPDATE)
+    @PostMapping("updatePlan")
+    public ApiResult<Void> updatePlan(@RequestBody PlanRecordVo planRecordVo) {
+        patrolInspectionPlanSonService.updatePlan(planRecordVo);
+        return ApiResult.success();
+    }
+
+
+    /**
+     * 手机端-巡检自检-巡检扫码地点详情
+     *
+     * @param planSonId 子计划ID
+     * @return
+     */
+    @GetMapping("planSonSiteDetails")
+    public ApiResult<List<PatrolInspectionSiteVo>> planSonSiteDetails(@RequestParam(value = "planSonId") Integer planSonId) {
+        return ApiResult.success(patrolInspectionPlanSonService.planSonSiteDetails(planSonId));
+    }
+
+
+    /**
+     * 手机端-巡检自检-点位采集-提交
+     *
+     * @param patrolInspectionSite
+     * @return
+     */
+    @Log(title = "移动端-点位采集", businessType = BusinessType.INSERT)
+    @PostMapping("addSite")
+    public ApiResult<Void> addSite(@RequestBody PatrolInspectionSite patrolInspectionSite) {
+        patrolInspectionPlanSonService.addSite(patrolInspectionSite);
+        return ApiResult.success();
+    }
+
+
+    /**
+     * 手机端-巡检自检-点位采集-采集记录
+     *
+     * @param startTime 开始时间 格式：yyyy-MM-dd HH:mm:ss
+     * @param endTime   结束时间 格式：yyyy-MM-dd HH:mm:ss
+     * @return
+     */
+    @GetMapping("siteList")
+    public ApiResult<List<PatrolInspectionSite>> siteList(@RequestParam(value = "startTime", required = false) String startTime,
+                                                          @RequestParam(value = "endTime", required = false) String endTime) {
+        return ApiResult.success(patrolInspectionPlanSonService.siteList(startTime, endTime));
+    }
+
+    /**
+     * 手机端-巡检自检-巡检记录
+     *
+     * @param currentDate 时间 格式：yyyy-MM-dd
+     * @param sort        排序 （正序：ASC 倒序：DESC）
+     * @param id          记录ID
+     * @return
+     */
+    @GetMapping("recordList")
+    public ApiResult<List<PatrolInspectionRecordVo>> recordList(@RequestParam(value = "currentDate", required = false) String currentDate,
+                                                                @RequestParam(value = "sort", required = false, defaultValue = "DESC") String sort,
+                                                                @RequestParam(value = "id", required = false, defaultValue = "0") Integer id,
+                                                                @RequestParam(value = "planSonId", required = false, defaultValue = "0") Integer planSonId,
+                                                                @RequestParam(value = "siteId", required = false, defaultValue = "0") Integer siteId) {
+        return ApiResult.success(patrolInspectionPlanSonService.recordList(currentDate, sort, id, planSonId, siteId));
+    }
+
+
+    /**
+     * 手机端-巡检自检-巡检记录-查看巡检项
+     *
+     * @param recordId 记录ID
+     * @param siteId   地点ID
+     * @return
+     */
+    @GetMapping("recordOption")
+    public ApiResult<Map<String, Object>> recordOption(@RequestParam(value = "recordId") Integer recordId,
+                                                       @RequestParam(value = "siteId") Integer siteId) {
+        return ApiResult.success(patrolInspectionPlanSonService.recordOption(recordId, siteId));
+    }
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/AtlasControllerWeb.java

@@ -0,0 +1,24 @@
+package com.usky.fire.controller.web;
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.fire.service.AtlasService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author yq
+ * @date 2021/7/13 14:06
+ */
+@RestController
+@RequestMapping("atlas")
+public class AtlasControllerWeb {
+
+    @Autowired
+    public AtlasService atlasService;
+
+    @RequestMapping("encrypt")
+    public ApiResult<String> encrypt() {
+        return ApiResult.success(atlasService.encrypt());
+    }
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/BaseCompanyAttach1Controller.java

@@ -0,0 +1,33 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.fire.service.BaseCompanyAttach1Service;
+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;
+
+/**
+ * <p>
+ * 联网单位信息附表1 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-09-20
+ */
+@RestController
+@RequestMapping("/baseCompanyAttach1")
+public class BaseCompanyAttach1Controller {
+
+    @Autowired
+    private BaseCompanyAttach1Service baseCompanyAttach1Service;
+
+    @GetMapping("streetTownList")
+    public ApiResult<Void> streetTownList() {
+        baseCompanyAttach1Service.streetTownList();
+        return ApiResult.success();
+    }
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/BaseCompanyAttach2Controller.java

@@ -0,0 +1,21 @@
+package com.usky.fire.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 联网单位信息附表2 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-09-20
+ */
+@Controller
+@RequestMapping("/baseCompanyAttach2")
+public class BaseCompanyAttach2Controller {
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/BaseCompanyController.java

@@ -0,0 +1,131 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
+import com.usky.fire.domain.BaseCompany;
+import com.usky.fire.service.BaseCompanyService;
+import com.usky.fire.service.vo.CompanyDataVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 联网单位信息表 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-08-23
+ */
+@RestController
+@RequestMapping("/baseCompany")
+public class BaseCompanyController {
+
+    @Autowired
+    private BaseCompanyService baseCompanyService;
+
+    /**
+     * 根据登录的用户查询所关联的单位下拉框
+     *
+     * @return
+     */
+    @GetMapping("userCompanySelect")
+    public ApiResult<List<BaseCompany>> userCompanySelect() {
+        return ApiResult.success(baseCompanyService.userCompanySelect());
+    }
+
+    /**
+     * 单位管理-单位列表查询
+     *
+     * @param companyName  单位名称
+     * @param organization 组织机构编码
+     * @param pageNum      当前页
+     * @param pageSize     每页条数
+     * @return
+     */
+    @GetMapping("companyList")
+    public ApiResult<CommonPage<Object>> companyList(@RequestParam(value = "companyName", required = false) String companyName,
+                                                     @RequestParam(value = "organization", required = false) String organization,
+                                                     @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                     @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
+        return ApiResult.success(baseCompanyService.companyList(companyName, organization, pageNum, pageSize));
+    }
+
+    /**
+     * 单位管理-修改
+     *
+     * @param companyDataVo
+     * @return
+     */
+    @Log(title = "单位管理-修改", businessType = BusinessType.UPDATE)
+    @PutMapping("updateCompany")
+    public ApiResult<Void> updateCompany(@RequestBody CompanyDataVo companyDataVo) {
+        baseCompanyService.updateCompany(companyDataVo);
+        return ApiResult.success();
+    }
+
+    /**
+     * 单位管理-删除
+     *
+     * @param id 主键ID
+     * @return
+     */
+    @Log(title = "单位管理-删除", businessType = BusinessType.DELETE)
+    @DeleteMapping("delCompany")
+    public ApiResult<Void> delCompany(@RequestParam(value = "id") Integer id) {
+        baseCompanyService.delCompany(id);
+        return ApiResult.success();
+    }
+
+
+    /**
+     * 企业自主管理-单位撒点
+     *
+     * @param streetTown  街镇
+     * @param companyType 单位类型（1：重点单位、2：一般单位、3：九小场所、9：其他单位）
+     * @return
+     */
+    @GetMapping("companyScatterer")
+    public ApiResult<List<Object>> companyScatterer(@RequestParam(value = "streetTown", required = false) String streetTown,
+                                                    @RequestParam(value = "companyType", required = false) String companyType) {
+        return ApiResult.success(baseCompanyService.companyScatterer(streetTown, companyType));
+    }
+
+    /**
+     * 消防执法动态-撒点
+     *
+     * @param streetTown   街镇
+     * @param sattererType 筛选条件
+     * @return
+     */
+    @GetMapping("lawTrendScatterer")
+    public ApiResult<List<Map<String, Object>>> lawTrendScatterer(@RequestParam(value = "streetTown", required = false) String streetTown,
+                                                                  @RequestParam(value = "sattererType", required = false) String sattererType) {
+        return ApiResult.success(baseCompanyService.lawTrendScatterer(streetTown, sattererType));
+    }
+
+    /**
+     * 消防检查信息-列表查询
+     *
+     * @param companyName  单位名称
+     * @param organization 组织机构代码
+     * @param id           主键ID
+     * @param pageNum      当前页
+     * @param pageSize     每页条数
+     * @return
+     */
+    @GetMapping("fireInspectionData")
+    public ApiResult<CommonPage<Map<String, Object>>> fireInspectionData(@RequestParam(value = "companyName", required = false) String companyName,
+                                                                         @RequestParam(value = "organization", required = false) String organization,
+                                                                         @RequestParam(value = "id", required = false, defaultValue = "0") Integer id,
+                                                                         @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                                         @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
+        return ApiResult.success(baseCompanyService.fireInspectionData(companyName, organization, id, pageNum, pageSize));
+    }
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/BaseCompanyPersonController.java

@@ -0,0 +1,91 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.fire.domain.BaseCompanyPerson;
+import com.usky.fire.domain.MhPostInspect;
+import com.usky.fire.service.BaseCompanyPersonService;
+import com.usky.fire.service.MhPostInspectService;
+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.Map;
+
+/**
+ * <p>
+ * 联网单位消防人员信息 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-08-24
+ */
+@RestController
+@RequestMapping("/baseCompanyPerson")
+public class BaseCompanyPersonController {
+
+    @Autowired
+    private BaseCompanyPersonService baseCompanyPersonService;
+
+    @Autowired
+    private MhPostInspectService mhPostInspectService;
+
+    /**
+     * 值班查岗-查岗单位及记录数据查询列表查询接口（闵行支队、企业版）
+     *
+     * @param companyCode 单位编号
+     * @param companyName 单位名称
+     * @param pageNum     当前页
+     * @param pageSize    每页条数
+     * @return
+     */
+    @GetMapping("postInspectList")
+    public ApiResult<CommonPage<BaseCompanyPerson>> postInspectList(@RequestParam(value = "companyCode", required = false) String companyCode,
+                                                                    @RequestParam(value = "companyName", required = false) String companyName,
+                                                                    @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                                    @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
+        return ApiResult.success(baseCompanyPersonService.baseCompanyPersonList(companyCode, companyName, pageNum, pageSize));
+    }
+
+    /**
+     * 值班查岗-主页面响应时间、查岗次数等统计查询接口（闵行支队、企业版）
+     *
+     * @return
+     */
+    @GetMapping("postInspectStatistics")
+    public ApiResult<Map<String, Object>> postInspectStatistics() {
+        return ApiResult.success(baseCompanyPersonService.postInspectStatistics());
+    }
+
+
+    /**
+     * 值班查岗-查岗记录数据列表查询接口（闵行支队、企业版）
+     *
+     * @param companyId 单位ID
+     * @param pageNum   当前页
+     * @param pageSize  每页条数
+     * @return
+     */
+    @GetMapping("postInspectRecordList")
+    public ApiResult<CommonPage<MhPostInspect>> postInspectRecordList(@RequestParam(value = "companyId") String companyId,
+                                                                      @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                                      @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
+        return ApiResult.success(mhPostInspectService.postInspectRecordList(companyId, pageNum, pageSize));
+    }
+
+    /**
+     * 值班查岗-查岗记录页面响应时间、查岗次数等统计查询接口（闵行支队、企业版）
+     *
+     * @param companyId 单位ID
+     * @return
+     */
+    @GetMapping("postInspectRecordStatistics")
+    public ApiResult<Map<String, Object>> postInspectRecordStatistics(@RequestParam(value = "companyId") String companyId) {
+        return ApiResult.success(mhPostInspectService.postInspectRecordStatistics(companyId));
+    }
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/BaseDeviceAttributeController.java

@@ -0,0 +1,21 @@
+package com.usky.fire.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 基础信息_设备点位 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-08-23
+ */
+@Controller
+@RequestMapping("/baseDeviceAttribute")
+public class BaseDeviceAttributeController {
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/BaseDeviceController.java

@@ -0,0 +1,21 @@
+package com.usky.fire.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-08-15
+ */
+@Controller
+@RequestMapping("/baseDevice")
+public class BaseDeviceController {
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/BaseModelController.java

@@ -0,0 +1,42 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.fire.service.BaseModelService;
+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;
+
+/**
+ * <p>
+ * 三维模型设备信息 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-09-05
+ */
+@RestController
+@RequestMapping("/baseModel")
+public class BaseModelController {
+
+    @Autowired
+    private BaseModelService baseModelService;
+
+    /**
+     * 三维建模-设备信息查询
+     *
+     * @param buildId 建筑ID
+     * @param floorId 楼层
+     * @return
+     */
+    @GetMapping("modelDataList")
+    public ApiResult<List<Object>> modelDataList(@RequestParam(value = "buildId") Integer buildId,
+                                                 @RequestParam(value = "floorId") Integer floorId) {
+        return ApiResult.success(baseModelService.modelDataList(buildId, floorId));
+    }
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/BaseUserCompanyController.java

@@ -0,0 +1,21 @@
+package com.usky.fire.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 用户单位关联 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-08-18
+ */
+@Controller
+@RequestMapping("/baseUserCompany")
+public class BaseUserCompanyController {
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/BscEnterpriseAutonomyController.java

@@ -0,0 +1,95 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.fire.service.BscEnterpriseAutonomyService;
+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;
+import java.util.Map;
+
+/**
+ * <p>
+ * 企业自主管理大屏统计（全部） 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-10-09
+ */
+@RestController
+@RequestMapping("/bscEnterpriseAutonomy")
+public class BscEnterpriseAutonomyController {
+
+    @Autowired
+    private BscEnterpriseAutonomyService bscEnterpriseAutonomyService;
+
+    /**
+     * 企业自主管理大屏统计-全部单位数据查询
+     *
+     * @param moduleType 模块类型
+     * @param dataType   数据类型
+     * @return
+     */
+    @GetMapping("enterpriseAutonomy")
+    public ApiResult<Object> enterpriseAutonomy(@RequestParam(value = "dataType") String dataType,
+                                                @RequestParam(value = "moduleType") String moduleType,
+                                                @RequestParam(value = "streetTown", required = false) String streetTown) {
+        return ApiResult.success(bscEnterpriseAutonomyService.enterprise(moduleType, dataType, streetTown));
+    }
+
+
+    /**
+     * 企业自主管理大屏统计(全部)-手动生成数据
+     *
+     * @return
+     */
+    @GetMapping("streetCompany")
+    public ApiResult<Void> streetCompany() {
+//        bscEnterpriseAutonomyService.patrolInspection();
+        bscEnterpriseAutonomyService.enterpriseAutonomyTask();
+        return ApiResult.success();
+    }
+
+
+    /**
+     * 企业自主管理-企业经营情况-数据查询
+     *
+     * @param companyId 单位ID
+     * @return
+     */
+    @GetMapping("erpData")
+    public ApiResult<List<Map<String, Object>>> erpData(@RequestParam(value = "companyId", defaultValue = "2DB679350A0F4023B74C4261539AA031") String companyId) {
+        return ApiResult.success(bscEnterpriseAutonomyService.erpData(companyId));
+    }
+
+
+    /**
+     * 企业自主管理-物联网处置情况查询
+     *
+     * @param streetTown 街镇
+     * @param startDate  开始时间
+     * @param endDate    结束时间
+     * @return
+     */
+    @GetMapping("iotDisposal")
+    public ApiResult<Map<String, Object>> iotDisposal(@RequestParam(value = "streetTown", required = false) String streetTown,
+                                                      @RequestParam(value = "startDate", required = false) String startDate,
+                                                      @RequestParam(value = "endDate", required = false) String endDate) {
+        return ApiResult.success(bscEnterpriseAutonomyService.iotDisposal(streetTown, startDate, endDate));
+    }
+
+    /**
+     * 企业自主管理-各街镇物联动态
+     *
+     * @return
+     */
+    @GetMapping("streetDynamic")
+    public ApiResult<List<Map<String, Object>>> streetDynamic() {
+        return ApiResult.success(bscEnterpriseAutonomyService.streetDynamic());
+    }
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/BscEnterpriseScreenController.java

@@ -0,0 +1,67 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.fire.service.BscEnterpriseScreenService;
+import com.usky.fire.service.vo.DataVo;
+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;
+
+/**
+ * <p>
+ * 企业大屏数据统计 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-09-06
+ */
+@RestController
+@RequestMapping("/bscEnterpriseScreen")
+public class BscEnterpriseScreenController {
+
+    @Autowired
+    private BscEnterpriseScreenService bscEnterpriseScreenService;
+
+    /**
+     * 大屏数据查询
+     *
+     * @param dataType   数据类型
+     * @param moduleType 模块类型
+     * @return
+     */
+    @GetMapping("screenDataStatistic")
+    public ApiResult<Object> screenDataStatistic(@RequestParam(value = "dataType") String dataType,
+                                                 @RequestParam(value = "moduleType") String moduleType,
+                                                 @RequestParam(value = "dataType1", required = false) String dataType1) {
+        return ApiResult.success(bscEnterpriseScreenService.screenDataStatistic(dataType, moduleType, dataType1));
+    }
+
+
+    /**
+     * 大屏定时任务（手动触发）
+     *
+     * @return
+     */
+    @GetMapping("dataSynchro")
+    public ApiResult dataSynchro() {
+        bscEnterpriseScreenService.dataSynchro();
+        return ApiResult.success();
+    }
+
+    /**
+     * 大屏实时消防告警推送
+     *
+     * @return
+     */
+    @GetMapping("Alarmlist")
+    public ApiResult<List<DataVo>> Alarmlist() {
+        return ApiResult.success(bscEnterpriseScreenService.Alarmlist());
+    }
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/BscEnterpriseStreetTownController.java

@@ -0,0 +1,49 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.fire.service.BscEnterpriseStreetTownService;
+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;
+
+/**
+ * <p>
+ * 企业自主管理大屏统计（街镇） 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-10-09
+ */
+@RestController
+@RequestMapping("/bscEnterpriseStreetTown")
+public class BscEnterpriseStreetTownController {
+
+    @Autowired
+    private BscEnterpriseStreetTownService bscEnterpriseStreetTownService;
+
+    /**
+     * 企业自主管理大屏统计-街镇数据查询
+     *
+     * @param moduleType 模块类型
+     * @param dataType   数据类型
+     * @param streetTown 街镇
+     * @return
+     */
+    @GetMapping("enterpriseStreetTown")
+    public ApiResult<Object> enterpriseStreetTown(@RequestParam(value = "dataType") String dataType,
+                                                  @RequestParam(value = "moduleType") String moduleType,
+                                                  @RequestParam(value = "streetTown") String streetTown) {
+        return ApiResult.success(bscEnterpriseStreetTownService.enterpriseStreetTown(moduleType, dataType, streetTown));
+    }
+
+
+    @GetMapping("streetCompany")
+    public ApiResult<Void> streetCompany() {
+        bscEnterpriseStreetTownService.enterpriseStreetTownTask();
+        return ApiResult.success();
+    }
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/BscLawTrendController.java

@@ -0,0 +1,60 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.fire.service.BscLawTrendService;
+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;
+import java.util.Map;
+
+/**
+ * <p>
+ * 消防执法动态大屏统计 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-10-13
+ */
+@RestController
+@RequestMapping("/bscLawTrend")
+public class BscLawTrendController {
+
+    @Autowired
+    private BscLawTrendService bscLawTrendService;
+
+    /**
+     * 消防执法动态-数据查询
+     *
+     * @param moduleType 模块类型(monthLaw:当月执法情况 adstraLicense:行政许可情况 reportComplaint:消防隐患举报投诉 complaintHandle:投诉处理情况)
+     * @return
+     */
+    @GetMapping("lawTrendList")
+    public ApiResult<Object> lawTrendList(@RequestParam(value = "moduleType") String moduleType) {
+        return ApiResult.success(bscLawTrendService.lawTrendList(moduleType));
+    }
+
+    /**
+     * 消防执法动态-单位撒点详情数据
+     *
+     * @param companyId 单位ID
+     * @return
+     */
+    @GetMapping("companyData")
+    public ApiResult<List<Map<String, Object>>> companyData(@RequestParam(value = "companyId") String companyId,
+                                                            @RequestParam(value = "companyName") String companyName) {
+        return ApiResult.success(bscLawTrendService.companyData(companyId, companyName));
+    }
+
+    @GetMapping("monthLaw")
+    public ApiResult<Void> monthLaw() {
+        bscLawTrendService.lawEnforcement();
+        return ApiResult.success();
+    }
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DataRtController.java

@@ -0,0 +1,81 @@
+package com.usky.fire.controller.web;
+
+
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.fire.domain.DataRt;
+import com.usky.fire.service.DataRtService;
+import com.usky.fire.service.vo.RealTimeStatus;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * <p>
+ * 实时数据表 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-08-24
+ */
+@RestController
+@RequestMapping("/dataRt")
+public class DataRtController {
+
+    @Autowired
+    private DataRtService dataRtService;
+
+    /**
+     * 物联网实时数据-列表查询
+     *
+     * @param deviceCode 设备编号
+     * @param systemType 系统类型(1.火灾自动报警系统 2.自动喷水灭火系统 3.消防给水及消火栓系统 4.防排烟系统 5.电气火灾系统 6.消防视频监控系统)
+     * @param pageNum    当前页
+     * @param pageSize   每页条数
+     * @return
+     */
+    @GetMapping("dataRtList")
+    public ApiResult<CommonPage<DataRt>> dataRtList(@RequestParam(value = "deviceCode", required = false) String deviceCode,
+                                                    @RequestParam(value = "systemType") Integer systemType,
+                                                    @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                    @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
+        return ApiResult.success(dataRtService.dataRtList(deviceCode, systemType, pageNum, pageSize));
+    }
+
+    /**
+     * 物联网实时数据-导出
+     *
+     * @param response
+     * @param deviceCode  设备编号
+     * @param systemType  系统类型(1.火灾自动报警系统 2.自动喷水灭火系统 3.消防给水及消火栓系统 4.防排烟系统 5.电气火灾系统 6.消防视频监控系统)
+     * @param exportTitle 标题
+     * @throws IOException
+     */
+    @PostMapping("dataRtListExport")
+    public void export(HttpServletResponse response,
+                       @RequestParam(value = "deviceCode", required = false) String deviceCode,
+                       @RequestParam(value = "systemType") Integer systemType,
+                       @RequestParam(value = "exportTitle") String exportTitle) throws IOException {
+        List<DataRt> list = dataRtService.dataRtListOne(deviceCode, systemType);
+        ExcelUtil<DataRt> util = new ExcelUtil<DataRt>(DataRt.class);
+        util.exportExcel(response, list, exportTitle, exportTitle);
+    }
+
+    /**
+     * 实时监控与工况-设备实时状态
+     *
+     * @param deviceCode 设备编号
+     * @return
+     */
+    @GetMapping("deviceInfoData")
+    public ApiResult<RealTimeStatus> deviceInfoData(@RequestParam(value = "deviceCode") String deviceCode) {
+        return ApiResult.success(dataRtService.deviceInfoData(deviceCode));
+    }
+
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemAtlDisagreeController.java

@@ -0,0 +1,21 @@
+package com.usky.fire.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 不同意使用 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-10-19
+ */
+@Controller
+@RequestMapping("/demAtlDisagree")
+public class DemAtlDisagreeController {
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemAtlInspectCertificateController.java

@@ -0,0 +1,21 @@
+package com.usky.fire.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 安全检查合格证 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-10-08
+ */
+@Controller
+@RequestMapping("/demAtlInspectCertificate")
+public class DemAtlInspectCertificateController {
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemAtlInspectDeclareController.java

@@ -0,0 +1,73 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
+import com.usky.fire.domain.DemAtlInspectDeclare;
+import com.usky.fire.service.DemAtlInspectDeclareService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 消防安检申报总表 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-10-08
+ */
+@RestController
+@RequestMapping("/demAtlInspectDeclare")
+public class DemAtlInspectDeclareController {
+
+    @Autowired
+    private DemAtlInspectDeclareService demAtlInspectDeclareService;
+
+    /**
+     * 行政许可数据-列表查询
+     *
+     * @param projectCode        项目编号
+     * @param declareCompanyName 申请单位
+     * @param id                 主键ID
+     * @param pageNum            当前页
+     * @param pageSize           每页条数
+     * @return
+     */
+    @GetMapping("atlInspectDeclareList")
+    public ApiResult<CommonPage<Object>> atlInspectDeclareList(@RequestParam(value = "projectCode", required = false) String projectCode,
+                                                               @RequestParam(value = "declareCompanyName", required = false) String declareCompanyName,
+                                                               @RequestParam(value = "id", required = false, defaultValue = "0") Integer id,
+                                                               @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                               @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
+        return ApiResult.success(demAtlInspectDeclareService.atlInspectDeclareList(projectCode, declareCompanyName, id, pageNum, pageSize));
+    }
+
+    /**
+     * 行政许可数据-修改
+     *
+     * @param demAtlInspectDeclare
+     */
+    @Log(title = "行政许可数据-修改", businessType = BusinessType.UPDATE)
+    @PutMapping("updateAtlInspectCertificate")
+    public ApiResult<Void> updateAtlInspectCertificate(@RequestBody DemAtlInspectDeclare demAtlInspectDeclare) {
+        demAtlInspectDeclareService.updateAtlInspectCertificate(demAtlInspectDeclare);
+        return ApiResult.success();
+    }
+
+    /**
+     * 行政许可数据-删除
+     *
+     * @param id 主键ID
+     */
+    @Log(title = "行政许可数据-删除", businessType = BusinessType.DELETE)
+    @DeleteMapping("delAtlInspectCertificate")
+    public ApiResult<Void> delAtlInspectCertificate(@RequestParam(value = "id") Integer id,
+                                                    @RequestParam(value = "zid", required = false, defaultValue = "0") Integer zid) {
+        demAtlInspectDeclareService.delAtlInspectCertificate(id, zid);
+        return ApiResult.success();
+    }
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemAtlInspectVoucherController.java

@@ -0,0 +1,21 @@
+package com.usky.fire.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 安全检查凭证 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-10-14
+ */
+@Controller
+@RequestMapping("/demAtlInspectVoucher")
+public class DemAtlInspectVoucherController {
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemBuildScoreController.java

@@ -0,0 +1,54 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
+import com.usky.fire.domain.DemBuildScore;
+import com.usky.fire.service.DemBuildScoreService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 建筑评分 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-09-06
+ */
+@RestController
+@RequestMapping("/demBuildScore")
+public class DemBuildScoreController {
+
+    @Autowired
+    private DemBuildScoreService demBuildScoreService;
+
+    /**
+     * 建筑评分管理-建筑评分规则修改
+     *
+     * @param demBuildScoreList
+     * @return
+     */
+    @Log(title = "建筑评分管理-建筑评分规则修改", businessType = BusinessType.UPDATE)
+    @PutMapping("buildScoreUpdate")
+    public ApiResult<Void> buildScoreUpdate(@RequestBody List<DemBuildScore> demBuildScoreList) {
+        demBuildScoreService.buildScoreUpdate(demBuildScoreList);
+        return ApiResult.success();
+    }
+
+    /**
+     * 建筑评分管理-列表查询
+     *
+     * @return
+     */
+    @GetMapping("buildScoreList")
+    public ApiResult<Object> buildScoreList() {
+        return ApiResult.success(demBuildScoreService.buildScoreList());
+    }
+
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemBuildScoreRiskController.java

@@ -0,0 +1,36 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.fire.service.DemBuildScoreRiskService;
+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;
+
+/**
+ * <p>
+ * 建筑评分风险类型 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-09-06
+ */
+@RestController
+@RequestMapping("/demBuildScoreRisk")
+public class DemBuildScoreRiskController {
+
+    @Autowired
+    private DemBuildScoreRiskService demBuildScoreRiskService;
+
+    /**
+     * 建筑评分管理-风险类型下拉框
+     *
+     * @return
+     */
+    @GetMapping("demBuildScoreRiskList")
+    public ApiResult<Object> demBuildScoreRiskList() {
+        return ApiResult.success(demBuildScoreRiskService.demBuildScoreRiskList());
+    }
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemCaseController.java

@@ -0,0 +1,67 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.fire.domain.DemCase;
+import com.usky.fire.service.DemCaseService;
+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.Map;
+
+/**
+ * <p>
+ * 设备案件 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-10-12
+ */
+@RestController
+@RequestMapping("/demCase")
+public class DemCaseController {
+
+    @Autowired
+    private DemCaseService demCaseService;
+
+    /**
+     * 企业自主管理-历史案件-列表查询
+     *
+     * @param streetTown  街镇
+     * @param companyName 单位名称
+     * @param deviceType  设备类型
+     * @param id          主键ID
+     * @param pageNum     当前页
+     * @param pageSize    每页条数
+     * @return
+     */
+    @GetMapping("caseList")
+    public ApiResult<CommonPage<DemCase>> caseList(@RequestParam(value = "streetTown", required = false) String streetTown,
+                                                   @RequestParam(value = "companyName", required = false) String companyName,
+                                                   @RequestParam(value = "deviceType", required = false) String deviceType,
+                                                   @RequestParam(value = "id", required = false, defaultValue = "0") Integer id,
+                                                   @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                   @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
+        return ApiResult.success(demCaseService.caseList(streetTown, companyName, deviceType, id, pageNum, pageSize));
+    }
+
+    /**
+     * 企业自主管理-历史案件-统计
+     *
+     * @param streetTown 街镇
+     * @param companyId  单位ID
+     * @return
+     */
+    @GetMapping("caseStatistics")
+    public ApiResult<Map<String, Object>> caseStatistics(@RequestParam(value = "streetTown", required = false) String streetTown,
+                                                         @RequestParam(value = "companyId", required = false) String companyId) {
+        return ApiResult.success(demCaseService.caseStatistics(streetTown, companyId));
+    }
+
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemEnforceInspectRecordController.java

@@ -0,0 +1,72 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
+import com.usky.fire.domain.DemEnforceInspectRecord;
+import com.usky.fire.service.DemEnforceInspectRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 消防监督检查记录 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-09-22
+ */
+@RestController
+@RequestMapping("/demEnforceInspectRecord")
+public class DemEnforceInspectRecordController {
+
+    @Autowired
+    private DemEnforceInspectRecordService demEnforceInspectRecordService;
+
+    /**
+     * 执法检查数据-列表查询
+     *
+     * @param projectCode 项目编号
+     * @param companyName 单位编号
+     * @param pageNum     当前页
+     * @param pageSize    每页条数
+     * @return
+     */
+    @GetMapping("enforceInspectRecordList")
+    public ApiResult<CommonPage<Object>> enforceInspectRecordList(@RequestParam(value = "projectCode", required = false) String projectCode,
+                                                                  @RequestParam(value = "companyName", required = false) String companyName,
+                                                                  @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                                  @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
+        return ApiResult.success(demEnforceInspectRecordService.enforceInspectRecordList(projectCode, companyName, pageNum, pageSize));
+    }
+
+    /**
+     * 执法检查数据-修改
+     *
+     * @param demEnforceInspectRecord
+     * @return
+     */
+    @Log(title = "执法检查数据-修改", businessType = BusinessType.UPDATE)
+    @PutMapping("updateEnforceInspectRecord")
+    public ApiResult<Void> updateEnforceInspectRecord(@RequestBody DemEnforceInspectRecord demEnforceInspectRecord) {
+        demEnforceInspectRecordService.updateEnforceInspectRecord(demEnforceInspectRecord);
+        return ApiResult.success();
+    }
+
+    /**
+     * 执法检查数据-删除
+     *
+     * @param id 主键ID
+     * @return
+     */
+    @Log(title = "执法检查数据-删除", businessType = BusinessType.DELETE)
+    @DeleteMapping("delEnforceInspectRecord")
+    public ApiResult<Void> delEnforceInspectRecord(@RequestParam(value = "id") Integer id) {
+        demEnforceInspectRecordService.delEnforceInspectRecord(id);
+        return ApiResult.success();
+    }
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemEnforceProjectAllController.java

@@ -0,0 +1,21 @@
+package com.usky.fire.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 监督管理项目全表 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-10-19
+ */
+@Controller
+@RequestMapping("/demEnforceProjectAll")
+public class DemEnforceProjectAllController {
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemEnforceReportAttachController.java

@@ -0,0 +1,21 @@
+package com.usky.fire.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 监督检查举报投诉信息附表 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-09-23
+ */
+@Controller
+@RequestMapping("/demEnforceReportAttach")
+public class DemEnforceReportAttachController {
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemEnforceReportComplaintController.java

@@ -0,0 +1,139 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
+import com.usky.fire.domain.DemEnforceReportComplaint;
+import com.usky.fire.domain.DemEnforceReportLabel;
+import com.usky.fire.service.DemEnforceReportComplaintService;
+import com.usky.fire.service.DemEnforceReportLabelService;
+import com.usky.fire.service.vo.ParameterVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 监督检查举报投诉信息 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-09-23
+ */
+@RestController
+@RequestMapping("/demEnforceReportComplaint")
+public class DemEnforceReportComplaintController {
+
+    @Autowired
+    private DemEnforceReportComplaintService demEnforceReportComplaintService;
+
+    @Autowired
+    private DemEnforceReportLabelService demEnforceReportLabelService;
+
+    /**
+     * 举报信息管理-列表查询
+     *
+     * @param serialNumber 流水号
+     * @param reportPhone  举报电话
+     * @param pageNum      当前页
+     * @param pageSize     每页条数
+     * @return
+     */
+    @GetMapping("enforceReportComplaintList")
+    public ApiResult<CommonPage<Object>> enforceReportComplaintList(@RequestParam(value = "serialNumber", required = false) String serialNumber,
+                                                                    @RequestParam(value = "reportPhone", required = false, defaultValue = "0") String reportPhone,
+                                                                    @RequestParam(value = "id", required = false, defaultValue = "0") Integer id,
+                                                                    @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                                    @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
+        return ApiResult.success(demEnforceReportComplaintService.enforceReportComplaintList(serialNumber, reportPhone, id, pageNum, pageSize));
+    }
+
+    /**
+     * 举报信息管理-标签添加
+     *
+     * @param demEnforceReportLabel
+     */
+    @Log(title = "举报信息管理-添加标签", businessType = BusinessType.INSERT)
+    @PostMapping("addLabel")
+    public ApiResult<Void> addLabel(@RequestBody DemEnforceReportLabel demEnforceReportLabel) {
+        demEnforceReportComplaintService.addLabel(demEnforceReportLabel);
+        return ApiResult.success();
+    }
+
+    /**
+     * 举报信息管理-标签绑定
+     *
+     * @param parameterVo
+     */
+    @Log(title = "举报信息管理-绑定标签", businessType = BusinessType.UPDATE)
+    @PutMapping("bindLabel")
+    public ApiResult<Void> bindLabel(@RequestBody ParameterVo parameterVo) {
+        demEnforceReportComplaintService.bindLabel(parameterVo);
+        return ApiResult.success();
+    }
+
+    /**
+     * 举报信息管理-修改
+     *
+     * @param demEnforceReportComplaint
+     */
+    @Log(title = "举报信息管理-修改", businessType = BusinessType.UPDATE)
+    @PutMapping("updateEnforceReportComplaint")
+    public ApiResult<Void> updateEnforceReportComplaint(@RequestBody DemEnforceReportComplaint demEnforceReportComplaint) {
+        demEnforceReportComplaintService.updateEnforceReportComplaint(demEnforceReportComplaint);
+        return ApiResult.success();
+    }
+
+    /**
+     * 举报信息管理-删除
+     *
+     * @param id 主键ID
+     */
+    @Log(title = "举报信息管理-删除", businessType = BusinessType.DELETE)
+    @DeleteMapping("delEnforceReportComplaint")
+    public ApiResult<Void> delEnforceReportComplaint(@RequestParam(value = "id") Integer id) {
+        demEnforceReportComplaintService.delEnforceReportComplaint(id);
+        return ApiResult.success();
+    }
+
+    /**
+     * 举报信息管理-标签分类下拉框
+     *
+     * @param fid 父级ID
+     * @return
+     */
+    @GetMapping("enforceReportLabelSelect")
+    public ApiResult<List<DemEnforceReportLabel>> enforceReportLabelSelect(@RequestParam(value = "fid", required = false, defaultValue = "0") Integer fid) {
+        return ApiResult.success(demEnforceReportLabelService.enforceReportLabelSelect(fid));
+    }
+
+    /**
+     * 举报信息管理-标签操作异常抛出
+     *
+     * @param demEnforceReportLabel
+     * @return
+     */
+    @PostMapping("abnormalData")
+    public ApiResult<Void> abnormalData(@RequestBody DemEnforceReportLabel demEnforceReportLabel) {
+        demEnforceReportComplaintService.abnormalData(demEnforceReportLabel);
+        return ApiResult.success();
+    }
+
+    /**
+     * 举报信息管理-标签删除
+     *
+     * @param id 主键ID
+     * @return
+     */
+    @Log(title = "标签-删除", businessType = BusinessType.DELETE)
+    @DeleteMapping("delEnforceReportLabel")
+    public ApiResult<Void> delDemFireStatistics(@RequestParam(value = "id") Integer id) {
+        demEnforceReportComplaintService.delEnforceReportLabel(id);
+        return ApiResult.success();
+    }
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemEnforceReportLabelAttributeController.java

@@ -0,0 +1,21 @@
+package com.usky.fire.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-10-08
+ */
+@Controller
+@RequestMapping("/demEnforceReportLabelAttribute")
+public class DemEnforceReportLabelAttributeController {
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemEnforceReportLabelController.java

@@ -0,0 +1,21 @@
+package com.usky.fire.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 监督检查举报投诉信息标签表 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-09-26
+ */
+@Controller
+@RequestMapping("/demEnforceReportLabel")
+public class DemEnforceReportLabelController {
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemFileLabelController.java

@@ -0,0 +1,59 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
+import com.usky.fire.domain.DemFileLabel;
+import com.usky.fire.service.DemFileLabelService;
+import com.usky.fire.service.DemFireStatisticsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-09-14
+ */
+@RestController
+@RequestMapping("/demFileLabel")
+public class DemFileLabelController {
+
+    @Autowired
+    private DemFileLabelService demFileLabelService;
+
+    @Autowired
+    private DemFireStatisticsService demFireStatisticsService;
+
+    /**
+     * 标签-列表/下拉框查询
+     *
+     * @param fid       父ID
+     * @param labelName 标签ID
+     * @return
+     */
+    @GetMapping("demFileLabelList")
+    public ApiResult<List<DemFileLabel>> demFileLabelList(@RequestParam(value = "fid", required = false) Integer fid,
+                                                          @RequestParam(value = "labelName", required = false) String labelName) {
+        return ApiResult.success(demFileLabelService.demFileLabelList(fid, labelName, null));
+    }
+
+    /**
+     * 标签-删除
+     *
+     * @param id 主键ID
+     * @return
+     */
+    @Log(title = "标签-删除", businessType = BusinessType.DELETE)
+    @DeleteMapping("delDemFileLabel")
+    public ApiResult<Void> delDemFireStatistics(@RequestParam(value = "id") Integer id) {
+        demFireStatisticsService.delDemFileLabel(id);
+        return ApiResult.success();
+    }
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemFireAccidentDescController.java

@@ -0,0 +1,134 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
+import com.usky.fire.domain.DemFileLabel;
+import com.usky.fire.service.DemFireStatisticsService;
+import com.usky.fire.service.vo.DemFireStatisticsVo;
+import com.usky.fire.service.vo.ParameterVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 火灾事故说明总表 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-09-13
+ */
+@RestController
+@RequestMapping("/demFireAccidentDesc")
+public class DemFireAccidentDescController {
+
+    @Autowired
+    private DemFireStatisticsService demFireStatisticsService;
+
+    /**
+     * 火灾数据管理-列表查询
+     *
+     * @param fireNumber 火灾序号
+     * @param labelId    标签ID
+     * @param typeId     分类ID
+     * @param pageNum    当前页
+     * @param pageSize   每页条数
+     * @return
+     */
+    @GetMapping("fireAccidentStatistic")
+    public ApiResult<CommonPage<Object>> fireAccidentStatistic(@RequestParam(value = "fireNumber", required = false) String fireNumber,
+                                                               @RequestParam(value = "labelId", required = false) Integer labelId,
+                                                               @RequestParam(value = "typeId", required = false, defaultValue = "0") Integer typeId,
+                                                               @RequestParam(value = "id", required = false, defaultValue = "0") Integer id,
+                                                               @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                               @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
+        return ApiResult.success(demFireStatisticsService.fireAccidentStatistic(fireNumber, labelId, typeId, id, pageNum, pageSize));
+    }
+
+    /**
+     * 火灾数据管理-添加标签
+     *
+     * @param demFileLabel
+     * @return
+     */
+    @Log(title = "火灾数据-添加标签", businessType = BusinessType.INSERT)
+    @PostMapping("addLabel")
+    public ApiResult<Void> addLabel(@RequestBody DemFileLabel demFileLabel) {
+        demFireStatisticsService.addLabel(demFileLabel);
+        return ApiResult.success();
+    }
+
+    /**
+     * 火灾数据管理-绑定弹窗列表查询
+     *
+     * @param fireNumber     火灾序号
+     * @param fireCauseType1 起火原因
+     * @param pageNum        当前页
+     * @param pageSize       每页条数
+     * @return
+     */
+    @GetMapping("fireStatisticList")
+    public ApiResult<CommonPage<Object>> fireStatisticList(@RequestParam(value = "fireNumber", required = false) String fireNumber,
+                                                           @RequestParam(value = "fireCauseType1", required = false) String fireCauseType1,
+                                                           @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                           @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
+        return ApiResult.success(demFireStatisticsService.fireStatisticList(fireNumber, fireCauseType1, pageNum, pageSize));
+    }
+
+    /**
+     * 火灾数据管理-绑定标签
+     *
+     * @param parameterVo
+     * @return
+     */
+    @Log(title = "火灾数据-绑定标签", businessType = BusinessType.UPDATE)
+    @PutMapping("bindingLabel")
+    public ApiResult<Void> bindingLabel(@RequestBody ParameterVo parameterVo) {
+        demFireStatisticsService.bindingLabel(parameterVo);
+        return ApiResult.success();
+    }
+
+    /**
+     * 火灾数据管理-修改
+     *
+     * @param demFireStatisticsVo
+     * @return
+     */
+    @Log(title = "火灾数据-修改", businessType = BusinessType.UPDATE)
+    @PutMapping("updateDemFireStatistics")
+    public ApiResult<Void> updateDemFireStatistics(@RequestBody DemFireStatisticsVo demFireStatisticsVo) {
+        demFireStatisticsService.updateDemFireStatistics(demFireStatisticsVo);
+        return ApiResult.success();
+    }
+
+    /**
+     * 火灾数据管理-删除
+     *
+     * @param id  主键ID
+     * @param zid 关联表ID
+     * @return
+     */
+    @Log(title = "火灾数据-删除", businessType = BusinessType.DELETE)
+    @DeleteMapping("delDemFireStatistics")
+    public ApiResult<Void> delDemFireStatistics(@RequestParam(value = "id") Integer id,
+                                                @RequestParam(value = "zid") Integer zid) {
+        demFireStatisticsService.delDemFireStatistics(id, zid);
+        return ApiResult.success();
+    }
+
+    /**
+     * 火灾数据管理-标签操作异常抛出
+     *
+     * @param demFileLabel
+     * @return
+     */
+    @PostMapping("abnormalData")
+    public ApiResult<Void> abnormalData(@RequestBody DemFileLabel demFileLabel) {
+        demFireStatisticsService.abnormalData(demFileLabel);
+        return ApiResult.success();
+    }
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemFireInspectController.java

@@ -0,0 +1,70 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
+import com.usky.fire.domain.DemFireInspect;
+import com.usky.fire.domain.DemFireInspectPerson;
+import com.usky.fire.service.DemFireInspectService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 消防检查 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-11-24
+ */
+@RestController
+@RequestMapping("/demFireInspect")
+public class DemFireInspectController {
+
+    @Autowired
+    private DemFireInspectService demFireInspectService;
+
+    /**
+     * 消防检查信息-检查计划-列表查询
+     *
+     * @param companyId 单位ID
+     * @param pageNum   当前页
+     * @param pageSize  每页条数
+     * @return
+     */
+    @GetMapping("fireInspectList")
+    public ApiResult<CommonPage<DemFireInspect>> fireInspectList(@RequestParam(value = "companyId") String companyId,
+                                                                 @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                                 @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
+        return ApiResult.success(demFireInspectService.fireInspectList(companyId, pageNum, pageSize));
+    }
+
+    /**
+     * 消防检查信息-检查计划-新增
+     *
+     * @param demFireInspect
+     * @return
+     */
+    @Log(title = "消防检查信息-检查计划-新增", businessType = BusinessType.INSERT)
+    @PostMapping("addFireInspect")
+    public ApiResult<DemFireInspectPerson> addFireInspect(@RequestBody DemFireInspect demFireInspect) {
+        return ApiResult.success(demFireInspectService.addFireInspect(demFireInspect));
+    }
+
+    /**
+     * 消防检查信息-检查计划-修改
+     *
+     * @param demFireInspect
+     * @return
+     */
+    @Log(title = "消防检查信息-检查计划-修改", businessType = BusinessType.UPDATE)
+    @PutMapping("updateFireInspect")
+    public ApiResult<Void> updateFireInspect(@RequestBody DemFireInspect demFireInspect) {
+        demFireInspectService.updateFireInspect(demFireInspect);
+        return ApiResult.success();
+    }
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemFireInspectPersonController.java

@@ -0,0 +1,88 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
+import com.usky.fire.domain.DemFireInspectPerson;
+import com.usky.fire.service.DemFireInspectPersonService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 消防检查人员 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-11-24
+ */
+@RestController
+@RequestMapping("/demFireInspectPerson")
+public class DemFireInspectPersonController {
+
+    @Autowired
+    private DemFireInspectPersonService demFireInspectPersonService;
+
+    /**
+     * 消防检查信息-检查人员信息-列表查询
+     *
+     * @param personName     检查员名称
+     * @param personPosition 检查员职位
+     * @param id             主键ID
+     * @param pageNum        当前页
+     * @param pageSize       每页条数
+     * @return
+     */
+    @GetMapping("fireInspectPersonList")
+    public ApiResult<CommonPage<DemFireInspectPerson>> fireInspectPersonList(@RequestParam(value = "personName", required = false) String personName,
+                                                                             @RequestParam(value = "personPosition", required = false) String personPosition,
+                                                                             @RequestParam(value = "id", required = false, defaultValue = "0") Integer id,
+                                                                             @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                                             @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
+        return ApiResult.success(demFireInspectPersonService.fireInspectPersonList(personName, personPosition, id, pageNum, pageSize));
+    }
+
+    /**
+     * 消防检查信息-检查人员信息-新增
+     *
+     * @param demFireInspectPerson
+     * @return
+     */
+    @Log(title = "消防检查信息-检查人员信息-新增", businessType = BusinessType.INSERT)
+    @PostMapping("addFireInspectPerson")
+    public ApiResult<Void> addFireInspectPerson(@RequestBody DemFireInspectPerson demFireInspectPerson) {
+        demFireInspectPersonService.addFireInspectPerson(demFireInspectPerson);
+        return ApiResult.success();
+    }
+
+    /**
+     * 消防检查信息-检查人员信息-修改
+     *
+     * @param demFireInspectPerson
+     * @return
+     */
+    @Log(title = "消防检查信息-检查人员信息-修改", businessType = BusinessType.UPDATE)
+    @PutMapping("updateFireInspectPerson")
+    public ApiResult<Void> updateFireInspectPerson(@RequestBody DemFireInspectPerson demFireInspectPerson) {
+        demFireInspectPersonService.updateFireInspectPerson(demFireInspectPerson);
+        return ApiResult.success();
+    }
+
+
+    /**
+     * 消防检查信息-检查人员信息-删除
+     *
+     * @param id 主键ID
+     * @return
+     */
+    @Log(title = "消防检查信息-检查人员信息-删除", businessType = BusinessType.DELETE)
+    @DeleteMapping("delFireInspectPerson")
+    public ApiResult<Void> delFireInspectPerson(@RequestParam(value = "id") Integer id) {
+        demFireInspectPersonService.delFireInspectPerson(id);
+        return ApiResult.success();
+    }
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemFireLabelAttributeController.java

@@ -0,0 +1,21 @@
+package com.usky.fire.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-09-27
+ */
+@Controller
+@RequestMapping("/demFireLabelAttribute")
+public class DemFireLabelAttributeController {
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemFireStatisticsAttachController.java

@@ -0,0 +1,117 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.fire.service.DemFireStatisticsAttachService;
+import com.usky.fire.service.DemFireStatisticsService;
+import com.usky.fire.service.po.FireStatisticsPO;
+import com.usky.fire.service.vo.FireBubbleVO;
+import com.usky.fire.service.vo.FireLevelRatioVO;
+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;
+
+/**
+ * <p>
+ * 消防检查人员 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-11-24
+ */
+@RestController
+@RequestMapping("/demFireStatisticsAttach")
+public class DemFireStatisticsAttachController {
+
+    @Autowired
+    private DemFireStatisticsAttachService demFireStatisticsAttachService;
+
+    @Autowired
+    private DemFireStatisticsService demFireStatisticsService;
+
+    /**
+     * 城市消防体征-火灾类型
+     *
+     * @return
+     */
+    @GetMapping("fireType")
+    public ApiResult<List<String>> fireType() {
+        return ApiResult.success(demFireStatisticsAttachService.getFireType());
+    }
+
+    /**
+     * 城市消防体征-火灾趋势图
+     *
+     * @param startTime 开始时间
+     * @param endTime   结束时间
+     * @param address   地址
+     * @param fireType  火灾类型
+     * @return
+     */
+    @GetMapping("fireCountByData")
+    public ApiResult<List<Object>> getFireCountByData(@RequestParam(value = "startTime") String startTime,
+                                                      @RequestParam(value = "endTime") String endTime,
+                                                      @RequestParam(value = "address", required = false) String address,
+                                                      @RequestParam(value = "fireType", required = false) String fireType) {
+        return ApiResult.success(demFireStatisticsService.getFireCountByData(startTime, endTime, address, fireType));
+    }
+
+
+    /**
+     * 火灾数据分析-火灾原因占比
+     *
+     * @param startTime 开始时间
+     * @param endTime   结束时间
+     * @param address   火灾地址
+     * @return
+     */
+    @GetMapping("fireCauseRatio")
+    public ApiResult<List<FireLevelRatioVO>> getGroupByLevel(@RequestParam(value = "startTime", required = false) String startTime,
+                                                             @RequestParam(value = "endTime", required = false) String endTime,
+                                                             @RequestParam(value = "address", required = false) String address) {
+        return ApiResult.success(demFireStatisticsService.getGroupByLevel(startTime, endTime, address));
+    }
+
+    /**
+     * 火灾数据分析-详细火灾情况
+     *
+     * @param startTime 开始时间
+     * @param endTime   结束时间
+     * @param address   地址
+     * @param current   当前页
+     * @param size      每页条数
+     * @return
+     */
+    @GetMapping("page")
+    public ApiResult<CommonPage<FireStatisticsPO>> page(@RequestParam(value = "startTime", required = false) String startTime,
+                                                        @RequestParam(value = "endTime", required = false) String endTime,
+                                                        @RequestParam(value = "address", required = false) String address,
+                                                        @RequestParam(value = "current", required = false, defaultValue = "1") Integer current,
+                                                        @RequestParam(value = "size", required = false, defaultValue = "10") Integer size) {
+        return ApiResult.success(demFireStatisticsService.page(current, size, startTime, endTime, address));
+    }
+
+    /**
+     * 火灾数据分析-火灾情况分析
+     *
+     * @param startTime 开始时间
+     * @param endTime   结束时间
+     * @param fireType  火灾类型
+     * @param unitId    单位代码
+     * @return
+     */
+    @GetMapping("fireBubble")
+    public ApiResult<List<FireBubbleVO>> getFireBubble(@RequestParam(value = "startTime", required = false) String startTime,
+                                                       @RequestParam(value = "endTime", required = false) String endTime,
+                                                       @RequestParam(value = "fireType", required = false) String fireType,
+                                                       @RequestParam(value = "unitId", required = false) String unitId) {
+        return ApiResult.success(demFireStatisticsService.getAvgAndSum(startTime, endTime, fireType, unitId));
+    }
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemGridMemberController.java

@@ -0,0 +1,89 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
+import com.usky.fire.domain.DemGridMember;
+import com.usky.fire.service.DemGridMemberService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 网格员信息管理表 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-11-15
+ */
+@RestController
+@RequestMapping("/demGridMember")
+public class DemGridMemberController {
+
+    @Autowired
+    private DemGridMemberService demGridMemberService;
+
+    /**
+     * 网格员信息管理-列表查询
+     *
+     * @param gridArea      网格区域
+     * @param streetTown    街镇
+     * @param gridPersonnel 网格人员姓名
+     * @param id            主键ID
+     * @param pageNum       当前页
+     * @param pageSize      每页条数
+     * @return
+     */
+    @GetMapping("gridMemberList")
+    public ApiResult<CommonPage<DemGridMember>> gridMemberList(@RequestParam(value = "gridArea", required = false) String gridArea,
+                                                               @RequestParam(value = "streetTown", required = false) String streetTown,
+                                                               @RequestParam(value = "gridPersonnel", required = false) String gridPersonnel,
+                                                               @RequestParam(value = "id", required = false, defaultValue = "0") Integer id,
+                                                               @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                               @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
+        return ApiResult.success(demGridMemberService.gridMemberList(gridArea, streetTown, gridPersonnel, id, pageNum, pageSize));
+    }
+
+    /**
+     * 网格员信息管理-新增
+     *
+     * @param demGridMember
+     * @return
+     */
+    @Log(title = "网格员信息管理-新增", businessType = BusinessType.INSERT)
+    @PostMapping("addGridMember")
+    public ApiResult<Void> addGridMember(@RequestBody DemGridMember demGridMember) {
+        demGridMemberService.addGridMember(demGridMember);
+        return ApiResult.success();
+    }
+
+    /**
+     * 网格员信息管理-修改
+     *
+     * @param demGridMember
+     * @return
+     */
+    @Log(title = "网格员信息管理-修改", businessType = BusinessType.UPDATE)
+    @PutMapping("updateGridMember")
+    public ApiResult<Void> updateGridMember(@RequestBody DemGridMember demGridMember) {
+        demGridMemberService.updateGridMember(demGridMember);
+        return ApiResult.success();
+    }
+
+    /**
+     * 网格员信息管理-删除
+     *
+     * @param id 主键ID
+     * @return
+     */
+    @Log(title = "网格员信息管理-删除", businessType = BusinessType.DELETE)
+    @DeleteMapping("delGridMember")
+    public ApiResult<Void> delGridMember(@RequestParam(value = "id") Integer id) {
+        demGridMemberService.delGridMember(id);
+        return ApiResult.success();
+    }
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemGridMemderViceController.java

@@ -0,0 +1,21 @@
+package com.usky.fire.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 网格员管理附属表 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-11-15
+ */
+@Controller
+@RequestMapping("/demGridMemderVice")
+public class DemGridMemderViceController {
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemLargeSecurityManageController.java

@@ -0,0 +1,82 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
+import com.usky.fire.domain.DemLargeSecurityManage;
+import com.usky.fire.service.DemLargeSecurityManageService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 大型安保管理 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-10-26
+ */
+@RestController
+@RequestMapping("/demLargeSecurityManage")
+public class DemLargeSecurityManageController {
+
+    @Autowired
+    private DemLargeSecurityManageService demLargeSecurityManageService;
+
+    /**
+     * 大型安保管理-列表
+     *
+     * @param securityTipsName 安保提示名称
+     * @param id               主键ID
+     * @param pageNum          当前页面
+     * @param pageSize         每页条数
+     * @return
+     */
+    @GetMapping("largeSecurityManageList")
+    public ApiResult<CommonPage<DemLargeSecurityManage>> largeSecurityManageList(@RequestParam(value = "securityTipsName", required = false) String securityTipsName,
+                                                                                 @RequestParam(value = "id", required = false, defaultValue = "0") Integer id,
+                                                                                 @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                                                 @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
+        return ApiResult.success(demLargeSecurityManageService.largeSecurityManageList(securityTipsName, id, pageNum, pageSize));
+    }
+
+    /**
+     * 大型安保管理-新增
+     *
+     * @param demLargeSecurityManage
+     */
+    @Log(title = "大型安保管理-新增", businessType = BusinessType.INSERT)
+    @PostMapping("addLargeSecurityManage")
+    public ApiResult<Void> addLargeSecurityManage(@RequestBody DemLargeSecurityManage demLargeSecurityManage) {
+        demLargeSecurityManageService.addLargeSecurityManage(demLargeSecurityManage);
+        return ApiResult.success();
+    }
+
+    /**
+     * 大型安保管理-修改
+     *
+     * @param demLargeSecurityManage
+     */
+    @Log(title = "大型安保管理-修改", businessType = BusinessType.UPDATE)
+    @PutMapping("updateLargeSecurityManage")
+    public ApiResult<Void> updateLargeSecurityManage(@RequestBody DemLargeSecurityManage demLargeSecurityManage) {
+        demLargeSecurityManageService.updateLargeSecurityManage(demLargeSecurityManage);
+        return ApiResult.success();
+    }
+
+    /**
+     * 大型安保管理-删除
+     *
+     * @param id 主键ID
+     */
+    @Log(title = "大型安保管理-删除", businessType = BusinessType.DELETE)
+    @DeleteMapping("delLargeSecurityManage")
+    public ApiResult<Void> delLargeSecurityManage(@RequestParam(value = "id") Integer id) {
+        demLargeSecurityManageService.delLargeSecurityManage(id);
+        return ApiResult.success();
+    }
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemLawSituationController.java

@@ -0,0 +1,71 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
+import com.usky.fire.domain.DemLawSituation;
+import com.usky.fire.service.DemLawSituationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 行政处罚情况表 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-09-27
+ */
+@RestController
+@RequestMapping("/demLawSituation")
+public class DemLawSituationController {
+
+    @Autowired
+    private DemLawSituationService demLawSituationService;
+
+    /**
+     * 处罚整改数据-列表查询
+     *
+     * @param punishedPerson      被处罚人
+     * @param legalRepresentative 行政相对人类别
+     * @param id                  主键ID
+     * @param pageNum             当前页
+     * @param pageSize            每页条数
+     * @return
+     */
+    @GetMapping("lawSituationList")
+    public ApiResult<CommonPage<Object>> lawSituationList(@RequestParam(value = "punishedPerson", required = false) String punishedPerson,
+                                                          @RequestParam(value = "legalRepresentative", required = false) String legalRepresentative,
+                                                          @RequestParam(value = "id", required = false, defaultValue = "0") Integer id,
+                                                          @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                          @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
+        return ApiResult.success(demLawSituationService.lawSituationList(punishedPerson, legalRepresentative, id, pageNum, pageSize));
+    }
+
+    /**
+     * 处罚整改数据-修改
+     *
+     * @param demLawSituation
+     */
+    @Log(title = "处罚整改数据-修改", businessType = BusinessType.UPDATE)
+    @PutMapping("updateLawSituation")
+    public ApiResult<Void> updateLawSituation(@RequestBody DemLawSituation demLawSituation) {
+        demLawSituationService.updateLawSituation(demLawSituation);
+        return ApiResult.success();
+    }
+
+    /**
+     * 处罚整改数据-删除
+     *
+     * @param id 主键ID
+     */
+    @Log(title = "处罚整改数据-删除", businessType = BusinessType.DELETE)
+    @DeleteMapping("delLawSituation")
+    public ApiResult<Void> delLawSituation(@RequestParam(value = "id") Integer id) {
+        demLawSituationService.delLawSituation(id);
+        return ApiResult.success();
+    }
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemLawStatisticsController.java

@@ -0,0 +1,21 @@
+package com.usky.fire.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 行政执法统计总表 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-10-13
+ */
+@Controller
+@RequestMapping("/demLawStatistics")
+public class DemLawStatisticsController {
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemMicroStationController.java

@@ -0,0 +1,86 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
+import com.usky.fire.domain.DemMicroStation;
+import com.usky.fire.service.DemMicroStationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 微型消防站 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-10-24
+ */
+@RestController
+@RequestMapping("/demMicroStation")
+public class DemMicroStationController {
+
+    @Autowired
+    private DemMicroStationService demMicroStationService;
+
+    /**
+     * 消防站点管理-列表
+     *
+     * @param squadron    所属中队
+     * @param stationName 消防站名称
+     * @param id          主键ID
+     * @param pageNum     当前页
+     * @param pageSize    每页条数
+     * @return
+     */
+    @GetMapping("microStationList")
+    public ApiResult<CommonPage<Map<String, Object>>> microStationList(@RequestParam(value = "squadron", required = false) String squadron,
+                                                                       @RequestParam(value = "stationName", required = false) String stationName,
+                                                                       @RequestParam(value = "stationType", required = false) String stationType,
+                                                                       @RequestParam(value = "id", required = false, defaultValue = "0") Integer id,
+                                                                       @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                                       @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
+        return ApiResult.success(demMicroStationService.microStationList(squadron, stationName, stationType, id, pageNum, pageSize));
+    }
+
+    /**
+     * 消防站点管理-修改
+     *
+     * @param demMicroStation
+     */
+    @Log(title = "消防站点管理-修改", businessType = BusinessType.UPDATE)
+    @PutMapping("updateMicroStation")
+    public ApiResult<Void> updateMicroStation(@RequestBody DemMicroStation demMicroStation) {
+        demMicroStationService.updateMicroStation(demMicroStation);
+        return ApiResult.success();
+    }
+
+    /**
+     * 消防站点管理-删除
+     *
+     * @param id 主键ID
+     */
+    @Log(title = "消防站点管理-删除", businessType = BusinessType.DELETE)
+    @DeleteMapping("delMicroStation")
+    public ApiResult<Void> delMicroStation(@RequestParam(value = "id") Integer id) {
+        demMicroStationService.delMicroStation(id);
+        return ApiResult.success();
+    }
+
+    /**
+     * 消防水源管理-天然水源维护-所属中队下拉框
+     *
+     * @param branchName 支队名称
+     * @return
+     */
+    @GetMapping("microStationDroplistList")
+    public ApiResult<List<Map<String, Object>>> microStationDroplistList(@RequestParam(value = "branchName", required = false, defaultValue = "闵行支队") String branchName) {
+        return ApiResult.success(demMicroStationService.microStationDroplistList(branchName));
+    }
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemOnDutyController.java

@@ -0,0 +1,21 @@
+package com.usky.fire.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 值班表 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-11-28
+ */
+@Controller
+@RequestMapping("/demOnDuty")
+public class DemOnDutyController {
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemPoliceInfoController.java

@@ -0,0 +1,158 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.fire.domain.DemPoliceInfo;
+import com.usky.fire.service.DemMicroStationService;
+import com.usky.fire.service.DemPoliceInfoService;
+import com.usky.fire.service.DemVehicleFightService;
+import com.usky.fire.service.DemWaterSourceService;
+import com.usky.fire.service.vo.AlertStatisticsVO;
+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;
+import java.util.Map;
+
+/**
+ * <p>
+ * 警情信息 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-10-24
+ */
+@RestController
+@RequestMapping("/demPoliceInfo")
+public class DemPoliceInfoController {
+
+    @Autowired
+    private DemMicroStationService demMicroStationService;
+
+    @Autowired
+    private DemPoliceInfoService demPoliceInfoService;
+
+    @Autowired
+    private DemWaterSourceService demWaterSourceService;
+
+    @Autowired
+    private DemVehicleFightService demVehicleFightService;
+
+    /**
+     * 综合警情-撒点
+     *
+     * @param streetTown    街镇
+     * @param scattererType 撒点类型
+     * @return
+     */
+    @GetMapping("synthesizePoliceSituationScatterer")
+    public ApiResult<List<Object>> synthesizePoliceSituationScatterer(@RequestParam(value = "streetTown", required = false) String streetTown,
+                                                                      @RequestParam(value = "scattererType", required = false) String scattererType) {
+        return ApiResult.success(demMicroStationService.synthesizePoliceSituationScatterer(streetTown, scattererType));
+    }
+
+    /**
+     * 综合警情-查询每年12个月警情
+     *
+     * @return
+     */
+    @GetMapping("/alertStatisticsByMonth")
+    public ApiResult<Map<String, List<AlertStatisticsVO>>> getAlertStatisticsByMonth(@RequestParam String startTime,
+                                                                                     @RequestParam String endTime,
+                                                                                     @RequestParam(value = "streetTown", required = false) String streetTown) {
+        return ApiResult.success(demPoliceInfoService.getAlertStatisticsByMonth(startTime, endTime, streetTown));
+    }
+
+    /**
+     * 查询不同警情(社会救助，警情，火灾)的占比
+     *
+     * @param startTime 开始时间
+     * @param endTime   结束时间
+     * @return
+     */
+    @GetMapping("/alertStatistics")
+    public ApiResult<List<AlertStatisticsVO>> getAlertStatistics(@RequestParam(value = "startTime") String startTime,
+                                                                 @RequestParam(value = "endTime") String endTime,
+                                                                 @RequestParam(value = "streetTown", required = false) String streetTown) {
+        return ApiResult.success(demPoliceInfoService.getAlertStatistics(startTime, endTime, streetTown));
+    }
+
+    /**
+     * 警情详细信息
+     *
+     * @param current   页数
+     * @param size      条数
+     * @param startTime 开始时间
+     * @param endTime   结束时间
+     * @return
+     */
+    @GetMapping("/page")
+    public ApiResult<CommonPage<DemPoliceInfo>> page(@RequestParam(value = "startTime", required = false) String startTime,
+                                                     @RequestParam(value = "endTime", required = false) String endTime,
+                                                     @RequestParam(value = "streetTown", required = false) String streetTown,
+                                                     @RequestParam(value = "current", required = false, defaultValue = "1") Integer current,
+                                                     @RequestParam(value = "size", required = false, defaultValue = "10") Integer size) {
+        return ApiResult.success(demPoliceInfoService.page(current, size, startTime, endTime, streetTown));
+    }
+
+
+    /**
+     * 综合警情-警情时段分布
+     *
+     * @param startTime 开始时间
+     * @param endTime   结束时间
+     * @return
+     */
+    @GetMapping("/alertStatisticsByHouse")
+    public ApiResult<Map<String, List<AlertStatisticsVO>>> getAlertStatisticsByHouse(@RequestParam(value = "startTime") String startTime,
+                                                                                     @RequestParam(value = "endTime") String endTime,
+                                                                                     @RequestParam(value = "streetTown", required = false) String streetTown) {
+        return ApiResult.success(demPoliceInfoService.getAlertStatisticsByHouse(startTime, endTime, streetTown));
+    }
+
+
+    /**
+     * 综合警情-警情撒点
+     *
+     * @param streetTown 街镇
+     * @return
+     */
+    @GetMapping("/warningInstanceScatterer")
+    public ApiResult<List<Map<String, Object>>> warningInstanceScatterer(@RequestParam(value = "streetTown", required = false) String streetTown,
+                                                                         @RequestParam(value = "id", required = false, defaultValue = "0") Integer id) {
+        return ApiResult.success(demPoliceInfoService.warningInstanceScatterer(streetTown, id));
+    }
+
+    /**
+     * 综合警情-周边资源
+     *
+     * @param longitude 实时警情经度
+     * @param latitude  实时警情纬度
+     * @param distance  距离
+     * @return
+     */
+    @GetMapping("/waterSourceList")
+    public ApiResult<List<Map<String, Object>>> waterSourceList(@RequestParam(value = "longitude") double longitude,
+                                                                @RequestParam(value = "latitude") double latitude,
+                                                                @RequestParam(value = "distance", required = false, defaultValue = "150") Integer distance) {
+        return ApiResult.success(demWaterSourceService.surroundingResources(longitude, latitude, distance));
+    }
+
+    /**
+     * 综合警情-警力实况
+     *
+     * @param policeId 案件信息ID
+     * @return
+     */
+    @GetMapping("/vehicleFightList")
+    public ApiResult<List<Map<String, Object>>> vehicleFightList(@RequestParam(value = "policeId") String policeId) {
+        return ApiResult.success(demVehicleFightService.vehicleFightList(policeId));
+    }
+
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemPoliceRecordController.java

@@ -0,0 +1,72 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
+import com.usky.fire.domain.DemPoliceRecord;
+import com.usky.fire.service.DemPoliceRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 处警记录 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-10-24
+ */
+@RestController
+@RequestMapping("/demPoliceRecord")
+public class DemPoliceRecordController {
+
+    @Autowired
+    private DemPoliceRecordService demPoliceRecordService;
+
+    /**
+     * 接处警数据-列表
+     *
+     * @param caseCode 案件编号
+     * @param branch   主管支队
+     * @param id       主键ID
+     * @param pageNum  当前页面
+     * @param pageSize 每页条数
+     * @return
+     */
+    @GetMapping("policeRecordList")
+    public ApiResult<CommonPage<Object>> policeRecordList(@RequestParam(value = "caseCode", required = false) String caseCode,
+                                                          @RequestParam(value = "branch", required = false) String branch,
+                                                          @RequestParam(value = "id", required = false, defaultValue = "0") Integer id,
+                                                          @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                          @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
+        return ApiResult.success(demPoliceRecordService.policeRecordList(caseCode, branch, id, pageNum, pageSize));
+    }
+
+    /**
+     * 接处警数据-修改
+     *
+     * @param demPoliceRecord
+     */
+    @Log(title = "接处警数据-修改", businessType = BusinessType.UPDATE)
+    @PutMapping("updatePoliceRecord")
+    public ApiResult<Void> updatePoliceRecord(@RequestBody DemPoliceRecord demPoliceRecord) {
+        demPoliceRecordService.updatePoliceRecord(demPoliceRecord);
+        return ApiResult.success();
+    }
+
+    /**
+     * 接处警数据-删除
+     *
+     * @param id 主键ID
+     */
+    @Log(title = "接处警数据-删除", businessType = BusinessType.DELETE)
+    @DeleteMapping("delPoliceRecord")
+    public ApiResult<Void> delPoliceRecord(@RequestParam(value = "id") Integer id) {
+        demPoliceRecordService.delPoliceRecord(id);
+        return ApiResult.success();
+    }
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemVehicleController.java

@@ -0,0 +1,72 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
+import com.usky.fire.domain.DemVehicle;
+import com.usky.fire.service.DemVehicleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 车辆信息 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-10-19
+ */
+@RestController
+@RequestMapping("/demVehicle")
+public class DemVehicleController {
+
+    @Autowired
+    private DemVehicleService demVehicleService;
+
+    /**
+     * 消防车辆管理-列表查询
+     *
+     * @param vehicleCode      车辆编号
+     * @param vehicleAbbreviat 车辆简称
+     * @param id               主键ID
+     * @param pageNum          当前页
+     * @param pageSize         每页条数
+     * @return
+     */
+    @GetMapping("vehicleList")
+    public ApiResult<CommonPage<Object>> vehicleList(@RequestParam(value = "vehicleCode", required = false) String vehicleCode,
+                                                     @RequestParam(value = "vehicleAbbreviat", required = false) String vehicleAbbreviat,
+                                                     @RequestParam(value = "id", required = false, defaultValue = "0") Integer id,
+                                                     @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                     @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
+        return ApiResult.success(demVehicleService.vehicleList(vehicleCode, vehicleAbbreviat, id, pageNum, pageSize));
+    }
+
+    /**
+     * 消防车辆管理-修改
+     *
+     * @param demVehicle
+     */
+    @Log(title = "消防车辆管理-修改", businessType = BusinessType.UPDATE)
+    @PutMapping("updateVehicle")
+    public ApiResult<Void> updateVehicle(@RequestBody DemVehicle demVehicle) {
+        demVehicleService.updateVehicle(demVehicle);
+        return ApiResult.success();
+    }
+
+    /**
+     * 消防车辆管理-删除
+     *
+     * @param id 主键ID
+     */
+    @Log(title = "消防车辆管理-删除", businessType = BusinessType.DELETE)
+    @DeleteMapping("delVehicle")
+    public ApiResult<Void> delVehicle(@RequestParam(value = "id") Integer id) {
+        demVehicleService.delVehicle(id);
+        return ApiResult.success();
+    }
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemVehicleFightController.java

@@ -0,0 +1,21 @@
+package com.usky.fire.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 车辆作战信息 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-10-19
+ */
+@Controller
+@RequestMapping("/demVehicleFight")
+public class DemVehicleFightController {
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemWaterSourceController.java

@@ -0,0 +1,119 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
+import com.usky.fire.domain.DemWaterSource;
+import com.usky.fire.service.DemWaterSourceService;
+import com.usky.fire.service.po.FireWaterPO;
+import com.usky.fire.service.vo.FireWaterStatisticsVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 水源信息表 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-10-24
+ */
+@RestController
+@RequestMapping("/demWaterSource")
+public class DemWaterSourceController {
+
+    @Autowired
+    private DemWaterSourceService demWaterSourceService;
+
+    /**
+     * 消防水源管理-列表
+     *
+     * @param waterName 水源名称
+     * @param id        主键ID
+     * @param pageNum   当前页
+     * @param pageSize  每页条数
+     * @return
+     */
+    @GetMapping("waterSourceList")
+    public ApiResult<CommonPage<Map<String, Object>>> waterSourceList(@RequestParam(value = "waterName", required = false) String waterName,
+                                                                      @RequestParam(value = "id", required = false, defaultValue = "0") Integer id,
+                                                                      @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                                      @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
+        return ApiResult.success(demWaterSourceService.waterSourceList(waterName, id, pageNum, pageSize));
+    }
+
+    /**
+     * 消防水源管理-修改
+     *
+     * @param demWaterSource
+     */
+    @Log(title = "消防水源管理-修改", businessType = BusinessType.UPDATE)
+    @PutMapping("updateWaterSource")
+    public ApiResult<Void> updateWaterSource(@RequestBody DemWaterSource demWaterSource) {
+        demWaterSourceService.updateWaterSource(demWaterSource);
+        return ApiResult.success();
+    }
+
+    /**
+     * 消防水源管理-删除
+     *
+     * @param id 主键ID
+     */
+    @Log(title = "消防水源管理-删除", businessType = BusinessType.DELETE)
+    @DeleteMapping("delWaterSource")
+    public ApiResult<Void> delWaterSource(@RequestParam(value = "id") Integer id) {
+        demWaterSourceService.delWaterSource(id);
+        return ApiResult.success();
+    }
+
+
+    /**
+     * 消防水源情况-警情撒点
+     *
+     * @param scattererType 撒点类型
+     * @param streetTown    街镇
+     * @return
+     */
+    @GetMapping("waterSourceScatterer")
+    public ApiResult<List<Object>> waterSourceScatterer(@RequestParam(value = "scattererType") String scattererType,
+                                                        @RequestParam(value = "streetTown", required = false) String streetTown) {
+        return ApiResult.success(demWaterSourceService.waterSourceScatterer(scattererType, streetTown));
+    }
+
+
+    /**
+     * 消防水源情况-消防水源数量
+     *
+     * @param startTime 开始时间
+     * @param endTime   结束时间
+     * @return
+     */
+    @GetMapping("/fireWaterStatistics")
+    public ApiResult<FireWaterStatisticsVO> getFireWaterStatistics(@RequestParam(value = "startTime", required = false) String startTime,
+                                                                   @RequestParam(value = "endTime", required = false) String endTime) {
+        return ApiResult.success(demWaterSourceService.getFireWaterStatistics(startTime, endTime));
+    }
+
+    /**
+     * 消防水源情况-水源情况
+     *
+     * @param current   当前页
+     * @param size      每页条数
+     * @param startTime 开始时间
+     * @param endTime   结束时间
+     * @return
+     */
+    @GetMapping("/page")
+    public ApiResult<CommonPage<FireWaterPO>> page(@RequestParam(value = "current", required = false, defaultValue = "1") Integer current,
+                                                   @RequestParam(value = "size", required = false, defaultValue = "10") Integer size,
+                                                   @RequestParam(value = "startTime", required = false) String startTime,
+                                                   @RequestParam(value = "endTime", required = false) String endTime) {
+        return ApiResult.success(demWaterSourceService.page(current, size, startTime, endTime));
+    }
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemWaterSourceMaintainController.java

@@ -0,0 +1,81 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
+import com.usky.fire.domain.DemWaterSourceMaintain;
+import com.usky.fire.service.DemWaterSourceMaintainService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 天然水源信息表 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-10-25
+ */
+@RestController
+@RequestMapping("/demWaterSourceMaintain")
+public class DemWaterSourceMaintainController {
+
+    @Autowired
+    private DemWaterSourceMaintainService demWaterSourceMaintainService;
+
+    /**
+     * 消防水源管理-天然水源维护-列表
+     *
+     * @param squadron 所属中队
+     * @param id       主键ID
+     * @param pageNum  当前页面
+     * @param pageSize 每页条数
+     * @return
+     */
+    @GetMapping("waterSourceMaintainList")
+    public ApiResult<CommonPage<DemWaterSourceMaintain>> waterSourceMaintainList(@RequestParam(value = "squadron", required = false) String squadron,
+                                                                                 @RequestParam(value = "id", required = false, defaultValue = "0") Integer id,
+                                                                                 @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                                                 @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
+        return ApiResult.success(demWaterSourceMaintainService.waterSourceMaintainList(squadron, id, pageNum, pageSize));
+    }
+
+    /**
+     * 消防水源管理-天然水源维护-新增
+     *
+     * @param demWaterSourceMaintain
+     */
+    @Log(title = "消防水源管理-天然水源维护-新增", businessType = BusinessType.INSERT)
+    @PostMapping("addWaterSourceMaintain")
+    public ApiResult<Void> addWaterSourceMaintain(@RequestBody DemWaterSourceMaintain demWaterSourceMaintain) {
+        demWaterSourceMaintainService.addWaterSourceMaintain(demWaterSourceMaintain);
+        return ApiResult.success();
+    }
+
+    /**
+     * 消防水源管理-天然水源维护-修改
+     *
+     * @param demWaterSourceMaintain
+     */
+    @Log(title = "消防水源管理-天然水源维护-修改", businessType = BusinessType.UPDATE)
+    @PutMapping("updateWaterSourceMaintain")
+    public ApiResult<Void> updateWaterSourceMaintain(@RequestBody DemWaterSourceMaintain demWaterSourceMaintain) {
+        demWaterSourceMaintainService.updateWaterSourceMaintain(demWaterSourceMaintain);
+        return ApiResult.success();
+    }
+
+    /**
+     * 消防水源管理-天然水源维护-删除
+     *
+     * @param id 主键ID
+     */
+    @Log(title = "消防水源管理-天然水源维护-删除", businessType = BusinessType.DELETE)
+    @DeleteMapping("delWaterSourceMaintain")
+    public ApiResult<Void> delWaterSourceMaintain(@RequestParam(value = "id") Integer id) {
+        demWaterSourceMaintainService.delWaterSourceMaintain(id);
+        return ApiResult.success();
+    }
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DeviceAlertController.java

@@ -0,0 +1,21 @@
+package com.usky.fire.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 设备告警 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-11-04
+ */
+@Controller
+@RequestMapping("/deviceAlert")
+public class DeviceAlertController {
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DeviceController.java

@@ -0,0 +1,21 @@
+package com.usky.fire.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 设备信息表 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-11-04
+ */
+@Controller
+@RequestMapping("/device")
+public class DeviceController {
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DeviceInfoController.java

@@ -0,0 +1,21 @@
+package com.usky.fire.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 设备心跳 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-11-04
+ */
+@Controller
+@RequestMapping("/deviceInfo")
+public class DeviceInfoController {
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/FirePlaceController.java

@@ -0,0 +1,61 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
+import com.usky.fire.domain.DemFireStatistics;
+import com.usky.fire.service.DemFireStatisticsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 火灾事故说明总表 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-09-13
+ */
+@RestController
+@RequestMapping("/firePlace")
+public class FirePlaceController {
+
+    @Autowired
+    private DemFireStatisticsService demFireStatisticsService;
+
+    /**
+     * 起火场所信息-列表查询
+     *
+     * @param fireNumber 火灾序号
+     * @param id         主键ID
+     * @param pageNum    当前页
+     * @param pageSize   每页条数
+     * @return
+     */
+    @GetMapping("firePlaceList")
+    public ApiResult<CommonPage<Map<String, Object>>> firePlaceList(@RequestParam(value = "fireNumber", required = false) String fireNumber,
+                                                                    @RequestParam(value = "id", required = false, defaultValue = "0") Integer id,
+                                                                    @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                                    @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
+        return ApiResult.success(demFireStatisticsService.firePlaceList(fireNumber, id, pageNum, pageSize));
+    }
+
+    /**
+     * 起火场所信息-修改
+     *
+     * @param demFireStatistics
+     * @return
+     */
+    @Log(title = "起火场所信息-修改", businessType = BusinessType.UPDATE)
+    @PutMapping("updateFirePlace")
+    public ApiResult<Void> updateFirePlace(@RequestBody DemFireStatistics demFireStatistics) {
+        demFireStatisticsService.updateFirePlace(demFireStatistics);
+        return ApiResult.success();
+    }
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/MhPostInspectController.java

@@ -0,0 +1,47 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
+import com.usky.fire.domain.MhPostInspect;
+import com.usky.fire.service.MhPostInspectService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 查岗信息 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-08-24
+ */
+@RestController
+@RequestMapping("/mhPostInspect")
+public class MhPostInspectController {
+
+    @Autowired
+    private MhPostInspectService mhPostInspectService;
+
+    /**
+     * 值班查岗-闵行支队平台查岗功能推送
+     *
+     * @param mhPostInspect
+     * @return
+     */
+    @Log(title = "闵行支队平台查岗", businessType = BusinessType.INSERT)
+    @PutMapping("postInspectPush")
+    public ApiResult<MhPostInspect> postInspectPush(@RequestBody MhPostInspect mhPostInspect) {
+        return ApiResult.success(mhPostInspectService.postInspectPush(mhPostInspect));
+    }
+
+
+    @GetMapping("postInspectAnswerRequest")
+    public ApiResult<Void> postInspectAnswerRequest() {
+        mhPostInspectService.postInspectAnswerRequest();
+        return ApiResult.success();
+    }
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/PatrolInspectionAreaController.java

@@ -0,0 +1,106 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
+import com.usky.fire.domain.PatrolInspectionArea;
+import com.usky.fire.service.PatrolInspectionAreaService;
+import com.usky.fire.service.vo.PatrolInspectionAreaVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 巡查自检-巡检区域
+ *
+ * @author JCB
+ * @since 2022-07-12
+ */
+@RestController
+@RequestMapping("/patrolInspectionArea")
+public class PatrolInspectionAreaController {
+
+    @Autowired
+    private PatrolInspectionAreaService patrolInspectionAreaService;
+
+    /**
+     * 巡查自检-巡检区域-新增
+     *
+     * @param patrolInspectionAreaVo
+     * @return
+     */
+    @Log(title = "巡检区域", businessType = BusinessType.INSERT)
+    @PostMapping("addPatrolInspectionArea")
+    public ApiResult<Void> addPatrolInspectionArea(@RequestBody PatrolInspectionAreaVo patrolInspectionAreaVo) {
+        patrolInspectionAreaService.addPatrolInspectionArea(patrolInspectionAreaVo);
+        return ApiResult.success();
+    }
+
+
+    /**
+     * 巡查自检-巡检区域-子区域新增
+     *
+     * @param patrolInspectionArea
+     * @return
+     */
+    @Log(title = "巡检区域-子区域", businessType = BusinessType.INSERT)
+    @PostMapping("addPatrolInspectionAreaSon")
+    public ApiResult<Void> addPatrolInspectionAreaSon(@RequestBody PatrolInspectionArea patrolInspectionArea) {
+        patrolInspectionAreaService.addPatrolInspectionAreaSon(patrolInspectionArea);
+        return ApiResult.success();
+    }
+
+    /**
+     * 巡查自检-巡检区域-编辑
+     *
+     * @param patrolInspectionArea
+     * @return
+     */
+    @Log(title = "巡检区域", businessType = BusinessType.UPDATE)
+    @PostMapping("updatePatrolInspectionArea")
+    public ApiResult<Void> updatePatrolInspectionArea(@RequestBody PatrolInspectionArea patrolInspectionArea) {
+        patrolInspectionAreaService.updatePatrolInspectionArea(patrolInspectionArea);
+        return ApiResult.success();
+    }
+
+    /**
+     * 巡查自检-巡检区域-删除
+     *
+     * @param id 区域ID
+     * @return
+     */
+    @Log(title = "巡检区域", businessType = BusinessType.DELETE)
+    @GetMapping("delPatrolInspectionArea")
+    public ApiResult<Void> delPatrolInspectionArea(@RequestParam(value = "id") Integer id) {
+        patrolInspectionAreaService.delPatrolInspectionArea(id);
+        return ApiResult.success();
+    }
+
+    /**
+     * 巡查自检-巡检区域-列表查詢
+     *
+     * @param areaName 区域名称
+     * @param id       区域ID
+     * @return
+     */
+    @GetMapping("patrolInspectionAreaList")
+    public ApiResult<List<PatrolInspectionArea>> patrolInspectionAreaList(@RequestParam(value = "areaName", required = false) String areaName,
+                                                                          @RequestParam(value = "id", required = false, defaultValue = "0") Integer id) {
+        return ApiResult.success(patrolInspectionAreaService.patrolInspectionAreaList(id, areaName));
+    }
+
+    /**
+     * 巡查自检-巡检区域-一级区域下拉框/巡检人员-二级区域查询
+     *
+     * @param areaFid 区域父ID
+     * @return
+     */
+    @GetMapping("patrolInspectionAreaSelect")
+    public ApiResult<List<PatrolInspectionArea>> patrolInspectionAreaSelect(@RequestParam(value = "areaFid", required = false, defaultValue = "0") Integer areaFid) {
+        return ApiResult.success(patrolInspectionAreaService.patrolInspectionAreaSelect(areaFid));
+    }
+
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/PatrolInspectionContentController.java

@@ -0,0 +1,107 @@
+package com.usky.fire.controller.web;
+
+
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
+import com.usky.fire.service.PatrolInspectionContentService;
+import com.usky.fire.service.vo.PatrolInspectionContentExportVo;
+import com.usky.fire.service.vo.PatrolInspectionContentVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * 巡查自检-巡检内容
+ *
+ * @author JCB
+ * @since 2022-07-15
+ */
+@RestController
+@RequestMapping("/patrolInspectionContent")
+public class PatrolInspectionContentController {
+
+    @Autowired
+    private PatrolInspectionContentService patrolInspectionContentService;
+
+    /**
+     * 巡查自检-巡检内容-列表查询
+     *
+     * @param contentTitle 内容标题
+     * @param pageNum      当前页
+     * @param pageSize     每页条数
+     * @param id           巡检内容ID
+     * @return
+     */
+    @GetMapping("patrolInspectionContentList")
+    public ApiResult<CommonPage<PatrolInspectionContentVo>> patrolInspectionContentList(@RequestParam(value = "contentTitle", required = false) String contentTitle,
+                                                                                        @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                                                        @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
+                                                                                        @RequestParam(value = "id", required = false, defaultValue = "0") Integer id) {
+        return ApiResult.success(patrolInspectionContentService.patrolInspectionContentList(contentTitle, pageNum, pageSize, id));
+    }
+
+    /**
+     * 巡查自检-巡检内容-新增
+     *
+     * @param patrolInspectionContentVo
+     * @return
+     */
+    @Log(title = "巡检内容", businessType = BusinessType.INSERT)
+    @PostMapping("addPatrolInspectionContent")
+    public ApiResult<Void> addPatrolInspectionContent(@RequestBody PatrolInspectionContentVo patrolInspectionContentVo) {
+        patrolInspectionContentService.addPatrolInspectionContent(patrolInspectionContentVo);
+        return ApiResult.success();
+    }
+
+    /**
+     * 巡查自检-巡检内容-修改
+     *
+     * @param patrolInspectionContentVo
+     * @return
+     */
+    @Log(title = "巡检内容", businessType = BusinessType.UPDATE)
+    @PostMapping("updatePatrolInspectionContent")
+    public ApiResult<Void> updatePatrolInspectionContent(@RequestBody PatrolInspectionContentVo patrolInspectionContentVo) {
+        patrolInspectionContentService.updatePatrolInspectionContent(patrolInspectionContentVo);
+        return ApiResult.success();
+    }
+
+    /**
+     * 巡查自检-巡检内容-删除
+     *
+     * @param id 巡检内容ID
+     * @return
+     */
+    @Log(title = "巡检内容", businessType = BusinessType.DELETE)
+    @GetMapping("delPatrolInspectionContent")
+    public ApiResult<Void> delPatrolInspectionContent(@RequestParam(value = "id") Integer id) {
+        patrolInspectionContentService.delPatrolInspectionContent(id);
+        return ApiResult.success();
+    }
+
+    /**
+     * 巡查自检-巡检内容-导出
+     *
+     * @param response
+     * @param contentTitle 内容标题
+     * @param idList       巡检内容ID
+     * @return
+     * @throws IOException
+     */
+    @PostMapping("/contentListExport")
+    public void export(HttpServletResponse response,
+                       @RequestParam(value = "contentTitle", required = false) String contentTitle,
+                       @RequestParam(value = "id", required = false) String idList) throws IOException {
+        List<PatrolInspectionContentExportVo> list = patrolInspectionContentService.contentListExport(contentTitle, idList);
+        ExcelUtil<PatrolInspectionContentExportVo> util = new ExcelUtil<PatrolInspectionContentExportVo>(PatrolInspectionContentExportVo.class);
+        util.exportExcel(response, list, "巡检内容列表", "巡检内容列表");
+    }
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/PatrolInspectionPersonnelController.java

@@ -0,0 +1,106 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
+import com.usky.fire.domain.PatrolInspectionPersonnel;
+import com.usky.fire.service.PatrolInspectionPersonnelService;
+import com.usky.fire.service.vo.PatrolInspectionAreaVo;
+import com.usky.fire.service.vo.PatrolInspectionPersonnelVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 巡查自检-巡检人员
+ *
+ * @author JCB
+ * @since 2022-07-26
+ */
+@RestController
+@RequestMapping("/patrolInspectionPersonnel")
+public class PatrolInspectionPersonnelController {
+
+    @Autowired
+    private PatrolInspectionPersonnelService patrolInspectionPersonnelService;
+
+    /**
+     * 巡查自检-巡检人员-新增
+     *
+     * @param patrolInspectionPersonnel
+     * @return
+     */
+    @Log(title = "巡检人员", businessType = BusinessType.INSERT)
+    @PostMapping("addPatrolInspectionPersonnel")
+    public ApiResult<Void> addPatrolInspectionPersonnel(@RequestBody PatrolInspectionPersonnel patrolInspectionPersonnel) {
+        patrolInspectionPersonnelService.addPatrolInspectionPersonnel(patrolInspectionPersonnel);
+        return ApiResult.success();
+    }
+
+    /**
+     * 巡查自检-巡检人员-修改
+     *
+     * @param patrolInspectionPersonnel
+     * @return
+     */
+    @Log(title = "巡检人员", businessType = BusinessType.UPDATE)
+    @PostMapping("updatePatrolInspectionPersonnel")
+    public ApiResult<Void> updatePatrolInspectionPersonnel(@RequestBody PatrolInspectionPersonnel patrolInspectionPersonnel) {
+        patrolInspectionPersonnelService.updatePatrolInspectionPersonnel(patrolInspectionPersonnel);
+        return ApiResult.success();
+    }
+
+    /**
+     * 巡查自检-巡检人员-删除
+     *
+     * @param id 人员记录表ID
+     * @return
+     */
+    @Log(title = "巡检人员", businessType = BusinessType.DELETE)
+    @GetMapping("delPatrolInspectionPersonnel")
+    public ApiResult<Void> delPatrolInspectionPersonnel(@RequestParam(value = "id") Integer id) {
+        patrolInspectionPersonnelService.delPatrolInspectionPersonnel(id);
+        return ApiResult.success();
+    }
+
+    /**
+     * 巡查自检-巡检人员-列表查询
+     *
+     * @param areaId   区域ID
+     * @param pageNum  当前页
+     * @param pageSize 每页条数
+     * @param id       人员记录表ID
+     * @return
+     */
+    @GetMapping("patrolInspectionPersonnelList")
+    public ApiResult<CommonPage<PatrolInspectionPersonnelVo>> patrolInspectionPersonnelList(@RequestParam(value = "areaId", required = false) Integer areaId,
+                                                                                            @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                                                            @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
+                                                                                            @RequestParam(value = "id", required = false, defaultValue = "0") Integer id) {
+        return ApiResult.success(patrolInspectionPersonnelService.patrolInspectionPersonnelList(areaId, pageNum, pageSize, id));
+    }
+
+    /**
+     * 巡查自检-巡检人员-左侧树形数据
+     *
+     * @return
+     */
+    @GetMapping("personnelLeftList")
+    public ApiResult<List<PatrolInspectionAreaVo>> personnelLeftList() {
+        return ApiResult.success(patrolInspectionPersonnelService.personnelLeftList());
+    }
+
+    /**
+     * 巡查自检-巡检计划-责任人下拉
+     * @param areaId 区域ID
+     * @return
+     */
+    @GetMapping("patrolInspectionPersonnelSelect")
+    public ApiResult<List<PatrolInspectionPersonnelVo>> patrolInspectionPersonnelSelect(@RequestParam(value = "areaId", required = false) Integer areaId) {
+        return ApiResult.success(patrolInspectionPersonnelService.patrolInspectionPersonnelSelect(areaId));
+    }
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/PatrolInspectionPlanController.java

@@ -0,0 +1,116 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
+import com.usky.fire.service.PatrolInspectionPlanService;
+import com.usky.fire.service.vo.PatrolInspectionAreaVo;
+import com.usky.fire.service.vo.PatrolInspectionPlanDataVo;
+import com.usky.fire.service.vo.PatrolInspectionPlanVo;
+import com.usky.fire.service.vo.PatrolInspectionSiteVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 巡查自检-巡检计划
+ *
+ * @author JCB
+ * @since 2022-07-18
+ */
+@RestController
+@RequestMapping("/patrolInspectionPlan")
+public class PatrolInspectionPlanController {
+
+    @Autowired
+    private PatrolInspectionPlanService patrolInspectionPlanService;
+
+    /**
+     * 巡查自检-巡检计划-新增
+     *
+     * @param patrolInspectionPlanVo
+     * @return
+     */
+    @Log(title = "巡检计划", businessType = BusinessType.INSERT)
+    @PostMapping("addPatrolInspectionPlan")
+    public ApiResult<Void> addPatrolInspectionPlan(@RequestBody PatrolInspectionPlanVo patrolInspectionPlanVo) {
+        patrolInspectionPlanService.addPatrolInspectionPlan(patrolInspectionPlanVo);
+        return ApiResult.success();
+    }
+
+    /**
+     * 巡查自检-巡检计划-修改
+     *
+     * @param patrolInspectionPlanVo
+     * @return
+     */
+    @Log(title = "巡检计划", businessType = BusinessType.UPDATE)
+    @PostMapping("updatePatrolInspectionPlan")
+    public ApiResult<Void> updatePatrolInspectionPlan(@RequestBody PatrolInspectionPlanVo patrolInspectionPlanVo) {
+        patrolInspectionPlanService.updatePatrolInspectionPlan(patrolInspectionPlanVo);
+        return ApiResult.success();
+    }
+
+    /**
+     * 巡查自检-巡检计划-删除
+     *
+     * @param id 计划ID
+     * @return
+     */
+    @Log(title = "巡检计划", businessType = BusinessType.DELETE)
+    @GetMapping("delPatrolInspectionPlan")
+    public ApiResult<Void> delPatrolInspectionPlan(@RequestParam(value = "id") Integer id) {
+        patrolInspectionPlanService.delPatrolInspectionPlan(id);
+        return ApiResult.success();
+    }
+
+    /**
+     * 巡查自检-巡检计划-列表查询
+     *
+     * @param planName 计划名称
+     * @param planType 计划类型（1 普通计划，2 按次计划）
+     * @param areaId   区域ID
+     * @param pageNum  当前页
+     * @param pageSize 每页条数
+     * @param id       计划ID
+     * @return
+     */
+    @GetMapping("patrolInspectionPlanList")
+    public ApiResult<CommonPage<PatrolInspectionPlanDataVo>> patrolInspectionPlanList(@RequestParam(value = "planName", required = false) String planName,
+                                                                                      @RequestParam(value = "planType", required = false, defaultValue = "0") Integer planType,
+                                                                                      @RequestParam(value = "areaId", required = false, defaultValue = "0") Integer areaId,
+                                                                                      @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                                                      @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
+                                                                                      @RequestParam(value = "id", required = false, defaultValue = "0") Integer id) {
+        return ApiResult.success(patrolInspectionPlanService.patrolInspectionPlanList(planName, planType, areaId, pageNum, pageSize, id));
+    }
+
+    /**
+     * 巡查自检-巡检计划-左侧区域树形
+     *
+     * @return
+     */
+    @GetMapping("planLeftList")
+    public ApiResult<List<PatrolInspectionAreaVo>> planLeftList() {
+        return ApiResult.success(patrolInspectionPlanService.planLeftList());
+    }
+
+
+    /**
+     * 巡查自检-巡检计划-新增/修改弹窗的地点数据查询
+     *
+     * @param planId 计划ID
+     * @param areaId 区域ID
+     * @return
+     */
+    @GetMapping("patrolInspectionSiteVoList")
+    public ApiResult<List<PatrolInspectionSiteVo>> patrolInspectionSiteVoList(@RequestParam(value = "planId", required = false, defaultValue = "0") Integer planId,
+                                                                              @RequestParam(value = "areaId") Integer areaId) {
+        return ApiResult.success(patrolInspectionPlanService.patrolInspectionSiteVoList(planId, areaId));
+    }
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/PatrolInspectionRecordController.java

@@ -0,0 +1,109 @@
+package com.usky.fire.controller.web;
+
+
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.fire.domain.PatrolInspectionRecord;
+import com.usky.fire.service.PatrolInspectionRecordService;
+import com.usky.fire.service.vo.PatrolInspectionRecordExportVo;
+import com.usky.fire.service.vo.PatrolInspectionRecordVo;
+import com.usky.fire.service.vo.RecordStatisticsVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * 巡查自检-巡检记录
+ *
+ * @author JCB
+ * @since 2022-07-21
+ */
+@RestController
+@RequestMapping("/patrolInspectionRecord")
+public class PatrolInspectionRecordController {
+
+    @Autowired
+    private PatrolInspectionRecordService patrolInspectionRecordService;
+
+    /**
+     * 巡查自检-巡检记录-列表查询
+     *
+     * @param areaName      区域名称
+     * @param siteName      地点名称
+     * @param name          人员名称
+     * @param planType      计划类型
+     * @param startDateTime 开始时间
+     * @param endDateTime   结束时间
+     * @param pageNum       当前页
+     * @param pageSize      每页条数
+     * @return
+     */
+    @GetMapping("patrolInspectionRecordLsit")
+    public ApiResult<CommonPage<PatrolInspectionRecord>> patrolInspectionRecordLsit(@RequestParam(value = "areaName", required = false) String areaName,
+                                                                                    @RequestParam(value = "siteName", required = false) String siteName,
+                                                                                    @RequestParam(value = "name", required = false) String name,
+                                                                                    @RequestParam(value = "planType", required = false) Integer planType,
+                                                                                    @RequestParam(value = "startDateTime", required = false) String startDateTime,
+                                                                                    @RequestParam(value = "endDateTime", required = false) String endDateTime,
+                                                                                    @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                                                    @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
+        return ApiResult.success(patrolInspectionRecordService.patrolInspectionRecordLsit(areaName, siteName, name, planType, startDateTime, endDateTime, pageNum, pageSize));
+    }
+
+    /**
+     * 巡查自检-巡检记录-详情查询
+     *
+     * @param id 记录ID
+     * @return
+     */
+    @GetMapping("patrolInspectionRecordDetails")
+    public ApiResult<List<PatrolInspectionRecordVo>> patrolInspectionRecordDetails(@RequestParam(value = "id") Integer id) {
+        return ApiResult.success(patrolInspectionRecordService.patrolInspectionRecordDetails(id));
+    }
+
+    /**
+     * 巡查自检-巡检记录-巡检情况统计
+     *
+     * @param startDate 开始日期 yyyy-MM-dd
+     * @param endDate   结束日期 yyyy-MM-dd
+     * @return
+     */
+    @GetMapping("recordStatistics")
+    public ApiResult<RecordStatisticsVo> recordStatistics(@RequestParam(value = "startDate") String startDate,
+                                                          @RequestParam(value = "endDate") String endDate) {
+        return ApiResult.success(patrolInspectionRecordService.recordStatistics(startDate, endDate));
+    }
+
+
+    /**
+     * 巡查自检-巡检记录-导出
+     *
+     * @param response
+     * @param areaName      区域名称
+     * @param siteName      地点名称
+     * @param name          人员名称
+     * @param planType      计划类型
+     * @param startDateTime 开始时间
+     * @param endDateTime   结束时间
+     * @param idList        记录ID
+     * @throws IOException
+     */
+    @PostMapping("/recordLsitExport")
+    public void export(HttpServletResponse response,
+                       @RequestParam(value = "areaName", required = false) String areaName,
+                       @RequestParam(value = "siteName", required = false) String siteName,
+                       @RequestParam(value = "name", required = false) String name,
+                       @RequestParam(value = "planType", required = false) Integer planType,
+                       @RequestParam(value = "startDateTime", required = false) String startDateTime,
+                       @RequestParam(value = "endDateTime", required = false) String endDateTime,
+                       @RequestParam(value = "idList", required = false) String idList) throws IOException {
+        List<PatrolInspectionRecordExportVo> list = patrolInspectionRecordService.recordLsitExport(areaName, siteName, name, planType, startDateTime, endDateTime, idList);
+        ExcelUtil<PatrolInspectionRecordExportVo> util = new ExcelUtil<PatrolInspectionRecordExportVo>(PatrolInspectionRecordExportVo.class);
+        util.exportExcel(response, list, "巡检记录", "巡检记录");
+    }
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/PatrolInspectionSiteController.java

@@ -0,0 +1,159 @@
+package com.usky.fire.controller.web;
+
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
+import com.usky.fire.domain.PatrolInspectionSite;
+import com.usky.fire.domain.PatrolInspectionSiteContent;
+import com.usky.fire.service.PatrolInspectionContentService;
+import com.usky.fire.service.PatrolInspectionSiteService;
+import com.usky.fire.service.vo.PatrolInspectionAreaVo;
+import com.usky.fire.service.vo.PatrolInspectionSiteExportVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 巡查自检-巡检地点
+ *
+ * @author JCB
+ * @since 2022-07-13
+ */
+@RestController
+@RequestMapping("/patrolInspectionSite")
+public class PatrolInspectionSiteController {
+
+    @Autowired
+    private PatrolInspectionSiteService patrolInspectionSiteService;
+
+    @Autowired
+    private PatrolInspectionContentService patrolInspectionContentService;
+
+
+    /**
+     * 巡查自检-巡检地点-左侧树形区域
+     *
+     * @return
+     */
+    @GetMapping("areaLeftList")
+    public ApiResult<List<PatrolInspectionAreaVo>> areaLeftList() {
+        return ApiResult.success(patrolInspectionSiteService.areaLeftList());
+    }
+
+
+    /**
+     * 巡查自检-巡检地点-巡检列表
+     *
+     * @param areaId   区域id
+     * @param siteName 地点名称
+     * @param pageNum  当前页
+     * @param pageSize 每页条数
+     * @param id       巡检地点ID
+     * @return
+     */
+    @GetMapping("patrolInspectionSiteList")
+    public ApiResult<CommonPage<PatrolInspectionSite>> patrolInspectionSiteList(@RequestParam(value = "areaId", required = false) Integer areaId,
+                                                                                @RequestParam(value = "siteName", required = false) String siteName,
+                                                                                @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                                                @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
+                                                                                @RequestParam(value = "id", required = false, defaultValue = "0") Integer id) {
+        return ApiResult.success(patrolInspectionSiteService.patrolInspectionSiteList(areaId, siteName, pageNum, pageSize, id));
+    }
+
+    /**
+     * 巡查自检-巡检地点-添加地点-保存
+     *
+     * @param PatrolInspectionSiteList
+     * @return
+     */
+    @Log(title = "巡检地点-点位分配", businessType = BusinessType.UPDATE)
+    @PostMapping("updatePatrolInspectionSiteList")
+    public ApiResult<Void> updatePatrolInspectionSiteList(@RequestBody List<PatrolInspectionSite> PatrolInspectionSiteList) {
+        patrolInspectionSiteService.updatePatrolInspectionSiteList(PatrolInspectionSiteList);
+        return ApiResult.success();
+    }
+
+    /**
+     * 巡查自检-巡检地点-编辑
+     *
+     * @param PatrolInspectionSite
+     * @return
+     */
+    @Log(title = "巡检地点", businessType = BusinessType.UPDATE)
+    @PostMapping("updatePatrolInspectionSite")
+    public ApiResult<Void> updatePatrolInspectionSite(@RequestBody PatrolInspectionSite PatrolInspectionSite) {
+        patrolInspectionSiteService.updatePatrolInspectionSite(PatrolInspectionSite);
+        return ApiResult.success();
+    }
+
+    /**
+     * 巡查自检-巡检地点-删除
+     *
+     * @param id 巡检地点ID
+     * @return
+     */
+    @Log(title = "巡检地点", businessType = BusinessType.DELETE)
+    @GetMapping("delPatrolInspectionSite")
+    public ApiResult<Void> delPatrolInspectionSite(@RequestParam(value = "id") Integer id) {
+        patrolInspectionSiteService.delPatrolInspectionSite(id);
+        return ApiResult.success();
+    }
+
+
+    /**
+     * 巡查自检-巡检地点-分配内容-列表查询
+     *
+     * @param pageNum  当前页
+     * @param pageSize 每页条数
+     * @param siteId   巡检地点ID
+     * @return
+     */
+    @GetMapping("siteContentList")
+    public ApiResult<Map<String, Object>> siteContentList(@RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                          @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
+                                                          @RequestParam(value = "siteId") Integer siteId) {
+        Map<String, Object> ajax = new HashMap<>();
+        ajax.put("checkedKeys", patrolInspectionSiteService.siteContentList(siteId));
+        ajax.put("InspectionContent", patrolInspectionContentService.patrolInspectionContentList(null, pageNum, pageSize, 0));
+        return ApiResult.success(ajax);
+    }
+
+    /**
+     * 巡查自检-巡检地点-分配内容-保存
+     *
+     * @param siteContentList
+     * @return
+     */
+    @Log(title = "巡检地点-分配内容", businessType = BusinessType.INSERT)
+    @PostMapping("addSiteContent")
+    public ApiResult<Void> addSiteContent(@RequestBody List<PatrolInspectionSiteContent> siteContentList) {
+        patrolInspectionSiteService.addSiteContent(siteContentList);
+        return ApiResult.success();
+    }
+
+    /**
+     * 巡查自检-巡检地点-列表导出
+     *
+     * @param areaId   区域id
+     * @param siteName 地点名称
+     * @param idList   地点ID
+     * @return
+     */
+    @PostMapping("/patrolInspectionSiteListExport")
+    public void export(HttpServletResponse response,
+                       @RequestParam(required = false) Integer areaId,
+                       @RequestParam(value = "siteName", required = false) String siteName,
+                       @RequestParam(value = "idList", required = false) String idList) throws IOException {
+        List<PatrolInspectionSiteExportVo> list = patrolInspectionSiteService.patrolInspectionSiteListExport(areaId, siteName, idList);
+        ExcelUtil<PatrolInspectionSiteExportVo> util = new ExcelUtil<PatrolInspectionSiteExportVo>(PatrolInspectionSiteExportVo.class);
+        util.exportExcel(response, list, "巡检地点列表", "巡检地点列表");
+    }
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/PostInspectController.java

@@ -0,0 +1,77 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
+import com.usky.fire.domain.PostInspect;
+import com.usky.fire.service.PostInspectService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 查岗信息 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-08-24
+ */
+@RestController
+@RequestMapping("/postInspect")
+public class PostInspectController {
+
+    @Autowired
+    private PostInspectService postInspectService;
+
+    /**
+     * 值班查岗-企业版平台查岗功能推送接收
+     *
+     * @param postInspect
+     * @return
+     */
+    @Log(title = "企业消防值班查岗", businessType = BusinessType.INSERT)
+    @PutMapping("postInspectRecept")
+    public ApiResult<Void> postInspectRecept(@RequestBody PostInspect postInspect) {
+        postInspectService.postInspectRecept(postInspect);
+        return ApiResult.success();
+    }
+
+    /**
+     * 值班查岗-企业版系统查岗功能相关数据查询
+     *
+     * @return
+     */
+    @GetMapping("postInspectPlatform")
+    public ApiResult<List<PostInspect>> postInspectPlatform() {
+        return ApiResult.success(postInspectService.postInspectPlatform());
+    }
+
+    /**
+     * 值班查岗-企业版系统查岗记录查询接口
+     *
+     * @return
+     */
+    @GetMapping("postInspectAnswerRecept")
+    public ApiResult<List<PostInspect>> postInspectAnswerRecept() {
+        return ApiResult.success(postInspectService.postInspectAnswerRecept());
+    }
+
+    /**
+     * 值班查岗-企业版系统网页应答数据接收，状态修改接口
+     *
+     * @param postInspect
+     * @return
+     */
+    @Log(title = "企业消防值班查岗应答", businessType = BusinessType.INSERT)
+    @PutMapping("postInspectAnswerUpdate")
+    public ApiResult<Void> postInspectAnswerUpdate(@RequestBody PostInspect postInspect) {
+        postInspectService.postInspectAnswerUpdate(postInspect);
+        return ApiResult.success();
+    }
+
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/ReservePlanController.java

@@ -0,0 +1,86 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
+import com.usky.fire.domain.ReservePlan;
+import com.usky.fire.service.ReservePlanService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 预案管理 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-09-05
+ */
+@RestController
+@RequestMapping("/reservePlan")
+public class ReservePlanController {
+
+    @Autowired
+    private ReservePlanService reservePlanService;
+
+    /**
+     * 预案管理-列表查询
+     *
+     * @param reserveName 预案名称
+     * @param startDate   开始时间 格式：yyyy-MM-dd HH:mm:ss
+     * @param endDate     结束时间 格式：yyyy-MM-dd HH:mm:ss
+     * @param pageNum     当前页
+     * @param pageSize    每页条数
+     * @return
+     */
+    @GetMapping("reservePlanDataList")
+    public ApiResult<CommonPage<Object>> reservePlanDataList(@RequestParam(value = "reserveName", required = false) String reserveName,
+                                                             @RequestParam(value = "startDate", required = false) String startDate,
+                                                             @RequestParam(value = "endDate", required = false) String endDate,
+                                                             @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                             @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
+        return ApiResult.success(reservePlanService.reservePlanDataList(reserveName, startDate, endDate, pageNum, pageSize));
+    }
+
+    /**
+     * 预案管理-信息新增
+     *
+     * @param reservePlan
+     * @return
+     */
+    @Log(title = "预案管理-信息新增", businessType = BusinessType.INSERT)
+    @PostMapping("reservePlanDataAdd")
+    public ApiResult<Void> reservePlanDataAdd(@RequestBody ReservePlan reservePlan) {
+        reservePlanService.reservePlanDataAdd(reservePlan);
+        return ApiResult.success();
+    }
+
+    /**
+     * 预案管理-信息编辑
+     *
+     * @param reservePlan
+     * @return
+     */
+    @Log(title = "预案管理-信息编辑", businessType = BusinessType.UPDATE)
+    @PutMapping("reservePlanDataUpdate")
+    public ApiResult<Void> reservePlanDataUpdate(@RequestBody ReservePlan reservePlan) {
+        reservePlanService.reservePlanDataUpdate(reservePlan);
+        return ApiResult.success();
+    }
+
+    /**
+     * 预案管理-信息删除
+     *
+     * @param id 主键ID
+     * @return
+     */
+    @Log(title = "预案管理-信息删除", businessType = BusinessType.DELETE)
+    @DeleteMapping("reservePlanDataDelete")
+    public ApiResult<Void> reservePlanDataDelete(@RequestParam(value = "id") Integer id) {
+        reservePlanService.reservePlanDataDelete(id);
+        return ApiResult.success();
+    }
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/SpOwnerCompanyController.java

@@ -0,0 +1,21 @@
+package com.usky.fire.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-11-04
+ */
+@Controller
+@RequestMapping("/spOwnerCompany")
+public class SpOwnerCompanyController {
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/TaskController.java

@@ -0,0 +1,55 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.fire.service.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author JCB
+ * @since 2022-08-08
+ */
+@EnableScheduling
+@Component
+public class TaskController {
+    @Autowired
+    private MhPostInspectService mhPostInspectService;
+
+    @Autowired
+    private BscEnterpriseScreenService bscEnterpriseScreenService;
+
+    @Autowired
+    private BscEnterpriseAutonomyService bscEnterpriseAutonomyService;
+
+    @Autowired
+    private BscEnterpriseStreetTownService bscEnterpriseStreetTownService;
+
+    @Autowired
+    private BscLawTrendService bscLawTrendService;
+
+    //    @Scheduled(cron = "0/5 * *  * * ?") // 间隔5秒执行
+    @Scheduled(cron = "0 0/5 * * * ? ") // 间隔5分钟执行
+    public void task() {
+        System.out.println(Thread.currentThread().getName() + "定时任务执行中");
+        mhPostInspectService.postInspectAnswerRequest();
+    }
+
+    //    @Scheduled(cron = "0 0 * * * ? ")//每小时
+    @Scheduled(cron = "0 0 1 * * ? ")//每天凌晨1点
+    public void task1() {
+        System.out.println(Thread.currentThread().getName() + "大屏定时任务执行中");
+        bscEnterpriseScreenService.dataSynchro();
+    }
+
+    @Scheduled(cron = "0 0 2 * * ? ")//每天凌晨2点
+    public void task2() {
+        System.out.println(Thread.currentThread().getName() + "企业自主管理(全、街道)大屏定时任务执行中");
+        bscEnterpriseAutonomyService.enterpriseAutonomyTask();
+        bscEnterpriseStreetTownService.enterpriseStreetTownTask();
+        bscLawTrendService.lawEnforcement();
+    }
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/TbAlarmController.java

@@ -0,0 +1,21 @@
+package com.usky.fire.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 设备告警表 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-11-04
+ */
+@Controller
+@RequestMapping("/tbAlarm")
+public class TbAlarmController {
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/TbInfoController.java

@@ -0,0 +1,21 @@
+package com.usky.fire.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 设备心跳表 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-11-04
+ */
+@Controller
+@RequestMapping("/tbInfo")
+public class TbInfoController {
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/UnitBeOnDutyController.java

@@ -0,0 +1,79 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.fire.domain.DemMicroStation;
+import com.usky.fire.domain.DemVehicle;
+import com.usky.fire.service.DemMicroStationService;
+import com.usky.fire.service.DemOnDutyService;
+import com.usky.fire.service.DemVehicleService;
+import com.usky.fire.service.po.UnitBeOnDutyPO;
+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;
+
+/**
+ * <p>
+ * 值班表 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-11-28
+ */
+@RestController
+@RequestMapping("/unitBeOnDuty")
+public class UnitBeOnDutyController {
+
+    @Autowired
+    private DemOnDutyService demOnDutyService;
+
+    @Autowired
+    private DemMicroStationService demMicroStationService;
+
+    @Autowired
+    private DemVehicleService demVehicleService;
+
+    /**
+     * 消防救援站点-支队值班情况
+     *
+     * @param startTime 开始时间
+     * @param endTime   结束时间
+     * @return
+     */
+    @GetMapping("/list")
+    public ApiResult<List<List<UnitBeOnDutyPO>>> list(@RequestParam(value = "startTime", required = false) String startTime,
+                                                      @RequestParam(value = "endTime", required = false) String endTime) {
+        return ApiResult.success(demOnDutyService.list(startTime, endTime));
+    }
+
+    /**
+     * 消防救援站点-各站点执勤实力
+     *
+     * @param current 当前页
+     * @param size    每页条数
+     * @return
+     */
+    @GetMapping("/page")
+    public ApiResult<CommonPage<DemMicroStation>> page(@RequestParam(value = "current", required = false, defaultValue = "1") Integer current,
+                                                       @RequestParam(value = "size", required = false, defaultValue = "10") Integer size) {
+        return ApiResult.success(demMicroStationService.page(current, size));
+    }
+
+    /**
+     * 消防救援站点-各站点执勤实力
+     *
+     * @param zdCode 所属消防机构
+     * @return
+     */
+    @GetMapping("vehiclelist")
+    public ApiResult<List<DemVehicle>> vehiclelist(@RequestParam String zdCode) {
+        return ApiResult.success(demVehicleService.list(zdCode));
+    }
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/WeatherControllerWeb.java

@@ -0,0 +1,58 @@
+package com.usky.fire.controller.web;
+
+
+import com.alibaba.nacos.common.utils.StringUtils;
+import com.usky.common.core.exception.BusinessException;
+import com.usky.common.core.util.HttpUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.io.IOException;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author yq
+ * @date 2021/6/16 18:02
+ */
+@RestController
+@RequestMapping("aliWeather")
+public class WeatherControllerWeb {
+
+
+    private static final String ALI_WEATHER_API_URL = "https://weather01.market.alicloudapi.com/area-to-weather?area=闵行区";
+    private static final String ALI_WEATHER_HEADER_KEY = "Authorization";
+    private static final String ALI_WEATHER_APPCODE = "0f2b7fce6e104ba8835358b7b59b4fb6";
+    private static final String ALI_WEATHER_HEADER_VALUE = "APPCODE " + ALI_WEATHER_APPCODE;
+
+    private String weather = "";
+
+    private Date date = null;
+
+    @GetMapping()
+    public String get() {
+        if (StringUtils.isBlank(weather)) {
+            weather = getWeatherApi();
+            date = new Date();
+        } else {
+            if ((System.currentTimeMillis() - date.getTime()) >= (1000 * 60 * 60 * 5)) {
+                weather = getWeatherApi();
+                date = new Date();
+            }
+        }
+        return weather;
+    }
+
+    public String getWeatherApi() {
+        try {
+            Map<String, String> headerMap = new HashMap<>();
+            headerMap.put(ALI_WEATHER_HEADER_KEY, ALI_WEATHER_HEADER_VALUE);
+            return HttpUtils.get(ALI_WEATHER_API_URL, headerMap);
+        } catch (IOException e) {
+            throw new BusinessException(e.getMessage());
+        }
+    }
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/AlarmElectricalFire.java

@@ -0,0 +1,150 @@
+package com.usky.fire.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 电气火灾隐患告警
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-08-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class AlarmElectricalFire implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设备编号
+     */
+    private String deviceCode;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 告警类型
+     */
+    private String alarmType;
+
+    /**
+     * 告警时间
+     */
+    private LocalDateTime alarmTime;
+
+    /**
+     * 上报地址
+     */
+    private String address;
+
+    /**
+     * 告警状态
+     */
+    private String alarmStatus;
+
+    /**
+     * 系统类型
+     */
+    private Integer systemType;
+
+    /**
+     * 端口号
+     */
+    private String portNum;
+
+    /**
+     * 单位ID
+     */
+    private String companyId;
+
+    /**
+     * 单位名称
+     */
+    private String companyName;
+
+    /**
+     * 属性值1
+     */
+    private String attributeValue1;
+
+    /**
+     * 属性值2
+     */
+    private String attributeValue2;
+
+    /**
+     * 属性值3
+     */
+    private String attributeValue3;
+
+    /**
+     * 属性值4
+     */
+    private String attributeValue4;
+
+    /**
+     * 处理人
+     */
+    private String handler;
+
+    /**
+     * 处理时间
+     */
+    private LocalDateTime handlingTime;
+
+    /**
+     * 处理内容
+     */
+    private String handlingContent;
+
+    /**
+     * 处理人电话
+     */
+    private String handlerPhone;
+
+    /**
+     * 处理状态（0、未处理 1、已处理）
+     */
+    private Integer handlingStatus;
+
+    /**
+     * 是否误报（0、非误报 1、误报）
+     */
+    private Integer falseAlarm;
+
+    /**
+     * 现场照片
+     */
+    private String sitePhoto;
+
+    /**
+     * 报告内容
+     */
+    @TableField(exist = false)
+    private String reportContent;
+
+    /**
+     * 告警类型名称
+     */
+    @TableField(exist = false)
+    private String alarmTypeName;
+
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/AlarmFire.java

@@ -0,0 +1,156 @@
+package com.usky.fire.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-08-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class AlarmFire implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设备编号
+     */
+    private String deviceCode;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 告警类型(2 火警、4 故障、16 监管等)
+     */
+    private String alarmType;
+
+    /**
+     * 告警时间
+     */
+    private LocalDateTime alarmTime;
+
+    /**
+     * 上报地址
+     */
+    private String address;
+
+    /**
+     * 告警状态
+     */
+    private String alarmStatus;
+
+    /**
+     * 系统类型(1.火灾自动报警系统 2.自动喷水灭火系统 3.消防给水及消火栓系统 4.防排烟系统 5.电气火灾系统 6.消防视频监控系统)
+     */
+    private Integer systemType;
+
+    /**
+     * 端口号
+     */
+    private String portNum;
+
+    /**
+     * 单位ID
+     */
+    private String companyId;
+
+    /**
+     * 单位名称
+     */
+    private String companyName;
+
+    /**
+     * 原始告警类型
+     */
+    private String attributeValue1;
+
+    /**
+     * 告警名称
+     */
+    private String attributeValue2;
+
+    /**
+     * 原始点位地址
+     */
+    private String attributeValue3;
+
+    /**
+     * 点位描述
+     */
+    private String attributeValue4;
+
+    /**
+     * 点位类型(0 通用设备、1 火灾报警控制器、10 可燃气体探测器、11 点型可燃气体探测器等)
+     */
+    private Integer pointType;
+
+    /**
+     * 主机号
+     */
+    private Integer hostNum;
+
+    /**
+     * 回路号
+     */
+    private Integer loopNum;
+
+    /**
+     * 点位号
+     */
+    private Integer ptNum;
+
+    /**
+     * 处理人
+     */
+    private String handler;
+
+    /**
+     * 处理时间
+     */
+    private LocalDateTime handlingTime;
+
+    /**
+     * 处理内容
+     */
+    private String handlingContent;
+
+    /**
+     * 处理人电话
+     */
+    private String handlerPhone;
+
+    /**
+     * 处理状态（0、未处理 1、已处理）
+     */
+    private Integer handlingStatus;
+
+    /**
+     * 是否误报（0、非误报 1、误报）
+     */
+    private Integer falseAlarm;
+
+    /**
+     * 现场照片
+     */
+    private String sitePhoto;
+
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/AlarmHydrantWater.java

@@ -0,0 +1,150 @@
+package com.usky.fire.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 消防给水及消火栓隐患告警
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-08-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class AlarmHydrantWater implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设备编号
+     */
+    private String deviceCode;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 告警类型
+     */
+    private String alarmType;
+
+    /**
+     * 告警时间
+     */
+    private LocalDateTime alarmTime;
+
+    /**
+     * 上报地址
+     */
+    private String address;
+
+    /**
+     * 告警状态
+     */
+    private String alarmStatus;
+
+    /**
+     * 系统类型
+     */
+    private Integer systemType;
+
+    /**
+     * 端口号
+     */
+    private String portNum;
+
+    /**
+     * 单位ID
+     */
+    private String companyId;
+
+    /**
+     * 单位名称
+     */
+    private String companyName;
+
+    /**
+     * 属性值1
+     */
+    private String attributeValue1;
+
+    /**
+     * 属性值2
+     */
+    private String attributeValue2;
+
+    /**
+     * 属性值3
+     */
+    private String attributeValue3;
+
+    /**
+     * 属性值4
+     */
+    private String attributeValue4;
+
+    /**
+     * 处理人
+     */
+    private String handler;
+
+    /**
+     * 处理时间
+     */
+    private LocalDateTime handlingTime;
+
+    /**
+     * 处理内容
+     */
+    private String handlingContent;
+
+    /**
+     * 处理人电话
+     */
+    private String handlerPhone;
+
+    /**
+     * 处理状态（0、未处理 1、已处理）
+     */
+    private Integer handlingStatus;
+
+    /**
+     * 是否误报（0、非误报 1、误报）
+     */
+    private Integer falseAlarm;
+
+    /**
+     * 现场照片
+     */
+    private String sitePhoto;
+
+    /**
+     * 报告内容
+     */
+    @TableField(exist = false)
+    private String reportContent;
+
+    /**
+     * 告警类型名称
+     */
+    @TableField(exist = false)
+    private String alarmTypeName;
+
+
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/AlarmSmokeControl.java

@@ -0,0 +1,150 @@
+package com.usky.fire.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 防排烟隐患告警
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-08-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class AlarmSmokeControl implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设备编号
+     */
+    private String deviceCode;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 告警类型
+     */
+    private String alarmType;
+
+    /**
+     * 告警时间
+     */
+    private LocalDateTime alarmTime;
+
+    /**
+     * 上报地址
+     */
+    private String address;
+
+    /**
+     * 告警状态
+     */
+    private String alarmStatus;
+
+    /**
+     * 系统类型
+     */
+    private Integer systemType;
+
+    /**
+     * 端口号
+     */
+    private String portNum;
+
+    /**
+     * 单位ID
+     */
+    private String companyId;
+
+    /**
+     * 单位名称
+     */
+    private String companyName;
+
+    /**
+     * 属性值1
+     */
+    private String attributeValue1;
+
+    /**
+     * 属性值2
+     */
+    private String attributeValue2;
+
+    /**
+     * 属性值3
+     */
+    private String attributeValue3;
+
+    /**
+     * 属性值4
+     */
+    private String attributeValue4;
+
+    /**
+     * 处理人
+     */
+    private String handler;
+
+    /**
+     * 处理时间
+     */
+    private LocalDateTime handlingTime;
+
+    /**
+     * 处理内容
+     */
+    private String handlingContent;
+
+    /**
+     * 处理人电话
+     */
+    private String handlerPhone;
+
+    /**
+     * 处理状态（0、未处理 1、已处理）
+     */
+    private Integer handlingStatus;
+
+    /**
+     * 是否误报（0、非误报 1、误报）
+     */
+    private Integer falseAlarm;
+
+    /**
+     * 现场照片
+     */
+    private String sitePhoto;
+
+    /**
+     * 报告内容
+     */
+    @TableField(exist = false)
+    private String reportContent;
+
+    /**
+     * 告警类型名称
+     */
+    @TableField(exist = false)
+    private String alarmTypeName;
+
+
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/AlarmSprayWater.java

@@ -0,0 +1,150 @@
+package com.usky.fire.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 自动喷水灭火隐患告警
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-08-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class AlarmSprayWater implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设备编号
+     */
+    private String deviceCode;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 告警类型
+     */
+    private String alarmType;
+
+    /**
+     * 告警时间
+     */
+    private LocalDateTime alarmTime;
+
+    /**
+     * 上报地址
+     */
+    private String address;
+
+    /**
+     * 告警状态
+     */
+    private String alarmStatus;
+
+    /**
+     * 系统类型
+     */
+    private Integer systemType;
+
+    /**
+     * 端口号
+     */
+    private String portNum;
+
+    /**
+     * 单位ID
+     */
+    private String companyId;
+
+    /**
+     * 单位名称
+     */
+    private String companyName;
+
+    /**
+     * 属性值1
+     */
+    private String attributeValue1;
+
+    /**
+     * 属性值2
+     */
+    private String attributeValue2;
+
+    /**
+     * 属性值3
+     */
+    private String attributeValue3;
+
+    /**
+     * 属性值4
+     */
+    private String attributeValue4;
+
+    /**
+     * 处理人
+     */
+    private String handler;
+
+    /**
+     * 处理时间
+     */
+    private LocalDateTime handlingTime;
+
+    /**
+     * 处理内容
+     */
+    private String handlingContent;
+
+    /**
+     * 处理人电话
+     */
+    private String handlerPhone;
+
+    /**
+     * 处理状态（0、未处理 1、已处理）
+     */
+    private Integer handlingStatus;
+
+    /**
+     * 是否误报（0、非误报 1、误报）
+     */
+    private Integer falseAlarm;
+
+    /**
+     * 现场照片
+     */
+    private String sitePhoto;
+
+    /**
+     * 报告内容
+     */
+    @TableField(exist = false)
+    private String reportContent;
+
+    /**
+     * 告警类型名称
+     */
+    @TableField(exist = false)
+    private String alarmTypeName;
+
+
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/AlarmVideo.java

@@ -0,0 +1,151 @@
+package com.usky.fire.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 视频监控隐患告警
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-08-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class AlarmVideo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设备编号
+     */
+    private String deviceCode;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 告警类型
+     */
+    private String alarmType;
+
+    /**
+     * 告警时间
+     */
+    private LocalDateTime alarmTime;
+
+    /**
+     * 上报地址
+     */
+    private String address;
+
+    /**
+     * 告警状态
+     */
+    private String alarmStatus;
+
+    /**
+     * 系统类型
+     */
+    private Integer systemType;
+
+    /**
+     * 端口号
+     */
+    private String portNum;
+
+    /**
+     * 单位ID
+     */
+    private String companyId;
+
+    /**
+     * 单位名称
+     */
+    private String companyName;
+
+    /**
+     * 属性值1
+     */
+    private String attributeValue1;
+
+    /**
+     * 属性值2
+     */
+    private String attributeValue2;
+
+    /**
+     * 属性值3
+     */
+    private String attributeValue3;
+
+    /**
+     * 属性值4
+     */
+    private String attributeValue4;
+
+    /**
+     * 处理人
+     */
+    private String handler;
+
+    /**
+     * 处理时间
+     */
+    private LocalDateTime handlingTime;
+
+    /**
+     * 处理内容
+     */
+    private String handlingContent;
+
+    /**
+     * 处理人电话
+     */
+    private String handlerPhone;
+
+    /**
+     * 处理状态（0、未处理 1、已处理）
+     */
+    private Integer handlingStatus;
+
+    /**
+     * 是否误报（0、非误报 1、误报）
+     */
+    private Integer falseAlarm;
+
+    /**
+     * 现场照片
+     */
+    private String sitePhoto;
+
+
+    /**
+     * 报告内容
+     */
+    @TableField(exist = false)
+    private String reportContent;
+
+    /**
+     * 告警类型名称
+     */
+    @TableField(exist = false)
+    private String alarmTypeName;
+
+
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/BaseCompany.java

@@ -0,0 +1,186 @@
+package com.usky.fire.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 联网单位信息表
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-08-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseCompany implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 单位ID
+     */
+    private String companyId;
+
+    /**
+     * 单位编号
+     */
+    private String companyCode;
+
+    /**
+     * 组织机构编码
+     */
+    private String organization;
+
+    /**
+     * 单位名称
+     */
+    private String companyName;
+
+    /**
+     * 单位拼音简称
+     */
+    private String nameAbbreviation;
+
+    /**
+     * 单位类型
+     */
+    private String companyType;
+
+    /**
+     * 单位详细地址
+     */
+    private String address;
+
+    /**
+     * 火灾危险性
+     */
+    private String fireHazard;
+
+    /**
+     * 邮政编码
+     */
+    private String postalCode;
+
+    /**
+     * 邮箱
+     */
+    private String mailbox;
+
+    /**
+     * 单位联系人
+     */
+    private String linkPerson;
+
+    /**
+     * 单位联系电话
+     */
+    private String linkPhone;
+
+    /**
+     * 单位传真
+     */
+    private String companyFax;
+
+    /**
+     * 经济所有制
+     */
+    private String economicOwnership;
+
+    /**
+     * 单位成立时间
+     */
+    private LocalDateTime foundTime;
+
+    /**
+     * 上级主管单位
+     */
+    private String upperName;
+
+    /**
+     * 单位等级
+     */
+    private Integer companyGrade;
+
+    /**
+     * 单位性质
+     */
+    private Integer companyNature;
+
+    /**
+     * 行政区域
+     */
+    private String administrativeDivision;
+
+    /**
+     * 行政区域名称
+     */
+    private String divisionName;
+
+    /**
+     * 消防管辖
+     */
+    private String fireJurisdiction;
+
+    /**
+     * 支队级机构ID填充
+     */
+    private String detachmentId;
+
+    /**
+     * 街镇
+     */
+    private String streetTown;
+
+    /**
+     * 删除标记
+     */
+    private String enable;
+
+    /**
+     * 创建者姓名
+     */
+    private String creatorName;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新人姓名
+     */
+    private String updatePersonName;
+
+    /**
+     * 修改人的IP
+     */
+    private String updatePersonIp;
+
+    /**
+     * 更新人
+     */
+    private String updatePerson;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/BaseCompanyAttach1.java

@@ -0,0 +1,251 @@
+package com.usky.fire.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 联网单位信息附表1
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-09-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseCompanyAttach1 implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 单位ID
+     */
+    private String companyId;
+
+    /**
+     * 单位编号
+     */
+    private String companyCode;
+
+    /**
+     * 支队级机构简称
+     */
+    private String detachmentName;
+
+    /**
+     * 管辖机构（含大队）
+     */
+    private String governBody;
+
+    /**
+     * 单位属性主分类
+     */
+    private String mainAttributeType;
+
+    /**
+     * 单位主属性
+     */
+    private String mainAttribute;
+
+    /**
+     * 单位子属性
+     */
+    private String sonAttribute;
+
+    /**
+     * 固定资产（单位：万元）
+     */
+    private String fixedAssets;
+
+    /**
+     * 职工人数
+     */
+    private String employeeNum;
+
+    /**
+     * 营业时最大人数
+     */
+    private String businessMaxNum;
+
+    /**
+     * 占地面积
+     */
+    private String coverArea;
+
+    /**
+     * 建筑面积
+     */
+    private String buildArea;
+
+    /**
+     * 自动消防设施情况
+     */
+    private String autoFireFacilities;
+
+    /**
+     * 经度
+     */
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+    private String latitude;
+
+    /**
+     * 地理情况
+     */
+    private String geography;
+
+    /**
+     * 有无避难层
+     */
+    private String refugeFloor;
+
+    /**
+     * 避难层数量
+     */
+    private String refugeFloorNum;
+
+    /**
+     * 避难层面积
+     */
+    private String refugeFloorArea;
+
+    /**
+     * 避难层位置
+     */
+    private String refugeFloorPosition;
+
+    /**
+     * 备注
+     */
+    private String remarks;
+
+    /**
+     * 单位平面图名称
+     */
+    private String planName;
+
+    /**
+     * 单位平面图存放地址
+     */
+    private String planUrl;
+
+    /**
+     * 建筑数量
+     */
+    private String buildNum;
+
+    /**
+     * 上级消防管辖单位
+     */
+    private String superiorFireJurisdiction;
+
+    /**
+     * 实际单位ID
+     */
+    private String actualCompanyId;
+
+    /**
+     * GLID
+     */
+    private String glId;
+
+    /**
+     * 确定重点单位时间
+     */
+    private LocalDateTime determineKeyTime;
+
+    /**
+     * 取消重点单位时间
+     */
+    private LocalDateTime cancelKeyTime;
+
+    /**
+     * 操作类型
+     */
+    private String operationType;
+
+    /**
+     * 老的单位ID
+     */
+    private String oldCompanyId;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新人
+     */
+    private String updatePerson;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 注册资金
+     */
+    private String registeredCapital;
+
+    /**
+     * 经营状态
+     */
+    private String businessStatus;
+
+    /**
+     * 实缴资本
+     */
+    private String paidCapital;
+
+    /**
+     * 登记机关
+     */
+    private String registrar;
+
+    /**
+     * 竣工年份
+     */
+    private String completedTime;
+
+    /**
+     * 耐火等级
+     */
+    private String fireRating;
+
+    /**
+     * 建筑高度
+     */
+    private String buildingHeight;
+
+    /**
+     * 建筑结构
+     */
+    private String buildingStructure;
+
+    /**
+     * 建筑情况
+     */
+    private String construction;
+
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/BaseCompanyAttach2.java

@@ -0,0 +1,286 @@
+package com.usky.fire.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 联网单位信息附表2
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-09-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseCompanyAttach2 implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 单位ID
+     */
+    private String companyId;
+
+    /**
+     * 单位编号
+     */
+    private String companyCode;
+
+    /**
+     * 义务消防员数
+     */
+    private String volunteerFiremanNum;
+
+    /**
+     * 消防自救措施
+     */
+    private String selfRescueMeasures;
+
+    /**
+     * 外围消防设施
+     */
+    private String peripheralFireFacilities;
+
+    /**
+     * 历史灾情
+     */
+    private String historicalDisaster;
+
+    /**
+     * 毗邻单位东
+     */
+    private String adjacentEast;
+
+    /**
+     * 毗邻单位南
+     */
+    private String adjacentSouth;
+
+    /**
+     * 毗邻单位西
+     */
+    private String adjacentWest;
+
+    /**
+     * 毗邻单位北
+     */
+    private String adjacentNorth;
+
+    /**
+     * 安全出口数
+     */
+    private String safetyExitsNum;
+
+    /**
+     * 消防车道数
+     */
+    private String fireLaneNum;
+
+    /**
+     * 消防车道位置
+     */
+    private String fireLanePosition;
+
+    /**
+     * 疏散电梯数
+     */
+    private String sparseElevatorNum;
+
+    /**
+     * 消防电梯数
+     */
+    private String fireElevatorNum;
+
+    /**
+     * 燃气类型
+     */
+    private String gasType;
+
+    /**
+     * 档案负责人
+     */
+    private String archivesPerson;
+
+    /**
+     * 消防监督监管（档案录入人）
+     */
+    private String archivesInputPerson;
+
+    /**
+     * 建档用户
+     */
+    private String filingPerson;
+
+    /**
+     * 建档用户姓名
+     */
+    private String filingPersonName;
+
+    /**
+     * 数据交换标记
+     */
+    private String dataExchangeMark;
+
+    /**
+     * 数据交换时间
+     */
+    private LocalDateTime dataExchangeTime;
+
+    /**
+     * 监督修改时间
+     */
+    private LocalDateTime superviModifyTime;
+
+    /**
+     * 总队机构ID
+     */
+    private String corpsId;
+
+    /**
+     * 是否派出所数据
+     */
+    private String policeData;
+
+    /**
+     * Row_Version
+     */
+    private String rowVersion;
+
+    /**
+     * 是否建筑管理单位
+     */
+    private String manageCompany;
+
+    /**
+     * SFHJHDW
+     */
+    private String sfhjhdw;
+
+    /**
+     * 是否高危单位
+     */
+    private String highRisk;
+
+    /**
+     * SFWBQY
+     */
+    private String sfwbqy;
+
+    /**
+     * HJHJZSL
+     */
+    private String hjhjzsl;
+
+    /**
+     * LGACC
+     */
+    private String lgacc;
+
+    /**
+     * LGACCName
+     */
+    private String lgaccName;
+
+    /**
+     * BZDZKGLID
+     */
+    private String bzdzkglid;
+
+    /**
+     * QRTime
+     */
+    private LocalDateTime qrtime;
+
+    /**
+     * QRAcc
+     */
+    private String qracc;
+
+    /**
+     * 重点单位确认人员姓名
+     */
+    private String determineKeyName;
+
+    /**
+     * QRYJ
+     */
+    private String qryj;
+
+    /**
+     * QRYJMS
+     */
+    private String qryjjms;
+
+    /**
+     * SCRKSJ
+     */
+    private String scrksj;
+
+    /**
+     * lawID
+     */
+    private String lawId;
+
+    /**
+     * 备用字段1
+     */
+    private String reserveField1;
+
+    /**
+     * 备用字段2
+     */
+    private String reserveField2;
+
+    /**
+     * 备用字段3
+     */
+    private String reserveField3;
+
+    /**
+     * 备用字段4
+     */
+    private String reserveField4;
+
+    /**
+     * BDP_AUDIT
+     */
+    private LocalDateTime bdpAudit;
+
+    /**
+     * unionKey
+     */
+    private String unionKey;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新人
+     */
+    private String updatePerson;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/BaseCompanyPerson.java

@@ -0,0 +1,150 @@
+package com.usky.fire.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 联网单位消防人员信息
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-08-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseCompanyPerson implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 联网单位id
+     */
+    private String companyId;
+
+    /**
+     * 单位编号
+     */
+    private String companyCode;
+
+    /**
+     * 单位名称
+     */
+    private String companyName;
+
+    /**
+     * 消防控制室电话
+     */
+    private String fireControlPhone;
+
+    /**
+     * 消防安全责任人姓名
+     */
+    private String fireDutyName;
+
+    /**
+     * 消防安全责任人公民身份号码
+     */
+    private String fireDutyIdcard;
+
+    /**
+     * 消防安全责任人电话
+     */
+    private String fireDutyPhone;
+
+    /**
+     * 消防安全管理人姓名
+     */
+    private String fireManageName;
+
+    /**
+     * 消防安全管理人公民身份号码
+     */
+    private String fireManageIdcard;
+
+    /**
+     * 消防安全管理人电话
+     */
+    private String fireManagePhone;
+
+    /**
+     * 专兼职消防管理人姓名
+     */
+    private String partTimeFireName;
+
+    /**
+     * 专兼职消防管理人公民身份号码
+     */
+    private String partTimeFireIdcard;
+
+    /**
+     * 专兼职消防管理人电话
+     */
+    private String partTimeFirePhone;
+
+    /**
+     * 法人代表姓名
+     */
+    private String delegateName;
+
+    /**
+     * 法人代表公民身份号码
+     */
+    private String delegateIdcard;
+
+    /**
+     * 法人代表电话
+     */
+    private String delegatePhone;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 更新人
+     */
+    private String updatePerson;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 查岗次数
+     */
+    @TableField(exist = false)
+    private Integer inspectCount;
+
+    /**
+     * 应答次数
+     */
+    @TableField(exist = false)
+    private Integer answerCount;
+
+    /**
+     * 最后查岗时间
+     */
+    @TableField(exist = false)
+    private LocalDateTime inspectTime;
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/BaseDevice.java

@@ -0,0 +1,134 @@
+package com.usky.fire.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDate;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-08-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class BaseDevice implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 设备信息表主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设备编号
+     */
+    private String deviceCode;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 安装位置
+     */
+    private String installAddress;
+
+    /**
+     * 设备类型
+     */
+    private Integer deviceType;
+
+    /**
+     * 产品ID
+     */
+    private Integer productId;
+
+    /**
+     * 所属楼层
+     */
+    private Integer floor;
+
+    /**
+     * 物联网卡号
+     */
+    private String simNum;
+
+    /**
+     * 通信方式
+     */
+    private Integer communicatMode;
+
+    /**
+     * 设备所属模型坐标
+     */
+    private String modelPosition;
+
+    /**
+     * 防火分区
+     */
+    private String fireZone;
+
+    /**
+     * 倍率
+     */
+    private Integer magnification;
+
+    /**
+     * 解析方法
+     */
+    private String analyticMethod;
+
+    /**
+     * 安装时间
+     */
+    private LocalDate installTime;
+
+    /**
+     * 安装人
+     */
+    private String installPerson;
+
+    /**
+     * 使能标识
+     */
+    private Integer enable;
+
+    /**
+     * 所属单位ID
+     */
+    private String companyId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 更新人
+     */
+    private String updatePerson;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/BaseDeviceAttribute.java

@@ -0,0 +1,136 @@
+package com.usky.fire.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 基础信息_设备点位
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-08-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseDeviceAttribute implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设备编号
+     */
+    private String deviceCode;
+
+    /**
+     * 设备id
+     */
+    private Integer deviceId;
+
+    /**
+     * 端口
+     */
+    private Integer ports;
+
+    /**
+     * 端口类型(1开关量 2模拟量)
+     */
+    private Integer portType;
+
+    /**
+     * 系统类型(1：火灾报警系统，2：自动喷水灭火系统，3：防火门及卷帘系统，4：气体灭火系统，5：消火栓系统)
+     */
+    private Integer systemType;
+
+    /**
+     * 电平类型(1高电平 2低电平)
+     */
+    private Integer levelType;
+
+    /**
+     * 高电平名称
+     */
+    private String highLevelName;
+
+    /**
+     * 低电平名称
+     */
+    private String lowLevelName;
+
+    /**
+     * 端口编码(与influxdb保持一致)
+     */
+    private String portCode;
+
+    /**
+     * 端口名称
+     */
+    private String portName;
+
+    /**
+     * 模拟量参数
+     */
+    private String analogQuantityParameter;
+
+    /**
+     * 模拟量告警上限
+     */
+    private String analogAlarmUpper;
+
+    /**
+     * 模拟量告警下限
+     */
+    private String analogAlarmLower;
+
+    /**
+     * 量程
+     */
+    private String range;
+
+    /**
+     * 量程上限
+     */
+    private String rangeUpper;
+
+    /**
+     * 量程下限
+     */
+    private String rangeLower;
+
+    /**
+     * 输出
+     */
+    private String output;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 更新人
+     */
+    private String updatePerson;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/BaseDeviceStatus.java

@@ -0,0 +1,51 @@
+package com.usky.fire.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 设备状态表
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-09-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseDeviceStatus implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设备编号
+     */
+    private String deviceCode;
+
+    /**
+     * 设备状态（0：离线、1：正常、2：故障、3：告警）
+     */
+    private Integer deviceStatus;
+
+    /**
+     * 上报时间
+     */
+    private LocalDateTime reportTime;
+
+    /**
+     * 单位ID
+     */
+    private String companyId;
+
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/BaseModel.java

@@ -0,0 +1,111 @@
+package com.usky.fire.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 三维模型设备信息
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-09-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseModel implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 模型名称
+     */
+    private String modelName;
+
+    /**
+     * 模型类型
+     */
+    private String modelType;
+
+    /**
+     * 模型URL
+     */
+    private String modelUrl;
+
+    /**
+     * 模型坐标
+     */
+    private String modelPosition;
+
+    /**
+     * 模型旋转角度
+     */
+    private String modelAngle;
+
+    /**
+     * 模型大小(默认大小[1,1,1])
+     */
+    private String modelScale;
+
+    /**
+     * 模型设备拖拽
+     */
+    private Boolean modelDragBool;
+
+    /**
+     * 楼层
+     */
+    private Integer floor;
+
+    /**
+     * 建筑ID
+     */
+    private Integer buildId;
+
+    /**
+     * 单位ID
+     */
+    private String companyId;
+
+    /**
+     * 使能标识(1：开通 、2：待定 、3：注销)
+     */
+    private Integer enable;
+
+    /**
+     * 对应设备编号
+     */
+    private String deviceCode;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 更新人
+     */
+    private String updatePerson;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/BaseUserCompany.java

@@ -0,0 +1,51 @@
+package com.usky.fire.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 用户单位关联
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-08-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseUserCompany implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 用户主键ID
+     */
+    private Integer userId;
+
+    /**
+     * 单位主键ID
+     */
+    private String companyId;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/BscEnterpriseAutonomy.java

@@ -0,0 +1,61 @@
+package com.usky.fire.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 企业自主管理大屏统计（全部）
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-10-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BscEnterpriseAutonomy implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 企业自主情况
+     */
+    private String enterpriseAutonomy;
+
+    /**
+     * 物联网设备情况
+     */
+    private String iotDevice;
+
+    /**
+     * 企业自主巡检情况
+     */
+    private String patrolInspection;
+
+    /**
+     * 各街镇单位情况
+     */
+    private String streetCompany;
+
+    /**
+     * 风险指数
+     */
+    private String rpn;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/BscEnterpriseScreen.java

@@ -0,0 +1,71 @@
+package com.usky.fire.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 企业大屏数据统计
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-09-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BscEnterpriseScreen implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 自主巡检情况
+     */
+    private String patrolInspection;
+
+    /**
+     * 值班查岗情况
+     */
+    private String postInspect;
+
+    /**
+     * 火灾告警报告
+     */
+    private String fireAlarm;
+
+    /**
+     * 预案场景
+     */
+    private String reservePlan;
+
+    /**
+     * 隐患处置情况
+     */
+    private String hiddenDanger;
+
+    /**
+     * 建筑评分模块
+     */
+    private String buildScore;
+
+    /**
+     * 单位ID
+     */
+    private String companyId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/BscEnterpriseStreetTown.java

@@ -0,0 +1,67 @@
+package com.usky.fire.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 企业自主管理大屏统计（街镇）
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-10-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BscEnterpriseStreetTown implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 企业自主情况
+     */
+    private String enterpriseAutonomy;
+
+    /**
+     * 物联网设备情况
+     */
+    private String iotDevice;
+
+    /**
+     * 企业自主巡检情况
+     */
+    private String patrolInspection;
+
+    /**
+     * 各街镇单位情况
+     */
+    private String streetCompany;
+
+    /**
+     * 风险指数
+     */
+    private String rpn;
+
+    /**
+     * 街镇
+     */
+    private String streetTown;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+
+}