From acae4ed906d582f41934854881b81d2242525b7d Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期二, 28 十一月 2023 21:53:39 +0800
Subject: [PATCH] 更新同步计划时，不区分类型，统一更新为轮换计划
---
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1404.java | 2 +-
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1111.java | 6 ++++++
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1111.java | 6 ++++++
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1403.java | 2 +-
src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1403Rep.java | 9 +++++++++
5 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1111.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1111.java
index 76472db..5051044 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1111.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1111.java
@@ -104,6 +104,12 @@
if(StringUtils.isNotEmpty(listApi1111.get(0).getAjdm())){
apiData.setAjdm(listApi1111.get(0).getAjdm());
}
+ if(StringUtils.isNotEmpty(listApi1111.get(0).getSpjksbwzys())){
+ apiData.setSpjksbwzys(listApi1111.get(0).getSpjksbwzys());
+ }
+ if(StringUtils.isNotEmpty(listApi1111.get(0).getBz())){
+ apiData.setBz(listApi1111.get(0).getBz());
+ }
apiData.setCzbz(listApi1111.get(0).getCzbz());
}else {
apiData.setCzbz(Constant.CZBZ_I);
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1403.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1403.java
index 59279c9..879483d 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1403.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1403.java
@@ -49,7 +49,7 @@
apiLog.setStatus(99);
apiLog.setId(ContextUtil.getUUID());
try {
- List<Fz35Plan> list = fzzy35Sync1403Rep.findDate("3", start, end);
+ List<Fz35Plan> list = fzzy35Sync1403Rep.findDateByTime(start, end);
if (null == list || list.isEmpty()) {
return;
}
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1404.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1404.java
index 360fcb0..6f01ea3 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1404.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1404.java
@@ -59,7 +59,7 @@
apiLog.setStatus(99);
apiLog.setId(ContextUtil.getUUID());
try {
- List<Fz35Plan> list = fzzy35Sync1403Rep.findDate("3", start, end);
+ List<Fz35Plan> list = fzzy35Sync1403Rep.findDateByTime(start, end);
if (null == list || list.isEmpty()) {
return;
diff --git a/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1403Rep.java b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1403Rep.java
index 0fd24d6..3ee8b6c 100644
--- a/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1403Rep.java
+++ b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1403Rep.java
@@ -23,4 +23,13 @@
*/
@Query("from Fz35Plan where type =:planType and createTime >=:start and createTime <:end order by createTime ")
List<Fz35Plan> findDate(@Param("planType") String planType, @Param("start") Date start, @Param("end") Date end);
+
+ /**
+ *
+ * @param start
+ * @param end
+ * @return
+ */
+ @Query("from Fz35Plan where createTime >=:start and createTime <:end order by createTime ")
+ List<Fz35Plan> findDateByTime(@Param("start") Date start, @Param("end") Date end);
}
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1111.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1111.java
index 2037d60..30e4269 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1111.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1111.java
@@ -110,6 +110,12 @@
if(StringUtils.isNotEmpty(listApi1111.get(0).getAjdm())){
apiData.setAjdm(listApi1111.get(0).getAjdm());
}
+ if(StringUtils.isNotEmpty(listApi1111.get(0).getSpjksbwzys())){
+ apiData.setSpjksbwzys(listApi1111.get(0).getSpjksbwzys());
+ }
+ if(StringUtils.isNotEmpty(listApi1111.get(0).getBz())){
+ apiData.setBz(listApi1111.get(0).getBz());
+ }
apiData.setCzbz(listApi1111.get(0).getCzbz());
}else {
apiData.setCzbz(Constant.CZBZ_I);
--
Gitblit v1.9.3