From 86d368337175a7d7eed5e9330bd80a838ab4f396 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期四, 09 十一月 2023 17:25:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/igds-api-gateway' into igds-api-gateway
---
src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
index 1056074..3e204e2 100644
--- a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
+++ b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
@@ -1,14 +1,13 @@
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;
/**
@@ -43,6 +42,10 @@
private Fzzy40Sync1210 fzzySync1210;
@Autowired
private Fzzy40Sync1109 fzzySync1109;
+ @Autowired
+ private Fzzy40Sync2101 fzzySync2101;
+ @Autowired
+ private Fzzy40Sync2104 fzzySync2104;
@Override
public String getProtocol() {
@@ -69,7 +72,7 @@
//绮鍏ュ簱璐ㄦ
fzzySync1203.syncData(kqdm, deptId, start, end);
- //绮鍏ュ簱缁撶畻
+ //绮鍏ュ簱缁撶畻
fzzySync1204.syncData(kqdm, deptId, start, end);
//绮鍑哄簱鍚屾
fzzySync1205.syncData(kqdm, deptId, start, end);
@@ -90,7 +93,14 @@
//绮鎬ц川杞彉淇℃伅鍚屾
fzzySync1210.syncData(kqdm, deptId, start, end);
-
+ /*-----鍚勭渷鐙湁鎺ュ彛淇℃伅鍚屾-----*/
+ 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());
+ }
//璐﹂潰搴撳瓨淇℃伅鍚屾 TODO
}
--
Gitblit v1.9.3