Merge branch 'usky-zyj' of uskycloud/usky-modules into master

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

@@ -71,7 +71,7 @@ public class MybatisGeneratorUtils {
         // strategy.setTablePrefix("t_"); // 表名前缀
         strategy.setEntityLombokModel(true); //使用lombok
         //修改自己想要生成的表
-        strategy.setInclude("dem_inspect_list");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
+        strategy.setInclude("dem_store");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
         mpg.setStrategy(strategy);
 
         // 关闭默认 xml 生成，调整生成 至 根目录

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

@@ -1,6 +1,7 @@
 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;
@@ -8,9 +9,13 @@ 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 com.usky.fire.service.vo.CompanyExportVO;
+import com.usky.fire.service.vo.DemGridMemberVO;
 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;
 
@@ -56,6 +61,23 @@ public class BaseCompanyController {
         return ApiResult.success(baseCompanyService.companyList(companyName, organization, pageNum, pageSize));
     }
 
+    /**
+     * 单位管理-单位列表查询-导出
+     *
+     * @param companyName  单位名称
+     * @param organization 组织机构编码
+     * @param exportTitle    文件名
+     * @throws IOException
+     */
+    @PostMapping("companyListExport")
+    public void export(HttpServletResponse response,
+                                  @RequestParam(value = "companyName", required = false) String companyName,
+                                  @RequestParam(value = "organization", required = false) String organization,
+                                  @RequestParam(value = "exportTitle") String exportTitle) throws IOException {
+        List<CompanyExportVO> list = baseCompanyService.companyListExport(companyName, organization);
+        ExcelUtil<CompanyExportVO> util = new ExcelUtil<CompanyExportVO>(CompanyExportVO.class);
+        util.exportExcel(response,list,exportTitle,exportTitle);
+    }
     /**
      * 单位管理-修改
      *

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

@@ -1,18 +1,21 @@
 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.BaseCompanyPerson;
 import com.usky.fire.domain.MhPostInspect;
 import com.usky.fire.service.BaseCompanyPersonService;
 import com.usky.fire.service.MhPostInspectService;
+import com.usky.fire.service.vo.AlarmFireVo;
+import com.usky.fire.service.vo.BaseCompanyPersonVO;
 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 org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -50,6 +53,24 @@ public class BaseCompanyPersonController {
         return ApiResult.success(baseCompanyPersonService.baseCompanyPersonList(companyCode, companyName, pageNum, pageSize));
     }
 
+    /**
+     * 值班查岗-查岗单位及记录数据查询列表查询接口（闵行支队、企业版）-导出
+     *
+     * @param companyCode 单位编号
+     * @param companyName 单位名称
+     * @param exportTitle    文件名
+     * @throws IOException
+     */
+    @PostMapping("postInspectListExport")
+    public void export(HttpServletResponse response,
+                       @RequestParam(value = "companyCode", required = false) String companyCode,
+                       @RequestParam(value = "companyName", required = false) String companyName,
+                       @RequestParam(value = "exportTitle") String exportTitle) throws IOException {
+        List<BaseCompanyPersonVO> list = baseCompanyPersonService.baseCompanyPersonListExport(companyCode,companyName);
+        ExcelUtil<BaseCompanyPersonVO> util = new ExcelUtil<BaseCompanyPersonVO>(BaseCompanyPersonVO.class);
+        util.exportExcel(response, list, exportTitle, exportTitle);
+    }
+
     /**
      * 值班查岗-主页面响应时间、查岗次数等统计查询接口（闵行支队、企业版）
      *

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

@@ -31,11 +31,15 @@ public class BscLawTrendController {
      * 消防执法动态-数据查询
      *
      * @param moduleType 模块类型(monthLaw:当月执法情况 adstraLicense:行政许可情况 reportComplaint:消防隐患举报投诉 complaintHandle:投诉处理情况)
+     * @param startDate      开始时间 格式：yyyy-MM-dd HH:mm:ss
+     * @param endDate        结束时间 格式：yyyy-MM-dd HH:mm:ss
      * @return
      */
     @GetMapping("lawTrendList")
-    public ApiResult<Object> lawTrendList(@RequestParam(value = "moduleType") String moduleType) {
-        return ApiResult.success(bscLawTrendService.lawTrendList(moduleType));
+    public ApiResult<Object> lawTrendList(@RequestParam(value = "moduleType") String moduleType,
+                                          @RequestParam(value = "startDate", required = false) String startDate,
+                                          @RequestParam(value = "endDate", required = false) String endDate) {
+        return ApiResult.success(bscLawTrendService.lawTrendList(moduleType, startDate, endDate));
     }
 
     /**

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

@@ -1,6 +1,7 @@
 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;
@@ -9,11 +10,15 @@ 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.CompanyExportVO;
 import com.usky.fire.service.vo.ParameterVo;
+import com.usky.fire.service.vo.DemEnforceReportComplaintVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import java.io.IOException;
 
 /**
  * <p>
@@ -51,6 +56,24 @@ public class DemEnforceReportComplaintController {
         return ApiResult.success(demEnforceReportComplaintService.enforceReportComplaintList(serialNumber, reportPhone, id, pageNum, pageSize));
     }
 
+    /**
+     * 举报信息管理-列表查询-导出
+     *
+     * @param serialNumber 流水号
+     * @param reportPhone  举报电话
+     * @param exportTitle   导出文件名
+     * @throws IOException
+     */
+    @PostMapping("enforceReportComplaintListExport")
+    public void export(HttpServletResponse response,
+                @RequestParam(value = "serialNumber", required = false) String serialNumber,
+                @RequestParam(value = "reportPhone", required = false) String reportPhone,
+                @RequestParam(value = "exportTitle") String exportTitle) throws IOException {
+        List<DemEnforceReportComplaintVO> list = demEnforceReportComplaintService.enforceReportComplaintListExport(serialNumber, reportPhone);
+        ExcelUtil<DemEnforceReportComplaintVO> util = new ExcelUtil<DemEnforceReportComplaintVO>(DemEnforceReportComplaintVO.class);
+        util.exportExcel(response, list, exportTitle, exportTitle);
+    }
+
     /**
      * 举报信息管理-标签添加
      *

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

@@ -1,17 +1,23 @@
 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.DemFileLabel;
 import com.usky.fire.service.DemFireStatisticsService;
+import com.usky.fire.service.vo.DemFireStatisticsExportVO;
 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.*;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
 /**
  * <p>
  * 火灾事故说明总表 前端控制器
@@ -32,7 +38,7 @@ public class DemFireAccidentDescController {
      *
      * @param fireNumber 火灾序号
      * @param labelId    标签ID
-     * @param typeId     分类ID
+     * @param classifyId     分类ID
      * @param pageNum    当前页
      * @param pageSize   每页条数
      * @return
@@ -40,11 +46,31 @@ public class DemFireAccidentDescController {
     @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 = "classifyId", required = false, defaultValue = "0") Integer classifyId,
                                                                @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));
+        return ApiResult.success(demFireStatisticsService.fireAccidentStatistic(fireNumber, labelId, classifyId, id, pageNum, pageSize));
+    }
+
+    /**
+     * 火灾数据管理-列表查询-导出
+     *
+     * @param fireNumber 火灾序号
+     * @param labelId    标签ID
+     * @param classifyId     分类ID
+     * @param exportTitle    文件名
+     * @throws IOException
+     */
+    @PostMapping("fireAccidentStatisticExport")
+    public void export(HttpServletResponse response,
+                       @RequestParam(value = "fireNumber", required = false) String fireNumber,
+                       @RequestParam(value = "labelId", required = false) Integer labelId,
+                       @RequestParam(value = "classifyId", required = false, defaultValue = "0") Integer classifyId,
+                       @RequestParam(value = "exportTitle") String exportTitle) throws IOException {
+        List<DemFireStatisticsExportVO> list = demFireStatisticsService.fireAccidentStatisticExport(fireNumber, labelId, classifyId);
+        ExcelUtil<DemFireStatisticsExportVO> util = new ExcelUtil<DemFireStatisticsExportVO>(DemFireStatisticsExportVO.class);
+        util.exportExcel(response,list,exportTitle,exportTitle);
     }
 
     /**

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

@@ -1,15 +1,21 @@
 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.DemGridMember;
 import com.usky.fire.service.DemGridMemberService;
+import com.usky.fire.service.vo.DemGridMemberVO;
 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>
  * 网格员信息管理表 前端控制器
@@ -46,6 +52,28 @@ public class DemGridMemberController {
         return ApiResult.success(demGridMemberService.gridMemberList(gridArea, streetTown, gridPersonnel, id, pageNum, pageSize));
     }
 
+    /**
+     * 网格员信息管理-列表查询-导出
+     *
+     * @param gridArea      网格区域
+     * @param streetTown    街镇
+     * @param gridPersonnel 网格人员姓名
+     * @param id            主键ID
+     * @param exportTitle    文件名
+     * @throws IOException
+     */
+    @PostMapping("gridMemberListExport")
+    public void export(HttpServletResponse response,
+                       @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 = "exportTitle") String exportTitle) throws IOException {
+        List<DemGridMemberVO> list = demGridMemberService.gridMemberListExport(gridArea, streetTown, gridPersonnel, id);
+        ExcelUtil<DemGridMemberVO> util = new ExcelUtil<DemGridMemberVO>(DemGridMemberVO.class);
+        util.exportExcel(response, list, exportTitle, exportTitle);
+    }
+
     /**
      * 网格员信息管理-新增
      *

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

@@ -0,0 +1,43 @@
+package com.usky.fire.controller.web;
+
+
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.usky.common.core.bean.ApiResult;
+import com.usky.fire.service.DemStoreService;
+
+import org.springframework.stereotype.Controller;
+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 ZYJ
+ * @since 2023-01-16
+ */
+@RestController
+@RequestMapping("/demStore")
+public class DemStoreController {
+    @Autowired
+    private DemStoreService demStoreService;
+
+    /**
+     * 城市消防特征-地图撒点-仓库撒点
+     *
+     * @param streetTown 街镇
+     * @return
+     */
+    @GetMapping("storeScatterer")
+    public ApiResult<List<Object>> storeScatterer(@RequestParam(value = "streetTown", required = false) String streetTown){
+        return ApiResult.success(demStoreService.storeScatterer(streetTown));
+    }
+}
+

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

@@ -0,0 +1,65 @@
+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.JcjAjxx;
+import com.usky.fire.service.JcjAjxxService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author ZYJ
+ * @since 2023-01-17
+ */
+@RestController
+@RequestMapping("/jcjAjxx")
+public class JcjAjxxController {
+    @Autowired
+    private JcjAjxxService jcjAjxxService;
+
+    /**
+     * 接警每个柱状图详情信息展示
+     *
+     * @param streetTown     街镇（4个）
+     * @param startDate      开始时间 格式：yyyy-MM-dd HH:mm:ss
+     * @param endDate        结束时间 格式：yyyy-MM-dd HH:mm:ss
+     * @param caseType       案件类型
+     * @param pageNum        当前页
+     * @param pageSize       每页条数
+     * @return
+     *
+     */
+    @GetMapping("jcjAjxxList")
+    public ApiResult<CommonPage<JcjAjxx>> jcjAjxxList(@RequestParam(value="streetTown") String streetTown,
+                                               @RequestParam(value = "startDate", required = false) String startDate,
+                                               @RequestParam(value = "endDate", required = false) String endDate,
+                                               @RequestParam(value = "caseType") String caseType,
+                                               @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                               @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize){
+        return ApiResult.success(jcjAjxxService.jcjAjxxList(streetTown, startDate, endDate, caseType, pageNum, pageSize));
+    }
+
+
+    /**
+     * 接警处置柱状图统计
+     */
+    @GetMapping("jcjAjxxStatistics")
+    public ApiResult<Map<String,Object>> jcjAjxxStatistics(@RequestParam(value="streetTown") String streetTown,
+                                                           @RequestParam(value = "startDate", required = false) String startDate,
+                                                           @RequestParam(value = "endDate", required = false) String endDate){
+        return ApiResult.success(jcjAjxxService.jcjAjxxStatistics(streetTown, startDate, endDate));
+    }
+
+}
+

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

@@ -0,0 +1,131 @@
+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 ZYJ
+ * @since 2023-01-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DemStore implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 单位类别
+     */
+    private String companyType;
+
+    /**
+     * 单位使用性质
+     */
+    private String companyNature;
+
+    /**
+     * 单位（法人）名称
+     */
+    private String delegateName;
+
+    /**
+     * 统一社会信用代码
+     */
+    private String socialCode;
+
+    /**
+     * 单位（场所）实际名称
+     */
+    private String companyName;
+
+    /**
+     * 所辖派出所
+     */
+    private String policeStation;
+
+    /**
+     * 单位地址
+     */
+    private String address;
+
+    /**
+     * 经度
+     */
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+    private String latitude;
+
+    /**
+     * 消防安全责任人
+     */
+    private String fireDutyName;
+
+    /**
+     * 消防安全管理人
+     */
+    private String fireManageName;
+
+    /**
+     * 联系电话（手机）
+     */
+    private String linkPhone;
+
+    /**
+     * 是否自主消防安全管理
+     */
+    private String fireSafetyManage;
+
+    /**
+     * 单位（场所）面积（㎡）
+     */
+    private String companyArea;
+
+    /**
+     * 行业类别
+     */
+    private String industryType;
+
+    /**
+     * 是否为洁净厂房
+     */
+    private String cleanRoom;
+
+    /**
+     * 生产经营组织形式
+     */
+    private String organizationForm;
+
+    /**
+     * 网格号
+     */
+    private String gridNo;
+
+    /**
+     * 年份
+     */
+    private String particularYear;
+
+    /**
+     * 提交时间
+     */
+    private LocalDateTime submitTime;
+
+
+}

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

@@ -0,0 +1,226 @@
+package com.usky.fire.domain;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ZYJ
+ * @since 2023-01-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class JcjAjxx implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 警情信息
+     */
+    @TableField("GIS_X")
+    private BigDecimal gisX;
+
+    @TableField("GIS_Y")
+    private BigDecimal gisY;
+
+    @TableField("SJC")
+    private LocalDateTime sjc;
+
+    @TableId("ID")
+    private String id;
+
+    /**
+     * 主管支队
+     */
+    private String zgzd;
+
+    /**
+     * 案件时间段
+     */
+    private String ajsjd;
+
+    /**
+     * 通知到场时间
+     */
+    private String tzdcsj;
+
+    /**
+     * 通知出水时间
+     */
+    private String tzcssj;
+
+    /**
+     * 通知控制时间
+     */
+    private String tzkzsj;
+
+    /**
+     * 通知熄灭时间
+     */
+    private String tzxmsj;
+
+    /**
+     * 通知返队时间
+     */
+    private String tzfdsj;
+
+    /**
+     * 区域
+     */
+    private String qy;
+
+    /**
+     * 案件类型
+     */
+    private String ajlx;
+
+    /**
+     * 案发地址
+     */
+    private String afdz;
+
+    /**
+     * 立案时间
+     */
+    private LocalDateTime lasj;
+
+    /**
+     * 立案日期
+     */
+    private String larq;
+
+    /**
+     * 处置对象
+     */
+    private String czdx;
+
+    /**
+     * 案件类型代码
+     */
+    private String ajlxdm;
+
+    /**
+     * 案件等级
+     */
+    private String ajdj;
+
+    /**
+     * 主管中队
+     */
+    private String zhongdui;
+
+    /**
+     * 区县
+     */
+    private String qx;
+
+    /**
+     * 案件编号
+     */
+    private String ajbh;
+
+    /**
+     * 案件状态
+     */
+    private String ajzt;
+
+    /**
+     * 案件性质
+     */
+    private String ajxz;
+
+    /**
+     * 通知时间
+     */
+    private LocalDateTime tzsj;
+
+    /**
+     * 到场时间
+     */
+    private LocalDateTime dcsj;
+
+    /**
+     * 出水时间
+     */
+    private LocalDateTime cssj;
+
+    /**
+     * 控制时间
+     */
+    private LocalDateTime kzsj;
+
+    /**
+     * 熄灭时间
+     */
+    private LocalDateTime xmsj;
+
+    /**
+     * 返队时间
+     */
+    private LocalDateTime fdsj;
+
+    /**
+     * 补充信息
+     */
+    private String bcxx;
+
+    /**
+     * 出动车辆
+     */
+    private BigDecimal cdcl;
+
+    /**
+     * 案件区域
+     */
+    private String ajqy;
+
+    /**
+     * 填表时间
+     */
+    @TableField("BDP_AUDIT")
+    private String bdpAudit;
+
+    /**
+     * 主管中队id
+     */
+    @TableField("ZGJGBH")
+    private String zgjgbh;
+
+    /**
+     * 街镇
+     */
+    @TableField("STREETTOWN")
+    private String streettown;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime created;
+
+    /**
+     * 编辑时间
+     */
+    private LocalDateTime updated;
+
+    /**
+     * 0有效/1无效
+     */
+    private Boolean yxx;
+
+    /**
+     * 0未确认/1已同步/2人员确认
+     */
+    private Integer qrqk;
+
+    private Integer fairIs;
+
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/mapper/DemStoreMapper.java

@@ -0,0 +1,16 @@
+package com.usky.fire.mapper;
+
+import com.usky.fire.domain.DemStore;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 仓库信息表 Mapper 接口
+ * </p>
+ *
+ * @author ZYJ
+ * @since 2023-01-16
+ */
+public interface DemStoreMapper extends CrudMapper<DemStore> {
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/mapper/JcjAjxxMapper.java

@@ -0,0 +1,16 @@
+package com.usky.fire.mapper;
+
+import com.usky.fire.domain.JcjAjxx;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ZYJ
+ * @since 2023-01-17
+ */
+public interface JcjAjxxMapper extends CrudMapper<JcjAjxx> {
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/BaseCompanyPersonService.java

@@ -3,8 +3,10 @@ package com.usky.fire.service;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.common.mybatis.core.CrudService;
 import com.usky.fire.domain.BaseCompanyPerson;
+import com.usky.fire.service.vo.BaseCompanyPersonVO;
 
 import java.util.Map;
+import java.util.List;
 
 /**
  * <p>
@@ -27,6 +29,8 @@ public interface BaseCompanyPersonService extends CrudService<BaseCompanyPerson>
      */
     CommonPage<BaseCompanyPerson> baseCompanyPersonList(String companyCode, String companyName, Integer pageNum, Integer pageSize);
 
+    List<BaseCompanyPersonVO> baseCompanyPersonListExport(String companyCode, String companyName);
+
     /**
      * 值班查岗-主页面响应时间、查岗次数等统计查询接口（闵行支队、企业版）
      *

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/BaseCompanyService.java

@@ -4,6 +4,7 @@ import com.usky.common.core.bean.CommonPage;
 import com.usky.common.mybatis.core.CrudService;
 import com.usky.fire.domain.BaseCompany;
 import com.usky.fire.service.vo.CompanyDataVo;
+import com.usky.fire.service.vo.CompanyExportVO;
 
 import java.util.List;
 import java.util.Map;
@@ -51,6 +52,13 @@ public interface BaseCompanyService extends CrudService<BaseCompany> {
      */
     CommonPage<Object> companyList(String companyName, String organization, Integer pageNum, Integer pageSize);
 
+    /**
+     * 单位管理-单位列表查询-导出
+     * @param companyName  单位名称
+     * @param organization 组织机构编码
+     */
+    List<CompanyExportVO> companyListExport(String companyName, String organization);
+
     /**
      * 单位管理-修改
      *

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/BscLawTrendService.java

@@ -25,9 +25,11 @@ public interface BscLawTrendService extends CrudService<BscLawTrend> {
      * 消防执法动态-数据查询
      *
      * @param moduleType 模块类型
+     * @param startDate  开始时间 格式：yyyy-MM-dd HH:mm:ss
+     * @param endDate    结束时间 格式：yyyy-MM-dd HH:mm:ss
      * @return
      */
-    Object lawTrendList(String moduleType);
+    Object lawTrendList(String moduleType, String startDate, String endDate);
 
     /**
      * 消防执法动态-单位撒点详情数据

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/DemEnforceReportComplaintService.java

@@ -5,6 +5,9 @@ import com.usky.common.mybatis.core.CrudService;
 import com.usky.fire.domain.DemEnforceReportComplaint;
 import com.usky.fire.domain.DemEnforceReportLabel;
 import com.usky.fire.service.vo.ParameterVo;
+import com.usky.fire.service.vo.DemEnforceReportComplaintVO;
+
+import java.util.List;
 
 /**
  * <p>
@@ -27,6 +30,14 @@ public interface DemEnforceReportComplaintService extends CrudService<DemEnforce
      */
     CommonPage<Object> enforceReportComplaintList(String serialNumber, String reportPhone, Integer id, Integer pageNum, Integer pageSize);
 
+    /**
+     * 举报信息管理-列表查询-导出
+     *
+     * @param serialNumber 流水号
+     * @param reportPhone  举报电话
+     */
+    List<DemEnforceReportComplaintVO> enforceReportComplaintListExport(String serialNumber, String reportPhone);
+
     /**
      * 举报信息管理-标签添加
      *

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/DemFireStatisticsService.java

@@ -5,11 +5,9 @@ import com.usky.common.mybatis.core.CrudService;
 import com.usky.fire.domain.DemFileLabel;
 import com.usky.fire.domain.DemFireStatistics;
 import com.usky.fire.service.po.FireStatisticsPO;
-import com.usky.fire.service.vo.DemFireStatisticsVo;
-import com.usky.fire.service.vo.FireBubbleVO;
-import com.usky.fire.service.vo.FireLevelRatioVO;
-import com.usky.fire.service.vo.ParameterVo;
+import com.usky.fire.service.vo.*;
 
+import java.io.IOException;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -30,12 +28,21 @@ public interface DemFireStatisticsService extends CrudService<DemFireStatistics>
      *
      * @param fireNumber 火灾序号
      * @param labelId    标签ID
-     * @param typeId     分类ID
+     * @param classifyId     分类ID
      * @param pageNum    当前页
      * @param pageSize   每页条数
      * @return
      */
-    CommonPage<Object> fireAccidentStatistic(String fireNumber, Integer labelId, Integer typeId, Integer id, Integer pageNum, Integer pageSize);
+    CommonPage<Object> fireAccidentStatistic(String fireNumber, Integer labelId, Integer classifyId, Integer id, Integer pageNum, Integer pageSize);
+
+    /**
+     * 火灾数据管理-列表查询-导出
+     *
+     * @param fireNumber 火灾序号
+     * @param labelId    标签ID
+     * @param classifyId     分类ID
+     */
+    List<DemFireStatisticsExportVO> fireAccidentStatisticExport(String fireNumber, Integer labelId, Integer classifyId);
 
     /**
      * 火灾数据管理-添加标签

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/DemGridMemberService.java

@@ -2,8 +2,11 @@ package com.usky.fire.service;
 
 import com.usky.common.core.bean.CommonPage;
 import com.usky.fire.domain.DemGridMember;
+import com.usky.fire.service.vo.DemGridMemberVO;
 import com.usky.common.mybatis.core.CrudService;
 
+import java.util.List;
+
 /**
  * <p>
  * 网格员信息管理表 服务类
@@ -16,6 +19,8 @@ public interface DemGridMemberService extends CrudService<DemGridMember> {
 
     CommonPage<DemGridMember> gridMemberList(String gridArea, String streetTown, String gridPersonnel, Integer id, Integer pageNum, Integer pageSize);
 
+    List<DemGridMemberVO> gridMemberListExport(String gridArea, String streetTown, String gridPersonnel, Integer id);
+
     void addGridMember(DemGridMember demGridMember);
 
     void updateGridMember(DemGridMember demGridMember);

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/DemStoreService.java

@@ -0,0 +1,25 @@
+package com.usky.fire.service;
+
+import com.usky.fire.domain.DemStore;
+import com.usky.common.mybatis.core.CrudService;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 仓库信息表 服务类
+ * </p>
+ *
+ * @author ZYJ
+ * @since 2023-01-16
+ */
+public interface DemStoreService extends CrudService<DemStore> {
+    /**
+     * 城市消防体征-地图撒点-仓库撒点
+     *
+     * @param streetTown 街镇
+     * @return
+     */
+    List<Object> storeScatterer(String streetTown);
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/JcjAjxxService.java

@@ -0,0 +1,24 @@
+package com.usky.fire.service;
+
+import com.usky.common.core.bean.CommonPage;
+import com.usky.fire.domain.JcjAjxx;
+import com.usky.common.mybatis.core.CrudService;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author ZYJ
+ * @since 2023-01-17
+ */
+public interface JcjAjxxService extends CrudService<JcjAjxx> {
+    CommonPage<JcjAjxx> jcjAjxxList(String streetTown, String startDate, String endDate, String caseType, Integer pageNum, Integer pageSize);
+
+    Map<String,Object> jcjAjxxStatistics(String streetTown, String startDate, String endDate);
+
+    Integer ajCount(String streetTown, String startDate, String endDate, String caseType);
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/BaseCompanyPersonServiceImpl.java

@@ -15,10 +15,12 @@ import com.usky.fire.mapper.BaseCompanyPersonMapper;
 import com.usky.fire.mapper.MhPostInspectMapper;
 import com.usky.fire.service.BaseCompanyPersonService;
 import com.usky.fire.service.BaseUserCompanyService;
+import com.usky.fire.service.vo.BaseCompanyPersonVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 
 /**
@@ -32,9 +34,6 @@ import java.util.*;
 @Service
 public class BaseCompanyPersonServiceImpl extends AbstractCrudService<BaseCompanyPersonMapper, BaseCompanyPerson> implements BaseCompanyPersonService {
 
-    @Autowired
-    private BaseUserCompanyService baseUserCompanyService;
-
     @Autowired
     private MhPostInspectMapper mhPostInspectMapper;
 
@@ -78,6 +77,51 @@ public class BaseCompanyPersonServiceImpl extends AbstractCrudService<BaseCompan
         return new CommonPage<>(page.getRecords(), page.getTotal(), pageSize, pageNum);
     }
 
+    @Override
+    public List<BaseCompanyPersonVO> baseCompanyPersonListExport(String companyCode,String companyName){
+        LambdaQueryWrapper<BaseCompany> queryWrapper1 = Wrappers.lambdaQuery();
+        queryWrapper1.select(BaseCompany::getCompanyId)
+                .eq(BaseCompany::getEnable,0)
+                .like(StringUtils.isNotBlank(companyCode), BaseCompany::getCompanyCode, companyCode)
+                .like(StringUtils.isNotBlank(companyName), BaseCompany::getCompanyName, companyName)
+                .orderByDesc(BaseCompany::getId);
+        List<BaseCompany> baseCompanies = baseCompanyMapper.selectList(queryWrapper1);
+        List<BaseCompanyPersonVO> list = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(baseCompanies)){
+            List<String> companyIdList = new ArrayList<>();
+            for (int i = 0; i < baseCompanies.size(); i++) {
+                companyIdList.add(baseCompanies.get(i).getCompanyId());
+            }
+            LambdaQueryWrapper<BaseCompanyPerson> queryWrapper = Wrappers.lambdaQuery();
+            queryWrapper.in(BaseCompanyPerson::getCompanyId, companyIdList)
+                    .orderByDesc(BaseCompanyPerson::getId);
+            List<BaseCompanyPerson> list1 = this.list(queryWrapper);
+            if (CollectionUtils.isNotEmpty(list1)) {
+                List<BaseCompanyPerson> baseCompanyPeople = mhPostInspectMapper.inspectStatistics(null);
+                for (int i = 0; i < list1.size(); i++) {
+                    BaseCompanyPersonVO baseCompanyPersonVO = new BaseCompanyPersonVO();
+                    baseCompanyPersonVO.setCompanyName(list1.get(i).getCompanyName());
+                    baseCompanyPersonVO.setCompanyCode(list1.get(i).getCompanyCode());
+                    baseCompanyPersonVO.setFireDutyName(list1.get(i).getFireDutyName());
+                    baseCompanyPersonVO.setFireDutyPhone(list1.get(i).getFireDutyPhone());
+                    baseCompanyPersonVO.setFireManageName(list1.get(i).getFireManageName());
+                    baseCompanyPersonVO.setFireManagePhone(list1.get(i).getFireManagePhone());
+                    baseCompanyPersonVO.setFireControlPhone(list1.get(i).getFireControlPhone());
+                    for (int j = 0; j < baseCompanyPeople.size(); j++) {
+                        if (list1.get(i).getCompanyId().equals(baseCompanyPeople.get(j).getCompanyId())) {
+                            baseCompanyPersonVO.setInspectCount(baseCompanyPeople.get(j).getInspectCount());
+                            baseCompanyPersonVO.setAnswerCount(baseCompanyPeople.get(j).getAnswerCount());
+                            baseCompanyPersonVO.setInspectTime((baseCompanyPeople.get(j).getInspectTime()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+                        }
+                    }
+                    list.add(baseCompanyPersonVO);
+                }
+            }
+
+        }
+        return list;
+    }
+
     @Override
     public Map<String, Object> postInspectStatistics() {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/BaseCompanyServiceImpl.java

@@ -15,12 +15,14 @@ import com.usky.fire.mapper.BaseCompanyMapper;
 import com.usky.fire.service.*;
 import com.usky.fire.service.util.OnlineMethod;
 import com.usky.fire.service.vo.CompanyDataVo;
+import com.usky.fire.service.vo.CompanyExportVO;
 import com.usky.fire.service.vo.LocateInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -171,6 +173,75 @@ public class BaseCompanyServiceImpl extends AbstractCrudService<BaseCompanyMappe
         return new CommonPage<>(list, page.getTotal(), pageSize, pageNum);
     }
 
+    @Override
+    public List<CompanyExportVO> companyListExport(String companyName, String organization){
+
+        List<CompanyExportVO> list = new ArrayList<>();
+        LambdaQueryWrapper<BaseCompany> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.select(BaseCompany::getId, BaseCompany::getCompanyId, BaseCompany::getCompanyName, BaseCompany::getOrganization,
+                BaseCompany::getAddress, BaseCompany::getCompanyType, BaseCompany::getFireHazard, BaseCompany::getLinkPhone,
+                BaseCompany::getFoundTime, BaseCompany::getCompanyNature, BaseCompany::getAdministrativeDivision, BaseCompany::getCreateTime)
+                .eq(BaseCompany::getEnable, 0)
+                .like(StringUtils.isNotBlank(companyName), BaseCompany::getCompanyName, companyName)
+                .like(StringUtils.isNotBlank(organization), BaseCompany::getOrganization, organization)
+                .orderByDesc(BaseCompany::getId);
+        List<BaseCompany> baseCompanyList = this.list(queryWrapper);
+        if (CollectionUtils.isNotEmpty(baseCompanyList)) {
+            List<String> companyIdList = new ArrayList<>();
+            for (int i = 0; i < baseCompanyList.size(); i++) {
+                companyIdList.add(baseCompanyList.get(i).getCompanyId());
+            }
+            List<BaseCompanyPerson> list1 = new ArrayList<>();
+            List<BaseCompanyAttach1> list2 = new ArrayList<>();
+            if (CollectionUtils.isNotEmpty(companyIdList)) {
+                LambdaQueryWrapper<BaseCompanyPerson> queryWrapper1 = Wrappers.lambdaQuery();
+                queryWrapper1.select(BaseCompanyPerson::getId, BaseCompanyPerson::getCompanyId, BaseCompanyPerson::getFireDutyName,
+                        BaseCompanyPerson::getFireManageName, BaseCompanyPerson::getDelegateName)
+                        .in(BaseCompanyPerson::getCompanyId, companyIdList);
+                list1 = baseCompanyPersonService.list(queryWrapper1);
+                LambdaQueryWrapper<BaseCompanyAttach1> queryWrapper2 = Wrappers.lambdaQuery();
+                queryWrapper2.select(BaseCompanyAttach1::getId, BaseCompanyAttach1::getCompanyId, BaseCompanyAttach1::getFixedAssets,
+                        BaseCompanyAttach1::getCoverArea, BaseCompanyAttach1::getBuildArea, BaseCompanyAttach1::getEmployeeNum,
+                        BaseCompanyAttach1::getMainAttribute, BaseCompanyAttach1::getGovernBody)
+                        .in(BaseCompanyAttach1::getCompanyId, companyIdList);
+                list2 = baseCompanyAttach1Service.list(queryWrapper2);
+            }
+
+            for (int i = 0; i < baseCompanyList.size(); i++) {
+                CompanyExportVO companyDataVo = new CompanyExportVO();
+                companyDataVo.setCompanyName(baseCompanyList.get(i).getCompanyName());
+                companyDataVo.setOrganization(baseCompanyList.get(i).getOrganization());
+                companyDataVo.setAddress(baseCompanyList.get(i).getAddress());
+                companyDataVo.setCompanyType(baseCompanyList.get(i).getCompanyType());
+                companyDataVo.setFireHazard(baseCompanyList.get(i).getFireHazard());
+                companyDataVo.setLinkPhone(baseCompanyList.get(i).getLinkPhone());
+                companyDataVo.setFoundTime(baseCompanyList.get(i).getFoundTime());
+                companyDataVo.setCompanyNature(baseCompanyList.get(i).getCompanyNature());
+                companyDataVo.setAdministrativeDivision(baseCompanyList.get(i).getAdministrativeDivision());
+                for (int j = 0; j < list1.size(); j++) {
+                    if (baseCompanyList.get(i).getCompanyId().equals(list1.get(j).getCompanyId())) {
+                        companyDataVo.setDelegateName(list1.get(j).getDelegateName());
+                        companyDataVo.setFireDutyName(list1.get(j).getFireDutyName());
+                        companyDataVo.setFireManageName(list1.get(j).getFireManageName());
+                    }
+                }
+                for (int j = 0; j < list2.size(); j++) {
+                    if (baseCompanyList.get(i).getCompanyId().equals(list2.get(j).getCompanyId())) {
+                        companyDataVo.setGovernBody(list2.get(j).getGovernBody());
+                        companyDataVo.setMainAttribute(list2.get(j).getMainAttribute());
+                        companyDataVo.setEmployeeNum(list2.get(j).getEmployeeNum());
+                        companyDataVo.setFixedAssets(list2.get(j).getFixedAssets());
+                        companyDataVo.setCoverArea(list2.get(j).getCoverArea());
+                        companyDataVo.setBuildArea(list2.get(j).getBuildArea());
+                    }
+                }
+                companyDataVo.setCreateTime((baseCompanyList.get(i).getCreateTime()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+                list.add(companyDataVo);
+            }
+        }
+        return list;
+    }
+
     @Transactional
     @Override
     public void updateCompany(CompanyDataVo companyDataVo) {

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/BscLawTrendServiceImpl.java

@@ -74,7 +74,7 @@ public class BscLawTrendServiceImpl extends AbstractCrudService<BscLawTrendMappe
     private DemEnforceInspectRecordService demEnforceInspectRecordService;
 
     @Override
-    public Object lawTrendList(String moduleType) {
+    public Object lawTrendList(String moduleType, String startDate, String endDate) {
         LambdaQueryWrapper<BscLawTrend> queryWrapper = Wrappers.lambdaQuery();
         switch (moduleType) {
             case "monthLaw":
@@ -95,7 +95,8 @@ public class BscLawTrendServiceImpl extends AbstractCrudService<BscLawTrendMappe
             default:
                 throw new BusinessException("参数错误");
         }
-        queryWrapper.orderByDesc(BscLawTrend::getId)
+        queryWrapper.between(StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate),  BscLawTrend::getCreateTime, startDate, endDate)
+                .orderByDesc(BscLawTrend::getId)
                 .last(" limit 1");
         List<BscLawTrend> list = this.list(queryWrapper);
         String data = null;

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DemEnforceReportComplaintServiceImpl.java

@@ -20,10 +20,12 @@ import com.usky.fire.service.DemEnforceReportLabelAttributeService;
 import com.usky.fire.service.DemEnforceReportLabelService;
 import com.usky.fire.service.util.OnlineMethod;
 import com.usky.fire.service.vo.ParameterVo;
+import com.usky.fire.service.vo.DemEnforceReportComplaintVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -149,6 +151,68 @@ public class DemEnforceReportComplaintServiceImpl extends AbstractCrudService<De
         return new CommonPage<>(list, page.getTotal(), pageSize, pageNum);
     }
 
+    @Override
+    public List<DemEnforceReportComplaintVO> enforceReportComplaintListExport(String serialNumber, String reportPhone){
+        List<DemEnforceReportComplaintVO> list = new ArrayList<>();
+        LambdaQueryWrapper<DemEnforceReportComplaint> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.select(DemEnforceReportComplaint::getSerialNumber, DemEnforceReportComplaint::getReportPerson,
+                DemEnforceReportComplaint::getReportPhone, DemEnforceReportComplaint::getWorkOrderStatus, DemEnforceReportComplaint::getReportMethod,
+                DemEnforceReportComplaint::getReportAddress, DemEnforceReportComplaint::getReportContent,DemEnforceReportComplaint::getReportTime,
+                DemEnforceReportComplaint::getAcceptTime, DemEnforceReportComplaint::getWorkOrderType, DemEnforceReportComplaint::getGovernCompany,
+                DemEnforceReportComplaint::getGovernArea, DemEnforceReportComplaint::getFactFind, DemEnforceReportComplaint::getReportRecord,
+                DemEnforceReportComplaint::getReportSource, DemEnforceReportComplaint::getSatisfiedType)
+                .eq(DemEnforceReportComplaint::getEnable, 0)
+                .like(StringUtils.isNotBlank(serialNumber), DemEnforceReportComplaint::getSerialNumber, serialNumber)
+                .like(StringUtils.isNotBlank(reportPhone), DemEnforceReportComplaint::getReportPhone, reportPhone)
+                .orderByDesc(DemEnforceReportComplaint::getId);
+        List<DemEnforceReportComplaint> list1 = this.list(queryWrapper);
+        if(CollectionUtils.isNotEmpty(list1)){
+            List<String> reportIdList = new ArrayList<>();
+            for (int i = 0; i < list1.size(); i++) {
+                reportIdList.add(list1.get(i).getReportId());
+            }
+            List<DemEnforceReportAttach> list2 = new ArrayList<>();
+            if(CollectionUtils.isNotEmpty(reportIdList)){
+                LambdaQueryWrapper<DemEnforceReportAttach> queryWrapper1 = Wrappers.lambdaQuery();
+                queryWrapper1.select(DemEnforceReportAttach::getId, DemEnforceReportAttach::getReportId,
+                        DemEnforceReportAttach::getCompleteTime, DemEnforceReportAttach::getFollowUpStatus)
+                        .in(DemEnforceReportAttach::getReportId, reportIdList);
+                list2 = demEnforceReportAttachService.list(queryWrapper1);
+            }
+
+            for(int i=0;i<list1.size();i++){
+                DemEnforceReportComplaintVO demEnforceReportComplaintVO = new DemEnforceReportComplaintVO();
+                demEnforceReportComplaintVO.setSerialNumber(list1.get(i).getSerialNumber());
+                demEnforceReportComplaintVO.setReportPerson(list1.get(i).getReportPerson());
+                demEnforceReportComplaintVO.setReportPhone(list1.get(i).getReportPhone());
+                demEnforceReportComplaintVO.setWorkOrderStatus(list1.get(i).getWorkOrderStatus());
+                demEnforceReportComplaintVO.setReportMethod(list1.get(i).getReportMethod());
+                demEnforceReportComplaintVO.setReportAddress(list1.get(i).getReportAddress());
+                demEnforceReportComplaintVO.setReportContent(list1.get(i).getReportContent());
+                demEnforceReportComplaintVO.setReportTime((list1.get(i).getReportTime()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+                demEnforceReportComplaintVO.setAcceptTime((list1.get(i).getAcceptTime()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+                demEnforceReportComplaintVO.setWorkOrderType(list1.get(i).getWorkOrderType());
+                demEnforceReportComplaintVO.setGovernCompany(list1.get(i).getGovernCompany());
+                demEnforceReportComplaintVO.setGovernArea(list1.get(i).getGovernArea());
+                demEnforceReportComplaintVO.setFactFind(list1.get(i).getFactFind());
+                for(int j=0;j<list2.size();j++){
+                    if(list1.get(i).getReportId().equals(list2.get(j).getReportId())){
+                        demEnforceReportComplaintVO.setCompleteTime((list2.get(i).getCompleteTime()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+                        demEnforceReportComplaintVO.setFollowUpStatus(list2.get(i).getFollowUpStatus());
+                    }
+                }
+
+                demEnforceReportComplaintVO.setReportRecord(list1.get(i).getReportRecord());
+                demEnforceReportComplaintVO.setReportSource(list1.get(i).getReportSource());
+                demEnforceReportComplaintVO.setSatisfiedType(list1.get(i).getSatisfiedType());
+
+                list.add(demEnforceReportComplaintVO);
+            }
+        }
+
+        return list;
+    }
+
     @Transactional
     @Override
     public void addLabel(DemEnforceReportLabel demEnforceReportLabel) {

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DemFireStatisticsServiceImpl.java

@@ -34,6 +34,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
@@ -59,7 +60,7 @@ public class DemFireStatisticsServiceImpl extends AbstractCrudService<DemFireSta
     private DemFireLabelAttributeService demFireLabelAttributeService;
 
     @Override
-    public CommonPage<Object> fireAccidentStatistic(String fireNumber, Integer labelId, Integer typeId, Integer id, Integer pageNum, Integer pageSize) {
+    public CommonPage<Object> fireAccidentStatistic(String fireNumber, Integer labelId, Integer classifyId, Integer id, Integer pageNum, Integer pageSize) {
         Integer type1 = 0;
         Integer type2 = 0;
         Integer type3 = 0;
@@ -72,19 +73,19 @@ public class DemFireStatisticsServiceImpl extends AbstractCrudService<DemFireSta
             if (list1.size() > 0) {
                 switch (list1.get(0).getAttribute()) {
                     case "typeName1":
-                        type1 = typeId;
+                        type1 = classifyId;
                         break;
                     case "typeName2":
-                        type2 = typeId;
+                        type2 = classifyId;
                         break;
                     case "typeName3":
-                        type3 = typeId;
+                        type3 = classifyId;
                         break;
                     case "typeName4":
-                        type4 = typeId;
+                        type4 = classifyId;
                         break;
                     case "typeName5":
-                        type5 = typeId;
+                        type5 = classifyId;
                         break;
                 }
             }
@@ -100,7 +101,7 @@ public class DemFireStatisticsServiceImpl extends AbstractCrudService<DemFireSta
                 .eq(type1 != null && type1 != 0, DemFireStatistics::getTypeId1, type1)
                 .eq(type2 != null && type2 != 0, DemFireStatistics::getTypeId2, type2)
                 .eq(type3 != null && type3 != 0, DemFireStatistics::getTypeId3, type3)
-                .eq(type4 != null && type4 != 0, DemFireStatistics::getTypeId5, type4)
+                .eq(type4 != null && type4 != 0, DemFireStatistics::getTypeId4, type4)
                 .eq(type5 != null && type5 != 0, DemFireStatistics::getTypeId5, type5)
                 .eq(id != null & id != 0, DemFireStatistics::getId, id)
                 .orderByDesc(DemFireStatistics::getId);
@@ -177,6 +178,93 @@ public class DemFireStatisticsServiceImpl extends AbstractCrudService<DemFireSta
         return new CommonPage<>(list, page.getTotal(), pageSize, pageNum);
     }
 
+    @Override
+    public List<DemFireStatisticsExportVO> fireAccidentStatisticExport(String fireNumber, Integer labelId, Integer classifyId){
+        List<DemFireStatisticsExportVO> list = new ArrayList<>();
+
+        Integer type1 = 0;
+        Integer type2 = 0;
+        Integer type3 = 0;
+        Integer type4 = 0;
+        Integer type5 = 0;
+        if (labelId != null && labelId != 0) {
+            LambdaQueryWrapper<DemFireLabelAttribute> queryWrapper1 = Wrappers.lambdaQuery();
+            queryWrapper1.eq(DemFireLabelAttribute::getLabelId, labelId);
+            List<DemFireLabelAttribute> list1 = demFireLabelAttributeService.list(queryWrapper1);
+            if (list1.size() > 0) {
+                switch (list1.get(0).getAttribute()) {
+                    case "typeName1":
+                        type1 = classifyId;
+                        break;
+                    case "typeName2":
+                        type2 = classifyId;
+                        break;
+                    case "typeName3":
+                        type3 = classifyId;
+                        break;
+                    case "typeName4":
+                        type4 = classifyId;
+                        break;
+                    case "typeName5":
+                        type5 = classifyId;
+                        break;
+                }
+            }
+        }
+        LambdaQueryWrapper<DemFireStatistics> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.select(DemFireStatistics::getBurnedArea, DemFireStatistics::getDirectPropertyLoss, DemFireStatistics::getVictimNumber,
+                DemFireStatistics::getInjuredNumber, DemFireStatistics::getDeathToll, DemFireStatistics::getFileCase, DemFireStatistics::getFireGrade,
+                DemFireStatistics::getSubordinateDetachment, DemFireStatistics::getAdministrativeDivision, DemFireStatistics::getFireNumber,
+                DemFireStatistics::getFireAddress, DemFireStatistics::getFireTime, DemFireStatistics::getId, DemFireStatistics::getTypeId1,
+                DemFireStatistics::getTypeId2, DemFireStatistics::getTypeId3, DemFireStatistics::getTypeId4, DemFireStatistics::getTypeId5)
+                .like(StringUtils.isNotBlank(fireNumber), DemFireStatistics::getFireNumber, fireNumber)
+                .eq(type1 != null && type1 != 0, DemFireStatistics::getTypeId1, type1)
+                .eq(type2 != null && type2 != 0, DemFireStatistics::getTypeId2, type2)
+                .eq(type3 != null && type3 != 0, DemFireStatistics::getTypeId3, type3)
+                .eq(type4 != null && type4 != 0, DemFireStatistics::getTypeId4, type4)
+                .eq(type5 != null && type5 != 0, DemFireStatistics::getTypeId5, type5)
+                .orderByDesc(DemFireStatistics::getId);
+        List<DemFireStatistics> fireStatisticsList = this.list(queryWrapper);
+        if(CollectionUtils.isNotEmpty(fireStatisticsList)){
+            List<String> fireNumberList = new ArrayList<>();
+            for (int i = 0; i < fireStatisticsList.size(); i++) {
+                fireNumberList.add(fireStatisticsList.get(i).getFireNumber());
+            }
+            List<DemFireStatisticsAttach> demFireStatisticsAttaches = new ArrayList<>();
+            if (CollectionUtils.isNotEmpty(fireNumberList)) {
+                demFireStatisticsAttaches = demFireStatisticsAttachService.fireAccidentStatistic(fireNumberList);
+            }
+
+            List<DemFileLabel> demFileLabels = demFileLabelService.demFileLabelList(null, null, null);
+            for (int i = 0; i < fireStatisticsList.size(); i++) {
+                DemFireStatisticsExportVO demFireStatisticsExportVO = new DemFireStatisticsExportVO();
+                demFireStatisticsExportVO.setFireNumber(fireStatisticsList.get(i).getFireNumber());
+                demFireStatisticsExportVO.setFireAddress(fireStatisticsList.get(i).getFireAddress());
+                demFireStatisticsExportVO.setFireTime((fireStatisticsList.get(i).getFireTime()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+                demFireStatisticsExportVO.setFireCause(null);
+                demFireStatisticsExportVO.setFireSite(null);
+                for (int j = 0; j < demFireStatisticsAttaches.size(); j++) {
+                    if (fireStatisticsList.get(i).getFireNumber().equals(demFireStatisticsAttaches.get(j).getFireNumber())) {
+                        demFireStatisticsExportVO.setFireCause(demFireStatisticsAttaches.get(j).getFireCauseType1());
+                        demFireStatisticsExportVO.setFireSite(demFireStatisticsAttaches.get(j).getFireSiteType1());
+                    }
+                }
+                demFireStatisticsExportVO.setDirectPropertyLoss(fireStatisticsList.get(i).getDirectPropertyLoss());
+                demFireStatisticsExportVO.setBurnedArea(fireStatisticsList.get(i).getBurnedArea());
+                demFireStatisticsExportVO.setVictimNumber(fireStatisticsList.get(i).getVictimNumber());
+                demFireStatisticsExportVO.setInjuredNumber(fireStatisticsList.get(i).getInjuredNumber());
+                demFireStatisticsExportVO.setDeathToll(fireStatisticsList.get(i).getDeathToll());
+                demFireStatisticsExportVO.setFileCase(fireStatisticsList.get(i).getFileCase());
+                demFireStatisticsExportVO.setFireGrade(fireStatisticsList.get(i).getFireGrade());
+                demFireStatisticsExportVO.setSubordinateDetachment(fireStatisticsList.get(i).getSubordinateDetachment());
+                demFireStatisticsExportVO.setAdministrativeDivision(fireStatisticsList.get(i).getAdministrativeDivision());
+                list.add(demFireStatisticsExportVO);
+            }
+        }
+
+        return list;
+    }
+
     @Transactional
     @Override
     public void addLabel(DemFileLabel demFileLabel) {

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DemGridMemberServiceImpl.java

@@ -15,11 +15,13 @@ import com.usky.fire.mapper.DemGridMemberMapper;
 import com.usky.fire.service.DemGridMemberService;
 import com.usky.fire.service.DemGridMemderViceService;
 import com.usky.fire.service.util.OnlineMethod;
+import com.usky.fire.service.vo.DemGridMemberVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -73,6 +75,74 @@ public class DemGridMemberServiceImpl extends AbstractCrudService<DemGridMemberM
         return new CommonPage<>(page.getRecords(), page.getTotal(), pageSize, pageNum);
     }
 
+    @Override
+    public List<DemGridMemberVO> gridMemberListExport(String gridArea, String streetTown, String gridPersonnel, Integer id) {
+        LambdaQueryWrapper<DemGridMember> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(DemGridMember::getDeleteFlag, 0)
+                .eq(StringUtils.isNotBlank(streetTown), DemGridMember::getStreetTown, streetTown)
+                .eq(id != null&&id != 0, DemGridMember::getId, id)
+                .like(StringUtils.isNotBlank(gridArea), DemGridMember::getGridArea, gridArea)
+                .like(StringUtils.isNotBlank(gridPersonnel), DemGridMember::getGridPersonnel, gridPersonnel)
+                .orderByDesc(DemGridMember::getId);
+        List<DemGridMember> list1 = this.list(queryWrapper);
+        List<DemGridMemberVO> list = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(list1)) {
+            List<Integer> gridMemberId = new ArrayList<>();
+            for (int i = 0; i < list1.size(); i++) {
+                gridMemberId.add(list1.get(i).getId());
+            }
+            List<DemGridMemderVice> demGridMemderVicesList = new ArrayList<>();
+            if (CollectionUtils.isNotEmpty(gridMemberId)) {
+                demGridMemderVicesList = demGridMemderViceService.gridMemderViceList(gridMemberId);
+            }
+            for (int i = 0; i < list1.size(); i++) {
+                DemGridMemberVO demGridMemberVO = new DemGridMemberVO();
+                demGridMemberVO.setGridArea(list1.get(i).getGridArea());
+                demGridMemberVO.setStreetTown(list1.get(i).getStreetTown());
+                StringBuffer gridPersonStr = new StringBuffer();
+                StringBuffer gridPhoneStr = new StringBuffer();
+                StringBuffer addPersonStr = new StringBuffer();
+                StringBuffer addPhoneStr = new StringBuffer();
+                gridPersonStr.append(list1.get(i).getGridPersonnel());
+                gridPhoneStr.append(list1.get(i).getGridPhone());
+                addPersonStr.append("");
+                addPhoneStr.append("");
+                if (CollectionUtils.isNotEmpty(demGridMemderVicesList)) {
+                    for (int j = 0; j < demGridMemderVicesList.size(); j++) {
+                        if (list1.get(i).getId() == demGridMemderVicesList.get(j).getGridMemberId()) {
+                            if(demGridMemderVicesList.get(j).getPersonnelType() == 1){
+                                gridPersonStr.append(",").append(demGridMemderVicesList.get(j).getPersonnelName());
+                                gridPhoneStr.append(",").append(demGridMemderVicesList.get(j).getPhone());
+                            }
+                            if(demGridMemderVicesList.get(j).getPersonnelType() == 2){
+                                addPersonStr.append(demGridMemderVicesList.get(j).getPersonnelName()).append(",");
+                                addPhoneStr.append(demGridMemderVicesList.get(j).getPhone()).append(",");
+
+                            }
+                        }
+                    }
+                }
+                String gridPerson = gridPersonStr.toString();
+                String gridPhone = gridPhoneStr.toString();
+                String addPerson = addPersonStr.toString();
+                String addPhone = addPhoneStr.toString();
+
+                demGridMemberVO.setGridPersonnel(gridPerson);
+                demGridMemberVO.setGridPhone(gridPhone);
+                if(StringUtils.isNotBlank(addPerson)){
+                    demGridMemberVO.setAddPersonnel(addPerson.substring(0,addPerson.length()-1));
+                }
+                if(StringUtils.isNotBlank(addPhone)) {
+                    demGridMemberVO.setAddPhone(addPhone.substring(0, addPhone.length() - 1));
+                }
+                demGridMemberVO.setCreateTime((list1.get(i).getCreateTime()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+                list.add(demGridMemberVO);
+            }
+
+        }
+        return list;
+    }
+
     @Transactional
     @Override
     public void addGridMember(DemGridMember demGridMember) {

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DemStoreServiceImpl.java

@@ -0,0 +1,67 @@
+package com.usky.fire.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.usky.fire.domain.DemStore;
+import com.usky.fire.mapper.DemStoreMapper;
+import com.usky.fire.service.DemStoreService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 仓库信息表 服务实现类
+ * </p>
+ *
+ * @author ZYJ
+ * @since 2023-01-16
+ */
+@Service
+public class DemStoreServiceImpl extends AbstractCrudService<DemStoreMapper, DemStore> implements DemStoreService {
+    @Override
+    public List<Object> storeScatterer(String streetTown){
+        List<Object> list = new ArrayList<>();
+        LambdaQueryWrapper<DemStore> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.like(StringUtils.isNotBlank(streetTown), DemStore::getPoliceStation, streetTown);
+        List<DemStore> list1 = this.list(queryWrapper);
+
+        if(CollectionUtils.isNotEmpty(list1)){
+            for(int i=0;i<list1.size();i++){
+                Map<String, Object> map = new HashMap<>();
+                map.put("companyType", list1.get(i).getCompanyType());
+                map.put("companyNature", list1.get(i).getCompanyNature());
+                map.put("delegateName", list1.get(i).getDelegateName());
+                map.put("socialCode", list1.get(i).getSocialCode());
+                map.put("companyName", list1.get(i).getCompanyName());
+                map.put("policeStation", list1.get(i).getPoliceStation());
+                map.put("address", list1.get(i).getAddress());
+                map.put("longitude", list1.get(i).getLongitude());
+                map.put("latitude", list1.get(i).getLatitude());
+                map.put("fireDutyName", list1.get(i).getFireDutyName());
+                map.put("fireManageName", list1.get(i).getFireManageName());
+                map.put("linkPhone", list1.get(i).getLinkPhone());
+                map.put("fireSafetyManage", list1.get(i).getFireSafetyManage());
+                map.put("companyArea", list1.get(i).getCompanyArea());
+                map.put("industryType", list1.get(i).getIndustryType());
+                map.put("cleanRoom", list1.get(i).getCleanRoom());
+                map.put("organizationForm", list1.get(i).getOrganizationForm());
+                map.put("gridNo", list1.get(i).getGridNo());
+                map.put("particularYear", list1.get(i).getParticularYear());
+                map.put("submitTime", (list1.get(i).getSubmitTime()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+
+                list.add(map);
+            }
+        }
+
+        return list;
+    }
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/JcjAjxxServiceImpl.java

@@ -0,0 +1,90 @@
+package com.usky.fire.service.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.fire.domain.JcjAjxx;
+import com.usky.fire.mapper.JcjAjxxMapper;
+import com.usky.fire.service.JcjAjxxService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author ZYJ
+ * @since 2023-01-17
+ */
+@DS("mhsystem")
+@Service
+public class JcjAjxxServiceImpl extends AbstractCrudService<JcjAjxxMapper, JcjAjxx> implements JcjAjxxService {
+
+    @Override
+    public CommonPage<JcjAjxx> jcjAjxxList(String streetTown, String startDate, String endDate, String caseType, Integer pageNum, Integer pageSize){
+        List<String> streetTownList = new ArrayList<>();
+        if(StringUtils.isNotBlank(streetTown)){
+            String[] splitList = streetTown.split(",");
+            for(int i=0;i<splitList.length;i++){
+                streetTownList.add(splitList[i]);
+            }
+        }
+        IPage<JcjAjxx> page = new Page<>(pageNum, pageSize);
+        LambdaQueryWrapper<JcjAjxx> queryWrapper = Wrappers.lambdaQuery();
+        if(streetTownList.size()>0){
+            queryWrapper.in(JcjAjxx::getStreettown, streetTownList);
+        }
+        queryWrapper.between(StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate), JcjAjxx::getLasj, startDate, endDate)
+                    .eq(StringUtils.isNotBlank(caseType), JcjAjxx::getAjlx, caseType)
+                    .eq(JcjAjxx::getYxx,0)
+                    .orderByDesc(JcjAjxx::getId);
+        page = this.page(page, queryWrapper);
+        return new CommonPage<>(page.getRecords(), page.getTotal(), pageNum, pageSize);
+
+    }
+
+    @Override
+    public Map<String,Object> jcjAjxxStatistics(String streetTown, String startDate, String endDate){
+        Map<String, Object> map = new HashMap<>();
+        int fireCount = 0;
+        int socialCount = 0;
+        int emergencyCount = 0;
+        fireCount = this.ajCount(streetTown, startDate, endDate, "火灾");
+        map.put("fireCount",fireCount);
+        socialCount = this.ajCount(streetTown, startDate, endDate, "社会救助");
+        map.put("socialCount",socialCount);
+        emergencyCount = this.ajCount(streetTown, startDate, endDate, "抢险救援");
+        map.put("emergencyCount",emergencyCount);
+
+        return map;
+    }
+
+    @Override
+    public Integer ajCount(String streetTown, String startDate, String endDate, String caseType){
+        List<String> streetTownList = new ArrayList<>();
+        String[] str = streetTown.split(",");
+        for(int i=0;i<str.length;i++){
+            streetTownList.add(str[i]);
+        }
+        LambdaQueryWrapper<JcjAjxx> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.in(JcjAjxx::getStreettown, streetTownList)
+                    .between(StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate), JcjAjxx::getLasj, startDate, endDate)
+                    .eq(JcjAjxx::getAjlx, caseType)
+                    .eq(JcjAjxx::getYxx, 0);
+        int count = this.count(queryWrapper);
+
+        return count;
+    }
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/mqtt/alarm/Alarm.java

@@ -20,6 +20,7 @@ import java.time.ZoneOffset;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Timer;
 
 /**
  * @author yq

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/BaseCompanyPersonVO.java

@@ -0,0 +1,95 @@
+package com.usky.fire.service.vo;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.ruoyi.common.core.annotation.Excel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 值班查岗信息表
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-01-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+
+public class BaseCompanyPersonVO {
+
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 单位名称
+     */
+    @Excel(name = "单位名称")
+    private String companyName;
+
+    /**
+     * 单位编号
+     */
+    @Excel(name = "单位编号")
+    private String companyCode;
+
+    /**
+     * 消防安全责任人姓名
+     */
+    @Excel(name = "消防安全责任人")
+    private String fireDutyName;
+
+    /**
+     * 消防安全责任人电话
+     */
+    @Excel(name = "消防安全责任人电话")
+    private String fireDutyPhone;
+
+    /**
+     * 消防安全管理人姓名
+     */
+    @Excel(name = "消防安全管理人")
+    private String fireManageName;
+
+    /**
+     * 消防安全管理人电话
+     */
+    @Excel(name = "消防安全管理人电话")
+    private String fireManagePhone;
+
+    /**
+     * 消防控制室电话
+     */
+    @Excel(name = "消防控制室电话")
+    private String fireControlPhone;
+
+    /**
+     * 查岗次数
+     */
+    @Excel(name = "查岗次数")
+    private Integer inspectCount;
+
+    /**
+     * 应答次数
+     */
+    @Excel(name = "应答次数")
+    private Integer answerCount;
+
+    /**
+     * 最后查岗时间
+     */
+    @Excel(name = "最后查岗时间")
+    private String inspectTime;
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/CompanyExportVO.java

@@ -0,0 +1,148 @@
+package com.usky.fire.service.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.ruoyi.common.core.annotation.Excel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-01-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class CompanyExportVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 单位名称
+     */
+    @Excel(name = "单位名称")
+    private String companyName;
+
+    /**
+     * 组织机构编码
+     */
+    @Excel(name = "组织机构代码")
+    private String organization;
+
+    /**
+     * 法人代表姓名
+     */
+    @Excel(name = "法人代表")
+    private String delegateName;
+
+    /**
+     * 单位详细地址
+     */
+    @Excel(name = "单位地址")
+    private String address;
+
+    /**
+     * 单位类型
+     */
+    @Excel(name = "单位类型")
+    private String companyType;
+
+    /**
+     * 火灾危险性
+     */
+    @Excel(name = "火灾危险性")
+    private String fireHazard;
+
+    /**
+     * 单位联系电话
+     */
+    @Excel(name = "单位电话")
+    private String linkPhone;
+
+    /**
+     * 单位成立时间
+     */
+    @Excel(name = "成立时间")
+    private LocalDateTime foundTime;
+
+    /**
+     * 单位性质
+     */
+    @Excel(name = "单位性质")
+    private Integer companyNature;
+
+    /**
+     * 行政区域
+     */
+    @Excel(name = "行政区域")
+    private String administrativeDivision;
+
+    /**
+     * 固定资产（单位：万元）
+     */
+    @Excel(name = "固定资产（万元）")
+    private String fixedAssets;
+
+    /**
+     * 占地面积
+     */
+    @Excel(name = "占地面积")
+    private String coverArea;
+
+    /**
+     * 建筑面积
+     */
+    @Excel(name = "建筑面积")
+    private String buildArea;
+
+    /**
+     * 职工人数
+     */
+    @Excel(name = "职工人数")
+    private String employeeNum;
+
+    /**
+     * 单位主属性
+     */
+    @Excel(name = "单位属性")
+    private String mainAttribute;
+
+    /**
+     * 管辖机构（含大队）
+     */
+    @Excel(name = "管辖机构")
+    private String governBody;
+
+    /**
+     * 消防安全责任人姓名
+     */
+    @Excel(name = "消防安全责任人")
+    private String fireDutyName;
+
+    /**
+     * 消防安全管理人姓名
+     */
+    @Excel(name = "消防安全管理人")
+    private String fireManageName;
+
+    /**
+     * 创建时间
+     */
+    @Excel(name = "创建时间")
+    private String createTime;
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/DemEnforceReportComplaintVO.java

@@ -0,0 +1,140 @@
+package com.usky.fire.service.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.ruoyi.common.core.annotation.Excel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-01-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class DemEnforceReportComplaintVO {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 流水号
+     */
+    @Excel(name = "流水号")
+    private String serialNumber;
+
+    /**
+     * 举报人
+     */
+    @Excel(name = "举报人")
+    private String reportPerson;
+
+    /**
+     * 举报电话
+     */
+    @Excel(name = "举报电话")
+    private String reportPhone;
+
+    /**
+     * 工单状态
+     */
+    @Excel(name = "工单状态")
+    private String workOrderStatus;
+
+    /**
+     * 举报方式
+     */
+    @Excel(name = "举报方式")
+    private String reportMethod;
+
+    /**
+     * 举报地址
+     */
+    @Excel(name = "举报地址")
+    private String reportAddress;
+
+    /**
+     * 举报内容
+     */
+    @Excel(name = "举报内容")
+    private String reportContent;
+
+    /**
+     * 举报时间
+     */
+    @Excel(name = "举报时间")
+    private String reportTime;
+
+    /**
+     * 受理时间
+     */
+    @Excel(name = "受理时间")
+    private String acceptTime;
+
+    /**
+     * 工单类别
+     */
+    @Excel(name = "工单类别")
+    private Integer workOrderType;
+
+    /**
+     * 管辖单位
+     */
+    @Excel(name = "管辖单位")
+    private String governCompany;
+
+    /**
+     * 管辖区域
+     */
+    @Excel(name = "管辖区域")
+    private String governArea;
+
+    /**
+     * 事实认定
+     */
+    @Excel(name = "事实认定")
+    private String factFind;
+
+    /**
+     * 办结时间
+     */
+    @Excel(name = "办结时间")
+    private String completeTime;
+
+    /**
+     * 回访状态
+     */
+    @Excel(name = "回访状态")
+    private Integer followUpStatus;
+
+    /**
+     * 举报的录音
+     */
+    @Excel(name = "举报的录音")
+    private String reportRecord;
+
+    /**
+     * 举报来源
+     */
+    @Excel(name = "举报来源")
+    private String reportSource;
+
+    /**
+     * 是否满意
+     */
+    @Excel(name = "是否满意")
+    private Integer satisfiedType;
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/DemFireStatisticsExportVO.java

@@ -0,0 +1,117 @@
+package com.usky.fire.service.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.ruoyi.common.core.annotation.Excel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-02-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+
+public class DemFireStatisticsExportVO {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 火灾序号
+     */
+    @Excel(name = "火灾序号")
+    private String fireNumber;
+
+    /**
+     * 起火地址
+     */
+    @Excel(name = "起火地址")
+    private String fireAddress;
+
+    /**
+     * 起火时间
+     */
+    @Excel(name = "起火时间")
+    private String fireTime;
+
+    /**
+     * 起火原因
+     */
+    @Excel(name = "起火原因")
+    private String fireCause;
+
+    /**
+     * 起火场所
+     */
+    @Excel(name = "起火场所")
+    private String fireSite;
+
+    /**
+     * 财产损失
+     */
+    @Excel(name = "财产损失")
+    private String directPropertyLoss;
+
+    /**
+     * 过火面积
+     */
+    @Excel(name = "过火面积")
+    private String burnedArea;
+
+    /**
+     * 受灾数
+     */
+    @Excel(name = "受灾数")
+    private String victimNumber;
+
+    /**
+     * 受伤数
+     */
+    @Excel(name = "受伤数")
+    private String injuredNumber;
+
+    /**
+     * 死亡数
+     */
+    @Excel(name = "死亡数")
+    private String deathToll;
+
+    /**
+     * 是否立案
+     */
+    @Excel(name = "是否立案")
+    private String fileCase;
+
+    /**
+     * 火灾等级
+     */
+    @Excel(name = "火灾等级")
+    private String fireGrade;
+
+    /**
+     * 所属支队
+     */
+    @Excel(name = "所属支队")
+    private String subordinateDetachment;
+
+    /**
+     * 行政区域
+     */
+    @Excel(name = "行政区域")
+    private String administrativeDivision;
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/DemGridMemberVO.java

@@ -0,0 +1,75 @@
+package com.usky.fire.service.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.ruoyi.common.core.annotation.Excel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 网格员信息表
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-01-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+
+public class DemGridMemberVO {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 网格区域
+     */
+    @Excel(name = "网格区域")
+    private String gridArea;
+
+    /**
+     * 街镇
+     */
+    @Excel(name = "街镇")
+    private String streetTown;
+
+    /**
+     * 网格人员姓名
+     */
+    @Excel(name = "网格人员姓名")
+    private String gridPersonnel;
+
+    /**
+     * 联系方式
+     */
+    @Excel(name = "联系方式")
+    private String gridPhone;
+
+    /**
+     * 增员人员姓名
+     */
+    @Excel(name = "增员人员姓名")
+    private String addPersonnel;
+
+    /**
+     * 联系方式
+     */
+    @Excel(name = "联系方式")
+    private String addPhone;
+
+    /**
+     * 创建时间
+     */
+    @Excel(name = "创建时间")
+    private String createTime;
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/MqttDataVO.java

@@ -0,0 +1,35 @@
+package com.usky.fire.service.vo;
+
+import lombok.Data;
+
+/**
+ * @author zyj
+ * @date 2023-01-11
+ */
+@Data
+public class MqttDataVO {
+    /**
+     * 设备编号
+     */
+    private String devId;
+
+    /**
+     * 设备类型
+     */
+    private Integer deviceType;
+
+    /**
+     * 单位编号
+     */
+    private String companyId;
+
+    /**
+     * 系统类型 (1.火灾自动报警系统 2.自动喷水灭火系统 3.消防给水及消火栓系统 4.防排烟系统 5.电气火灾系统 6.消防视频监控系统)
+     */
+    private Integer systemType;
+
+    /**
+     * 单位名称
+     */
+    private String companyName;
+}

service-fire/service-fire-biz/src/main/resources/mapper/fire/DemStoreMapper.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.usky.fire.mapper.DemStoreMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemStore">
+        <id column="id" property="id" />
+        <result column="company_type" property="companyType" />
+        <result column="company_nature" property="companyNature" />
+        <result column="delegate_name" property="delegateName" />
+        <result column="social_code" property="socialCode" />
+        <result column="company_name" property="companyName" />
+        <result column="police_station" property="policeStation" />
+        <result column="address" property="address" />
+        <result column="longitude" property="longitude" />
+        <result column="latitude" property="latitude" />
+        <result column="fire_duty_name" property="fireDutyName" />
+        <result column="fire_manage_name" property="fireManageName" />
+        <result column="link_phone" property="linkPhone" />
+        <result column="fire_safety_manage" property="fireSafetyManage" />
+        <result column="company_area" property="companyArea" />
+        <result column="industry_type" property="industryType" />
+        <result column="clean_room" property="cleanRoom" />
+        <result column="organization_form" property="organizationForm" />
+        <result column="grid_no" property="gridNo" />
+        <result column="particular_year" property="particularYear" />
+        <result column="submit_time" property="submitTime" />
+    </resultMap>
+
+</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/JcjAjxxMapper.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.usky.fire.mapper.JcjAjxxMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.fire.domain.JcjAjxx">
+        <id column="ID" property="id" />
+        <result column="GIS_X" property="gisX" />
+        <result column="GIS_Y" property="gisY" />
+        <result column="SJC" property="sjc" />
+        <result column="zgzd" property="zgzd" />
+        <result column="ajsjd" property="ajsjd" />
+        <result column="tzdcsj" property="tzdcsj" />
+        <result column="tzcssj" property="tzcssj" />
+        <result column="tzkzsj" property="tzkzsj" />
+        <result column="tzxmsj" property="tzxmsj" />
+        <result column="tzfdsj" property="tzfdsj" />
+        <result column="qy" property="qy" />
+        <result column="ajlx" property="ajlx" />
+        <result column="afdz" property="afdz" />
+        <result column="lasj" property="lasj" />
+        <result column="larq" property="larq" />
+        <result column="czdx" property="czdx" />
+        <result column="ajlxdm" property="ajlxdm" />
+        <result column="ajdj" property="ajdj" />
+        <result column="zhongdui" property="zhongdui" />
+        <result column="qx" property="qx" />
+        <result column="ajbh" property="ajbh" />
+        <result column="ajzt" property="ajzt" />
+        <result column="ajxz" property="ajxz" />
+        <result column="tzsj" property="tzsj" />
+        <result column="dcsj" property="dcsj" />
+        <result column="cssj" property="cssj" />
+        <result column="kzsj" property="kzsj" />
+        <result column="xmsj" property="xmsj" />
+        <result column="fdsj" property="fdsj" />
+        <result column="bcxx" property="bcxx" />
+        <result column="cdcl" property="cdcl" />
+        <result column="ajqy" property="ajqy" />
+        <result column="BDP_AUDIT" property="bdpAudit" />
+        <result column="ZGJGBH" property="zgjgbh" />
+        <result column="STREETTOWN" property="streettown" />
+        <result column="created" property="created" />
+        <result column="updated" property="updated" />
+        <result column="yxx" property="yxx" />
+        <result column="qrqk" property="qrqk" />
+        <result column="fair_is" property="fairIs" />
+    </resultMap>
+
+</mapper>