微调

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

 package com.nzwz.controller;
 
 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.serivce.ISynchronizationService;
@@ -53,10 +54,10 @@ public class SynchronizationController {
         return synchronizationService.manualSynchronization();
     }
 
-    @ApiOperation("手动启动失败同步方法")
+    @ApiOperation("手动同步失败同步方法")
     @GetMapping("/abnormal/synchronization")
-    public RestResponse abnormalSynchronization() {
-        return synchronizationService.abnormalSynchronization();
+    public RestResponse abnormalSynchronization(@ModelAttribute AbnormalSynchronizationInVo inVo) {
+        return synchronizationService.abnormalSynchronization(inVo);
     }
 
 

starbos-system/src/main/java/com/nzwz/dao/LogMapper.java

@@ -30,16 +30,16 @@ public interface LogMapper extends BaseMapper<Log> {
      * @param content 内容
      * @return 同步时间
      */
-    String slectOrderCreateTimeByContent(String content);
+    String selectOrderCreateTimeByContent(String content);
 
 
     /**
      * 根据时间查询失败同步日志
      *
-     * @param createTime 时间
+     * @param id 时间
      * @return 失败同步日志
      */
-    List<Log> selectLogByFlag(String createTime);
+    Log selectLogById(Integer id);
 
 
 }

starbos-system/src/main/java/com/nzwz/dao/mapper/LogMapper.xml

@@ -29,7 +29,7 @@
 
 
 
-    <select id="slectOrderCreateTimeByContent" parameterType="java.lang.String" resultType="java.lang.String">
+    <select id="selectOrderCreateTimeByContent" parameterType="java.lang.String" resultType="java.lang.String">
 
         SELECT create_time FROM tb_log WHERE content = #{content} ORDER BY create_time LIMIT 1
 
@@ -37,9 +37,9 @@
 
 
 
-    <select id="selectLogByFlag" parameterType="java.lang.String" resultType="com.nzwz.model.Log">
+    <select id="selectLogById" parameterType="java.lang.Integer" resultType="com.nzwz.model.Log">
 
-        SELECT id, content, `data` FROM tb_log WHERE create_time &lt;= #{createTime} AND flag = 0 ORDER BY create_time ASC
+        SELECT id, content, `data` FROM tb_log WHERE id = #{id}
 
     </select>
 

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

 package com.nzwz.serivce;
 
 import com.nzwz.common.response.RestResponse;
+import com.nzwz.transfer.synchronization.AbnormalSynchronizationInVo;
 import com.nzwz.transfer.synchronization.InitConnectParmCreateInVo;
 import com.nzwz.transfer.synchronization.InitConnectParmOutVo;
 
@@ -48,19 +49,15 @@ public interface ISynchronizationService {
     /**
      * 手动启动失败同步方法
      *
+     * @param inVo 条件
      * @return 结果
      */
-    RestResponse abnormalSynchronization();
+    RestResponse abnormalSynchronization(AbnormalSynchronizationInVo inVo);
 
     /**
      * 同步方法
      */
     void synchronization();
 
-    /**
-     * 异常重新同步方法
-     */
-    void abnormalAgainSynchronization();
-
 
 }

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

@@ -6,6 +6,7 @@ import com.nzwz.common.response.RestResponse;
 import com.nzwz.quartz.model.QuartzJob;
 import com.nzwz.quartz.transfer.QuartzJobPauseInVo;
 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.utils.JsonUtil;
@@ -146,18 +147,12 @@ public class SynchronizationServiceImpl implements ISynchronizationService {
     }
 
     @Override
-    public RestResponse abnormalSynchronization() {
-        QuartzJob quartzJob = quartzJobService.getBaseMapper().selectById("1");
+    public RestResponse abnormalSynchronization(AbnormalSynchronizationInVo inVo) {
+        Log log = logMapper.selectLogById(inVo.getId());
 
-        if (StringUtil.isNotNull(quartzJob)) {
-            if (quartzJob.getStatus() == 1) {
-                return RestResponse.fail("请先关闭同步再开启!");
-            }
-        } else {
-            return RestResponse.fail("自动同步定时任务不存在！");
-        }
+        Map<String, Object> data = JsonUtil.toMap(log.getData(), String.class, Object.class);
+        this.reload(data, log);
 
-        this.abnormalAgainSynchronization();
         return RestResponse.success();
     }
 
@@ -221,7 +216,7 @@ public class SynchronizationServiceImpl implements ISynchronizationService {
         data.put("IS_TABLE_HEADER", tableRelation.getForeignKey());
 
         if (StringUtil.isNotBlank(tableRelation.getTableDate())) {
-            String dateForm = logMapper.slectOrderCreateTimeByContent(tableRelation.getTableHeader());
+            String dateForm = logMapper.selectOrderCreateTimeByContent(tableRelation.getTableHeader());
             if (StringUtil.isNotBlank(dateForm)) {
                 data.put("DATE_FORM", dateForm);
             } else {
@@ -232,16 +227,6 @@ public class SynchronizationServiceImpl implements ISynchronizationService {
         return data;
     }
 
-    @Override
-    public void abnormalAgainSynchronization() {
-        List<Log> logList = logMapper.selectLogByFlag(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
-
-        for (Log log : logList) {
-            Map<String, Object> data = JsonUtil.toMap(log.getData(), String.class, Object.class);
-            this.reload(data, log);
-        }
-    }
-
     private String reload(Map<String, Object> data, Log log) {
         System.out.println("金蝶请求参数: " + data);
 

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

+package com.nzwz.transfer.synchronization;
+
+import lombok.Data;
+
+/**
+ * @author Inori
+ */
+@Data
+public class AbnormalSynchronizationInVo {
+
+    /**
+     * ID
+     */
+    private Integer id;
+
+
+}