jackson long返回字符串配置提交

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

@@ -10,11 +10,11 @@ public enum LatentDangerBizTypeEnum {
     /**
      * 防火监督
      */
-    防火监督("防火监督", "supervision", "fire_supervision_hazard_management"),
+    防火监督("防火监督", "supervision"),
     /**
      * 巡检
      */
-    巡检("巡检", "patrol", "");
+    巡检("巡检", "patrol");
 
     /**
      * 业务名称
@@ -26,15 +26,9 @@ public enum LatentDangerBizTypeEnum {
      */
     String code;
 
-    /**
-     * 业务对应工作流定义key
-     */
-    String workflowDefKey;
-
-    LatentDangerBizTypeEnum(String name, String code, String workflowDefKey) {
+    LatentDangerBizTypeEnum(String name, String code) {
         this.name = name;
         this.code = code;
-        this.workflowDefKey = workflowDefKey;
     }
 
     public static LatentDangerBizTypeEnum getByCode(String code) {

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

 package com.yeejoin.amos.latentdanger.common.enums;
 
+/**
+ * @author DELL
+ */
 public enum LatentDangerOvertimeStateEnum {
-    未超时("未超时", 0),
-    已超时("已超时", 1);
+    /**
+     * 未逾期
+     */
+    未逾期("未超时", 0),
+    已逾期("已超时", 1);
 
     /**
      * 名称，描述

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/dao/mapper/LatentDangerMapper.java

@@ -44,9 +44,10 @@ public interface LatentDangerMapper extends BaseMapper<LatentDanger> {
     /**
      * 查询治理期限即将到期的隐患
      *
+     * @param dangerState 隐患状态（逗号分割字符串）
      * @return
      */
-    List<LatentDangerNoticeBo> listNeedNoticeDanger();
+    List<LatentDangerNoticeBo> listNeedNoticeDanger(@Param("dangerState") String dangerState);
 
     /**
      * 根据隐患id获取评审信息

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

@@ -601,7 +601,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
     private String getLimitDesc(LatentDangerBo bo, Date start) {
         String dangerState = bo.getDangerState();
         if (LatentDangerStateEnum.已撤销.getCode().equals(dangerState) || LatentDangerStateEnum.治理完毕.getCode().equals(dangerState)) {
-            if (bo.getOvertimeState().equals(LatentDangerOvertimeStateEnum.已超时.getCode())) {
+            if (bo.getOvertimeState().equals(LatentDangerOvertimeStateEnum.已逾期.getCode())) {
                 return "逾期治理";
             } else {
                 return "按期治理";
@@ -611,7 +611,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
             if (end == null) {
                 return "";
             }
-            if (bo.getOvertimeState().equals(LatentDangerOvertimeStateEnum.已超时.getCode())) {
+            if (bo.getOvertimeState().equals(LatentDangerOvertimeStateEnum.已逾期.getCode())) {
                 return "逾期未治理";
             } else {
                 long betweenSecond = (end.getTime() - start.getTime()) / 1000;
@@ -1004,11 +1004,24 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
     @Override
     public void updateDangerStateOfOvertime() {
         logger.info("修改治理过期隐患的逾期状态");
+        String bizType = redisUtils.get(Constants.DANGER_BIZ_TYPE_KEY).toString();
+        String dangerState = "2,3,4";
+        if (LatentDangerBizTypeEnum.巡检.getCode().equals(bizType)) {
+            dangerState = "2,3,4";
+        } else if (LatentDangerBizTypeEnum.防火监督.getCode().equals(bizType)) {
+            dangerState = "taskDispatch,governFileSubmit,governLeaderConfirm,governChargerConfirm," +
+                    "governLeadershipConfirm,governLeaderReviewConfirm,governSecondReviewConfirm";
+        }
         List<LatentDangerBo> overtimeList = latentDangerMapper.listOfOvertime();
+        LambdaQueryWrapper<LatentDanger> queryWrapper = new LambdaQueryWrapper<>();
+//        queryWrapper
+        List<LatentDanger> overtimeDangerList = this.baseMapper.selectList(queryWrapper);
         for (LatentDangerBo latentDangerBo : overtimeList) {
-            latentDangerBo.setOvertimeState(LatentDangerOvertimeStateEnum.已超时.getCode());
+            latentDangerBo.setOvertimeState(LatentDangerOvertimeStateEnum.已逾期.getCode());
             latentDangerMapper.update(latentDangerBo);
-            if (latentDangerBo.getDangerType().equals(LatentDangerTypeEnum.计划检查.getCode())) {
+
+            if (LatentDangerBizTypeEnum.巡检.getCode().equals(bizType) &&
+                    latentDangerBo.getDangerType().equals(LatentDangerTypeEnum.计划检查.getCode())) {
                 // TODO 远程调用修改
                 LatentDangerPatrolBo patrolBo = latentDangerPatrolMapper.getByDangerId(latentDangerBo.getId());
                 LatentDangerResultPushSpcRequest spcRequest = new LatentDangerResultPushSpcRequest();
@@ -1020,11 +1033,11 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
                 remoteSpcService.pushLatentDangerExecuteResult(spcRequest);
             }
         }
-        //推送页面刷新
+        // TODO 推送页面刷新
 //        remoteWebSocketServer.wsDataRefresh("dangerOverdue");
 
         // 即将逾期的隐患发送消息提醒用户
-        List<LatentDangerNoticeBo> needNoticeDangerList = latentDangerMapper.listNeedNoticeDanger();
+        List<LatentDangerNoticeBo> needNoticeDangerList = latentDangerMapper.listNeedNoticeDanger(dangerState);
         if (!CollectionUtils.isEmpty(needNoticeDangerList)) {
             logger.info("隐患治理即将逾期通知》》》》");
             needNoticeDangerList.forEach(danger -> {
@@ -1200,7 +1213,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
         boolean executeResult = workflowExecuteService.CompleteTask(processInstanceId, condition, reginParams);
         if (!executeResult) {
             executeSubmitDto.setIsOk(false);
-            executeResultMsg = "任务执行失败";
+            executeSubmitDto.setMsg("任务执行失败");
+            return executeSubmitDto;
         }
 
         String nextState = "";
@@ -1497,7 +1511,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
             flowRecordBos.forEach(l -> {
                 String status = null;
                 if (l.getDangerState().equals(LatentDangerStateEnum.待治理.getCode())
-                        && l.getDangerOvertimeState().equals(LatentDangerOvertimeStateEnum.已超时.getCode())) {
+                        && l.getDangerOvertimeState().equals(LatentDangerOvertimeStateEnum.已逾期.getCode())) {
                     status = "治理逾期";
                 } else {
                     if (l.getExecuteResult().equals(LatentDangerExecuteTypeEnum.隐患评审通过.getName())) {
@@ -1823,7 +1837,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
         return dangerListResponseList;
     }
 
-    //获取下一节点需要发消息的用户信息
+    // TODO 获取下一节点需要发消息的用户信息
     private String getNextExecuteUsers(String instanceId) {
         String informerList = "";
         JSONObject object = remoteWorkFlowService.getChildNodeDetail(instanceId);

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/service/intfc/ILatentDangerService.java

@@ -140,7 +140,7 @@ public interface ILatentDangerService {
                        String deptId, String deptName, ReginParams reginParams) throws Exception;
 
     /**
-     * 隐患审核分页查询
+     * 防火监督-隐患审核分页查询
      *
      * @param pageParam
      * @return

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/config/JacksonCustomizerConfig.java

@@ -7,11 +7,13 @@ import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonDeserializer;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 import java.io.IOException;
+import java.math.BigInteger;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 
@@ -28,6 +30,8 @@ public class JacksonCustomizerConfig {
         return builder -> {
             builder.serializerByType(LocalDateTime.class, new LocalDateTimeSerializer());
             builder.deserializerByType(LocalDateTime.class, new LocalDateTimeDeserializer());
+            builder.serializerByType(Long.class, ToStringSerializer.instance);
+            builder.serializerByType(BigInteger.class, ToStringSerializer.instance);
         };
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/schedule/LatentDangerScheduled.java

@@ -19,7 +19,7 @@ public class LatentDangerScheduled {
     /**
      * 每1分钟执行一次：查询逾期的隐患，修改状态
      */
-//    @Scheduled(cron = "0 0/1 * * * ?")
+    @Scheduled(cron = "0 0/1 * * * ?")
     public void updateDangerStateOfOvertime() {
         iLatentDangerService.updateDangerStateOfOvertime();
     }

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

@@ -401,6 +401,28 @@
          and id !=#{dangerId}
     </select>
 
+    <select id="listNeedNoticeDanger"
+            resultType="com.yeejoin.amos.latentdanger.business.entity.mybatis.extend.LatentDangerNoticeBo">
+        SELECT
+        ld.id dangerId,
+        ld.org_code orgCode,
+        ld.danger_state dangerState,
+        ld.danger_name dangerName,
+        ld.instance_id instanceId,
+        ld.reform_limit_date reformLimitDate
+        FROM
+        cb_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分钟数
+        AND ld.overtime_state = 0
+        AND ld.deleted = 0
+        <if test="dangerState != null and dangerState != ''" >
+            AND ld.danger_state in (#{dangerState});
+        </if>
+
+    </select>
+
     <select id="countByFlowUserIds" resultType="java.lang.Long">
         select
             count(1)
@@ -466,25 +488,6 @@
             AND c.original_id = d.id;
     </select>
 
-    <select id="listNeedNoticeDanger"
-            resultType="com.yeejoin.amos.latentdanger.business.entity.mybatis.extend.LatentDangerNoticeBo">
-        SELECT
-            ld.id dangerId,
-            ld.org_code orgCode,
-            ld.danger_state dangerState,
-            ld.danger_name dangerName,
-            ld.instance_id instanceId,
-            ld.reform_limit_date reformLimitDate
-        FROM
-            cb_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分钟数
-            AND ld.overtime_state = 0
-            AND ld.deleted = 0
-            AND ld.danger_state = 2;
-    </select>
-
     <select id="getReViewInfo" resultType="java.util.HashMap">
         SELECT
         f.id,