微调

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

@@ -50,15 +50,13 @@ public class SynchronizationController {
     @ApiOperation("手动启动同步方法")
     @GetMapping("/manual/synchronization")
     public RestResponse manualSynchronization() {
-        synchronizationService.manualSynchronization();
-        return RestResponse.success();
+        return synchronizationService.manualSynchronization();
     }
 
     @ApiOperation("手动启动失败同步方法")
     @GetMapping("/abnormal/synchronization")
     public RestResponse abnormalSynchronization() {
-        synchronizationService.abnormalSynchronization();
-        return RestResponse.success();
+        return synchronizationService.abnormalSynchronization();
     }
 
 

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

@@ -39,25 +39,28 @@ public interface ISynchronizationService {
     RestResponse initConnectParmCreate(InitConnectParmCreateInVo inVo);
 
     /**
-     * 同步方法
+     * 手动启动同步方法
+     *
+     * @return 结果
      */
-    void synchronization();
-
+    RestResponse manualSynchronization();
 
     /**
-     * 手动启动同步方法
+     * 手动启动失败同步方法
+     *
+     * @return 结果
      */
-    void manualSynchronization();
+    RestResponse abnormalSynchronization();
 
     /**
-     * 异常重新同步方法
+     * 同步方法
      */
-    void abnormalAgainSynchronization();
+    void synchronization();
 
     /**
-     * 手动启动失败同步方法
+     * 异常重新同步方法
      */
-    void abnormalSynchronization();
+    void abnormalAgainSynchronization();
 
 
 }

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

@@ -94,7 +94,7 @@ public class SynchronizationServiceImpl implements ISynchronizationService {
         QuartzJob quartzJob = quartzJobService.getBaseMapper().selectById("1");
 
         if (StringUtil.isNotNull(quartzJob)) {
-            if (quartzJob.getStatus() == 0) {
+            if (quartzJob.getStatus() == 1) {
                 return RestResponse.fail("请先关闭同步再保存!");
             }
         } else {
@@ -130,13 +130,35 @@ public class SynchronizationServiceImpl implements ISynchronizationService {
     }
 
     @Override
-    public void manualSynchronization() {
+    public RestResponse manualSynchronization() {
+        QuartzJob quartzJob = quartzJobService.getBaseMapper().selectById("1");
+
+        if (StringUtil.isNotNull(quartzJob)) {
+            if (quartzJob.getStatus() == 1) {
+                return RestResponse.fail("请先关闭同步再保存!");
+            }
+        } else {
+            return RestResponse.fail("自动同步定时任务不存在！");
+        }
+
         this.synchronization();
+        return RestResponse.success();
     }
 
     @Override
-    public void abnormalSynchronization() {
+    public RestResponse abnormalSynchronization() {
+        QuartzJob quartzJob = quartzJobService.getBaseMapper().selectById("1");
+
+        if (StringUtil.isNotNull(quartzJob)) {
+            if (quartzJob.getStatus() == 1) {
+                return RestResponse.fail("请先关闭同步再保存!");
+            }
+        } else {
+            return RestResponse.fail("自动同步定时任务不存在！");
+        }
+
         this.abnormalAgainSynchronization();
+        return RestResponse.success();
     }
 
     @Override

starbos-system/src/main/java/com/nzwz/transfer/log/LogListInVo.java

@@ -8,7 +8,7 @@ import com.nzwz.utils.StringUtil;
 public class LogListInVo {
 
     /**
-     * 内容
+     * 名称
      */
     private String name;