修改巡检隐患表

amos-boot-module/amos-boot-module-api/amos-boot-module-latentdanger-api/src/main/java/com/yeejoin/amos/latentdanger/common/enums/ExecuteTypeEnum.java

@@ -10,9 +10,9 @@ public enum ExecuteTypeEnum {
     /**
      * 未执行
      */
-    未执行("未执行", -1),
-    通过("通过", 0),
-    驳回("驳回", 1);
+    未执行("未执行", 1),
+    通过("通过", 2),
+    驳回("驳回", 3);
 
     /**
      * 名称，描述
@@ -24,6 +24,7 @@ public enum ExecuteTypeEnum {
     private Integer code;
 
 
+
     ExecuteTypeEnum(String name, Integer code) {
         this.name = name;
         this.code = code;

amos-boot-module/amos-boot-module-api/amos-boot-module-latentdanger-api/src/main/java/com/yeejoin/amos/latentdanger/common/enums/LatentDangerState.java

@@ -195,7 +195,7 @@ public interface LatentDangerState {
         }
     }
 
-    enum PatrolDangerLevelEnum implements LatentDangerState {
+    enum PatrolDangerStateEnum implements LatentDangerState {
         /**
          * 待评审
          */
@@ -219,7 +219,7 @@ public interface LatentDangerState {
          */
         private String code;
 
-        PatrolDangerLevelEnum(String name, String code) {
+        PatrolDangerStateEnum(String name, String code) {
             this.name = name;
             this.code = code;
         }
@@ -241,7 +241,7 @@ public interface LatentDangerState {
         }
 
         public LatentDangerState getEnumByCode(String code) {
-            for (PatrolDangerLevelEnum _enum : PatrolDangerLevelEnum.values()) {
+            for (PatrolDangerStateEnum _enum : PatrolDangerStateEnum.values()) {
                 if (code.equals(_enum.getCode())) {
                     return _enum;
                 }
@@ -251,7 +251,7 @@ public interface LatentDangerState {
 
         public String getEnumNameByCode(String code) {
             String enumName = "";
-            for(PatrolDangerLevelEnum type: PatrolDangerLevelEnum.values()) {
+            for(PatrolDangerStateEnum type: PatrolDangerStateEnum.values()) {
                 if (type.getCode().equals(code)) {
                     enumName = type.getName();
                     break;
@@ -262,7 +262,7 @@ public interface LatentDangerState {
 
         public static List<Map<String, String>> getEnumList() {
             List<Map<String, String>> enumList = Lists.newArrayList();
-            for(PatrolDangerLevelEnum type: PatrolDangerLevelEnum.values()) {
+            for(PatrolDangerStateEnum type: PatrolDangerStateEnum.values()) {
                 Map<String, String> resultMap = Maps.newHashMap();
                 resultMap.put("key", type.getCode());
                 resultMap.put("name", type.getName());

amos-boot-module/amos-boot-module-api/amos-boot-module-latentdanger-api/src/main/java/com/yeejoin/amos/latentdanger/dao/entity/LatentDanger.java

@@ -23,7 +23,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName(value = "cb_latent_danger", autoResultMap = true)
+@TableName(value = "p_latent_danger", autoResultMap = true)
 @ApiModel(value="LatentDanger", description="隐患信息")
 public class LatentDanger extends BasicEntity {
     private static final long serialVersionUID = 1L;

amos-boot-module/amos-boot-module-api/amos-boot-module-latentdanger-api/src/main/java/com/yeejoin/amos/latentdanger/dao/entity/LatentDangerFlowRecord.java

@@ -24,7 +24,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("cb_latent_danger_flow_record")
+@TableName("p_latent_danger_flow_record")
 @ApiModel(value="LatentDangerFlowRecord", description="隐患工作流记录信息")
 public class LatentDangerFlowRecord extends BasicEntity {
     private static final long serialVersionUID = 1L;

amos-boot-module/amos-boot-module-api/amos-boot-module-patrol-api/src/main/java/com/yeejoin/amos/patrol/common/enums/LatentDangerLevelEnum.java

 package com.yeejoin.amos.patrol.common.enums;
 
+import io.swagger.models.auth.In;
+
 public enum LatentDangerLevelEnum {
 
     安全问题("安全问题", 0, "0"),
@@ -64,4 +66,13 @@ public enum LatentDangerLevelEnum {
         }
         return null;
     }
+
+    public static LatentDangerLevelEnum getByCode(String code) {
+        for (LatentDangerLevelEnum l : LatentDangerLevelEnum.values()) {
+            if (l.getCode().equals(Integer.parseInt(code))) {
+                return l;
+            }
+        }
+        return null;
+    }
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-patrol-api/src/main/java/com/yeejoin/amos/patrol/common/enums/LatentDangerReformTypeEnum.java

@@ -44,4 +44,13 @@ public enum LatentDangerReformTypeEnum {
         }
         return null;
     }
+
+    public static LatentDangerReformTypeEnum getByCode(String code) {
+        for (LatentDangerReformTypeEnum l : LatentDangerReformTypeEnum.values()) {
+            if (l.getCode().equals(Integer.parseInt(code))) {
+                return l;
+            }
+        }
+        return null;
+    }
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-patrol-api/src/main/java/com/yeejoin/amos/patrol/common/enums/LatentDangerStateEnum.java

@@ -60,4 +60,13 @@ public enum LatentDangerStateEnum {
         }
         return null;
     }
+
+    public static LatentDangerStateEnum getByCode(String code) {
+        for (LatentDangerStateEnum l : LatentDangerStateEnum.values()) {
+            if (l.getCode().equals(Integer.parseInt(code))) {
+                return l;
+            }
+        }
+        return null;
+    }
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-patrol-api/src/main/java/com/yeejoin/amos/patrol/common/enums/LatentDangerTypeEnum.java

@@ -56,4 +56,13 @@ public enum LatentDangerTypeEnum {
         }
         return null;
     }
+
+    public static LatentDangerTypeEnum getByCode(String code) {
+        for (LatentDangerTypeEnum l : LatentDangerTypeEnum.values()) {
+            if (l.getCode().equals(Integer.parseInt(code))) {
+                return l;
+            }
+        }
+        return null;
+    }
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-patrol-api/src/main/java/com/yeejoin/amos/patrol/dao/entity/LatentDanger.java

 package com.yeejoin.amos.patrol.dao.entity;
 
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
 import org.hibernate.annotations.Where;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -21,6 +29,10 @@ import java.util.Date;
 @NamedQuery(name = "LatentDanger.findAll", query = "SELECT c FROM LatentDanger c")
 @Where(clause = "deleted=0") //表示未删除的数据
 @Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName(value = "p_latent_danger", autoResultMap = true)
+@ApiModel(value="LatentDanger", description="隐患信息")
 public class LatentDanger extends BasicEntity {
     private static final long serialVersionUID = 1L;
 
@@ -53,7 +65,13 @@ public class LatentDanger extends BasicEntity {
      * 隐患等级（1：一般隐患；2：重大隐患；0：安全问题）
      */
     @Column(name = "danger_level")
-    private Integer dangerLevel;
+    private String dangerLevel;
+
+    /**
+     * 隐患等级名称
+     */
+    @Column(name = "danger_level_name")
+    private String dangerLevelName;
 
     /**
      * 隐患地点
@@ -65,7 +83,13 @@ public class LatentDanger extends BasicEntity {
      * 隐患类型（1：普通隐患；2：巡检隐患）
      */
     @Column(name = "danger_type")
-    private Integer dangerType;
+    private String dangerType;
+
+    /**
+     * 隐患类型名称
+     */
+    @Column(name = "danger_type_name")
+    private String dangerTypeName;
 
     /**
      * 备注
@@ -77,12 +101,19 @@ public class LatentDanger extends BasicEntity {
      * 整改类型（1：常规整改；2：安措计划；3：延期整改）
      */
     @Column(name = "reform_type")
-    private Integer reformType;
+    private String reformType;
+
+    /**
+     * 整改类型名称
+     */
+    @Column(name = "reform_type_name")
+    private String reformTypeName;
 
     /**
      * 限制时间
      */
     @Column(name = "reform_limit_date")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date reformLimitDate;
 
     @Column(name = "overtime_state")
@@ -95,7 +126,13 @@ public class LatentDanger extends BasicEntity {
      * 隐患状态（1：待评审；2：待治理；3：安措计划中；4：逾期未治理；5：待验证；6：治理完毕；7：已撤销）
      */
     @Column(name = "danger_state")
-    private Integer dangerState;
+    private String dangerState;
+
+    /**
+     * 隐患状态名称
+     */
+    @Column(name = "danger_state_name")
+    private String dangerStateName;
 
     /**
      * 发现人
@@ -113,18 +150,20 @@ public class LatentDanger extends BasicEntity {
      * 是否删除（0：否；1：是）
      */
     @Column(name = "deleted")
-    private Integer deleted;
+    private Boolean deleted;
 
     /**
      * 记录修改时间
      */
     @Column(name = "update_date")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateDate;
 
     /**
      * 延期治理时间
      */
     @Column(name = "delay_limit_date")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date delayLimitDate;
 
     /**
@@ -148,7 +187,73 @@ public class LatentDanger extends BasicEntity {
     /**
      * 检查记录创建的隐患检查项对应id
      */
-    @Column(name = "check_input_id")
-    private Long checkInputId;
+    @Column(name = "biz_id")
+    private Long bizId;
+
+    /**
+     * 建筑id
+     */
+    private Long structureId;
+
+    /**
+     * 建筑名称
+     */
+    private String structureName;
+
+    private String instanceKey;
+
+    /**
+     * 业务类型（不同业务创建的隐患以此区分:巡检隐患、防火监督隐患、其他隐患。。。）
+     */
+    private String bizType;
 
+    @TableField(exist = false)
+    private String bizTypeName;
+
+    /**
+     * 经度
+     */
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+    private String latitude;
+
+    /**
+     * 业务信息
+     */
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private JSONObject bizInfo;
+
+    /**
+     * 是否审核状态
+     */
+    @TableField(exist = false)
+    private Boolean unReviewed;
+
+    public Boolean getUnReviewed() {
+        if ("dangerSubmit".equals(this.getDangerState())) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 提交信息
+     */
+    @TableField(exist = false)
+    private JSONObject flowJson;
+
+    /**
+     * 阶段状态
+     */
+    @TableField(exist = false)
+    private String processState;
+
+    /**
+     * 阶段状态名称
+     */
+    @TableField(exist = false)
+    private String processStateName;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-patrol-api/src/main/java/com/yeejoin/amos/patrol/dao/entity/LatentDangerFlowRecord.java

 package com.yeejoin.amos.patrol.dao.entity;
 
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
 import org.hibernate.annotations.Where;
 
 import javax.persistence.Column;
@@ -22,6 +26,10 @@ import java.util.Date;
 @NamedQuery(name = "LatentDangerFlowRecord.findAll", query = "SELECT c FROM LatentDangerFlowRecord c")
 @Where(clause = "deleted=0") //表示未删除的数据
 @Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("p_latent_danger_flow_record")
+@ApiModel(value="LatentDangerFlowRecord", description="隐患工作流记录信息")
 public class LatentDangerFlowRecord extends BasicEntity {
     private static final long serialVersionUID = 1L;
 
@@ -40,14 +48,17 @@ public class LatentDangerFlowRecord extends BasicEntity {
     @Column(name = "flow_task_id")
     private String flowTaskId;
 
-    @Column(name = "excute_state")
-    private Integer excuteState;
+    @Column(name = "execute_state")
+    private Integer executeState;
 
-    @Column(name = "excute_user_id")
-    private String excuteUserId;
+    @Column(name = "execute_user_id")
+    private String executeUserId;
 
-    @Column(name = "excute_result")
-    private String excuteResult;
+    @Column(name = "execute_user_name")
+    private String executeUserName;
+
+    @Column(name = "execute_result")
+    private String executeResult;
 
     @Column(name = "remark")
     private String remark;
@@ -59,7 +70,7 @@ public class LatentDangerFlowRecord extends BasicEntity {
      * 是否删除（0：否；1：是）
      */
     @Column(name = "deleted")
-    private Integer deleted;
+    private Boolean deleted = false;
 
     /**
      * 记录修改时间
@@ -67,7 +78,9 @@ public class LatentDangerFlowRecord extends BasicEntity {
     @Column(name = "update_date")
     private Date updateDate;
 
-    @Column(name = "excute_department_id")
-    private String excuteDepartmentId;
+    @Column(name = "execute_department_id")
+    private String executeDepartmentId;
 
+    @Column(name = "execute_department_name")
+    private String executeDepartmentName;
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/service/impl/LatentDangerServiceImpl.java

@@ -356,8 +356,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
                 latentDanger.setDangerState(LatentDangerState.SupervisionDangerStateEnum.提交隐患.getCode());
                 latentDanger.setDangerStateName(LatentDangerState.SupervisionDangerStateEnum.提交隐患.getName());
             } else if (LatentDangerBizTypeEnum.巡检.getCode().equals(bizType)) {
-                latentDanger.setDangerState(LatentDangerState.PatrolDangerLevelEnum.待评审.getCode());
-                latentDanger.setDangerStateName(LatentDangerState.PatrolDangerLevelEnum.待评审.getName());
+                latentDanger.setDangerState(LatentDangerState.PatrolDangerStateEnum.待评审.getCode());
+                latentDanger.setDangerStateName(LatentDangerState.PatrolDangerStateEnum.待评审.getName());
             }
             if (ValidationUtil.isEmpty(dangerDto.getDangerName())) {
                 latentDanger.setDangerName(dangerDto.getInputItemName());
@@ -1136,7 +1136,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
             return executeSubmitDto;
         }
         // TODO 修改
-        amosUserId = "3400882";
+//        amosUserId = "3400882";
         AgencyUserModel userModel = Privilege.agencyUserClient.queryByUserId(amosUserId).getResult();
         String checkLeaderId = userModel.getUserName();
 
@@ -1679,14 +1679,14 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
     public List<Map<String, String>> getAllDangerState() {
         List<Map<String, String>> levelList = Lists.newArrayList();
         List<LatentDangerState.SupervisionDangerStateEnum> supervisionDangerStateList = Lists.newArrayList(LatentDangerState.SupervisionDangerStateEnum.values());
-        List<LatentDangerState.PatrolDangerLevelEnum> patrolDangerLevelEnumList = Lists.newArrayList(LatentDangerState.PatrolDangerLevelEnum.values());
+        List<LatentDangerState.PatrolDangerStateEnum> patrolDangerStateEnumList = Lists.newArrayList(LatentDangerState.PatrolDangerStateEnum.values());
         supervisionDangerStateList.forEach(level -> {
             Map<String, String> l = Maps.newHashMap();
             l.put("code", level.getCode());
             l.put("name", level.getName());
             levelList.add(l);
         });
-        patrolDangerLevelEnumList.forEach(level -> {
+        patrolDangerStateEnumList.forEach(level -> {
             Map<String, String> l = Maps.newHashMap();
             l.put("code", level.getCode());
             l.put("name", level.getName());
@@ -1778,7 +1778,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
                 if (LatentDangerBizTypeEnum.防火监督.getCode().equals(bizType)) {
                     pageParam.put("dangerState", LatentDangerState.SupervisionDangerStateEnum.提交隐患.getCode());
                 } else if (LatentDangerBizTypeEnum.巡检.getCode().equals(bizType)) {
-                    pageParam.put("dangerState", LatentDangerState.PatrolDangerLevelEnum.待评审.getCode());
+                    pageParam.put("dangerState", LatentDangerState.PatrolDangerStateEnum.待评审.getCode());
                 }
             }
         }
@@ -1826,6 +1826,14 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
                     LatentDangerProcessStateEnum processStateEnum = LatentDangerProcessStateEnum.getByCode(danger.getProcessState());
                     danger.setProcessStateName(processStateEnum.getName());
                 }
+                if (LatentDangerBizTypeEnum.巡检.getCode().equals(danger.getBizType())) {
+                    LatentDangerLevelEnum levelEnum = Arrays.stream(LatentDangerLevelEnum.values()).filter(l -> l.getCode().equals(danger.getDangerLevel())).findFirst().get();
+                    danger.setDangerLevelName(levelEnum.getName());
+                    LatentDangerReformTypeEnum reformTypeEnum = Arrays.stream(LatentDangerReformTypeEnum.values()).filter(l -> l.getCode().equals(danger.getReformType())).findFirst().get();
+                    danger.setReformTypeName(reformTypeEnum.getName());
+                    LatentDangerState.PatrolDangerStateEnum patrolDangerStateEnum = Arrays.stream(LatentDangerState.PatrolDangerStateEnum.values()).filter(l -> l.getCode().equals(danger.getDangerState())).findFirst().get();
+                    danger.setDangerStateName(patrolDangerStateEnum.getName());
+                }
                 danger.setBizTypeName(bizTypeEnum.getName());
             });
         }
@@ -1978,7 +1986,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
         if (LatentDangerBizTypeEnum.防火监督.getCode().equals(bizType)) {
             return LatentDangerState.SupervisionDangerStateEnum.getEnumList();
         } else {
-            return LatentDangerState.PatrolDangerLevelEnum.getEnumList();
+            return LatentDangerState.PatrolDangerStateEnum.getEnumList();
         }
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/entity/mybatis/extend/LatentDangerBo.java

@@ -16,6 +16,11 @@ public class LatentDangerBo {
     private Long id;
 
     /**
+     * 业务类型
+     */
+    private String bizType;
+
+    /**
      * 业务唯一标识
      */
     private String businessKey;
@@ -37,7 +42,7 @@ public class LatentDangerBo {
     /**
      * 隐患等级（1：一般隐患；2：重大隐患；0：安全问题）
      */
-    private Integer dangerLevel;
+    private String dangerLevel;
 
     /**
      * 隐患地点
@@ -47,7 +52,7 @@ public class LatentDangerBo {
     /**
      * 隐患类型（1：普通隐患；2：巡检隐患）
      */
-    private Integer dangerType;
+    private String dangerType;
 
     /**
      * 备注
@@ -57,7 +62,7 @@ public class LatentDangerBo {
     /**
      * 整改类型（1：常规整改；2：安措计划；3：延期整改）
      */
-    private Integer reformType;
+    private String reformType;
 
     /**
      * 限制时间
@@ -71,7 +76,7 @@ public class LatentDangerBo {
     /**
      * 隐患状态（1：待评审；2：待治理；3：安措计划中；4：逾期未治理；5：待验证；6：治理完毕；7：已撤销）
      */
-    private Integer dangerState;
+    private String dangerState;
 
     /**
      * 发现人
@@ -120,7 +125,7 @@ public class LatentDangerBo {
     /**
      * 检查记录创建的隐患检查项对应id
      */
-    private Long checkInputId;
+    private Long bizId;
 
     /**
      * 建筑id

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/LatentDangerServiceImpl.java

@@ -195,6 +195,9 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
     private String dangerTopic;
     @Autowired
     private WebMqttComponent webMqttComponent;
+
+    private String bizType = "patrol";
+
     @Transactional
     @Override
     public CommonResponse saveNormal(LatentDangerNormalParam latentDangerParam, String userId, String userRealName, String departmentId, String departmentName, String companyId, String orgCode, RoleBo role) {
@@ -204,7 +207,7 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
                 , latentDangerParam.getDangerPosition(), LatentDangerTypeEnum.随手拍,
                                                          latentDangerParam.getPhotoUrls(), 0L, latentDangerParam.getStructureId(), latentDangerParam.getStructureName(), InstanceKeyEnum.NORMAL.getCode());
         // 更新p_check_input表state字段
-        updateCheckInputDangerState(latentDangerBo.getCheckInputId(), DangerHandleStateEnum.HANDLE.getCode());
+        updateCheckInputDangerState(latentDangerBo.getBizId(), DangerHandleStateEnum.HANDLE.getCode());
         Long dangerId = latentDangerBo.getId();
         Date startDate = new Date();
         JSONObject jsonObject = remoteWorkFlowService.startNew(dangerId, businessKey, processDefinitionKey);
@@ -317,7 +320,7 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
                                                              null, dangerTypeEnum, photoUrls, inputCheckDto.getCheckInputId(), riskSourceId,
                     position.get(inputCheckDto.getRiskSourceId())==null?"":position.get(inputCheckDto.getRiskSourceId()).toString(), InstanceKeyEnum.PATROL.getCode());
             // 更新p_check_input表state字段
-            updateCheckInputDangerState(latentDangerBo.getCheckInputId(), DangerHandleStateEnum.HANDLE.getCode());
+            updateCheckInputDangerState(latentDangerBo.getBizId(), DangerHandleStateEnum.HANDLE.getCode());
             Long dangerId = latentDangerBo.getId();
             Date startDate = new Date();
             JSONObject jsonObject = remoteWorkFlowService.startNew(dangerId, businessKey, processDefinitionKey);
@@ -401,18 +404,19 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
                                            Integer level, String position, LatentDangerTypeEnum dangerTypeEnum,
                                            String photoUrls, Long checkInputId, Long structureId, String structureName, String instanceKey) {
         LatentDangerBo latentDangerBo = new LatentDangerBo();
+        latentDangerBo.setBizType(bizType);
         latentDangerBo.setInstanceId(instanceId);
         latentDangerBo.setProblemDescription(problemDescription);
         latentDangerBo.setRemark(remark);
-        latentDangerBo.setDangerState(LatentDangerStateEnum.待评审.getCode());
+        latentDangerBo.setDangerState(LatentDangerStateEnum.待评审.getCode().toString());
         latentDangerBo.setDiscovererUserId(userId);
         latentDangerBo.setDiscovererDepartmentId(departmentId);
         latentDangerBo.setBusinessKey(businessKey);
         latentDangerBo.setOrgCode(orgCode);
         latentDangerBo.setDangerName(dangerName);
-        latentDangerBo.setDangerLevel(level);
+        latentDangerBo.setDangerLevel(level.toString());
         latentDangerBo.setDangerPosition(position);
-        latentDangerBo.setDangerType(dangerTypeEnum.getCode());
+        latentDangerBo.setDangerType(dangerTypeEnum.getCode().toString());
         StringBuilder photoUrlsB = new StringBuilder();
         if(org.apache.commons.lang3.StringUtils.isNotBlank(photoUrls)){
             String[] photoUrlsList = photoUrls.split(",");
@@ -425,7 +429,7 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
             }
         }
         latentDangerBo.setPhotoUrls(photoUrlsB.toString());
-        latentDangerBo.setCheckInputId(checkInputId);
+        latentDangerBo.setBizId(checkInputId);
         latentDangerBo.setStructureId(structureId);
         latentDangerBo.setStructureName(structureName);
         latentDangerBo.setInstanceKey(instanceKey);
@@ -593,12 +597,12 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
                 vo.setDangerName(bo.getDangerName());
                 vo.setDiscovererUserName(userMap.get(bo.getDiscovererUserId()).getRealName());
                 vo.setLevel(bo.getDangerLevel());
-                LatentDangerLevelEnum levelEnum = LatentDangerLevelEnum.getByCode(bo.getDangerLevel());
+                LatentDangerLevelEnum levelEnum = LatentDangerLevelEnum.getByCode(Integer.parseInt(bo.getDangerLevel()));
                 if (levelEnum != null) {
                     vo.setLevelDesc(levelEnum.getName());
                 }
                 vo.setState(bo.getDangerState());
-                LatentDangerStateEnum stateEnum = LatentDangerStateEnum.getByCode(bo.getDangerState());
+                LatentDangerStateEnum stateEnum = LatentDangerStateEnum.getByCode(Integer.parseInt(bo.getDangerState()));
                 if (stateEnum != null) {
                     vo.setStateDesc(stateEnum.getName());
                 }
@@ -634,7 +638,7 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
     }
 
     private String getLimitDesc(LatentDangerBo bo, Date start) {
-        Integer dangerState = bo.getDangerState();
+        Integer dangerState = Integer.parseInt(bo.getDangerState());
         if (LatentDangerStateEnum.已撤销.getCode().equals(dangerState) || LatentDangerStateEnum.治理完毕.getCode().equals(dangerState)) {
             if (bo.getOvertimeState().equals(LatentDangerOvertimeStateEnum.已超时.getCode())) {
                 return "逾期治理";
@@ -833,7 +837,7 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
                     }
                 }
                 List<CheckShot> checkShots = iCheckShotDao.findAllByCheckIdAndCheckInputId(patrolBo.getCheckId(),
-                                                                                           latentDangerBo.getCheckInputId());
+                                                                                           latentDangerBo.getBizId());
                 if (!CollectionUtils.isEmpty(checkShots)) {
                     List<String> photos = Lists.transform(checkShots, e -> {
                         if (e != null) {
@@ -999,7 +1003,7 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
                 LatentDangerFlowRecordBo record = saveFlowRecord(flowJson.getString("id"), userIds,
                                                                  flowJson.getString("name"), flowJson.getString("taskDefinitionKey"), latentDangerBo.getId());
                 latentDangerBo.setCurrentFlowRecordId(record.getId());
-                latentDangerBo.setDangerState(excuteTypeEnum.getNextState().getCode());
+                latentDangerBo.setDangerState(excuteTypeEnum.getNextState().getCode().toString());
                 latentDangerMapper.update(latentDangerBo);
                 ///web推送刷新消息
 //                dangerStateChangeWebSockte(latentDangerBo);
@@ -1007,7 +1011,7 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
                 sendMessage(latentDangerBo, excuteTypeEnum, patrolBo, currentRecord.getFlowTaskName(), this.getNextExecuteUsers(latentDangerBo.getInstanceId()), userRealName, departmentName);
             } else if (actionType.equals(2)) {
                 //终止
-                latentDangerBo.setDangerState(LatentDangerStateEnum.已撤销.getCode());
+                latentDangerBo.setDangerState(LatentDangerStateEnum.已撤销.getCode().toString());
                 latentDangerMapper.update(latentDangerBo);
 //                remoteWorkFlowService.stop(latentDangerBo.getInstanceId());
                 if (latentDangerBo.getDangerType().equals(LatentDangerTypeEnum.计划检查.getCode())) {
@@ -1047,7 +1051,7 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
                 LatentDangerFlowRecordBo record = saveFlowRecord(flowJson.getString("id"), userIds,
                                                                  flowJson.getString("name"), flowJson.getString("taskDefinitionKey"), latentDangerBo.getId());
                 latentDangerBo.setCurrentFlowRecordId(record.getId());
-                latentDangerBo.setDangerState(excuteTypeEnum.getNextState().getCode());
+                latentDangerBo.setDangerState(excuteTypeEnum.getNextState().getCode().toString());
                 latentDangerMapper.update(latentDangerBo);
                 ///web推送刷新消息
 //                dangerStateChangeWebSockte(latentDangerBo);
@@ -1097,8 +1101,8 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
      * web安全态势预控 （ 隐患按车间/部门统计） 模块推送刷新消息
      */
     private void dangerStateChangeWebSockte(LatentDangerBo latentDangerBo) {
-        Integer state = latentDangerBo.getDangerState();
-        Integer type = latentDangerBo.getDangerType();
+        Integer state = Integer.parseInt(latentDangerBo.getDangerState());
+        Integer type = Integer.parseInt(latentDangerBo.getDangerType());
         if (LatentDangerTypeEnum.计划检查.getCode().equals(type)
                 || LatentDangerTypeEnum.无计划检查.getCode().equals(type)) {
             if (LatentDangerStateEnum.待治理.getCode().equals(state)
@@ -1185,26 +1189,26 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
         }
         JSONObject data = executeJson.getJSONObject("data");
         if (executeTypeEnum.getNextState().equals(LatentDangerStateEnum.已撤销)) {
-            latentDangerBo.setDangerState(executeTypeEnum.getNextState().getCode());
+            latentDangerBo.setDangerState(executeTypeEnum.getNextState().getCode().toString());
             saveFlowRecord(executeJson.getString("id"), data.getString("name"), userId, departmentId,
                            param.getFlowJson(), param.getDangerId(), role, executeTypeEnum.getName(),param.getRemark());
         } else if (executeTypeEnum.getNextState().equals(LatentDangerStateEnum.治理完毕)) {
-            latentDangerBo.setDangerState(executeTypeEnum.getNextState().getCode());
+            latentDangerBo.setDangerState(executeTypeEnum.getNextState().getCode().toString());
             saveFlowRecord(executeJson.getString("id"), data.getString("name"), userId, departmentId,
                            param.getFlowJson(), param.getDangerId(), role, executeTypeEnum.getName(),param.getRemark());
         } else {
             LatentDangerFlowRecordBo flowRecord = saveFlowRecord(executeJson.getString("id"), data.getString("name"), userId, departmentId,
                                                                  param.getFlowJson(), param.getDangerId(), role, executeTypeEnum.getName(),param.getRemark());
             latentDangerBo.setCurrentFlowRecordId(flowRecord.getId());
-            latentDangerBo.setDangerState(executeTypeEnum.getNextState().getCode());
+            latentDangerBo.setDangerState(executeTypeEnum.getNextState().getCode().toString());
             if (executeTypeEnum.equals(LatentDangerExcuteTypeEnum.隐患常规治理)) {
-                latentDangerBo.setReformType(LatentDangerReformTypeEnum.常规整改.getCode());
+                latentDangerBo.setReformType(LatentDangerReformTypeEnum.常规整改.getCode().toString());
                 latentDangerBo.setReformJson(param.getFlowJson().toJSONString());
                 latentDangerBo.setInferOtherThings(param.getInferOtherThings());
                 latentDangerBo.setProblemDescription(param.getReasonAnalysis());
                 latentDangerBo.setReasonAnalysis(param.getRemark());
             } else if (executeTypeEnum.equals(LatentDangerExcuteTypeEnum.隐患延期治理)) {
-                latentDangerBo.setReformType(LatentDangerReformTypeEnum.延期治理.getCode());
+                latentDangerBo.setReformType(LatentDangerReformTypeEnum.延期治理.getCode().toString());
                 latentDangerBo.setReformJson(param.getFlowJson().toJSONString());
                 latentDangerBo.setInferOtherThings(param.getInferOtherThings());
                 latentDangerBo.setProblemDescription(param.getReasonAnalysis());
@@ -1213,16 +1217,16 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
             }
             if (executeTypeEnum.equals(LatentDangerExcuteTypeEnum.隐患评审通过)) {
                 latentDangerBo.setReformLimitDate(DateUtil.str2Date(param.getReformLimitDate(), DateUtil.DATETIME_DEFAULT_FORMAT));
-                latentDangerBo.setDangerLevel(param.getDangerLevel());
+                latentDangerBo.setDangerLevel(param.getDangerLevel().toString());
             }
         }
         if (executeTypeEnum.equals(LatentDangerExcuteTypeEnum.隐患延期治理车间部门审核通过)) {
             // 延期治理评审通过且 不需要 公司审核
             if (param.getNeedCompanyVerify() == 0) {
-                latentDangerBo.setDangerState(LatentDangerStateEnum.延期治理申请.getCode());
+                latentDangerBo.setDangerState(LatentDangerStateEnum.延期治理申请.getCode().toString());
                 latentDangerBo.setReformLimitDate(latentDangerBo.getDelayLimitDate());
             } else {// 延期治理评审通过且 需要 公司审核
-                latentDangerBo.setDangerState(LatentDangerStateEnum.延期治理申请待公司审核.getCode());
+                latentDangerBo.setDangerState(LatentDangerStateEnum.延期治理申请待公司审核.getCode().toString());
                 LatentDangerFlowRecordBo recordBo =
                         latentDangerFlowRecordMapper.getByDangerIdAndCreate(latentDangerBo.getId());
                 String flowJsonStr = recordBo.getFlowJson();
@@ -1232,12 +1236,12 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
                 latentDangerFlowRecordMapper.update(recordBo);
             }
         } else if (executeTypeEnum.equals(LatentDangerExcuteTypeEnum.隐患延期治理车间部门审核拒绝)) {
-            latentDangerBo.setDangerState(LatentDangerStateEnum.待治理.getCode());
+            latentDangerBo.setDangerState(LatentDangerStateEnum.待治理.getCode().toString());
         } else if (executeTypeEnum.equals(LatentDangerExcuteTypeEnum.隐患延期治理公司审核通过)) {
-            latentDangerBo.setDangerState(LatentDangerStateEnum.延期治理申请.getCode());
+            latentDangerBo.setDangerState(LatentDangerStateEnum.延期治理申请.getCode().toString());
             latentDangerBo.setReformLimitDate(latentDangerBo.getDelayLimitDate());
         } else if (executeTypeEnum.equals(LatentDangerExcuteTypeEnum.隐患延期治理公司审核拒绝)) {
-            latentDangerBo.setDangerState(LatentDangerStateEnum.延期治理申请待车间部门审核.getCode());
+            latentDangerBo.setDangerState(LatentDangerStateEnum.延期治理申请待车间部门审核.getCode().toString());
         }
         latentDangerMapper.update(latentDangerBo);
         if (patrolBo != null) {
@@ -1268,7 +1272,7 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
                                                          departmentName, latentDangerBo.getId(), userRealName,
                                                          flowTaskName, ExecuteStateEnum.驳回.getName(),
                                                          DateUtil.date2Str(new Date(), DateUtil.DATETIME_DEFAULT_FORMAT),
-                                                         latentDangerBo.getDangerState());
+                                                         Integer.parseInt(latentDangerBo.getDangerState()));
             } else if (excuteTypeEnum.equals(LatentDangerExcuteTypeEnum.隐患验证通过)) {
                 if (patrolBo != null) {
 //                    RiskFactorBo riskFactorBo = riskFactorMapper.getById(Long.valueOf(patrolBo.getClassifyOriginalId()));
@@ -1283,7 +1287,7 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
 //                                DateUtil.date2Str(new Date(), DateUtil.DATETIME_DEFAULT_FORMAT));
 //                    }
                     // 更新p_check_input表state字段
-                    updateCheckInputDangerState(latentDangerBo.getCheckInputId(), DangerHandleStateEnum.COMPLETED.getCode());
+                    updateCheckInputDangerState(latentDangerBo.getBizId(), DangerHandleStateEnum.COMPLETED.getCode());
                     DangerResultBo dangerResultBo = new DangerResultBo();
                     try {
                         business.processProtalDataFromDanger(dangerResultBo);
@@ -1301,7 +1305,7 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
                                                          departmentName, latentDangerBo.getId(), userRealName,
                                                          flowTaskName, excuteTypeEnum.getExcuteState().getName(),
                                                          DateUtil.date2Str(new Date(), DateUtil.DATETIME_DEFAULT_FORMAT),
-                                                         latentDangerBo.getDangerState());
+                                                         Integer.parseInt(latentDangerBo.getDangerState()));
                 if (excuteTypeEnum.equals(LatentDangerExcuteTypeEnum.隐患评审通过)) {
                     // 隐患治理到期时间为当天，则立即提示消息
                     Date reformLimitDate = latentDangerBo.getReformLimitDate();
@@ -1310,7 +1314,7 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
                                                                                latentDangerBo.getOrgCode(), latentDangerBo.getDangerName(),
                                                                                DateUtil.date2Str(latentDangerBo.getReformLimitDate(), DateUtil.DATETIME_DEFAULT_FORMAT),
                                                                                latentDangerBo.getId(),
-                                                                               latentDangerBo.getDangerState(),userRealName);
+                                                                               Integer.parseInt(latentDangerBo.getDangerState()),userRealName);
                     }
                 }
             }
@@ -1440,11 +1444,15 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
 //                return LatentDangerLevelEnum.重大隐患.getRiskSourceDangerLevelCode();
 //            }
         }
-        int code = latentDangerBos.stream().mapToInt(LatentDangerBo::getDangerLevel).max().getAsInt();
+        int code = latentDangerBos.stream().mapToInt(this::toIntFun).max().getAsInt();
         dangerLevel = LatentDangerLevelEnum.getByCode(code).getRiskSourceDangerLevelCode();
         return dangerLevel;
     }
 
+    public Integer toIntFun(LatentDangerBo dangerBo) {
+        return Integer.parseInt(dangerBo.getDangerLevel());
+    }
+
     @Override
     public void freshRiskJudgmentLangerCount(LatentDangerExcuteParam latentDangerExcuteParam) {
         Long currentFlowRecordId = latentDangerExcuteParam.getFlowRecordId();

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/vo/LatentDangerDetailVo.java

@@ -13,7 +13,7 @@ public class LatentDangerDetailVo {
 
     private String dangerName;
 
-    private Integer level;
+    private String level;
 
     private String levelDesc;
 
@@ -29,9 +29,9 @@ public class LatentDangerDetailVo {
 
     private Long currentFlowRecordId;
 
-    private Integer dangerState;
+    private String dangerState;
 
-    private Integer dangerType;
+    private String dangerType;
 
     private String dangerStateDesc;
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/vo/LatentDangerListVo.java

@@ -11,13 +11,13 @@ public class LatentDangerListVo {
 
     private String discovererUserName;
 
-    private Integer level;
+    private String level;
 
     private String levelDesc;
 
     private String limitDesc;
 
-    private Integer state;
+    private String state;
 
     private String stateDesc;
 

amos-boot-system-latentdanger/src/main/resources/application-dev.properties

@@ -17,7 +17,7 @@ ribbon.MaxAutoRetriesNextServer = 2
 ribbon.MaxAutoRetries = 1
 
 #DB properties:
-spring.datasource.url = jdbc:mysql://172.16.6.60:3306/amos-jcs-biz?useUnicode=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+spring.datasource.url = jdbc:mysql://172.16.10.66:3306/safety-business-3.0.1?useUnicode=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
 spring.datasource.username= root
 spring.datasource.password= root_123
 spring.datasource.driver-class-name = com.mysql.jdbc.Driver

amos-boot-system-latentdanger/src/main/resources/db/changelog/init/create-latent-danger-table.sql

@@ -59,7 +59,6 @@ CREATE TABLE `cb_latent_danger`  (
 
 SET FOREIGN_KEY_CHECKS = 1;
 
-
 /*
  Navicat Premium Data Transfer
 
@@ -103,4 +102,3 @@ CREATE TABLE `cb_latent_danger_flow_record`  (
 ) ENGINE = InnoDB AUTO_INCREMENT = 449 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '隐患工作流记录表' ROW_FORMAT = Dynamic;
 
 SET FOREIGN_KEY_CHECKS = 1;
-

amos-boot-system-latentdanger/src/main/resources/db/mapper/LatentDangerFlowRecordMapper.xml

@@ -6,7 +6,7 @@
     <insert id="save" keyColumn="id" keyProperty="id"
             parameterType="com.yeejoin.amos.latentdanger.business.entity.mybatis.extend.LatentDangerFlowRecordBo"
             useGeneratedKeys="true">
-        insert into cb_latent_danger_flow_record
+        insert into p_latent_danger_flow_record
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="dangerId != null">
                 danger_id,
@@ -98,7 +98,7 @@
     </insert>
 
     <update id="update" parameterType="com.yeejoin.amos.latentdanger.business.entity.mybatis.extend.LatentDangerFlowRecordBo">
-        update cb_latent_danger_flow_record
+        update p_latent_danger_flow_record
         <set>
             <if test="dangerId != null">
                 danger_id = #{dangerId},
@@ -147,25 +147,25 @@
     </update>
 
     <select id="getById" resultType="com.yeejoin.amos.latentdanger.business.entity.mybatis.extend.LatentDangerFlowRecordBo">
-        select * from cb_latent_danger_flow_record where deleted = 0 and id = #{id} limit 1
+        select * from p_latent_danger_flow_record where deleted = 0 and id = #{id} limit 1
     </select>
 
     <select id="getNewestRecordByDangerId" resultType="com.yeejoin.amos.latentdanger.business.entity.mybatis.extend.LatentDangerFlowRecordBo">
-        select * from cb_latent_danger_flow_record where deleted = 0 and danger_id = #{dangerId} order by create_date desc limit 1
+        select * from p_latent_danger_flow_record where deleted = 0 and danger_id = #{dangerId} order by create_date desc limit 1
     </select>
 
     <select id="listPassByDangerId" resultType="com.yeejoin.amos.latentdanger.business.entity.mybatis.extend.LatentDangerFlowRecordBo">
         select
             *
         from
-            cb_latent_danger_flow_record
+            p_latent_danger_flow_record
         where
             id in
             (
                 select
                     max(id)
                 from
-                    cb_latent_danger_flow_record
+                    p_latent_danger_flow_record
                 where
                     deleted = 0
                 and
@@ -180,7 +180,7 @@
         select
             *
         from
-            cb_latent_danger_flow_record
+            p_latent_danger_flow_record
         where
             1 = 1
         and
@@ -191,7 +191,7 @@
         select
             *
         from
-            cb_latent_danger_flow_record
+            p_latent_danger_flow_record
         where
             danger_id = #{dangerId}
         and
@@ -204,7 +204,7 @@
         select
             *
         from
-            cb_latent_danger_flow_record
+            p_latent_danger_flow_record
         where
             danger_id = #{dangerId}
         order by create_date desc
@@ -215,16 +215,16 @@
         select
             a.*,b.overtime_state as dangerOvertimeState,b.danger_state as dangerState
         from
-            cb_latent_danger_flow_record as a
+            p_latent_danger_flow_record as a
         left join
-            cb_latent_danger as b on a.danger_id = b.id
+            p_latent_danger as b on a.danger_id = b.id
         where
             a.id in
             (
                 select
                     max(id)
                 from
-                    cb_latent_danger_flow_record
+                    p_latent_danger_flow_record
                 where
                     deleted = 0
 				and
@@ -239,7 +239,7 @@
     </select>
 
     <delete id="deleteByLatentDangerIds">
-        update cb_latent_danger_flow_record set deleted = 1 where danger_id in
+        update p_latent_danger_flow_record set deleted = 1 where danger_id in
         <foreach collection="list" index="index" item="dangerId" open="(" separator="," close=")">
             #{dangerId}
         </foreach>
@@ -260,8 +260,8 @@
             pld.delay_limit_date AS delayLimitDate
 #             wws.full_name AS structureName
         FROM
-            cb_latent_danger pld
-            LEFT JOIN cb_latent_danger_flow_record pldfr ON pldfr.id = pld.current_flow_record_id
+            p_latent_danger pld
+            LEFT JOIN p_latent_danger_flow_record pldfr ON pldfr.id = pld.current_flow_record_id
 #             LEFT JOIN wl_warehouse_structure wws ON wws.id = pld.structure_id
 <!--        WHERE-->
 <!--            <if test="beginTime != null and beginTime != ''">-->
@@ -272,6 +272,6 @@
     </select>
     <select id="getByIdOderByDate"
             resultType="com.yeejoin.amos.latentdanger.business.entity.mybatis.extend.LatentDangerFlowRecordBo">
-        select * from cb_latent_danger_flow_record where deleted = 0 and danger_id = #{dangerId} ORDER BY create_date DESC LIMIT 1
+        select * from p_latent_danger_flow_record where deleted = 0 and danger_id = #{dangerId} ORDER BY create_date DESC LIMIT 1
     </select>
 </mapper>
\ No newline at end of file

amos-boot-system-latentdanger/src/main/resources/db/mapper/LatentDangerMapper.xml

@@ -6,7 +6,7 @@
     <insert id="save" keyColumn="id" keyProperty="id"
             parameterType="com.yeejoin.amos.latentdanger.business.entity.mybatis.extend.LatentDangerBo"
             useGeneratedKeys="true">
-        insert into cb_latent_danger
+        insert into p_latent_danger
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="businessKey != null">
                 business_key,
@@ -158,7 +158,7 @@
     </insert>
 
     <update id="update" parameterType="com.yeejoin.amos.latentdanger.business.entity.mybatis.extend.LatentDangerBo">
-        update cb_latent_danger
+        update p_latent_danger
         <set>
             <if test="businessKey != null">
                 business_key = #{businessKey},
@@ -240,27 +240,27 @@
     </update>
 
     <update id="deleteByIds">
-        update cb_latent_danger set deleted = 1 where id in
+        update p_latent_danger set deleted = 1 where id in
         <foreach collection="list" index="index" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>
     </update>
 
     <select id="getById" resultType="com.yeejoin.amos.latentdanger.business.entity.mybatis.extend.LatentDangerBo">
-        select * from cb_latent_danger where deleted = 0 and id = #{id}
+        select * from p_latent_danger where deleted = 0 and id = #{id}
     </select>
 
     <select id="getByInstanceId" resultType="com.yeejoin.amos.latentdanger.business.entity.mybatis.extend.LatentDangerBo">
-        select * from cb_latent_danger where deleted = 0 and instance_id = #{instanceId} and danger_state = 3 limit 1
+        select * from p_latent_danger where deleted = 0 and instance_id = #{instanceId} and danger_state = 3 limit 1
     </select>
 
     <select id="listByMap" resultType="com.yeejoin.amos.latentdanger.business.entity.mybatis.extend.LatentDangerBo">
         select
           a.*
         from
-          cb_latent_danger as a
+          p_latent_danger as a
         left join
-          cb_latent_danger_flow_record as b on a.current_flow_record_id = b.id
+          p_latent_danger_flow_record as b on a.current_flow_record_id = b.id
         <where>
 <!--            case-->
 <!--            when a.danger_type = 1 and find_in_set(b.action_flag, 'B_3,B_4') then-->
@@ -308,9 +308,9 @@
         select
             count(1)
         from
-            cb_latent_danger as a
+            p_latent_danger as a
         left join
-            cb_latent_danger_flow_record as b on a.current_flow_record_id = b.id
+            p_latent_danger_flow_record as b on a.current_flow_record_id = b.id
         <where>
             case
             when a.danger_type = 1 and find_in_set(b.action_flag, 'B_3,B_4') then
@@ -351,14 +351,14 @@
     </select>
 
     <select id="listOfOvertime" resultType="com.yeejoin.amos.latentdanger.business.entity.mybatis.extend.LatentDangerBo">
-        select * from cb_latent_danger where now()>reform_limit_date and overtime_state = 0 and deleted = 0 and danger_state in (2,3,4)
+        select * from p_latent_danger where now()>reform_limit_date and overtime_state = 0 and deleted = 0 and danger_state in (2,3,4)
     </select>
 
     <select id="countNotFinishByFlowId" resultType="java.lang.Integer">
         select
             count(1)
         from
-            cb_latent_danger
+            p_latent_danger
         where
             deleted = 0
         and
@@ -369,7 +369,7 @@
                 select
                     latent_danger_id
                 from
-                    cb_latent_danger_patrol
+                    p_latent_danger_patrol
                 where
                     risk_factor_flow_id = #{value}
                 and
@@ -381,7 +381,7 @@
         select
             *
         from
-            cb_latent_danger
+            p_latent_danger
         where
             deleted = 0
         and
@@ -392,7 +392,7 @@
                 select
                     latent_danger_id
                 from
-                    cb_latent_danger_patrol
+                    p_latent_danger_patrol
                 where
                     point_id = #{pointId}
                 and
@@ -411,7 +411,7 @@
         ld.instance_id instanceId,
         ld.reform_limit_date reformLimitDate
         FROM
-        cb_latent_danger ld
+        p_latent_danger ld
         WHERE
         TIMESTAMPDIFF( MINUTE, now(), ld.reform_limit_date ) = TIMESTAMPDIFF( MINUTE, (SELECT DATE_ADD(CURDATE(),
         INTERVAL 8 HOUR)), ld.reform_limit_date ) -- 截止日期到当天早上8:00:00分钟数
@@ -427,9 +427,9 @@
         select
             count(1)
         from
-            cb_latent_danger as a
+            p_latent_danger as a
         left join
-            cb_latent_danger_flow_record as b on a.current_flow_record_id = b.id
+            p_latent_danger_flow_record as b on a.current_flow_record_id = b.id
         where
             find_in_set(#{userId},b.flow_task_user_ids)
         and
@@ -442,8 +442,8 @@
 		SELECT
 			count(1)
 		FROM
-			cb_latent_danger a,
-		    cb_latent_danger_patrol b,
+			p_latent_danger a,
+		    p_latent_danger_patrol b,
 		    p_point c,
 		    spc_risk_source d
 		WHERE
@@ -466,8 +466,8 @@
         SELECT
             GROUP_CONCAT(DISTINCT a.id ) extraIds
         FROM
-            cb_latent_danger a,
-            cb_latent_danger_patrol b,
+            p_latent_danger a,
+            p_latent_danger_patrol b,
             p_point c,
             spc_risk_source d
         WHERE
@@ -506,7 +506,7 @@
         f.flow_json flowJson,
         f.remark,
         ld.infer_other_things inferOtherThings,
-        (select ff.flow_task_user_ids from cb_latent_danger_flow_record ff where ff.danger_id = f.danger_id and
+        (select ff.flow_task_user_ids from p_latent_danger_flow_record ff where ff.danger_id = f.danger_id and
             ff.action_flag = 'B_3' limit 1 ) handleUserIds,
         CASE
             WHEN ld.reform_type	= 1 THEN
@@ -519,8 +519,8 @@
         ld.reform_type reformType,
         ld.delay_limit_date delayLimitDate
         FROM
-        cb_latent_danger_flow_record f
-        LEFT JOIN cb_latent_danger ld ON ld.id = f.danger_id
+        p_latent_danger_flow_record f
+        LEFT JOIN p_latent_danger ld ON ld.id = f.danger_id
         WHERE
         f.action_flag != 'B_1'
         AND NOT ISNULL( f.update_date )
@@ -562,8 +562,8 @@
         pld.structure_id structureId,
         pld.structure_name structureName
         FROM
-        cb_latent_danger pld
-        LEFT JOIN cb_latent_danger_patrol ldp ON pld.id = ldp.latent_danger_id
+        p_latent_danger pld
+        LEFT JOIN p_latent_danger_patrol ldp ON pld.id = ldp.latent_danger_id
         LEFT JOIN p_point p ON p.id = ldp.point_id
         LEFT JOIN p_point_classify ppc ON ppc.id = ldp.point_classify_id
         LEFT JOIN p_input_item pii ON pii.id = ldp.item_id
@@ -694,8 +694,8 @@
         dangerFlow.verifyResult,
         pld.reform_json measures
         FROM
-        cb_latent_danger pld
-        LEFT JOIN cb_latent_danger_patrol ldp ON pld.id = ldp.latent_danger_id
+        p_latent_danger pld
+        LEFT JOIN p_latent_danger_patrol ldp ON pld.id = ldp.latent_danger_id
         LEFT JOIN p_point_classify ppc ON ppc.id = ldp.point_classify_id
         LEFT JOIN p_input_item pii ON pii.id = ldp.item_id
         LEFT JOIN p_check pc ON pc.id = ldp.check_id
@@ -757,13 +757,13 @@
         SELECT
         *
         FROM
-        cb_latent_danger_flow_record
+        p_latent_danger_flow_record
         WHERE
         id IN (
         SELECT
         max(id)
         FROM
-        cb_latent_danger_flow_record
+        p_latent_danger_flow_record
         WHERE
         deleted = 0
         AND action_flag IN ('B_3', 'B_4')
@@ -867,7 +867,7 @@
         SELECT
          *
         FROM
-            cb_latent_danger pld
+            p_latent_danger pld
         WHERE
             pld.business_key IN
         <foreach collection = "businessKeys" item = "businessKey" index="index" open = "(" close = ")" separator = "," >
@@ -895,7 +895,7 @@
         SELECT
         count(*)
         FROM
-        cb_latent_danger pld
+        p_latent_danger pld
         WHERE
         pld.business_key IN
         <foreach collection = "businessKeys" item = "businessKey" index="index" open = "(" close = ")" separator = "," >
@@ -919,7 +919,7 @@
         SELECT
         count(*)
         FROM
-        cb_latent_danger pld
+        p_latent_danger pld
         WHERE
         pld.deleted = 0
         AND
@@ -942,12 +942,12 @@
         SELECT
         *
         FROM
-        cb_latent_danger pld
+        p_latent_danger pld
         WHERE
         pld.business_key = #{businessKey}
     </select>
     <select id="selectPageByParam" resultType="com.yeejoin.amos.latentdanger.dao.entity.LatentDanger">
-        select * from cb_latent_danger a
+        select * from p_latent_danger a
         <where>
             deleted = 0
             <foreach collection="paramMap" index="key" item="value">
@@ -975,9 +975,12 @@
                 <if test="key == 'endTime' and value != null and value != ''">
                     and a.create_date <![CDATA[ <= ]]> #{value}
                 </if>
-                <if test="key == 'name' and value != null and value != ''">
+                <if test="key == 'dangerName' and value != null and value != ''">
                     and a.danger_name like concat('%', #{value}, '%')
                 </if>
+                <if test="key == 'reformType' and value != null and value != ''">
+                    and a.reform_type = #{value}
+                </if>
                 <if test="key == 'structureIdList' and value != null">
                     and a.structure_id in
                     <foreach collection="value" item="structureId" open="(" separator="," close=")">

amos-boot-system-patrol/src/main/resources/db/changelog/patrol-3.0.1.xml

@@ -121,4 +121,198 @@
             `longitude`;
         </sql>
     </changeSet>
+
+    <changeSet author="tb" id="tb-20211009-1">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_latent_danger" columnName="danger_level_name"/>
+            </not>
+        </preConditions>
+        <comment>p_latent_danger add COLUMN danger_level_name '隐患等级名称'</comment>
+        <sql>
+            ALTER TABLE p_latent_danger add COLUMN `danger_level_name` varchar(50) DEFAULT NULL COMMENT '隐患等级名称' after
+            `danger_level`;
+        </sql>
+    </changeSet>
+    <changeSet author="tb" id="tb-20211009-2">
+        <preConditions onFail="MARK_RAN">
+            <columnExists tableName="p_latent_danger" columnName="danger_level"/>
+        </preConditions>
+        <comment>p_latent_danger MODIFY COLUMN danger_level</comment>
+        <sql>
+            ALTER TABLE p_latent_danger MODIFY COLUMN `danger_level` varchar(30) NOT NULL DEFAULT '1' COMMENT '隐患等级';
+        </sql>
+    </changeSet>
+
+    <changeSet author="tb" id="tb-20211009-3">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_latent_danger" columnName="danger_type_name"/>
+            </not>
+        </preConditions>
+        <comment>p_latent_danger add COLUMN danger_type_name '隐患类型名称'</comment>
+        <sql>
+            ALTER TABLE p_latent_danger add COLUMN `danger_type_name` varchar(50) DEFAULT NULL COMMENT '隐患类型名称';
+        </sql>
+    </changeSet>
+    <changeSet author="tb" id="tb-20211009-4">
+        <preConditions onFail="MARK_RAN">
+            <columnExists tableName="p_latent_danger" columnName="danger_type"/>
+        </preConditions>
+        <comment>p_latent_danger MODIFY COLUMN danger_type</comment>
+        <sql>
+            ALTER TABLE p_latent_danger MODIFY COLUMN `danger_type` varchar(30) NOT NULL DEFAULT '1' COMMENT '隐患类型（1：无码无计划隐患；2：巡检隐患；3：有码无计划隐患；4：随手拍）';
+        </sql>
+    </changeSet>
+
+    <changeSet author="tb" id="tb-20211009-5">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_latent_danger" columnName="reform_type_name"/>
+            </not>
+        </preConditions>
+        <comment>p_latent_danger add COLUMN reform_type_name '整改类型名称'</comment>
+        <sql>
+            ALTER TABLE p_latent_danger add COLUMN `reform_type_name` varchar(50) DEFAULT NULL COMMENT '整改类型名称';
+        </sql>
+    </changeSet>
+    <changeSet author="tb" id="tb-20211009-6">
+        <preConditions onFail="MARK_RAN">
+            <columnExists tableName="p_latent_danger" columnName="reform_type"/>
+        </preConditions>
+        <comment>p_latent_danger MODIFY COLUMN reform_type</comment>
+        <sql>
+            ALTER TABLE p_latent_danger MODIFY COLUMN `reform_type` varchar(30) DEFAULT NULL COMMENT '整改类型';
+        </sql>
+    </changeSet>
+
+    <changeSet author="tb" id="tb-20211009-7">
+        <preConditions onFail="MARK_RAN">
+            <columnExists tableName="p_latent_danger" columnName="overtime_state"/>
+        </preConditions>
+        <comment>p_latent_danger MODIFY COLUMN overtime_state</comment>
+        <sql>
+            ALTER TABLE p_latent_danger MODIFY COLUMN `overtime_state` bit(4) NOT NULL DEFAULT b'0' COMMENT '是否逾期（0：否；1：是）';
+        </sql>
+    </changeSet>
+
+    <changeSet author="tb" id="tb-20211009-8">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_latent_danger" columnName="danger_state_name"/>
+            </not>
+        </preConditions>
+        <comment>p_latent_danger add COLUMN danger_state_name '隐患状态名称'</comment>
+        <sql>
+            ALTER TABLE p_latent_danger add COLUMN `danger_state_name` varchar(50) DEFAULT NULL COMMENT '隐患状态名称';
+        </sql>
+    </changeSet>
+    <changeSet author="tb" id="tb-20211009-9">
+        <preConditions onFail="MARK_RAN">
+            <columnExists tableName="p_latent_danger" columnName="danger_state"/>
+        </preConditions>
+        <comment>p_latent_danger MODIFY COLUMN danger_state</comment>
+        <sql>
+            ALTER TABLE p_latent_danger MODIFY COLUMN `danger_state` varchar(30) NOT NULL DEFAULT '1' COMMENT '隐患状态';
+        </sql>
+    </changeSet>
+
+    <changeSet author="tb" id="tb-20211009-10">
+        <preConditions onFail="MARK_RAN">
+            <columnExists tableName="p_latent_danger" columnName="deleted"/>
+        </preConditions>
+        <comment>p_latent_danger MODIFY COLUMN deleted</comment>
+        <sql>
+            ALTER TABLE p_latent_danger MODIFY COLUMN `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除（0：否；1：是）';
+        </sql>
+    </changeSet>
+
+    <changeSet author="tb" id="tb-20211009-11">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_latent_danger" columnName="check_input_id"/>
+            </not>
+        </preConditions>
+        <comment>p_latent_danger CHANGE COLUMN check_input_id to biz_id '创建隐患的业务数据主键id'</comment>
+        <sql>
+            ALTER TABLE p_latent_danger CHANGE COLUMN `check_input_id` `biz_id` bigint(20) DEFAULT NULL COMMENT '创建隐患的业务数据主键id';
+        </sql>
+    </changeSet>
+
+    <changeSet author="tb" id="tb-20211009-12">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_latent_danger" columnName="biz_info"/>
+            </not>
+        </preConditions>
+        <comment>p_latent_danger add COLUMN biz_info '业务信息'</comment>
+        <sql>
+            ALTER TABLE p_latent_danger add COLUMN `biz_info` varchar(500) DEFAULT NULL COMMENT '业务信息';
+        </sql>
+    </changeSet>
+
+    <changeSet author="tb" id="tb-20211009-13">
+        <preConditions onFail="MARK_RAN">
+            <columnExists tableName="p_latent_danger_flow_record" columnName="excute_state"/>
+        </preConditions>
+        <comment>p_latent_danger_flow_record CHANGE COLUMN excute_state</comment>
+        <sql>
+            ALTER TABLE p_latent_danger_flow_record CHANGE COLUMN `excute_state` `execute_state` tinyint(4) NOT NULL DEFAULT '1' COMMENT '执行状态（1：未执行；2：通过；3：驳回）';
+        </sql>
+    </changeSet>
+
+    <changeSet author="tb" id="tb-20211009-14">
+        <preConditions onFail="MARK_RAN">
+            <columnExists tableName="p_latent_danger_flow_record" columnName="excute_user_id"/>
+        </preConditions>
+        <comment>p_latent_danger_flow_record CHANGE COLUMN excute_user_id to execute_user_id</comment>
+        <sql>
+            ALTER TABLE p_latent_danger_flow_record CHANGE COLUMN `excute_user_id` `execute_user_id` varchar(255) DEFAULT NULL COMMENT '执行人';
+        </sql>
+    </changeSet>
+
+    <changeSet author="tb" id="tb-20211009-15">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_latent_danger_flow_record" columnName="execute_user_name"/>
+            </not>
+        </preConditions>
+        <comment>p_latent_danger_flow_record add COLUMN execute_user_name '执行人名称'</comment>
+        <sql>
+            ALTER TABLE p_latent_danger_flow_record add COLUMN `execute_user_name` varchar(255) DEFAULT NULL COMMENT '执行人名称';
+        </sql>
+    </changeSet>
+
+    <changeSet author="tb" id="tb-20211009-16">
+        <preConditions onFail="MARK_RAN">
+            <columnExists tableName="p_latent_danger_flow_record" columnName="excute_department_id"/>
+        </preConditions>
+        <comment>p_latent_danger_flow_record CHANGE COLUMN excute_department_id to execute_department_id</comment>
+        <sql>
+            ALTER TABLE p_latent_danger_flow_record CHANGE COLUMN `excute_department_id` `execute_department_id` varchar(255) DEFAULT NULL COMMENT '执行部门编号';
+        </sql>
+    </changeSet>
+
+    <changeSet author="tb" id="tb-20211009-17">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_latent_danger_flow_record" columnName="execute_department_name"/>
+            </not>
+        </preConditions>
+        <comment>p_latent_danger_flow_record add COLUMN execute_department_name '执行部门名称'</comment>
+        <sql>
+            ALTER TABLE p_latent_danger_flow_record add COLUMN `execute_department_name` varchar(255) DEFAULT NULL COMMENT '执行部门名称';
+        </sql>
+    </changeSet>
+
+    <changeSet author="tb" id="tb-20211009-18">
+        <preConditions onFail="MARK_RAN">
+            <columnExists tableName="p_latent_danger_flow_record" columnName="excute_result"/>
+        </preConditions>
+        <comment>p_latent_danger_flow_record CHANGE COLUMN excute_result to execute_result</comment>
+        <sql>
+            ALTER TABLE p_latent_danger_flow_record CHANGE COLUMN `excute_result` `execute_result` varchar(255) DEFAULT NULL COMMENT '执行结果';
+        </sql>
+    </changeSet>
+
 </databaseChangeLog>
\ No newline at end of file

amos-boot-system-patrol/src/main/resources/db/mapper/LatentDangerMapper.xml

@@ -11,6 +11,9 @@
             <if test="businessKey != null">
                 business_key,
             </if>
+            <if test="bizType != null">
+                biz_type,
+            </if>
             <if test="orgCode != null">
                 org_code,
             </if>
@@ -71,8 +74,8 @@
             <if test="problemDescription != null">
                 problem_description,
             </if>
-            <if test="checkInputId != null">
-                check_input_id,
+            <if test="bizId != null">
+                biz_id,
             </if>
             <if test="structureId != null">
                 structure_id,
@@ -85,6 +88,9 @@
             <if test="businessKey != null">
                 #{businessKey},
             </if>
+            <if test="bizType != null">
+                #{bizType},
+            </if>
             <if test="orgCode != null">
                 #{orgCode},
             </if>
@@ -145,8 +151,8 @@
             <if test="problemDescription != null">
                 #{problemDescription},
             </if>
-            <if test="checkInputId != null">
-                #{checkInputId},
+            <if test="bizId != null">
+                #{bizId},
             </if>
             <if test="structureId != null">
                 #{structureId},