消防执法动态相关接口开发

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_atl_inspect_voucher");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
+        strategy.setInclude("dem_enforce_project_all");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
         mpg.setStrategy(strategy);
 
         // 关闭默认 xml 生成，调整生成 至 根目录

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

@@ -50,8 +50,9 @@ public class BscLawTrendController {
     }
 
     @GetMapping("monthLaw")
-    public ApiResult<Object> monthLaw() {
-        return ApiResult.success(bscLawTrendService.reportComplaint());
+    public ApiResult<Void> monthLaw() {
+        bscLawTrendService.lawEnforcement();
+        return ApiResult.success();
     }
 
 }

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/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/DemVehicleController.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("/demVehicle")
+public class DemVehicleController {
+
+}
+

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/TaskController.java

@@ -1,10 +1,7 @@
 package com.usky.fire.controller.web;
 
 
-import com.usky.fire.service.BscEnterpriseAutonomyService;
-import com.usky.fire.service.BscEnterpriseScreenService;
-import com.usky.fire.service.BscEnterpriseStreetTownService;
-import com.usky.fire.service.MhPostInspectService;
+import com.usky.fire.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -29,6 +26,9 @@ public class TaskController {
     @Autowired
     private BscEnterpriseStreetTownService bscEnterpriseStreetTownService;
 
+    @Autowired
+    private BscLawTrendService bscLawTrendService;
+
     //    @Scheduled(cron = "0/5 * *  * * ?") // 间隔5秒执行
     @Scheduled(cron = "0 0/5 * * * ? ") // 间隔5分钟执行
     public void task() {
@@ -48,6 +48,7 @@ public class TaskController {
         System.out.println(Thread.currentThread().getName() + "企业自主管理(全、街道)大屏定时任务执行中");
         bscEnterpriseAutonomyService.enterpriseAutonomyTask();
         bscEnterpriseStreetTownService.enterpriseStreetTownTask();
+        bscLawTrendService.lawEnforcement();
     }
 
 }

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

@@ -0,0 +1,276 @@
+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-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DemAtlDisagree implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 不同意使用ID
+     */
+    private String disagreeId;
+
+    /**
+     * 项目编号
+     */
+    private String projectCode;
+
+    /**
+     * 源法律文书ID
+     */
+    private String sourcePaperId;
+
+    /**
+     * 源法律文书类别
+     */
+    private String sourcePaperType;
+
+    /**
+     * 文号1
+     */
+    private String documentNumber1;
+
+    /**
+     * 文号2
+     */
+    private String documentNumber2;
+
+    /**
+     * 文号3
+     */
+    private String documentNumber3;
+
+    /**
+     * 文号4
+     */
+    private String documentNumber4;
+
+    /**
+     * 文号
+     */
+    private String documentNumber;
+
+    /**
+     * 公安局
+     */
+    private String publicSecurity;
+
+    /**
+     * 文书抬头
+     */
+    private String paperTitle;
+
+    /**
+     * 单位名称
+     */
+    private String companyName;
+
+    /**
+     * 检查申请
+     */
+    private String inspectRequest;
+
+    /**
+     * 检查单位
+     */
+    private String inspectCompany;
+
+    /**
+     * 检查日期
+     */
+    private LocalDateTime inspectTime;
+
+    /**
+     * 法律规定
+     */
+    private String legalProvision;
+
+    /**
+     * 不同意内容
+     */
+    private String disagreeContent;
+
+    /**
+     * 申请行政复议单位
+     */
+    private String reconsiderCompany;
+
+    /**
+     * 人民法院
+     */
+    private String peopleCourt;
+
+    /**
+     * 填发日期
+     */
+    private LocalDateTime fillingTime;
+
+    /**
+     * 审批人账号
+     */
+    private String approverAccount;
+
+    /**
+     * 审批人姓名
+     */
+    private String approverName;
+
+    /**
+     * 审批时间
+     */
+    private LocalDateTime approvalTime;
+
+    /**
+     * 审批意见
+     */
+    private String approvalOpinion;
+
+    /**
+     * 是否送达
+     */
+    private String whetherService;
+
+    /**
+     * 送达方式
+     */
+    private String serviceMode;
+
+    /**
+     * 法律文书版本号
+     */
+    private String sourcePaperVersion;
+
+    /**
+     * 主管单位
+     */
+    private String competentCompany;
+
+    /**
+     * 录入人账号
+     */
+    private String enteredAccount;
+
+    /**
+     * 录入人姓名
+     */
+    private String enteredName;
+
+    /**
+     * 录入时间
+     */
+    private LocalDateTime enteredTime;
+
+    /**
+     * 录入人IP
+     */
+    private String enteredIp;
+
+    /**
+     * 修改人账号
+     */
+    private String updateAccount;
+
+    /**
+     * 修改人姓名
+     */
+    private String updateName;
+
+    /**
+     * 修改时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 修改IP
+     */
+    private String updateIp;
+
+    /**
+     * 是否删除
+     */
+    private String deleteFlag;
+
+    /**
+     * 备用字段1
+     */
+    private String alternateField1;
+
+    /**
+     * 备用字段2
+     */
+    private String alternateField2;
+
+    /**
+     * 备用字段3
+     */
+    private String alternateField3;
+
+    /**
+     * 备用字段4
+     */
+    private String alternateField4;
+
+    /**
+     * 备用字段5
+     */
+    private String alternateField5;
+
+    /**
+     * Row_Version
+     */
+    private String rowVersion;
+
+    /**
+     * Csdz
+     */
+    private String csdz;
+
+    /**
+     * spbId
+     */
+    private String spbId;
+
+    /**
+     * IsRead
+     */
+    private String isRead;
+
+    /**
+     * ReadTime
+     */
+    private LocalDateTime readTime;
+
+    /**
+     * BDP_AUDIT
+     */
+    private LocalDateTime bdpAudit;
+
+    /**
+     * unionKey
+     */
+    private String unionKey;
+
+
+}

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

@@ -0,0 +1,491 @@
+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-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DemEnforceProjectAll implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 项目编号
+     */
+    private String projectCode;
+
+    /**
+     * 项目名称
+     */
+    private String projectName;
+
+    /**
+     * 项目单位ID
+     */
+    private String projectCompanyId;
+
+    /**
+     * 项目单位名称
+     */
+    private String projectCompanyName;
+
+    /**
+     * 项目单位地址
+     */
+    private String projectCompanyAddress;
+
+    /**
+     * 项目单位类别
+     */
+    private Integer projectCompanyType;
+
+    /**
+     * 监管单位类别（重点单位等）
+     */
+    private String superviseCompanyType;
+
+    /**
+     * 项目总类型
+     */
+    private Integer projectType;
+
+    /**
+     * 项目分类型一
+     */
+    private String projectBranchType1;
+
+    /**
+     * 项目类型一
+     */
+    private String projectTypeDescribe1;
+
+    /**
+     * 项目分类型二
+     */
+    private String projectBranchType2;
+
+    /**
+     * 项目类型二
+     */
+    private String projectTypeDescribe2;
+
+    /**
+     * 关联项目编号
+     */
+    private String relateProjectCode;
+
+    /**
+     * 关联项目类别
+     */
+    private String relateProjectType;
+
+    /**
+     * 关联法律文书ID
+     */
+    private String relatePaperId;
+
+    /**
+     * 关联法律文书类别
+     */
+    private String relatePaperType;
+
+    /**
+     * 关联ID1(备用)
+     */
+    private String relateId1;
+
+    /**
+     * 关联ID2(备用)
+     */
+    private String relateId2;
+
+    /**
+     * 项目状态
+     */
+    private String projectStatus;
+
+    /**
+     * 项目状态值
+     */
+    private String projectStatusValue;
+
+    /**
+     * 项目备用状态
+     */
+    private String projectSpareStatus;
+
+    /**
+     * 项目结果
+     */
+    private String projectResult;
+
+    /**
+     * 项目结果名称
+     */
+    private String projectResultName;
+
+    /**
+     * 结案状态
+     */
+    private String closeStatus;
+
+    /**
+     * 主管单位
+     */
+    private String competentCompany;
+
+    /**
+     * 主管单位简称（含大队）
+     */
+    private String competentCompanyName;
+
+    /**
+     * 受理单位
+     */
+    private String acceptCompany;
+
+    /**
+     * 项目创建日期
+     */
+    private LocalDateTime projectCreateTime;
+
+    /**
+     * 项目完成日期
+     */
+    private LocalDateTime projectCompleteTime;
+
+    /**
+     * 截止日期
+     */
+    private LocalDateTime closeDate;
+
+    /**
+     * 处理时间
+     */
+    private LocalDateTime processTime;
+
+    /**
+     * 是否有制发法律文书
+     */
+    private String legalPaper;
+
+    /**
+     * 受理方式
+     */
+    private String acceptMethod;
+
+    /**
+     * 行政区域编号
+     */
+    private String administrativeDivision;
+
+    /**
+     * CBRAcc
+     */
+    private String cbrAcc;
+
+    /**
+     * 主承办人姓名
+     */
+    private String undertaker;
+
+    /**
+     * XCBAcc
+     */
+    private String xcbAcc;
+
+    /**
+     * 协办人姓名
+     */
+    private String coOrganizer;
+
+    /**
+     * 录入人账号
+     */
+    private String enteredAccount;
+
+    /**
+     * 录入人姓名
+     */
+    private String enteredName;
+
+    /**
+     * 录入时间
+     */
+    private LocalDateTime enteredTime;
+
+    /**
+     * 删除标识
+     */
+    private String deleteFlag;
+
+    /**
+     * SpareFiled1
+     */
+    private String spareFiled1;
+
+    /**
+     * SpareFiled2
+     */
+    private String spareFiled2;
+
+    /**
+     * 是否抽中
+     */
+    private String winLottery;
+
+    /**
+     * SpareFiled4
+     */
+    private String spareFiled4;
+
+    /**
+     * SpareFiled5
+     */
+    private LocalDateTime spareFiled5;
+
+    /**
+     * 项目备用状态2(隐患整改情况) 隐患跟踪： 0未改正，1已改正
+     */
+    private String projectSpareStatus2;
+
+    /**
+     * 项目备用状态3
+     */
+    private String projectSpareStatus3;
+
+    /**
+     * 项目分类型三 L 临时查封项目
+     */
+    private String projectBranchType3;
+
+    /**
+     * 销案时间
+     */
+    private LocalDateTime closeCaseTime;
+
+    /**
+     * 复查时间
+     */
+    private LocalDateTime reviewTime;
+
+    /**
+     * 复查时间2
+     */
+    private LocalDateTime reviewTime2;
+
+    /**
+     * 主要用于审验和备案，标记项目档案的监管单位的归属哪个管辖
+     */
+    private String revertCompany;
+
+    /**
+     * 主管单位ID
+     */
+    private String competentCompanyId;
+
+    /**
+     * ItemFinalResult
+     */
+    private String itemFinalResult;
+
+    /**
+     * ItemStateBak4
+     */
+    private String itemStateBak4;
+
+    /**
+     * 修改时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 总队机构ID
+     */
+    private String corpsOrganizateId;
+
+    /**
+     * 支队机构ID
+     */
+    private String detachOrganizateId;
+
+    /**
+     * 是否派出所数据
+     */
+    private String policeData;
+
+    /**
+     * ItemTypeSubFour
+     */
+    private String itemTypeSubfour;
+
+    /**
+     * Row_Version
+     */
+    private String rowVersion;
+
+    /**
+     * JZID
+     */
+    private String jzId;
+
+    /**
+     * IsXSSC
+     */
+    private String isXssc;
+
+    /**
+     * KTZLGZ
+     */
+    private String ktzlgz;
+
+    /**
+     * CPJDJCWZ
+     */
+    private String cpjdjcwz;
+
+    /**
+     * BHGYWYY
+     */
+    private String bhgywyy;
+
+    /**
+     * CPJD_GCID
+     */
+    private String cpjdGcid;
+
+    /**
+     * CPJD_CCJHID
+     */
+    private String cpjdCcjhid;
+
+    /**
+     * ISLMQY
+     */
+    private String islmqy;
+
+    /**
+     * HLWZF
+     */
+    private String hlwzf;
+
+    /**
+     * HLWCS
+     */
+    private String hlwcs;
+
+    /**
+     * INSTANCEID
+     */
+    private String instanceid;
+
+    /**
+     * SN
+     */
+    private String sn;
+
+    /**
+     * PROJECTCODE
+     */
+    private String projectcode;
+
+    /**
+     * PROJECT
+     */
+    private String project;
+
+    /**
+     * TZSPRESULT
+     */
+    private String tzspresult;
+
+    /**
+     * DISTRICT
+     */
+    private String disrict;
+
+    /**
+     * PROJECTNAME
+     */
+    private String projectname;
+
+    /**
+     * lawID
+     */
+    private String lawId;
+
+    /**
+     * JSProjectCode
+     */
+    private String jsprojectCode;
+
+    /**
+     * ApplyNo
+     */
+    private String applyNo;
+
+    /**
+     * ApplyCardNum
+     */
+    private String applyCardNum;
+
+    /**
+     * PeopleCardNum
+     */
+    private String peopleCardNum;
+
+    /**
+     * BelongSystem
+     */
+    private String belongSystem;
+
+    /**
+     * SPBDDJ
+     */
+    private String spbddj;
+
+    /**
+     * CLProcess
+     */
+    private String clpRocess;
+
+    /**
+     * BDP_AUDIT
+     */
+    private LocalDateTime bdpAudit;
+
+    /**
+     * 支队机构填充ID
+     */
+    private String branchId;
+
+    /**
+     * 支队级简称（总队及各支队）
+     */
+    private String branchName;
+
+    /**
+     * unionKey
+     */
+    private String unionKey;
+
+
+}

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

@@ -0,0 +1,394 @@
+package com.usky.fire.domain;
+
+import java.math.BigDecimal;
+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-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DemVehicle implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 车辆信息
+     */
+    private String vehicleId;
+
+    /**
+     * 单件装备编码
+     */
+    private String singleEquipCode;
+
+    /**
+     * 装备名称
+     */
+    private String equipName;
+
+    /**
+     * 装备编码
+     */
+    private String equipCode;
+
+    /**
+     * 上级装备编码
+     */
+    private String superiorEquipCode;
+
+    /**
+     * 装备类型代码
+     */
+    private String equipTypeCode;
+
+    /**
+     * 单件装备状况代码
+     */
+    private String singleEquipStatus;
+
+    /**
+     * 所属消防机构
+     */
+    private String fireOrga;
+
+    /**
+     * GPS编号
+     */
+    private String gpsCode;
+
+    /**
+     * 车辆等级代码
+     */
+    private String vehicleClassCode;
+
+    /**
+     * 车牌号码
+     */
+    private String licensePlate;
+
+    /**
+     * 规格号码
+     */
+    private String standardCode;
+
+    /**
+     * 资产编号
+     */
+    private String assetCode;
+
+    /**
+     * 参考价
+     */
+    private BigDecimal referencePrice;
+
+    /**
+     * 商标
+     */
+    private String trademark;
+
+    /**
+     * 颜色
+     */
+    private String colour;
+
+    /**
+     * 国别代码
+     */
+    private String countryCode;
+
+    /**
+     * 生产厂家代码
+     */
+    private String productCode;
+
+    /**
+     * 生产厂家名称
+     */
+    private String productName;
+
+    /**
+     * 装备日期
+     */
+    private LocalDateTime equipTime;
+
+    /**
+     * 报废日期
+     */
+    private LocalDateTime scrapTime;
+
+    /**
+     * 有效期至
+     */
+    private LocalDateTime validityTime;
+
+    /**
+     * 车架号
+     */
+    private String frameCode;
+
+    /**
+     * 发动机编号
+     */
+    private String engineCode;
+
+    /**
+     * 批次号
+     */
+    private String batchCode;
+
+    /**
+     * 计量单位代码
+     */
+    private String uomCode;
+
+    /**
+     * 车辆状态码_灭火
+     */
+    private String fireFightStatus;
+
+    /**
+     * 记录状态
+     */
+    private BigDecimal recordStatus;
+
+    /**
+     * 传输状态
+     */
+    private String tranStatus;
+
+    /**
+     * 时间戳
+     */
+    private LocalDateTime timeStamp;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 电台呼号
+     */
+    private String radioCallSign;
+
+    /**
+     * 处警单编号
+     */
+    private String policeListCode;
+
+    /**
+     * 是否装配
+     */
+    private String whetherAssemble;
+
+    /**
+     * 是否跨支队
+     */
+    private String whetherCrossDeta;
+
+    /**
+     * 是否跨总队
+     */
+    private String whetherCrossTeam;
+
+    /**
+     * 车辆编号
+     */
+    private String vehicleCode;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    private LocalDateTime ccrq;
+
+    /**
+     * 车辆简称
+     */
+    private String vehicleAbbreviat;
+
+    /**
+     * 电台频道
+     */
+    private String radioChannel;
+
+    private String gisX;
+
+    private String gisY;
+
+    /**
+     * 指挥员姓名
+     */
+    private String commanderName;
+
+    /**
+     * 通信员
+     */
+    private String reporter;
+
+    /**
+     * 驾驶员
+     */
+    private String driver;
+
+    /**
+     * 战斗员人数
+     */
+    private String soldierNumber;
+
+    private String zdbz;
+
+    private String sjjsy;
+
+    private String tczhc;
+
+    /**
+     * 类型编号
+     */
+    private String typeCode;
+
+    /**
+     * 启用标志
+     */
+    private String enableFlag;
+
+    /**
+     * 载水(吨)
+     */
+    private String carryWater;
+
+    /**
+     * 载泡(吨)
+     */
+    private String carryVesicle;
+
+    /**
+     * 泵流量
+     */
+    private String pumpFlow;
+
+    /**
+     * 泡流量
+     */
+    private String vesicleFlow;
+
+    /**
+     * 云梯高度
+     */
+    private String scalingHegiht;
+
+    private BigDecimal ledsx;
+
+    private String xzjgid;
+
+    private String zldm;
+
+    /**
+     * 指挥员id
+     */
+    private String commanderId;
+
+    /**
+     * 通讯员id
+     */
+    private String reporterId;
+
+    /**
+     * 驾驶员id
+     */
+    private String driverId;
+
+    /**
+     * 战士人员
+     */
+    private String soldier;
+
+    /**
+     * 战士人员id
+     */
+    private String soldierId;
+
+    private BigDecimal ledcmsx;
+
+    private String stbll;
+
+    private String blbz;
+
+    private String pdabh;
+
+    private String sfdyjg;
+
+    private String cldtid;
+
+    private LocalDateTime bdpAudtt;
+
+    private LocalDateTime sjc;
+
+    /**
+     * 车辆状态
+     */
+    private String vehicleStatus;
+
+    /**
+     * 装备类型名称
+     */
+    private String equipTypeName;
+
+    /**
+     * 机构名称
+     */
+    private String orgaName;
+
+    /**
+     * 机构简称
+     */
+    private String orgaDesc;
+
+    private String jgtree;
+
+    /**
+     * 机构缩写
+     */
+    private String orgaAbbrevia;
+
+    /**
+     * 机构显示顺序
+     */
+    private Integer orgaSort;
+
+    /**
+     * 车辆最大人数限制
+     */
+    private BigDecimal standardNum;
+
+    private String carUrl;
+
+    private String sjjgId;
+
+    private String zhiDui;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+
+}

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

@@ -0,0 +1,180 @@
+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-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DemVehicleFight implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 车辆作战信息ID
+     */
+    private String vehicleFightId;
+
+    /**
+     * 消防机构ID
+     */
+    private String fireOrgaId;
+
+    /**
+     * 处警记录ID
+     */
+    private String policeRecordId;
+
+    /**
+     * 车辆ID
+     */
+    private String vehicleId;
+
+    /**
+     * 装备类型代码
+     */
+    private String equipTypeCode;
+
+    private String zzgnmc;
+
+    /**
+     * 作战功能代码
+     */
+    private String fightFunctionCode;
+
+    /**
+     * 通知时间
+     */
+    private LocalDateTime noticeTime;
+
+    /**
+     * 出动时间
+     */
+    private LocalDateTime dispatchTime;
+
+    /**
+     * 到场时间
+     */
+    private LocalDateTime arrivalTime;
+
+    /**
+     * 出水时间
+     */
+    private LocalDateTime effluentTime;
+
+    /**
+     * 停水时间
+     */
+    private LocalDateTime cutOffTime;
+
+    /**
+     * 返队时间
+     */
+    private LocalDateTime returnTime;
+
+    /**
+     * 实际出动时间
+     */
+    private LocalDateTime actualDispatchTime;
+
+    /**
+     * 驾驶员
+     */
+    private String driver;
+
+    /**
+     * 驾驶员id
+     */
+    private String driverId;
+
+    /**
+     * 指挥员
+     */
+    private String commander;
+
+    /**
+     * 指挥员id
+     */
+    private String commanderId;
+
+    /**
+     * 通讯员
+     */
+    private String reporter;
+
+    /**
+     * 通讯员id
+     */
+    private String reporterId;
+
+    /**
+     * 战士人员
+     */
+    private String soldier;
+
+    /**
+     * 战士人员id
+     */
+    private String soldierId;
+
+    /**
+     * 车辆简称
+     */
+    private String vehicleAbbreviat;
+
+    /**
+     * 时间戳
+     */
+    private LocalDateTime timeStamp;
+
+    /**
+     * 记录状态
+     */
+    private String recordStatus;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 主管中队
+     */
+    private String chargeSquadron;
+
+    /**
+     * 机构简称
+     */
+    private String orgaAbbreviat;
+
+    /**
+     * 案件id
+     */
+    private String caseId;
+
+    private String dthh;
+
+
+}

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

@@ -0,0 +1,16 @@
+package com.usky.fire.mapper;
+
+import com.usky.fire.domain.DemAtlDisagree;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 不同意使用 Mapper 接口
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-10-19
+ */
+public interface DemAtlDisagreeMapper extends CrudMapper<DemAtlDisagree> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.usky.fire.mapper;
+
+import com.usky.fire.domain.DemEnforceProjectAll;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 监督管理项目全表 Mapper 接口
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-10-19
+ */
+public interface DemEnforceProjectAllMapper extends CrudMapper<DemEnforceProjectAll> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.usky.fire.mapper;
+
+import com.usky.fire.domain.DemVehicleFight;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 车辆作战信息 Mapper 接口
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-10-19
+ */
+public interface DemVehicleFightMapper extends CrudMapper<DemVehicleFight> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.usky.fire.mapper;
+
+import com.usky.fire.domain.DemVehicle;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 车辆信息 Mapper 接口
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-10-19
+ */
+public interface DemVehicleMapper extends CrudMapper<DemVehicle> {
+
+}

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

@@ -0,0 +1,22 @@
+package com.usky.fire.service;
+
+import com.usky.common.mybatis.core.CrudService;
+import com.usky.fire.domain.DemAtlDisagree;
+
+/**
+ * <p>
+ * 不同意使用 服务类
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-10-19
+ */
+public interface DemAtlDisagreeService extends CrudService<DemAtlDisagree> {
+
+    /**
+     * 不同意使用数量统计
+     *
+     * @return
+     */
+    int atlDisagreeCount();
+}

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

@@ -0,0 +1,30 @@
+package com.usky.fire.service;
+
+import com.usky.common.mybatis.core.CrudService;
+import com.usky.fire.domain.DemEnforceProjectAll;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 监督管理项目全表 服务类
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-10-19
+ */
+public interface DemEnforceProjectAllService extends CrudService<DemEnforceProjectAll> {
+
+    /**
+     * 监督管理项目数量查询
+     *
+     * @param typeOneLetter 项目分类型一
+     * @param typeTwoLetter 项目分类型二
+     * @param startTime     开始时间
+     * @param endTime       结束时间
+     * @param unitId        项目单位ID
+     * @param qualifiedFlag 项目结果
+     * @return
+     */
+    int enforceProjectAllCount(String typeOneLetter, String typeTwoLetter, Date startTime, Date endTime, String unitId, String qualifiedFlag);
+}

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

@@ -0,0 +1,16 @@
+package com.usky.fire.service;
+
+import com.usky.fire.domain.DemVehicleFight;
+import com.usky.common.mybatis.core.CrudService;
+
+/**
+ * <p>
+ * 车辆作战信息 服务类
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-10-19
+ */
+public interface DemVehicleFightService extends CrudService<DemVehicleFight> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.usky.fire.service;
+
+import com.usky.fire.domain.DemVehicle;
+import com.usky.common.mybatis.core.CrudService;
+
+/**
+ * <p>
+ * 车辆信息 服务类
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-10-19
+ */
+public interface DemVehicleService extends CrudService<DemVehicle> {
+
+}

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

@@ -15,6 +15,8 @@ import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.fire.domain.*;
 import com.usky.fire.mapper.BscLawTrendMapper;
 import com.usky.fire.service.*;
+import com.usky.fire.service.enums.BsSaOneCode;
+import com.usky.fire.service.enums.BsSaTwoCode;
 import com.usky.fire.service.vo.AlFsdAllVO;
 import com.usky.fire.service.vo.ReportComplaintVO;
 import com.usky.fire.service.vo.SiAeAllVO;
@@ -61,6 +63,12 @@ public class BscLawTrendServiceImpl extends AbstractCrudService<BscLawTrendMappe
     @Autowired
     private DemAtlInspectCertificateService demAtlInspectCertificateService;
 
+    @Autowired
+    private DemAtlDisagreeService demAtlDisagreeService;
+
+    @Autowired
+    private DemEnforceProjectAllService demEnforceProjectAllService;
+
     @Override
     public Object lawTrendList(String moduleType) {
         LambdaQueryWrapper<BscLawTrend> queryWrapper = Wrappers.lambdaQuery();
@@ -123,7 +131,7 @@ public class BscLawTrendServiceImpl extends AbstractCrudService<BscLawTrendMappe
                 BaseCompany::getAddress, BaseCompany::getLinkPerson, BaseCompany::getLinkPhone)
                 .eq(BaseCompany::getCompanyId, companyId).eq(BaseCompany::getEnable, 0);
         List<BaseCompany> companylist = baseCompanyService.list(queryWrapper);
-        if (CollectionUtils.isNotEmpty(companylist)){
+        if (CollectionUtils.isNotEmpty(companylist)) {
             LambdaQueryWrapper<DemLawStatistics> queryWrapper1 = Wrappers.lambdaQuery();
             queryWrapper1.eq(DemLawStatistics::getCompanyCode, companylist.get(0).getCompanyCode())
                     .eq(DemLawStatistics::getDeleteFlag, 0);
@@ -184,7 +192,7 @@ public class BscLawTrendServiceImpl extends AbstractCrudService<BscLawTrendMappe
                 map.put("fireTime", list1.get(0).getFireTime());
                 map.put("burnedArea", list1.get(0).getBurnedArea());
                 map.put("fireGrade", list1.get(0).getFireGrade());
-                if (CollectionUtils.isNotEmpty(list2)){
+                if (CollectionUtils.isNotEmpty(list2)) {
                     map.put("initialFuelType1", list2.get(0).getInitialFuelType1());
                 }
             }
@@ -206,7 +214,7 @@ public class BscLawTrendServiceImpl extends AbstractCrudService<BscLawTrendMappe
     }
 
     @Override
-    public void lawEnforcement(){
+    public void lawEnforcement() {
         List<SiAeAllVO> siAeAllVOS = this.monthLaw();
         AlFsdAllVO alFsdAllVO = this.adstraLicense();
         List<ReportComplaintVO> reportComplaintVOS = this.reportComplaint();
@@ -297,13 +305,13 @@ public class BscLawTrendServiceImpl extends AbstractCrudService<BscLawTrendMappe
     public AlFsdAllVO adstraLicense() {
         AlFsdAllVO alFsdAllVo = new AlFsdAllVO();
         alFsdAllVo.setAcceptNumber(demAtlInspectVoucherService.AtlInspectVoucherCount());
-        alFsdAllVo.setCheckNumber(0);
+        alFsdAllVo.setCheckNumber(demEnforceProjectAllService.enforceProjectAllCount(BsSaOneCode.SAFETY_CHECK.getLetter(), BsSaTwoCode.C_S.getLetter(), null, null, null, null));
         //行政许可安全检查合格证
         Integer seqCount = demAtlInspectCertificateService.atlInspectCertificateCount();
         //行政许可-消防安检申报不同意
-        Integer disagreeCount = 0;
-        alFsdAllVo.setArticleNumber(seqCount+disagreeCount);
-        alFsdAllVo.setQualifiedRadio(Arith.div(seqCount,seqCount+disagreeCount));
+        Integer disagreeCount = demAtlDisagreeService.atlDisagreeCount();
+        alFsdAllVo.setArticleNumber(seqCount + disagreeCount);
+        alFsdAllVo.setQualifiedRadio(Arith.div(seqCount, seqCount + disagreeCount));
         return alFsdAllVo;
     }
 

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

@@ -0,0 +1,30 @@
+package com.usky.fire.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.usky.fire.domain.DemAtlDisagree;
+import com.usky.fire.mapper.DemAtlDisagreeMapper;
+import com.usky.fire.service.DemAtlDisagreeService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 不同意使用 服务实现类
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-10-19
+ */
+@Service
+public class DemAtlDisagreeServiceImpl extends AbstractCrudService<DemAtlDisagreeMapper, DemAtlDisagree> implements DemAtlDisagreeService {
+
+    @Override
+    public int atlDisagreeCount(){
+        LambdaQueryWrapper<DemAtlDisagree> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(DemAtlDisagree::getDeleteFlag, 0);
+        int count = this.count(queryWrapper);
+        return count;
+    }
+
+}

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

@@ -0,0 +1,39 @@
+package com.usky.fire.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.fire.domain.DemEnforceProjectAll;
+import com.usky.fire.mapper.DemEnforceProjectAllMapper;
+import com.usky.fire.service.DemEnforceProjectAllService;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 监督管理项目全表 服务实现类
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-10-19
+ */
+@Service
+public class DemEnforceProjectAllServiceImpl extends AbstractCrudService<DemEnforceProjectAllMapper, DemEnforceProjectAll> implements DemEnforceProjectAllService {
+
+    @Override
+    public int enforceProjectAllCount(String typeOneLetter, String typeTwoLetter, Date startTime, Date endTime, String unitId, String qualifiedFlag) {
+        LambdaQueryWrapper<DemEnforceProjectAll> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(DemEnforceProjectAll::getDeleteFlag, 0)
+                .eq(StringUtils.isNotBlank(typeOneLetter), DemEnforceProjectAll::getProjectBranchType1, typeOneLetter)
+                .eq(StringUtils.isNotBlank(typeTwoLetter), DemEnforceProjectAll::getProjectBranchType2, typeTwoLetter)
+                .eq(unitId != null && unitId != "", DemEnforceProjectAll::getProjectCompanyId, unitId)
+                .eq(StringUtils.isNotBlank(qualifiedFlag), DemEnforceProjectAll::getProjectResult, qualifiedFlag)
+                .between(startTime != null && endTime != null, DemEnforceProjectAll::getProjectCreateTime, startTime, endTime);
+        int count = this.count(queryWrapper);
+        return count;
+
+    }
+
+}

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

@@ -0,0 +1,20 @@
+package com.usky.fire.service.impl;
+
+import com.usky.fire.domain.DemVehicleFight;
+import com.usky.fire.mapper.DemVehicleFightMapper;
+import com.usky.fire.service.DemVehicleFightService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 车辆作战信息 服务实现类
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-10-19
+ */
+@Service
+public class DemVehicleFightServiceImpl extends AbstractCrudService<DemVehicleFightMapper, DemVehicleFight> implements DemVehicleFightService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.usky.fire.service.impl;
+
+import com.usky.fire.domain.DemVehicle;
+import com.usky.fire.mapper.DemVehicleMapper;
+import com.usky.fire.service.DemVehicleService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 车辆信息 服务实现类
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-10-19
+ */
+@Service
+public class DemVehicleServiceImpl extends AbstractCrudService<DemVehicleMapper, DemVehicle> implements DemVehicleService {
+
+}

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

@@ -0,0 +1,59 @@
+<?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.DemAtlDisagreeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemAtlDisagree">
+        <id column="id" property="id" />
+        <result column="disagree_id" property="disagreeId" />
+        <result column="project_code" property="projectCode" />
+        <result column="source_paper_id" property="sourcePaperId" />
+        <result column="source_paper_type" property="sourcePaperType" />
+        <result column="document_number1" property="documentNumber1" />
+        <result column="document_number2" property="documentNumber2" />
+        <result column="document_number3" property="documentNumber3" />
+        <result column="document_number4" property="documentNumber4" />
+        <result column="document_number" property="documentNumber" />
+        <result column="public_security" property="publicSecurity" />
+        <result column="paper_title" property="paperTitle" />
+        <result column="company_name" property="companyName" />
+        <result column="inspect_request" property="inspectRequest" />
+        <result column="inspect_company" property="inspectCompany" />
+        <result column="inspect_time" property="inspectTime" />
+        <result column="legal_provision" property="legalProvision" />
+        <result column="disagree_content" property="disagreeContent" />
+        <result column="reconsider_company" property="reconsiderCompany" />
+        <result column="people_court" property="peopleCourt" />
+        <result column="filling_time" property="fillingTime" />
+        <result column="approver_account" property="approverAccount" />
+        <result column="approver_name" property="approverName" />
+        <result column="approval_time" property="approvalTime" />
+        <result column="approval_opinion" property="approvalOpinion" />
+        <result column="whether_service" property="whetherService" />
+        <result column="service_mode" property="serviceMode" />
+        <result column="source_paper_version" property="sourcePaperVersion" />
+        <result column="competent_company" property="competentCompany" />
+        <result column="entered_account" property="enteredAccount" />
+        <result column="entered_name" property="enteredName" />
+        <result column="entered_time" property="enteredTime" />
+        <result column="entered_ip" property="enteredIp" />
+        <result column="update_account" property="updateAccount" />
+        <result column="update_name" property="updateName" />
+        <result column="update_time" property="updateTime" />
+        <result column="update_ip" property="updateIp" />
+        <result column="delete_flag" property="deleteFlag" />
+        <result column="alternate_field1" property="alternateField1" />
+        <result column="alternate_field2" property="alternateField2" />
+        <result column="alternate_field3" property="alternateField3" />
+        <result column="alternate_field4" property="alternateField4" />
+        <result column="alternate_field5" property="alternateField5" />
+        <result column="row_version" property="rowVersion" />
+        <result column="csdz" property="csdz" />
+        <result column="spb_id" property="spbId" />
+        <result column="is_read" property="isRead" />
+        <result column="read_time" property="readTime" />
+        <result column="bdp_audit" property="bdpAudit" />
+        <result column="union_key" property="unionKey" />
+    </resultMap>
+
+</mapper>

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

@@ -0,0 +1,102 @@
+<?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.DemEnforceProjectAllMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemEnforceProjectAll">
+        <id column="id" property="id" />
+        <result column="project_code" property="projectCode" />
+        <result column="project_name" property="projectName" />
+        <result column="project_company_id" property="projectCompanyId" />
+        <result column="project_company_name" property="projectCompanyName" />
+        <result column="project_company_address" property="projectCompanyAddress" />
+        <result column="project_company_type" property="projectCompanyType" />
+        <result column="supervise_company_type" property="superviseCompanyType" />
+        <result column="project_type" property="projectType" />
+        <result column="project_branch_type1" property="projectBranchType1" />
+        <result column="project_type_describe1" property="projectTypeDescribe1" />
+        <result column="project_branch_type2" property="projectBranchType2" />
+        <result column="project_type_describe2" property="projectTypeDescribe2" />
+        <result column="relate_project_code" property="relateProjectCode" />
+        <result column="relate_project_type" property="relateProjectType" />
+        <result column="relate_paper_id" property="relatePaperId" />
+        <result column="relate_paper_type" property="relatePaperType" />
+        <result column="relate_id1" property="relateId1" />
+        <result column="relate_id2" property="relateId2" />
+        <result column="project_status" property="projectStatus" />
+        <result column="project_status_value" property="projectStatusValue" />
+        <result column="project_spare_status" property="projectSpareStatus" />
+        <result column="project_result" property="projectResult" />
+        <result column="project_result_name" property="projectResultName" />
+        <result column="close_status" property="closeStatus" />
+        <result column="competent_company" property="competentCompany" />
+        <result column="competent_company_name" property="competentCompanyName" />
+        <result column="accept_company" property="acceptCompany" />
+        <result column="project_create_time" property="projectCreateTime" />
+        <result column="project_complete_time" property="projectCompleteTime" />
+        <result column="close_date" property="closeDate" />
+        <result column="process_time" property="processTime" />
+        <result column="legal_paper" property="legalPaper" />
+        <result column="accept_method" property="acceptMethod" />
+        <result column="administrative_division" property="administrativeDivision" />
+        <result column="cbr_acc" property="cbrAcc" />
+        <result column="undertaker" property="undertaker" />
+        <result column="xcb_acc" property="xcbAcc" />
+        <result column="co_organizer" property="coOrganizer" />
+        <result column="entered_account" property="enteredAccount" />
+        <result column="entered_name" property="enteredName" />
+        <result column="entered_time" property="enteredTime" />
+        <result column="delete_flag" property="deleteFlag" />
+        <result column="spare_filed1" property="spareFiled1" />
+        <result column="spare_filed2" property="spareFiled2" />
+        <result column="win_lottery" property="winLottery" />
+        <result column="spare_filed4" property="spareFiled4" />
+        <result column="spare_filed5" property="spareFiled5" />
+        <result column="project_spare_status2" property="projectSpareStatus2" />
+        <result column="project_spare_status3" property="projectSpareStatus3" />
+        <result column="project_branch_type3" property="projectBranchType3" />
+        <result column="close_case_time" property="closeCaseTime" />
+        <result column="review_time" property="reviewTime" />
+        <result column="review_time2" property="reviewTime2" />
+        <result column="revert_company" property="revertCompany" />
+        <result column="competent_company_id" property="competentCompanyId" />
+        <result column="item_final_result" property="itemFinalResult" />
+        <result column="item_state_bak4" property="itemStateBak4" />
+        <result column="update_time" property="updateTime" />
+        <result column="corps_organizate_id" property="corpsOrganizateId" />
+        <result column="detach_organizate_id" property="detachOrganizateId" />
+        <result column="police_data" property="policeData" />
+        <result column="item_type_subfour" property="itemTypeSubfour" />
+        <result column="row_version" property="rowVersion" />
+        <result column="jz_id" property="jzId" />
+        <result column="is_xssc" property="isXssc" />
+        <result column="ktzlgz" property="ktzlgz" />
+        <result column="cpjdjcwz" property="cpjdjcwz" />
+        <result column="bhgywyy" property="bhgywyy" />
+        <result column="cpjd_gcid" property="cpjdGcid" />
+        <result column="cpjd_ccjhid" property="cpjdCcjhid" />
+        <result column="islmqy" property="islmqy" />
+        <result column="hlwzf" property="hlwzf" />
+        <result column="hlwcs" property="hlwcs" />
+        <result column="instanceid" property="instanceid" />
+        <result column="sn" property="sn" />
+        <result column="projectcode" property="projectcode" />
+        <result column="project" property="project" />
+        <result column="tzspresult" property="tzspresult" />
+        <result column="disrict" property="disrict" />
+        <result column="projectname" property="projectname" />
+        <result column="law_id" property="lawId" />
+        <result column="jsproject_code" property="jsprojectCode" />
+        <result column="apply_no" property="applyNo" />
+        <result column="apply_card_num" property="applyCardNum" />
+        <result column="people_card_num" property="peopleCardNum" />
+        <result column="belong_system" property="belongSystem" />
+        <result column="spbddj" property="spbddj" />
+        <result column="clp_rocess" property="clpRocess" />
+        <result column="bdp_audit" property="bdpAudit" />
+        <result column="branch_id" property="branchId" />
+        <result column="branch_name" property="branchName" />
+        <result column="union_key" property="unionKey" />
+    </resultMap>
+
+</mapper>

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

@@ -0,0 +1,41 @@
+<?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.DemVehicleFightMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemVehicleFight">
+        <id column="id" property="id" />
+        <result column="vehicle_fight_id" property="vehicleFightId" />
+        <result column="fire_orga_id" property="fireOrgaId" />
+        <result column="police_record_id" property="policeRecordId" />
+        <result column="vehicle_id" property="vehicleId" />
+        <result column="equip_type_code" property="equipTypeCode" />
+        <result column="zzgnmc" property="zzgnmc" />
+        <result column="fight_function_code" property="fightFunctionCode" />
+        <result column="notice_time" property="noticeTime" />
+        <result column="dispatch_time" property="dispatchTime" />
+        <result column="arrival_time" property="arrivalTime" />
+        <result column="effluent_time" property="effluentTime" />
+        <result column="cut_off_time" property="cutOffTime" />
+        <result column="return_time" property="returnTime" />
+        <result column="actual_dispatch_time" property="actualDispatchTime" />
+        <result column="driver" property="driver" />
+        <result column="driver_id" property="driverId" />
+        <result column="commander" property="commander" />
+        <result column="commander_id" property="commanderId" />
+        <result column="reporter" property="reporter" />
+        <result column="reporter_id" property="reporterId" />
+        <result column="soldier" property="soldier" />
+        <result column="soldier_id" property="soldierId" />
+        <result column="vehicle_abbreviat" property="vehicleAbbreviat" />
+        <result column="time_stamp" property="timeStamp" />
+        <result column="record_status" property="recordStatus" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="charge_squadron" property="chargeSquadron" />
+        <result column="orga_abbreviat" property="orgaAbbreviat" />
+        <result column="case_id" property="caseId" />
+        <result column="dthh" property="dthh" />
+    </resultMap>
+
+</mapper>

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

@@ -0,0 +1,95 @@
+<?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.DemVehicleMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemVehicle">
+        <id column="id" property="id" />
+        <result column="vehicle_id" property="vehicleId" />
+        <result column="single_equip_code" property="singleEquipCode" />
+        <result column="equip_name" property="equipName" />
+        <result column="equip_code" property="equipCode" />
+        <result column="superior_equip_code" property="superiorEquipCode" />
+        <result column="equip_type_code" property="equipTypeCode" />
+        <result column="single_equip_status" property="singleEquipStatus" />
+        <result column="fire_orga" property="fireOrga" />
+        <result column="gps_code" property="gpsCode" />
+        <result column="vehicle_class_code" property="vehicleClassCode" />
+        <result column="license_plate" property="licensePlate" />
+        <result column="standard_code" property="standardCode" />
+        <result column="asset_code" property="assetCode" />
+        <result column="reference_price" property="referencePrice" />
+        <result column="trademark" property="trademark" />
+        <result column="colour" property="colour" />
+        <result column="country_code" property="countryCode" />
+        <result column="product_code" property="productCode" />
+        <result column="product_name" property="productName" />
+        <result column="equip_time" property="equipTime" />
+        <result column="scrap_time" property="scrapTime" />
+        <result column="validity_time" property="validityTime" />
+        <result column="frame_code" property="frameCode" />
+        <result column="engine_code" property="engineCode" />
+        <result column="batch_code" property="batchCode" />
+        <result column="uom_code" property="uomCode" />
+        <result column="fire_fight_status" property="fireFightStatus" />
+        <result column="record_status" property="recordStatus" />
+        <result column="tran_status" property="tranStatus" />
+        <result column="time_stamp" property="timeStamp" />
+        <result column="remark" property="remark" />
+        <result column="radio_call_sign" property="radioCallSign" />
+        <result column="police_list_code" property="policeListCode" />
+        <result column="whether_assemble" property="whetherAssemble" />
+        <result column="whether_cross_deta" property="whetherCrossDeta" />
+        <result column="whether_cross_team" property="whetherCrossTeam" />
+        <result column="vehicle_code" property="vehicleCode" />
+        <result column="create_time" property="createTime" />
+        <result column="ccrq" property="ccrq" />
+        <result column="vehicle_abbreviat" property="vehicleAbbreviat" />
+        <result column="radio_channel" property="radioChannel" />
+        <result column="gis_x" property="gisX" />
+        <result column="gis_y" property="gisY" />
+        <result column="commander_name" property="commanderName" />
+        <result column="reporter" property="reporter" />
+        <result column="driver" property="driver" />
+        <result column="soldier_number" property="soldierNumber" />
+        <result column="zdbz" property="zdbz" />
+        <result column="sjjsy" property="sjjsy" />
+        <result column="tczhc" property="tczhc" />
+        <result column="type_code" property="typeCode" />
+        <result column="enable_flag" property="enableFlag" />
+        <result column="carry_water" property="carryWater" />
+        <result column="carry_vesicle" property="carryVesicle" />
+        <result column="pump_flow" property="pumpFlow" />
+        <result column="vesicle_flow" property="vesicleFlow" />
+        <result column="scaling_hegiht" property="scalingHegiht" />
+        <result column="ledsx" property="ledsx" />
+        <result column="xzjgid" property="xzjgid" />
+        <result column="zldm" property="zldm" />
+        <result column="commander_id" property="commanderId" />
+        <result column="reporter_id" property="reporterId" />
+        <result column="driver_id" property="driverId" />
+        <result column="soldier" property="soldier" />
+        <result column="soldier_id" property="soldierId" />
+        <result column="ledcmsx" property="ledcmsx" />
+        <result column="stbll" property="stbll" />
+        <result column="blbz" property="blbz" />
+        <result column="pdabh" property="pdabh" />
+        <result column="sfdyjg" property="sfdyjg" />
+        <result column="cldtid" property="cldtid" />
+        <result column="bdp_audtt" property="bdpAudtt" />
+        <result column="sjc" property="sjc" />
+        <result column="vehicle_status" property="vehicleStatus" />
+        <result column="equip_type_name" property="equipTypeName" />
+        <result column="orga_name" property="orgaName" />
+        <result column="orga_desc" property="orgaDesc" />
+        <result column="jgtree" property="jgtree" />
+        <result column="orga_abbrevia" property="orgaAbbrevia" />
+        <result column="orga_sort" property="orgaSort" />
+        <result column="standard_num" property="standardNum" />
+        <result column="car_url" property="carUrl" />
+        <result column="sjjg_id" property="sjjgId" />
+        <result column="zhi_dui" property="zhiDui" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+</mapper>