优化过期失效的字段

know_sub_business/src/main/java/com/supervision/knowsub/service/impl/KnowledgeManageServiceImpl.java

@@ -268,7 +268,6 @@ public class KnowledgeManageServiceImpl implements KnowledgeManageService {
                 .set(KnowledgeInfo::getTerritory, knowledgeInfo.getTerritory())
                 .set(KnowledgeInfo::getPublishScope, knowledgeInfo.getPublishScope())
                 .set(KnowledgeInfo::getKnowledgeTag, knowledgeInfo.getKnowledgeTag())
-                .set(KnowledgeInfo::getAutoLoseEffect, knowledgeInfo.getAutoLoseEffect())
                 .set(KnowledgeInfo::getExecTimeBegin, knowledgeInfo.getExecTimeBegin())
                 .set(KnowledgeInfo::getExecTimeEnd, knowledgeInfo.getExecTimeEnd())
                 .set(KnowledgeInfo::getTimeliness, knowledgeInfo.getTimeliness())

know_sub_business/src/main/java/com/supervision/knowsub/task/InvalidCheckTask.java

@@ -31,7 +31,7 @@ public class InvalidCheckTask {
         List<CheckInvalidDTO> checkInvalidDTOS = knowledgeService.queryKnowledgeInvalidList();
         for (CheckInvalidDTO checkInvalidDTO : checkInvalidDTOS) {
             // 校验当前时间是否超过了最大时间
-            if (ObjectUtil.isNotEmpty(checkInvalidDTO.getAutoLoseEffect()) &&  2 == checkInvalidDTO.getAutoLoseEffect() &&  LocalDateTime.now().isAfter(checkInvalidDTO.getExecTimeEnd())) {
+            if (LocalDateTime.now().isAfter(checkInvalidDTO.getExecTimeEnd())) {
                 log.info("标题:{},过期时间:{},目前已过期,标记为过期", checkInvalidDTO.getTitle(), checkInvalidDTO.getExecTimeEnd());
                 // 如果超过了当前时间,说明过期了
                 knowledgeService.lambdaUpdate().set(Knowledge::getStatus, StatusEnum.INVALID.getStatus())

know_sub_model/src/main/java/com/supervision/knowsub/dto/knowledge/CheckInvalidDTO.java

@@ -15,8 +15,6 @@ public class CheckInvalidDTO {
 
     private Integer timeliness;
 
-    private Integer autoLoseEffect;
-
     private LocalDateTime execTimeBegin;
 
     private LocalDateTime execTimeEnd;

know_sub_model/src/main/java/com/supervision/knowsub/model/KnowledgeInfo.java

@@ -58,13 +58,6 @@ public class KnowledgeInfo implements Serializable {
      */
     @Schema(description = "时效性 1长期有效 2临时有效")
     private Integer timeliness;
-
-    /**
-     * 到期自动失效 1到期自动失效
-     */
-    @Schema(description = "到期自动失效 1到期自动失效")
-    private Integer autoLoseEffect;
-
     /**
      * 执行期限开始
      */

know_sub_model/src/main/resources/mapper/KnowledgeInfoMapper.xml

@@ -12,7 +12,6 @@
         <result property="territory" column="territory" jdbcType="VARCHAR"/>
         <result property="publishDate" column="publish_date" jdbcType="TIMESTAMP"/>
         <result property="timeliness" column="timeliness" jdbcType="INTEGER"/>
-        <result property="autoLoseEffect" column="auto_lose_effect" jdbcType="INTEGER"/>
         <result property="execTimeBegin" column="exec_time_begin" jdbcType="TIMESTAMP"/>
         <result property="execTimeEnd" column="exec_time_end" jdbcType="TIMESTAMP"/>
         <result property="knowledgeTag" column="knowledge_tag" jdbcType="VARCHAR"/>
@@ -28,7 +27,7 @@
         id
         ,context_id,cover_id,
         source,territory,publish_date,
-        timeliness,autoLoseEffect,exec_time_begin,exec_time_end,
+        timeliness,exec_time_begin,exec_time_end,
         knowledge_tag,policy_type,publish_scope,create_user_id,
         create_time,update_user_id,update_time
     </sql>

know_sub_model/src/main/resources/mapper/KnowledgeMapper.xml

@@ -96,13 +96,11 @@
                t1.title            as title,
                t1.status           as status,
                t2.timeliness       as timeliness,
-               t2.auto_lose_effect as autoLoseEffect,
                t2.exec_time_begin  as execTimeBegin,
                t2.exec_time_end    as execTimeEnd
         from ks_knowledge t1
                  left join ks_knowledge_info t2 on t1.info_id = t2.id
         where status = 2
           and t2.timeliness = 2
-          and auto_lose_effect = 1
     </select>
 </mapper>