fix(核查模块): 增加了终止任务功能

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/common/CcDataCache.java

+package com.tykj.dev.device.confirmcheck.common;
+
+import com.tykj.dev.device.confirmcheck.entity.vo.LinkVo;
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * CcDataCache. 核查模块自用缓存
+ *
+ * @author Matrix <xhyrzldf@gmail.com>
+ * @since 2021/9/23 at 5:32 下午
+ */
+@Data
+public class CcDataCache {
+
+    public static Map<Integer, LinkVo> linkVoCache = new HashMap<>();
+}

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/common/CcInitRunner.java

+package com.tykj.dev.device.confirmcheck.common;
+
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.core.annotation.Order;
+
+import java.util.HashMap;
+
+/**
+ * CcInitRunner.
+ *
+ * @author Matrix <xhyrzldf@gmail.com>
+ * @since 2021/9/23 at 5:30 下午
+ */
+@Order(99)
+public class CcInitRunner implements CommandLineRunner {
+    @Override
+    public void run(String... args) throws Exception {
+        //初始化Map 从DB里面拿数据
+        CcDataCache.linkVoCache = new HashMap<>(32);
+
+    }
+}

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/entity/domain/DeviceCheckLink.java

+package com.tykj.dev.device.confirmcheck.entity.domain;
+
+import com.tykj.dev.device.confirmcheck.entity.vo.DeviceCheckLinkVo;
+import com.tykj.dev.device.confirmcheck.entity.vo.LinkVo;
+import com.tykj.dev.device.confirmcheck.utils.MapperHelper;
+import com.tykj.dev.misc.base.BaseEntity;
+import com.tykj.dev.misc.utils.JacksonUtil;
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.SQLDelete;
+import org.modelmapper.ModelMapper;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.time.LocalDateTime;
+
+/**
+ * DeviceCheckLink.
+ *
+ * @author Matrix <xhyrzldf@gmail.com>
+ * @since 2021/9/23 at 5:40 下午
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@Entity
+@SQLDelete(sql = "update device_check_link set delete_tag = 1 where id = ?")
+@ApiModel("核查检查列表的缓存表")
+@NoArgsConstructor
+@Table(name = "device_check_link")
+public class DeviceCheckLink extends BaseEntity {
+
+    private Integer statId;
+
+    @Column(name = "link_text", columnDefinition = "TEXT")
+    private String linkText;
+
+    public DeviceCheckLinkVo toVo() {
+        ModelMapper mapper = MapperHelper.getMapper();
+        DeviceCheckLinkVo dcLinkVo = mapper.map(this, DeviceCheckLinkVo.class);
+        LinkVo linkVo = JacksonUtil.readValue(linkText, LinkVo.class);
+        dcLinkVo.setLinkVo(linkVo);
+        return dcLinkVo;
+    }
+
+    public DeviceCheckLink(Integer statId , String linkText) {
+        this.statId = statId;
+        this.linkText = linkText;
+    }
+
+    public DeviceCheckLink(Integer id, Integer createUserId, Integer updateUserId, LocalDateTime createTime, LocalDateTime updateTime, Integer deleteTag, Integer statId, String linkText) {
+        super(id, createUserId, updateUserId, createTime, updateTime, deleteTag);
+        this.statId = statId;
+        this.linkText = linkText;
+    }
+}

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/entity/vo/DeviceCheckLinkVo.java

+package com.tykj.dev.device.confirmcheck.entity.vo;
+
+import com.alibaba.fastjson.JSON;
+import com.tykj.dev.device.confirmcheck.entity.domain.DeviceCheckLink;
+import com.tykj.dev.device.confirmcheck.utils.MapperHelper;
+import com.tykj.dev.misc.base.BaseVo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import org.modelmapper.ModelMapper;
+
+import java.time.LocalDateTime;
+
+/**
+ * DeviceCheckLinkVo.
+ *
+ * @author Matrix <xhyrzldf@gmail.com>
+ * @since 2021/9/24 at 10:58 上午
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@NoArgsConstructor
+public class DeviceCheckLinkVo extends BaseVo {
+
+    private Integer statId;
+
+    private LinkVo linkVo;
+
+    public DeviceCheckLinkVo(Integer statId, LinkVo linkVo) {
+        this.statId = statId;
+        this.linkVo = linkVo;
+    }
+
+    public DeviceCheckLinkVo(Integer id, Integer createUserId, Integer updateUserId, LocalDateTime createTime, LocalDateTime updateTime, Integer deleteTag, Integer statId, LinkVo linkVo) {
+        super(id, createUserId, updateUserId, createTime, updateTime, deleteTag);
+        this.statId = statId;
+        this.linkVo = linkVo;
+    }
+
+    public DeviceCheckLink toDo() {
+        ModelMapper mapper = MapperHelper.getMapper();
+        DeviceCheckLink dcLink = mapper.map(this, DeviceCheckLink.class);
+        String linkText = JSON.toJSONStringWithDateFormat(this.linkVo, "yyyy-MM-dd HH:mm:ss");
+        dcLink.setLinkText(linkText);
+        return dcLink;
+    }
+}

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/entity/vo/LinkVo.java

 package com.tykj.dev.device.confirmcheck.entity.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
 import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDate;
 import java.util.List;
@@ -25,11 +31,19 @@ public class LinkVo {
      */
     private int type;
 
+    /**
+     * 是否终结 true = 已终结 ,false = 未终结
+     */
+    private boolean isShutDown;
+
     /**
      * 核查/检查总标题
      */
     private String title;
 
+    @JsonDeserialize(using = LocalDateDeserializer.class)
+    @JsonSerialize(using = LocalDateSerializer.class)
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
     private LocalDate endTime;
 
     /**
@@ -48,4 +62,13 @@ public class LinkVo {
         this.type = type;
         this.endTime = endTime;
     }
+
+//    public LinkVo(int type, String title, String endTime, List<LinkCheckDetail> lcDetail, List<LinkExamDetail> leDetail, int detailId) {
+//        this.type = type;
+//        this.title = title;
+//        this.endTime = LocalDate.parse(endTime);
+//        this.lcDetail = lcDetail;
+//        this.leDetail = leDetail;
+//        this.detailId = detailId;
+//    }
 }

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/repository/DeviceCheckLinkDao.java

+package com.tykj.dev.device.confirmcheck.repository;
+
+import com.tykj.dev.device.confirmcheck.entity.domain.DeviceCheckLink;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.stereotype.Repository;
+
+import java.util.Optional;
+
+/**
+ * DeviceCheckLinkDao.
+ *
+ * @author Matrix <xhyrzldf@gmail.com>
+ * @since 2021/9/24 at 11:05 上午
+ */
+@Repository
+public interface DeviceCheckLinkDao extends JpaRepository<DeviceCheckLink, Integer>, JpaSpecificationExecutor<DeviceCheckLink> {
+
+    Optional<DeviceCheckLink> findByStatId(Integer statId);
+}

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/utils/ObjTransUtil.java

@@ -42,6 +42,8 @@ import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import static com.tykj.dev.misc.base.StatusEnum.END;
+import static com.tykj.dev.misc.base.StatusEnum.REVOKEALLOTTASK;
 import static java.util.stream.Collectors.toList;
 import static java.util.stream.Collectors.toMap;
 
@@ -164,7 +166,7 @@ public class ObjTransUtil {
         long total = childTask.size();
 
         long done = childTask.stream()
-                .filter(task -> task.getBillStatus().equals(9999))
+                .filter(task -> task.getBillStatus().equals(END.id)||task.getBillStatus().equals(REVOKEALLOTTASK.id))
                 .count();
 
         //如果是检查统计的话那么还要看一下他的父节点是不是已经完成了

dev-misc/src/main/java/com/tykj/dev/misc/base/BaseEntity.java

@@ -9,6 +9,7 @@ import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedBy;
 import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.persistence.*;
 import java.time.LocalDateTime;
@@ -52,12 +53,14 @@ public class BaseEntity {
      * 创建时间
      */
     @CreatedDate
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
 
     /**
      * 更新时间
      */
     @LastModifiedDate
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime updateTime;
 
     /**

dev-misc/src/main/java/com/tykj/dev/misc/base/BaseVo.java

+package com.tykj.dev.misc.base;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.data.annotation.CreatedBy;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedBy;
+import org.springframework.data.annotation.LastModifiedDate;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import java.time.LocalDateTime;
+
+/**
+ * BaseVo.
+ *
+ * @author Matrix <xhyrzldf@gmail.com>
+ * @since 2021/9/24 at 11:02 上午
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class BaseVo {
+
+    /**
+     * 主键id
+     */
+    private Integer id;
+
+    /**
+     * 创建用户id
+     */
+    private Integer createUserId;
+
+    /**
+     * 更新用户id
+     */
+    private Integer updateUserId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 删除标记(0:未删除，1:已删除)
+     */
+    private Integer deleteTag = 0;
+}