微调

starbos-system/src/main/java/com/nzwz/controller/SynchronizationController.java

@@ -5,6 +5,7 @@ import com.nzwz.transfer.synchronization.AbnormalSynchronizationInVo;
 import com.nzwz.transfer.synchronization.InitConnectParmCreateInVo;
 import com.nzwz.transfer.synchronization.InitConnectParmOutVo;
 import com.nzwz.serivce.ISynchronizationService;
+import com.nzwz.transfer.synchronization.ManualSynchronizationInVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,9 +50,9 @@ public class SynchronizationController {
     }
 
     @ApiOperation("手动启动同步方法")
-    @GetMapping("/manual/synchronization")
-    public RestResponse manualSynchronization() {
-        return synchronizationService.manualSynchronization();
+    @PostMapping("/manual/synchronization")
+    public RestResponse manualSynchronization(@RequestBody ManualSynchronizationInVo inVo) {
+        return synchronizationService.manualSynchronization(inVo);
     }
 
     @ApiOperation("手动同步失败同步方法")

starbos-system/src/main/java/com/nzwz/quartz/job/SynchronizationJob.java

@@ -7,6 +7,7 @@ import org.quartz.JobExecutionContext;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
 import java.util.Date;
 
 /**
@@ -29,7 +30,7 @@ public class SynchronizationJob implements Job {
             e.printStackTrace();
         }
 
-        synchronizationService.synchronization();
+        synchronizationService.synchronization(new ArrayList<>());
     }
 
 

starbos-system/src/main/java/com/nzwz/serivce/ISynchronizationService.java

@@ -4,6 +4,9 @@ import com.nzwz.common.response.RestResponse;
 import com.nzwz.transfer.synchronization.AbnormalSynchronizationInVo;
 import com.nzwz.transfer.synchronization.InitConnectParmCreateInVo;
 import com.nzwz.transfer.synchronization.InitConnectParmOutVo;
+import com.nzwz.transfer.synchronization.ManualSynchronizationInVo;
+
+import java.util.List;
 
 /**
  * @author Inori
@@ -42,9 +45,10 @@ public interface ISynchronizationService {
     /**
      * 手动启动同步方法
      *
+     * @param inVo 条件
      * @return 结果
      */
-    RestResponse manualSynchronization();
+    RestResponse manualSynchronization(ManualSynchronizationInVo inVo);
 
     /**
      * 手动启动失败同步方法
@@ -56,8 +60,10 @@ public interface ISynchronizationService {
 
     /**
      * 同步方法
+     *
+     * @param tableHeaderList 表名
      */
-    void synchronization();
+    void synchronization(List<String> tableHeaderList);
 
 
 }

starbos-system/src/main/java/com/nzwz/serivce/impl/SynchronizationServiceImpl.java

@@ -10,6 +10,7 @@ import com.nzwz.quartz.transfer.QuartzJobResumeInVo;
 import com.nzwz.transfer.synchronization.AbnormalSynchronizationInVo;
 import com.nzwz.transfer.synchronization.InitConnectParmCreateInVo;
 import com.nzwz.transfer.synchronization.InitConnectParmOutVo;
+import com.nzwz.transfer.synchronization.ManualSynchronizationInVo;
 import com.nzwz.utils.JsonUtil;
 import com.nzwz.utils.KingDeeUtil;
 import com.nzwz.utils.StringUtil;
@@ -143,7 +144,7 @@ public class SynchronizationServiceImpl implements ISynchronizationService {
     }
 
     @Override
-    public RestResponse manualSynchronization() {
+    public RestResponse manualSynchronization(ManualSynchronizationInVo inVo) {
         QuartzJob quartzJob = quartzJobService.getBaseMapper().selectById("1");
 
         if (StringUtil.isNotNull(quartzJob)) {
@@ -154,7 +155,9 @@ public class SynchronizationServiceImpl implements ISynchronizationService {
             return RestResponse.fail("自动同步定时任务不存在！");
         }
 
-        threadPool.execute(this::synchronization);
+        threadPool.execute(() -> {
+            this.synchronization(inVo.getTableHeaderList());
+        });
         return RestResponse.success();
     }
 
@@ -176,10 +179,13 @@ public class SynchronizationServiceImpl implements ISynchronizationService {
     }
 
     @Override
-    public void synchronization() {
+    public void synchronization(List<String> tableHeaderList) {
         List<TableRelation> tableRelationList = tableRelationMapper.selectList(new QueryWrapper<>());
 
         List<TableRelation> tempList = tableRelationList.stream().filter(m -> StringUtil.isNotBlank(m.getTableDate())).collect(Collectors.toList());
+        if (!CollectionUtils.isEmpty(tableHeaderList)) {
+            tempList = tempList.stream().filter(m -> tableHeaderList.contains(m.getSubTableHeader())).collect(Collectors.toList());
+        }
         for (TableRelation tableRelation : tempList) {
             Map<String, Object> data = this.assemblyMap(tableRelation);
             Log log = new Log(tableRelation.getTableName(), tableRelation.getTableHeader(), JsonUtil.toString(Collections.singletonList(data)));

starbos-system/src/main/java/com/nzwz/transfer/synchronization/ManualSynchronizationInVo.java

+package com.nzwz.transfer.synchronization;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Inori
+ */
+@Data
+public class ManualSynchronizationInVo {
+
+    /**
+     * 表名列表
+     */
+    private List<String> tableHeaderList = new ArrayList<>();
+
+
+}