采集器版本更换

collector-scheduling-management/src/main/java/com/docus/server/common/process/CollectorVersionProcessor.java

@@ -0,0 +1,72 @@
+package com.docus.server.common.process;
+
+import com.docus.infrastructure.redis.service.IdService;
+import com.docus.log.context.TrackContext;
+import com.docus.log.processor.AbstractProcessor;
+import com.docus.server.dto.scheduling.management.schcollector.UpdateSchCollectorDTO;
+import com.docus.server.entity.scheduling.management.SchCollector;
+import com.docus.server.entity.scheduling.management.SchCollectorVersion;
+import com.docus.server.entity.scheduling.management.SchCollectorVersionLog;
+import com.docus.server.entity.scheduling.management.SchSystemParams;
+import com.docus.server.enums.StateEnum;
+import com.docus.server.infrastructure.dao.ISchCollectorDao;
+import com.docus.server.infrastructure.dao.ISchCollectorVersionDao;
+import com.docus.server.infrastructure.dao.ISchCollectorVersionLogDao;
+import com.docus.server.infrastructure.dao.ISchSystemParamsDao;
+
+import javax.annotation.Resource;
+
+/**
+ * 日志管理
+ */
+public class CollectorVersionProcessor extends AbstractProcessor {
+    @Resource
+    private ISchCollectorVersionLogDao iSchCollectorVersionLogDao;
+    @Resource
+    private ISchCollectorVersionDao iSchCollectorVersionDao;
+    @Resource
+    private ISchSystemParamsDao iSchSystemParamsDao;
+    @Resource
+    private ISchCollectorDao iSchCollectorDao;
+    @Resource
+    private IdService idService;
+
+    @Override
+    public Object beforeProcess(TrackContext context) {
+        super.beforeProcess(context);
+        UpdateSchCollectorDTO updateDTO = (UpdateSchCollectorDTO) context.getArgs()[0];
+        Long collectorId = updateDTO.getCollectorId();
+        SchCollector schCollector = iSchCollectorDao.findOneBy("collectorId", collectorId);
+        SchCollectorVersion preVersion = iSchCollectorVersionDao.findById(schCollector.getCollectorVersionId());
+        return preVersion.getCollectVersion();
+    }
+
+    @Override
+    protected Object doProcess(TrackContext context) {
+        logProcess(context);
+        return null;
+    }
+
+    private void logProcess(TrackContext context) {
+
+        boolean error = context.isError();
+
+        UpdateSchCollectorDTO updateDTO = (UpdateSchCollectorDTO) context.getArgs()[0];
+        Long collectorId = updateDTO.getCollectorId();
+        String preVersion = (String) context.getBeforeResult();
+        SchCollectorVersion curVersion = iSchCollectorVersionDao.findById(updateDTO.getCollectorVersionId());
+        SchSystemParams schSystemParams = iSchSystemParamsDao.findOneBy("paramValue", collectorId);
+
+        SchCollectorVersionLog log = new SchCollectorVersionLog();
+        log.setId(idService.getDateSeq());
+        log.setCollectorId(collectorId);
+        log.setOperationModule(context.getGroup());
+        log.setOperationType(context.getAction());
+        log.setOperationDesc(context.getDesc());
+        log.setOperationContent(String.format("采集器：%s，上一个版本是：%s，更换成当前版本是：%s", schSystemParams.getParamName(), preVersion, curVersion.getCollectVersion()));
+        log.setState(error ? StateEnum.FAIL : StateEnum.OK);
+
+        iSchCollectorVersionLogDao.save(log);
+    }
+
+}

collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectorController.java

@@ -2,10 +2,13 @@ package com.docus.server.controller;
 
 import com.docus.infrastructure.web.request.SearchDTO;
 import com.docus.infrastructure.web.response.PageResult;
+import com.docus.log.annotation.TrackLogGroup;
 import com.docus.server.api.scheduling.management.SchCollectorApi;
+import com.docus.server.common.process.CollectorVersionProcessor;
 import com.docus.server.dto.scheduling.management.schcollector.AddSchCollectorDTO;
 import com.docus.server.dto.scheduling.management.schcollector.DeleteSchCollectorDTO;
 import com.docus.server.dto.scheduling.management.schcollector.EditSchCollectorDTO;
+import com.docus.server.dto.scheduling.management.schcollector.UpdateSchCollectorDTO;
 import com.docus.server.service.ISchCollectorService;
 import com.docus.server.vo.scheduling.management.schcollector.SchCollectorVO;
 import org.springframework.web.bind.annotation.RestController;
@@ -77,4 +80,15 @@ public class SchCollectorController implements SchCollectorApi {
     public int delete(DeleteSchCollectorDTO deleteSchCollectorDTO) {
         return iSchCollectorService.delete(deleteSchCollectorDTO);
     }
+
+    /**
+     * 选为当前版本并更新
+     *
+     * @return 成功或失败
+     */
+    @TrackLogGroup(group = "采集器管理", action = "更新", desc = "更新采集器版本", processor = CollectorVersionProcessor.class)
+    @Override
+    public boolean updateVersion(UpdateSchCollectorDTO updateDTO) {
+        return iSchCollectorService.updateVersion(updateDTO);
+    }
 }

collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectorVersionController.java

@@ -6,6 +6,7 @@ import com.docus.server.api.scheduling.management.SchCollectorVersionApi;
 import com.docus.server.dto.scheduling.management.schcollectorversion.AddSchCollectorVersionDTO;
 import com.docus.server.dto.scheduling.management.schcollectorversion.DeleteSchCollectorVersionDTO;
 import com.docus.server.dto.scheduling.management.schcollectorversion.EditSchCollectorVersionDTO;
+import com.docus.server.service.ISchCollectorService;
 import com.docus.server.service.ISchCollectorVersionService;
 import com.docus.server.vo.scheduling.management.schcollectorversion.SchCollectorVersionVO;
 import org.springframework.web.bind.annotation.RestController;
@@ -22,6 +23,8 @@ import javax.annotation.Resource;
 public class SchCollectorVersionController implements SchCollectorVersionApi {
     @Resource
     private ISchCollectorVersionService iSchCollectorVersionService;
+    @Resource
+    private ISchCollectorService iSchCollectorService;
 
     /**
      * 按主键查询
@@ -77,4 +80,5 @@ public class SchCollectorVersionController implements SchCollectorVersionApi {
     public int delete(DeleteSchCollectorVersionDTO deleteSchCollectorVersionDTO) {
         return iSchCollectorVersionService.delete(deleteSchCollectorVersionDTO);
     }
+
 }

collector-scheduling-management/src/main/java/com/docus/server/service/ISchCollectorService.java

@@ -5,6 +5,7 @@ import com.docus.infrastructure.web.response.PageResult;
 import com.docus.server.dto.scheduling.management.schcollector.AddSchCollectorDTO;
 import com.docus.server.dto.scheduling.management.schcollector.DeleteSchCollectorDTO;
 import com.docus.server.dto.scheduling.management.schcollector.EditSchCollectorDTO;
+import com.docus.server.dto.scheduling.management.schcollector.UpdateSchCollectorDTO;
 import com.docus.server.vo.scheduling.management.schcollector.SchCollectorVO;
 
 /**
@@ -53,4 +54,12 @@ public interface ISchCollectorService {
      * @return 分页列表
      */
     PageResult<SchCollectorVO> search(SearchDTO searchDTO);
+
+    /**
+     * 选为当前版本并更新
+     *
+     * @return 成功或失败
+     */
+    boolean updateVersion(UpdateSchCollectorDTO schCollector);
+
 }

collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchCollectorServiceImpl.java

@@ -12,6 +12,7 @@ import com.docus.server.convert.SchCollectorConvert;
 import com.docus.server.dto.scheduling.management.schcollector.AddSchCollectorDTO;
 import com.docus.server.dto.scheduling.management.schcollector.DeleteSchCollectorDTO;
 import com.docus.server.dto.scheduling.management.schcollector.EditSchCollectorDTO;
+import com.docus.server.dto.scheduling.management.schcollector.UpdateSchCollectorDTO;
 import com.docus.server.entity.scheduling.management.SchCollector;
 import com.docus.server.entity.scheduling.management.SchSystemParams;
 import com.docus.server.infrastructure.dao.ISchCollectorDao;
@@ -19,6 +20,7 @@ import com.docus.server.service.ISchCollectorService;
 import com.docus.server.service.ISchSystemParamsService;
 import com.docus.server.vo.scheduling.management.schcollector.SchCollectorVO;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
@@ -77,6 +79,19 @@ public class SchCollectorServiceImpl implements ISchCollectorService {
         return result;
     }
 
+    /**
+     * 选为当前版本并更新
+     *
+     * @return 成功或失败
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean updateVersion(UpdateSchCollectorDTO updateDTO) {
+        SchCollector schCollector = iSchCollectorDao.findOneBy("collectorId", updateDTO.getCollectorId());
+        schCollector.setCollectorVersionId(updateDTO.getCollectorVersionId());
+        return iSchCollectorDao.updateById(schCollector);
+    }
+
     /**
      * 新增
      *

collector-scheduling-management/src/main/resources/mapper/SchCollectorVersionLogMapper.xml

@@ -6,7 +6,6 @@
     <resultMap id="BaseResultMap"
                type="com.docus.server.entity.scheduling.management.SchCollectorVersionLog">
                     <id column="id" property="id"/>
-                    <result column="collector_version_id" property="collectorVersionId"/>
                     <result column="collector_id" property="collectorId"/>
                     <result column="operation_module" property="operationModule"/>
                     <result column="operation_type" property="operationType"/>
@@ -19,7 +18,7 @@
 
             <!-- 通用查询结果列 -->
             <sql id="Base_Column_List">
-                id, collector_version_id, collector_id, operation_module, operation_type, operation_desc, operation_content, state, create_time, update_time
+                id, collector_id, operation_module, operation_type, operation_desc, operation_content, state, create_time, update_time
             </sql>
 
 </mapper>

docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectorApi.java

@@ -5,17 +5,12 @@ import com.docus.infrastructure.web.response.PageResult;
 import com.docus.server.dto.scheduling.management.schcollector.AddSchCollectorDTO;
 import com.docus.server.dto.scheduling.management.schcollector.DeleteSchCollectorDTO;
 import com.docus.server.dto.scheduling.management.schcollector.EditSchCollectorDTO;
+import com.docus.server.dto.scheduling.management.schcollector.UpdateSchCollectorDTO;
 import com.docus.server.vo.scheduling.management.schcollector.SchCollectorVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
 
 
 /**
@@ -78,4 +73,14 @@ public interface SchCollectorApi {
     @ApiOperation("批量删除")
     @DeleteMapping("/delete")
     int delete(@RequestBody DeleteSchCollectorDTO deleteSchCollectorDTO);
+
+    /**
+     * 选为当前版本并更新
+     *
+     * @param updateDTO 版本更新参数
+     * @return 成功或失败
+     */
+    @ApiOperation("选为当前版本并更新")
+    @PutMapping("/updateVersion")
+    boolean updateVersion(@RequestBody UpdateSchCollectorDTO updateDTO);
 }

docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectorVersionApi.java

@@ -9,13 +9,7 @@ import com.docus.server.vo.scheduling.management.schcollectorversion.SchCollecto
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
 
 
 /**

docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollector/UpdateSchCollectorDTO.java

@@ -0,0 +1,25 @@
+package com.docus.server.dto.scheduling.management.schcollector;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 采集器版本列表管理 UpdateSchCollectorVersionDTO
+ *
+ * @author AutoGenerator
+ * @since 2023-07-15
+ */
+@Data
+@ApiModel(value = "UpdateSchCollectorDTO", description = "采集器版本列表管理")
+public class UpdateSchCollectorDTO implements Serializable {
+
+    @ApiModelProperty(value = "采集器版本主键")
+    private Long collectorVersionId;
+
+    @ApiModelProperty(value = "采集器id")
+    private Long collectorId;
+
+}

docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectorversionlog/AddSchCollectorVersionLogDTO.java

@@ -1,18 +1,15 @@
 package com.docus.server.dto.scheduling.management.schcollectorversionlog;
 
+import com.docus.server.enums.StateEnum;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import com.docus.server.enums.*;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
-*
  * 采集器版本更新日志管理 AddDTO
  *
  * @author AutoGenerator
@@ -25,9 +22,6 @@ public class AddSchCollectorVersionLogDTO implements Serializable {
     @ApiModelProperty(value = "主键")
     private Long id;
 
-    @ApiModelProperty(value = "采集器管理版本id")
-    private Long collectorVersionId;
-
     @ApiModelProperty(value = "采集器管理id")
     private Long collectorId;
 
@@ -44,13 +38,15 @@ public class AddSchCollectorVersionLogDTO implements Serializable {
     private String operationContent;
 
     @ApiModelProperty(value = "执行状态0：成功，1:失败")
-    private Integer state;
+    private StateEnum state;
 
     @ApiModelProperty(value = "入库时间")
-    private LocalDateTime createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
 
     @ApiModelProperty(value = "入库更新时间")
-    private LocalDateTime updateTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
 
 
 }

docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectorversionlog/EditSchCollectorVersionLogDTO.java

@@ -1,18 +1,15 @@
 package com.docus.server.dto.scheduling.management.schcollectorversionlog;
 
+import com.docus.server.enums.StateEnum;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import com.docus.server.enums.*;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
-*
  * 采集器版本更新日志管理 EditDTO
  *
  * @author AutoGenerator
@@ -25,9 +22,6 @@ public class EditSchCollectorVersionLogDTO implements Serializable {
     @ApiModelProperty(value = "主键")
     private Long id;
 
-    @ApiModelProperty(value = "采集器管理版本id")
-    private Long collectorVersionId;
-
     @ApiModelProperty(value = "采集器管理id")
     private Long collectorId;
 
@@ -44,13 +38,15 @@ public class EditSchCollectorVersionLogDTO implements Serializable {
     private String operationContent;
 
     @ApiModelProperty(value = "执行状态0：成功，1:失败")
-    private Integer state;
+    private StateEnum state;
 
     @ApiModelProperty(value = "入库时间")
-    private LocalDateTime createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
 
     @ApiModelProperty(value = "入库更新时间")
-    private LocalDateTime updateTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
 
 
 }

docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/SchCollectorVersionLog.java

@@ -1,21 +1,20 @@
 package com.docus.server.entity.scheduling.management;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.docus.server.enums.StateEnum;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
 
-import com.docus.server.enums.*;
+import java.io.Serializable;
+import java.util.Date;
 
 /**
-*
  * 采集器版本更新日志管理
  *
  * @author AutoGenerator
@@ -31,10 +30,6 @@ public class SchCollectorVersionLog implements Serializable {
     @TableId(value = "id", type = IdType.ASSIGN_UUID)
     private Long id;
 
-    @ApiModelProperty(value = "采集器管理版本id")
-    @TableField("collector_version_id")
-    private Long collectorVersionId;
-
     @ApiModelProperty(value = "采集器管理id")
     @TableField("collector_id")
     private Long collectorId;
@@ -57,15 +52,17 @@ public class SchCollectorVersionLog implements Serializable {
 
     @ApiModelProperty(value = "执行状态0：成功，1:失败")
     @TableField("state")
-    private Integer state;
+    private StateEnum state;
 
     @ApiModelProperty(value = "入库时间")
     @TableField("create_time")
-    private LocalDateTime createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
 
     @ApiModelProperty(value = "入库更新时间")
     @TableField("update_time")
-    private LocalDateTime updateTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
 
 
 }

docus-client-interface/src/main/java/com/docus/server/vo/scheduling.management/schcollectorversionlog/SchCollectorVersionLogVO.java

@@ -1,18 +1,15 @@
 package com.docus.server.vo.scheduling.management.schcollectorversionlog;
 
+import com.docus.server.enums.StateEnum;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import com.docus.server.enums.*;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
-*
  * 采集器版本更新日志管理 VO
  *
  * @author AutoGenerator
@@ -25,9 +22,6 @@ public class SchCollectorVersionLogVO implements Serializable {
     @ApiModelProperty(value = "主键")
     private Long id;
 
-    @ApiModelProperty(value = "采集器管理版本id")
-    private Long collectorVersionId;
-
     @ApiModelProperty(value = "采集器管理id")
     private Long collectorId;
 
@@ -44,13 +38,15 @@ public class SchCollectorVersionLogVO implements Serializable {
     private String operationContent;
 
     @ApiModelProperty(value = "执行状态0：成功，1:失败")
-    private Integer state;
+    private StateEnum state;
 
     @ApiModelProperty(value = "入库时间")
-    private LocalDateTime createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
 
     @ApiModelProperty(value = "入库更新时间")
-    private LocalDateTime updateTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
 
 
 }