From 1aac0b24b4b7f0e15bb4f7001ae8d1e313336caf Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期二, 07 一月 2025 15:46:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java | 64 +++++++++++++++++++++++--------
1 files changed, 47 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
index 11947f2..bdfbef9 100644
--- a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
+++ b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
@@ -1,11 +1,11 @@
package com.fzzy.async.fzzy40;
import com.fzzy.api.data.ApiParam;
+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;
@@ -23,13 +23,31 @@
@Autowired
private Fzzy40Sync1202 fzzySync1202;
@Autowired
+ private Fzzy40Sync1203 fzzySync1203;
+ @Autowired
+ private Fzzy40Sync1204 fzzySync1204;
+ @Autowired
private Fzzy40Sync1205 fzzySync1205;
@Autowired
- private Fzzy40Sync1212 fzzySync1212;
+ private Fzzy40Sync1206 fzzySync1206;
+ @Autowired
+ private Fzzy40Sync1207 fzzySync1207;
@Autowired
private Fzzy40Sync1208 fzzySync1208;
@Autowired
- private Fzzy40Sync1203 fzzySync1203;
+ private Fzzy40Sync1209 fzzySync1209;
+ @Autowired
+ private Fzzy40Sync1211 fzzySync1211;
+ @Autowired
+ private Fzzy40Sync1210 fzzySync1210;
+ @Autowired
+ private Fzzy40Sync1212 fzzySync1212;
+ @Autowired
+ private Fzzy40Sync1213 fzzySync1213;
+ @Autowired
+ private Fzzy40Sync1109 fzzySync1109;
+ @Autowired
+ private Fzzy40Sync2102 fzzySync2102;
@Override
public String getProtocol() {
@@ -50,34 +68,46 @@
//鍚堝悓鍚屾
fzzySync1201.syncData(kqdm, deptId, start, end);
+ //绮鍏ュ簱缁撶畻
+ fzzySync1204.syncData(kqdm, deptId, start, end);
+
//绮鍏ュ簱鍚屾
fzzySync1202.syncData(kqdm, deptId, start, end);
- //绮鍏ュ簱璐ㄦ TODO
+ //绮鍏ュ簱璐ㄦ
fzzySync1203.syncData(kqdm, deptId, start, end);
- //绮鍏ュ簱缁撶畻 TODO
+ //绮鍑哄簱缁撶畻
+ fzzySync1206.syncData(kqdm, deptId, start, end);
//绮鍑哄簱鍚屾
fzzySync1205.syncData(kqdm, deptId, start, end);
- //绮鍑哄簱缁撶畻 TODO
+ //绮鎹熺泭
+ fzzySync1209.syncData(kqdm, deptId, start, end);
+ //鍊掍粨淇℃伅鍚屾
+ fzzySync1207.syncData(kqdm, deptId, start, end);
- //绮鎹熺泭 TODO
+ //鍑哄叆搴撴枃浠朵俊鎭悓姝�
+ fzzySync1109.syncData(kqdm, deptId, start, end);
- //鍊掍粨淇℃伅鍚屾 TODO
-
-
- //鍑哄叆搴撴枃浠朵俊鎭悓姝� TODO
-
-
- //绮搴撳瓨鍚屾 TODO
+ //绮搴撳瓨鍚屾
fzzySync1208.syncData(kqdm, deptId, start, end);
- //绮鎬ц川杞彉淇℃伅鍚屾 TODO
+ //绮鎬ц川杞彉淇℃伅鍚屾
+ fzzySync1210.syncData(kqdm, deptId, start, end);
+ //璐﹂潰搴撳瓨淇℃伅鍚屾
+ fzzySync1211.syncData(kqdm, deptId, start, end);
+ //灏佷粨纭淇℃伅鍚屾
+ fzzySync1213.syncData(kqdm, deptId, start, end);
- //璐﹂潰搴撳瓨淇℃伅鍚屾 TODO
+ /*-----鍚勭渷鐙湁鎺ュ彛淇℃伅鍚屾-----*/
+ //涓婃捣甯傚钩鍙�2023鐗�
+ if (StringUtils.isNotEmpty(param.getPushProtocol()) && PushProtocol.SB_SH_2023.getCode().equals(param.getPushProtocol())) {
+ //鍊掍粨鍊掑叆淇℃伅鍚屾
+ fzzySync2102.syncData(kqdm, deptId, start, end);
+ }
}
--
Gitblit v1.9.3