From 13391e649a65a374e390066a35b52c61a6feaa3f Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期二, 14 十一月 2023 21:19:40 +0800
Subject: [PATCH] 调整心跳指令返回

---
 src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java |   25 ++++++++++++-------------
 1 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
index 8880181..abac48f 100644
--- a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
+++ b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
@@ -4,13 +4,10 @@
 import com.fzzy.api.data.PushProtocol;
 import com.fzzy.api.data.SyncProtocol;
 import com.fzzy.api.service.SyncService12;
-import com.fzzy.async.fzzy35.impl.Fzzy35Sync1203;
-import com.fzzy.async.fzzy35.impl.Fzzy35Sync1208;
 import com.fzzy.async.fzzy40.impl.*;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-
 import java.util.Date;
 
 /**
@@ -48,6 +45,8 @@
     @Autowired
     private Fzzy40Sync2101 fzzySync2101;
     @Autowired
+    private Fzzy40Sync2102 fzzySync2102;
+    @Autowired
     private Fzzy40Sync2104 fzzySync2104;
 
     @Override
@@ -62,15 +61,6 @@
         String deptId = param.getDeptId();
         Date start = param.getStart();
         Date end = param.getEnd();
-
-        /*-----鍚勭渷鐙湁鎺ュ彛淇℃伅鍚屾-----*/
-        if (StringUtils.isNotEmpty(param.getPushProtocol()) && PushProtocol.SB_SH_2023.getCode().equals(param.getPushProtocol())) {
-            //涓婃捣甯傚钩鍙�2023鐗堬紝闇�瑕佸悓姝ュ競鍌ㄦ鏂ゅ崟锛屽悓姝ュ競鍌ㄩ┏杩愬崟
-            //鍚屾甯傚偍妫�鏂ゅ崟
-            fzzySync2101.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
-            //鍚屾甯傚偍椹宠繍鍗�
-            fzzySync2104.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
-        }
 
         //瀹㈡埛鍚屾
         fzzySync1212.syncData(kqdm, deptId, start, end);
@@ -105,7 +95,16 @@
         //绮鎬ц川杞彉淇℃伅鍚屾
         fzzySync1210.syncData(kqdm, deptId, start, end);
 
-
+        /*-----鍚勭渷鐙湁鎺ュ彛淇℃伅鍚屾-----*/
+        //涓婃捣甯傚钩鍙�2023鐗�
+        if (StringUtils.isNotEmpty(param.getPushProtocol()) && PushProtocol.SB_SH_2023.getCode().equals(param.getPushProtocol())) {
+            //鍊掍粨鍊掑叆淇℃伅鍚屾
+            fzzySync2102.syncData(kqdm, deptId, start, end);
+//            //鍚屾甯傚偍妫�鏂ゅ崟
+//            fzzySync2101.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+//            //鍚屾甯傚偍椹宠繍鍗�
+//            fzzySync2104.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+        }
         //璐﹂潰搴撳瓨淇℃伅鍚屾  TODO
 
     }

--
Gitblit v1.9.3