后管-同步

1、新增任务查询

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/WbsTreeSynchronousRecord.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
@@ -26,69 +27,84 @@ public class WbsTreeSynchronousRecord {
     /**
      * 项目id
      */
+    @ApiModelProperty(value = "项目id")
     private Long projectId;
 
     /**
      * 项目名称
      */
+    @ApiModelProperty(value = "项目名称")
     private String projectName;
 
 
+    @ApiModelProperty(value = "同步范围(1-从后管同步，2-同步到合同段)")
     @TableField("`range`")
     private Integer range;
     /**
      * 同步范围名称
      */
+    @ApiModelProperty(value = "同步范围名称")
     private String rangeName;
     /**
      * 合同段范围 逗号拼接的编号 101.未填报 102.已填报-未上报 103.未上报 104.待审批 105.已审批
      */
+    @ApiModelProperty(value = "合同段范围 逗号拼接的编号 101.未填报 102.已填报-未上报 103.未上报 104.待审批 105.已审批")
     private String contractRange;
     /**
      * 合同段范围名称
      */
+    @ApiModelProperty(value = "合同段范围名称")
     private String contractRangeName;
 
     /**
      * 同步源Id
      */
+    @ApiModelProperty(value = "同步源Id")
     private Long templateId;
 
     /**
      * 同步源名称
      */
+    @ApiModelProperty(value = "同步源名称")
     private String templateName;
 
     /**
      * 同步类型 逗号拼接的编号 1.新增表单 2.清表配置 3.元素配置 4.电签配置 5.公式配置 6.默认值配置 7.表单排序
      */
+    @ApiModelProperty(value = "同步类型 逗号拼接的编号 1.新增表单 2.清表配置 3.元素配置 4.电签配置 5.公式配置 6.默认值配置 7.表单排序")
     private String type;
 
     /**
      * 同步类型名称
      */
+    @ApiModelProperty(value = "同步类型名称")
     private String typeName;
 
     /**
      * 同步节点id 多个节点
      */
+    @ApiModelProperty(value = "同步节点id 多个节点")
     private String nodeId;
 
     /**
      * 同步节点名称
      */
+    @ApiModelProperty(value = "同步节点名称")
     private String nodeName;
     /**
      * 表单Ids     range = 4 强制同步时  当前数据为同步源
      */
+    @ApiModelProperty(value = "表单Ids     range = 4 强制同步时  当前数据为同步源")
     private String formIds;
     /**
      * 同步节点数量
      */
+    @ApiModelProperty(value = "同步节点数量")
     private Integer nodeNum;
     /**
      * 已同步数量
      */
+    @ApiModelProperty(value = "已同步数量")
     private Integer nodeNumEnd;
 
     /**
@@ -99,15 +115,18 @@ public class WbsTreeSynchronousRecord {
     /**
      * 状态（0-未同步，1-正在同步，2-已同步，3-同步失败）
      */
+    @ApiModelProperty(value = "状态（0-未同步，1-正在同步，2-已同步，3-同步失败）")
     private Integer status;
     /**
      * 状态（0-未同步，1-正在同步，2-已同步，3-同步失败）
      */
+    @ApiModelProperty(value = "状态名称")
     @TableField(exist = false)
     private String statusName;
     /**
      * 错误信息
      */
+    @ApiModelProperty(value = "错误信息")
     @TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
     private String errorMsg;
     /**

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/WbsTreeSynchronousRecordController.java

@@ -4,6 +4,8 @@ package org.springblade.manager.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.manager.entity.ProjectInfo;
 import org.springblade.manager.entity.WbsTreePrivate;
@@ -27,6 +29,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/synchronousRecord")
+@Api(value = "WBS同步记录表接口", tags = "WBS同步记录表接口")
 public class WbsTreeSynchronousRecordController {
     /**
      * 服务对象
@@ -41,6 +44,7 @@ public class WbsTreeSynchronousRecordController {
      * @param query  分页对象
      * @return 所有数据
      */
+    @ApiOperation(value = "分页查询")
     @GetMapping("/page")
     public R<IPage<WbsTreeSynchronousRecord>> selectAll(WbsTreeSynchronousRecord record, Query query) {
         LambdaQueryWrapper<WbsTreeSynchronousRecord> lambda = new QueryWrapper().lambda();
@@ -79,6 +83,7 @@ public class WbsTreeSynchronousRecordController {
      * @param id 主键
      * @return 单条数据
      */
+    @ApiOperation(value = "通过主键查询单条数据")
     @GetMapping("getById")
     public R<WbsTreeSynchronousRecord> selectOne(@RequestParam Long id) {
         return R.data(this.mWbsTreeSynchronousRecordService.getById(id));
@@ -91,6 +96,7 @@ public class WbsTreeSynchronousRecordController {
      * @param mWbsTreeSynchronousRecord 实体对象
      * @return 新增结果
      */
+    @ApiOperation(value = "新增数据")
     @PostMapping("add")
     public R<WbsTreeSynchronousRecord> insert(@RequestBody WbsTreeSynchronousRecord mWbsTreeSynchronousRecord) {
 
@@ -127,6 +133,7 @@ public class WbsTreeSynchronousRecordController {
     /**
      * 认证接口是否正在同步
      */
+    @ApiOperation(value = "认证接口是否正在同步")
     @PostMapping("getNodeStatus")
     public R<WbsTreeSynchronousRecord> getNodeStatus(@RequestParam Long id) {
         return R.data(this.mWbsTreeSynchronousRecordService.getNodeStatus(id));
@@ -138,6 +145,7 @@ public class WbsTreeSynchronousRecordController {
      *
      * @param nodeIds 节点ids 逗号拼接
      */
+    @ApiOperation(value = "获取当前项目的模板项目")
     @GetMapping("getTempProject")
     public R<List<WbsTreeSynchronousRecordVo>> getProjectTemplate(@RequestParam String nodeIds) {
         if (StringUtil.isBlank(nodeIds)) {
@@ -146,5 +154,17 @@ public class WbsTreeSynchronousRecordController {
         return R.data(this.mWbsTreeSynchronousRecordService.getProjectTemplate(nodeIds));
     }
 
+    /**
+     * 添加同步记录查询功能
+     *  采用定时查询模式展示进度条
+     */
+    @ApiOperation(value = "添加同步记录查询功能")
+    @GetMapping("querySyncRecord")
+    public R<List<WbsTreeSynchronousRecord>> querySyncRecord(@RequestParam Long projectId) {
+        return R.data(this.mWbsTreeSynchronousRecordService.list(new QueryWrapper<WbsTreeSynchronousRecord>().lambda()
+                .eq(WbsTreeSynchronousRecord::getProjectId, projectId)
+                .ne(WbsTreeSynchronousRecord::getStatus, 2)
+        ));
+    }
 }