From fce0f324697f6313c13a28c29b93dfd2c8589566 Mon Sep 17 00:00:00 2001
From: 陈战涛 <chenzhantao7055@sina.com>
Date: 星期日, 14 五月 2023 22:15:15 +0800
Subject: [PATCH] 提交上海嘉定纪委接口同步及推送
---
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1310.java | 137 +++++++++
src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService13.java | 6
src/main/resources/application-pro.yml | 13
src/main/resources/application-pro5303.yml | 56 +++
src/main/java/com/fzzy/api/view/repository/Api1205Rep.java | 4
src/main/java/com/fzzy/api/entity/Api1404.java | 20
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1403.java | 86 +++++
src/main/java/com/fzzy/async/fzzy35/entity/Fz35Quality.java | 106 +++++++
src/main/java/com/fzzy/push/impl/ComPushService12.java | 6
src/main/java/com/fzzy/api/view/repository/Api1202Rep.java | 4
src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService14.java | 13
src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1404Rep.java | 23 +
src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1310Rep.java | 26 +
src/main/java/com/fzzy/push/shjdjw2023/Shjdjw2023PushService12.java | 10
src/main/java/com/fzzy/api/view/repository/Api1203Rep.java | 4
src/main/java/com/fzzy/async/fzzy35/entity/Fz35Plan.java | 70 ++++
src/main/java/com/fzzy/api/view/pr/Api1202PR.java | 2
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1404.java | 102 ++++++
src/main/java/com/fzzy/api/entity/Api1310.java | 42 +-
src/main/java/com/fzzy/api/entity/Api1403.java | 16
src/main/java/com/fzzy/api/view/pr/Api1205PR.java | 2
src/main/java/com/fzzy/async/fzzy35/entity/Fz35PlanDetail.java | 73 ++++
src/main/java/com/fzzy/api/view/pr/Api1203PR.java | 2
src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1403Rep.java | 26 +
src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService12.java | 47 +-
25 files changed, 808 insertions(+), 88 deletions(-)
diff --git a/src/main/java/com/fzzy/api/entity/Api1310.java b/src/main/java/com/fzzy/api/entity/Api1310.java
index 8d69693..0c35af5 100644
--- a/src/main/java/com/fzzy/api/entity/Api1310.java
+++ b/src/main/java/com/fzzy/api/entity/Api1310.java
@@ -30,28 +30,28 @@
@Id
@PropertyDef(label = "璐ㄦ鎶ュ憡鍗曞彿" )
- @Column(name = "zjbgdh", length = 14, nullable = false)
+ @Column(name = "zjbgdh", length = 14)
private String zjbgdh;
@PropertyDef(label = "璐т綅浠ｇ爜" )
- @Column(name = "hwdm", length = 30, nullable = false)
+ @Column(name = "hwdm", length = 30)
private String hwdm;
@PropertyDef(label = "绮鍝佺浠ｇ爜" )
- @Column(name = "lspzdm", length = 7, nullable = false)
+ @Column(name = "lspzdm", length = 7)
private String lspzdm;
@PropertyDef(label = "绮绛夌骇浠ｇ爜" )
- @Column(name = "lsdjdm", length = 2, nullable = false)
+ @Column(name = "lsdjdm", length = 2)
private String lsdjdm;
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "鍏ュ簱鏃ユ湡" )
- @Column(name = "rkrq", nullable = false)
+ @Column(name = "rkrq")
private Date rkrq;
@PropertyDef(label = "妫�楠岀被鍒�" )
- @Column(name = "jylb", length = 2, nullable = false)
+ @Column(name = "jylb", length = 2)
private String jylb;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@@ -60,7 +60,7 @@
private Date jysj;
@PropertyDef(label = "妫�楠屽崟浣�" )
- @Column(name = "jydw", length = 128, nullable = false)
+ @Column(name = "jydw", length = 128)
private String jydw;
@PropertyDef(label = "妫�楠屼汉" )
@@ -68,23 +68,23 @@
private String jyr;
@PropertyDef(label = "妫�楠屼緷鎹�" )
- @Column(name = "jyyj", length = 1, nullable = false)
+ @Column(name = "jyyj", length = 1)
private String jyyj;
@PropertyDef(label = "鎸囨爣绫诲埆" )
- @Column(name = "zblb", length = 8, nullable = false)
+ @Column(name = "zblb", length = 8)
private String zblb;
@PropertyDef(label = "妫�楠岄」鐩�" )
- @Column(name = "jyxm", length = 1000, nullable = false)
+ @Column(name = "jyxm", length = 1000)
private String jyxm;
@PropertyDef(label = "妫�楠岄」鐩��" )
- @Column(name = "jyxmz", length = 1000, nullable = false)
+ @Column(name = "jyxmz", length = 1000)
private String jyxmz;
@PropertyDef(label = "鎸囨爣缁撴灉鍒ゅ畾" )
- @Column(name = "zbjgpd", length = 128, nullable = false)
+ @Column(name = "zbjgpd", length = 128)
private String zbjgpd;
@JSONField(format = "yyyy-MM-dd")
@@ -98,7 +98,7 @@
private Date bgcjsj;
@PropertyDef(label = "瀹℃牳浜哄鍚�" )
- @Column(name = "shrxm", length = 64, nullable = false)
+ @Column(name = "shrxm", length = 64)
private String shrxm;
@PropertyDef(label = "鎵︽牱鍗曠紪鍙�" )
@@ -107,7 +107,7 @@
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "鎵︽牱鏃堕棿" )
- @Column(name = "qysj", nullable = false)
+ @Column(name = "qysj")
private Date qysj;
@PropertyDef(label = "鎵︽牱鍖哄煙" )
@@ -115,7 +115,7 @@
private String qyqy;
@PropertyDef(label = "鎵︽牱浜哄鍚�" )
- @Column(name = "qyrxm", length = 64, nullable = false)
+ @Column(name = "qyrxm", length = 64)
private String qyrxm;
@PropertyDef(label = "鐩戠潱浜哄鍚�" )
@@ -127,19 +127,19 @@
private String ypbh;
@PropertyDef(label = "鏍峰搧鏁伴噺" )
- @Column(name = "ypsl", precision = 20, scale = 6, nullable = false)
+ @Column(name = "ypsl", precision = 20, scale = 6)
private double ypsl;
@PropertyDef(label = "浠ｈ〃鏁伴噺" )
- @Column(name = "dbsl", precision = 20, scale = 6, nullable = false)
+ @Column(name = "dbsl", precision = 20, scale = 6)
private double dbsl;
@PropertyDef(label = "鏍峰搧绛夌骇" )
- @Column(name = "ypdj", length = 2, nullable = false)
+ @Column(name = "ypdj", length = 2)
private String ypdj;
@PropertyDef(label = "鏄惁姝ｅ父瀛樺偍骞撮檺" )
- @Column(name = "sfzcccnx", length = 1, nullable = false)
+ @Column(name = "sfzcccnx", length = 1)
private String sfzcccnx;
@PropertyDef(label = "澶囨敞" )
@@ -147,12 +147,12 @@
private String bz;
@PropertyDef(label = "鎿嶄綔鏍囧織" )
- @Column(name = "czbz", length = 1, nullable = false)
+ @Column(name = "czbz", length = 1)
private String czbz;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�" )
- @Column(name = "zhgxsj", nullable = false)
+ @Column(name = "zhgxsj")
private Date zhgxsj;
}
diff --git a/src/main/java/com/fzzy/api/entity/Api1403.java b/src/main/java/com/fzzy/api/entity/Api1403.java
index 7743197..f8ccb84 100644
--- a/src/main/java/com/fzzy/api/entity/Api1403.java
+++ b/src/main/java/com/fzzy/api/entity/Api1403.java
@@ -30,7 +30,7 @@
@Id
@PropertyDef(label = "杞崲璁″垝鍗曞彿" )
- @Column(name = "lhjhdh", length = 25, nullable = false)
+ @Column(name = "lhjhdh", length = 25)
private String lhjhdh;
@PropertyDef(label = "璁″垝鏂囧彿" )
@@ -38,25 +38,25 @@
private String jhwh;
@PropertyDef(label = "璁″垝鍚嶇О" )
- @Column(name = "jhmc", length = 256, nullable = false)
+ @Column(name = "jhmc", length = 256)
private String jhmc;
@PropertyDef(label = "璁″垝骞村害" )
- @Column(name = "jhnd", length = 4, nullable = false)
+ @Column(name = "jhnd", length = 4)
private String jhnd;
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "寮�濮嬫墽琛屾棩鏈�" )
- @Column(name = "kszxrq", nullable = false)
+ @Column(name = "kszxrq")
private Date kszxrq;
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "鎴鎵ц鏃ユ湡" )
- @Column(name = "jzzxrq", nullable = false)
+ @Column(name = "jzzxrq")
private Date jzzxrq;
@PropertyDef(label = "璁″垝涓嬭揪鍗曚綅" )
- @Column(name = "jhxddw", length = 18, nullable = false)
+ @Column(name = "jhxddw", length = 18)
private String jhxddw;
@JSONField(format = "yyyy-MM-dd")
@@ -65,12 +65,12 @@
private Date jhxdsj;
@PropertyDef(label = "鎿嶄綔鏍囧織" )
- @Column(name = "czbz", length = 1, nullable = false)
+ @Column(name = "czbz", length = 1)
private String czbz;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�" )
- @Column(name = "zhgxsj", nullable = false)
+ @Column(name = "zhgxsj")
private Date zhgxsj;
@JSONField(serialize = false)
diff --git a/src/main/java/com/fzzy/api/entity/Api1404.java b/src/main/java/com/fzzy/api/entity/Api1404.java
index 3646020..6720f7b 100644
--- a/src/main/java/com/fzzy/api/entity/Api1404.java
+++ b/src/main/java/com/fzzy/api/entity/Api1404.java
@@ -30,27 +30,27 @@
@Id
@PropertyDef(label = "璁″垝鏄庣粏鍗曞彿" )
- @Column(name = "jhmxdh", length = 50, nullable = false)
+ @Column(name = "jhmxdh", length = 50)
private String jhmxdh;
@PropertyDef(label = "杞崲璁″垝鍗曞彿" )
- @Column(name = "lhjhdh", length = 25, nullable = false)
+ @Column(name = "lhjhdh", length = 25)
private String lhjhdh;
@PropertyDef(label = "绮鍝佺浠ｇ爜" )
- @Column(name = "lspzdm", length = 7, nullable = false)
+ @Column(name = "lspzdm", length = 7)
private String lspzdm;
@PropertyDef(label = "绮绛夌骇浠ｇ爜" )
- @Column(name = "lsdjdm", length = 2, nullable = false)
+ @Column(name = "lsdjdm", length = 2)
private String lsdjdm;
@PropertyDef(label = "绮鎬ц川浠ｇ爜" )
- @Column(name = "lsxzdm", length = 3, nullable = false)
+ @Column(name = "lsxzdm", length = 3)
private String lsxzdm;
@PropertyDef(label = "鏀惰幏骞村害" )
- @Column(name = "shnd", length = 4, nullable = false)
+ @Column(name = "shnd", length = 4)
private String shnd;
@PropertyDef(label = "杞崲璐т綅浠ｇ爜" )
@@ -58,20 +58,20 @@
private String lhhwdm;
@PropertyDef(label = "杞崲鏁伴噺" )
- @Column(name = "lhsl", precision = 20, scale = 6, nullable = false)
+ @Column(name = "lhsl", precision = 20, scale = 6)
private double lhsl;
@PropertyDef(label = "杞崲绫诲瀷" )
- @Column(name = "lhlx", length = 1, nullable = false)
+ @Column(name = "lhlx", length = 1)
private String lhlx;
@PropertyDef(label = "鎿嶄綔鏍囧織" )
- @Column(name = "czbz", length = 1, nullable = false)
+ @Column(name = "czbz", length = 1)
private String czbz;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�" )
- @Column(name = "zhgxsj", nullable = false)
+ @Column(name = "zhgxsj")
private Date zhgxsj;
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1202PR.java b/src/main/java/com/fzzy/api/view/pr/Api1202PR.java
index 512d095..8d81643 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1202PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1202PR.java
@@ -184,7 +184,7 @@
if (responseDto.getSuccess() == 0) {
//todo 浠ｈ〃涓婁紶鎴愬姛 ,鍚庢湡闇�瑕佷繚瀛樻棩蹇�
if ("i".equals(d.getCzbz())) {
- apiRepository.updateStatus(d.getId(), Constant.CZBZ_U);
+ apiRepository.updateStatus(d.getRkywdh(), Constant.CZBZ_U);
}
}
}
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1203PR.java b/src/main/java/com/fzzy/api/view/pr/Api1203PR.java
index a126822..dccf249 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1203PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1203PR.java
@@ -185,7 +185,7 @@
if (responseDto.getSuccess() == 0) {
//todo 浠ｈ〃涓婁紶鎴愬姛 ,鍚庢湡闇�瑕佷繚瀛樻棩蹇�
if ("i".equals(d.getCzbz())) {
- apiRepository.updateStatus(d.getId(), Constant.CZBZ_U);
+ apiRepository.updateStatus(d.getRkjydh(), Constant.CZBZ_U);
}
}
}
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1205PR.java b/src/main/java/com/fzzy/api/view/pr/Api1205PR.java
index 958bd26..ac893f7 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1205PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1205PR.java
@@ -186,7 +186,7 @@
if (responseDto.getSuccess() == 0) {
//todo 浠ｈ〃涓婁紶鎴愬姛 ,鍚庢湡闇�瑕佷繚瀛樻棩蹇�
if ("i".equals(d.getCzbz())) {
- apiRepository.updateStatus(d.getId(), Constant.CZBZ_U);
+ apiRepository.updateStatus(d.getCkywdh(), Constant.CZBZ_U);
}
}
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1202Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1202Rep.java
index c3ea6a0..283f2b1 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1202Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1202Rep.java
@@ -19,6 +19,6 @@
@Transactional
@Modifying
- @Query("update Api1202 set czbz =:czbz where id=:id")
- void updateStatus(@Param("id") String id, @Param("czbz") String czbz);
+ @Query("update Api1202 set czbz =:czbz where rkywdh=:rkywdh")
+ int updateStatus(@Param("rkywdh") String rkywdh, @Param("czbz") String czbz);
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1203Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1203Rep.java
index c07c48c..0b4f05b 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1203Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1203Rep.java
@@ -19,6 +19,6 @@
@Transactional
@Modifying
- @Query("update Api1203 set czbz =:czbz where id=:id")
- void updateStatus(@Param("id") String id, @Param("czbz") String czbz);
+ @Query("update Api1203 set czbz =:czbz where rkjydh=:rkjydh")
+ void updateStatus(@Param("rkjydh") String rkjydh, @Param("czbz") String czbz);
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1205Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1205Rep.java
index 668e518..f9f6f8e 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1205Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1205Rep.java
@@ -20,6 +20,6 @@
@Transactional
@Modifying
- @Query("update Api1205 set czbz =:czbz where id=:id")
- void updateStatus(@Param("id") String id, @Param("czbz") String czbz);
+ @Query("update Api1205 set czbz =:czbz where ckywdh=:ckywdh")
+ void updateStatus(@Param("ckywdh") String ckywdh, @Param("czbz") String czbz);
}
diff --git a/src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService12.java b/src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService12.java
index 1eeee2a..15a0549 100644
--- a/src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService12.java
+++ b/src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService12.java
@@ -49,29 +49,30 @@
Date start = param.getStart();
Date end = param.getEnd();
-// //鍚堝悓鍚屾
-// fzzySync1201.syncData(kqdm, deptId, start, end);
-//
-// //绮鍏ュ簱鍚屾
-// fzzySync1202.syncData(kqdm, deptId, start, end);
-//
-// //绮鍏ュ簱璐ㄦ鍚屾
-// fzzySync1203.syncData(kqdm, deptId, start, end);
-//
-// //绮鍏ュ簱缁撶畻鍚屾
-// fzzySync1204.syncData(kqdm, deptId, start, end);
-//
-// //绮鍑哄簱鍚屾
-// fzzySync1205.syncData(kqdm, deptId, start, end);
-//
-// //绮鍑哄簱缁撶畻鍚屾
-// fzzySync1206.syncData(kqdm, deptId, start, end);
-//
-// //绮鎹熸孩鍚屾
-// fzzySync1209.syncData(kqdm, deptId, start, end);
-//
-// //鏂囦欢淇℃伅鍚屾
-// fzzy35Sync1109.syncData(kqdm, deptId, start, end);
+
+ //鍚堝悓鍚屾
+ fzzySync1201.syncData(kqdm, deptId, start, end);
+
+ //绮鍏ュ簱鍚屾
+ fzzySync1202.syncData(kqdm, deptId, start, end);
+
+ //绮鍏ュ簱璐ㄦ鍚屾
+ fzzySync1203.syncData(kqdm, deptId, start, end);
+
+ //绮鍏ュ簱缁撶畻鍚屾
+ fzzySync1204.syncData(kqdm, deptId, start, end);
+
+ //绮鍑哄簱鍚屾
+ fzzySync1205.syncData(kqdm, deptId, start, end);
+
+ //绮鍑哄簱缁撶畻鍚屾
+ fzzySync1206.syncData(kqdm, deptId, start, end);
+
+ //绮鎹熸孩鍚屾
+ fzzySync1209.syncData(kqdm, deptId, start, end);
+
+ //鏂囦欢淇℃伅鍚屾
+ fzzy35Sync1109.syncData(kqdm, deptId, start, end);
//绮搴撳瓨鍚屾
fzzySync1208.syncData(kqdm, deptId, start, end);
diff --git a/src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService13.java b/src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService13.java
index 217706c..7491323 100644
--- a/src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService13.java
+++ b/src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService13.java
@@ -6,6 +6,7 @@
import com.fzzy.async.fzzy35.impl.Fzzy35Sync1302;
import com.fzzy.async.fzzy35.impl.Fzzy35Sync1303;
import com.fzzy.async.fzzy35.impl.Fzzy35Sync1304;
+import com.fzzy.async.fzzy35.impl.Fzzy35Sync1310;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -22,6 +23,8 @@
private Fzzy35Sync1303 fzzySync1303;
@Autowired
private Fzzy35Sync1304 fzzySync1304;
+ @Autowired
+ private Fzzy35Sync1310 fzzySync1310;
@Override
@@ -40,6 +43,9 @@
//姘斾綋妫�娴嬪悓姝�
fzzySync1304.syncData(param.getDeptId(), param.getStart(), param.getEnd());
+
+ //璐ㄦ鍚屾
+ fzzySync1310.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
}
}
diff --git a/src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService14.java b/src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService14.java
index 9b582db..05bba1e 100644
--- a/src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService14.java
+++ b/src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService14.java
@@ -3,6 +3,9 @@
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.SyncProtocol;
import com.fzzy.api.service.SyncService14;
+import com.fzzy.async.fzzy35.impl.Fzzy35Sync1403;
+import com.fzzy.async.fzzy35.impl.Fzzy35Sync1404;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
/**
@@ -11,8 +14,10 @@
@Component
public class Fzzy35SyncService14 implements SyncService14 {
- // public static final String BEAN_ID = "fzzy35.syncService14";
-
+ @Autowired
+ private Fzzy35Sync1403 fzzy35Sync1403;
+ @Autowired
+ private Fzzy35Sync1404 fzzy35Sync1404;
@Override
public String getProtocol() {
@@ -21,7 +26,11 @@
@Override
public void syncData(ApiParam param) {
+ //杞崲璁″垝鍚屾
+ fzzy35Sync1403.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+ //杞崲璁″垝鏄庣粏鍚屾
+ fzzy35Sync1404.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
}
}
diff --git a/src/main/java/com/fzzy/async/fzzy35/entity/Fz35Plan.java b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35Plan.java
new file mode 100644
index 0000000..b4b8426
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35Plan.java
@@ -0,0 +1,70 @@
+package com.fzzy.async.fzzy35.entity;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 璁″垝绠＄悊-涓昏〃
+ *
+ *
+ */
+@Data
+@Entity
+@Table(name = "D_M_PLAN")
+public class Fz35Plan implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @Id
+ @Column(name = "ID_", length = 40)
+ @PropertyDef(label = "璁″垝缂栫爜")
+ private String id;
+
+ @Column(name = "REFERENCE_NUMBER_", length = 40)
+ @PropertyDef(label = "璁″垝鏂囧彿")
+ private String referenceNumber;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
+
+ @Column(name = "DEPT_ID_", length = 40)
+ @PropertyDef(label = "鎵�灞炲垎搴�")
+ private String deptId;
+
+ @Column(name = "TYPE_", length = 10)
+ @PropertyDef(label = "璁″垝绫诲瀷")
+ private String type;
+
+ @Column(name = "NAME_", length = 50)
+ @PropertyDef(label = "璁″垝鍚嶇О")
+ private String name;
+
+ @Column(name = "YEAR_", length = 10)
+ @PropertyDef(label = "骞翠唤")
+ private String year;
+
+ @Column(name = "CREATE_USER_", length = 50)
+ @PropertyDef(label = "鍒涘缓浜�")
+ private String createUser;
+
+ @Column(name = "CREATE_TIME_")
+ @PropertyDef(label = "鍒涘缓鏃堕棿")
+ private Date createTime;
+
+ @Column(name = "BEGIN_TIME_")
+ @PropertyDef(label = "寮�濮嬫椂闂�")
+ private Date beginTime;
+
+ @Column(name = "END_TIME_")
+ @PropertyDef(label = "鎴鏃堕棿")
+ private Date endTime;
+
+ @Column(name = "REMARK_", length = 300)
+ @PropertyDef(label = "澶囨敞")
+ private String remark;
+
+}
diff --git a/src/main/java/com/fzzy/async/fzzy35/entity/Fz35PlanDetail.java b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35PlanDetail.java
new file mode 100644
index 0000000..bc13413
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35PlanDetail.java
@@ -0,0 +1,73 @@
+package com.fzzy.async.fzzy35.entity;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 璁″垝绠＄悊-璁″垝璇︾粏
+ *
+ * @author:
+ *
+ */
+@Data
+@Entity
+@Table(name = "D_M_PLAN_DETAIL")
+public class Fz35PlanDetail implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @Id
+ @Column(name = "ID_", length = 40)
+ @PropertyDef(label = "ID_")
+ private String id;
+
+ @Column(name = "PLAN_ID_", length = 40)
+ @PropertyDef(label = "璁″垝ID")
+ private String planId;
+
+ @Column(name = "DEPOT_ID_", length = 50)
+ @PropertyDef(label = "浠撳簱")
+ private String depotId;
+
+ @Column(name = "YEAR_", length = 10)
+ @PropertyDef(label = "骞翠唤")
+ private String year;
+
+ @Column(name = "TYPE_", length = 10)
+ @PropertyDef(label = "绫诲瀷")
+ private String type;
+
+ @Column(name = "FOOD_VARIETY_", length = 10)
+ @PropertyDef(label = "绮鍝佺")
+ private String foodVariety;
+
+ @Column(name = "FOOD_TYPE_", length = 10)
+ @PropertyDef(label = "绮鎬ц川")
+ private String foodType;
+
+ @Column(name = "FOOD_LEVEL_", length = 10)
+ @PropertyDef(label = "绮绛夌骇")
+ private String foodLevel;
+
+ @Column(name = "PLAN_NUM_", precision = 16, scale = 2)
+ @PropertyDef(label = "鏁伴噺")
+ private Double planNum;
+
+ @Column(name = "PRICE_", precision = 16, scale = 2)
+ @PropertyDef(label = "鍗曚环")
+ private Double price;
+
+ @Column(name = "TOTAL_", precision = 16, scale = 2)
+ @PropertyDef(label = "鎬讳环")
+ private Double total;
+
+ @Column(name = "CREATE_TIME_")
+ @PropertyDef(label = "鍒涘缓鏃堕棿")
+ private Date createTime;
+}
diff --git a/src/main/java/com/fzzy/async/fzzy35/entity/Fz35Quality.java b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35Quality.java
new file mode 100644
index 0000000..8bb7298
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35Quality.java
@@ -0,0 +1,106 @@
+package com.fzzy.async.fzzy35.entity;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 璐ㄩ噺宸℃--绮鍦ㄤ粨妫�娴�
+ *
+ * @author chen
+ *
+ */
+@Data
+@Entity
+@Table(name = "D_M_QUALITY")
+public class Fz35Quality implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @Id
+ @Column(name = "ID_", length = 40)
+ @PropertyDef(label = "涓婚敭ID", description = "ZJ+妫�楠岀被鍒�+骞存湀鏃ユ椂鍒嗙")
+ private String id;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
+
+ @Column(name = "DEPT_ID_", length = 40)
+ @PropertyDef(label = "搴撳尯缂栫爜")
+ private String deptId;
+
+ @Column(name = "DEPOT_ID_", length = 50)
+ @PropertyDef(label = "浠撳簱缂栫爜")
+ private String depotId;
+
+ @Column(name = "FOOD_VARIETY_", length = 10)
+ @PropertyDef(label = "绮鍝佺")
+ private String foodVariety;
+
+ @Column(name = "FOOD_LEVEL_", length = 10)
+ @PropertyDef(label = "绮绛夌骇")
+ private String foodLevel;
+
+ @Column(name = "FOOD_TYPE_", length = 10)
+ @PropertyDef(label = "绮鎬ц川")
+ private String foodType;
+
+ @Column(name = "FOOD_LOCATION_", length = 30)
+ @PropertyDef(label = "绮浜у湴")
+ private String foodLocation;
+
+ @Column(name = "TYPE_", length = 10)
+ @PropertyDef(label = "妫�楠岀被鍒�", description = "濡傚叆搴撻獙鏀躲�佸偍钘忔楠屻�佹棩甯稿贰妫�绛�")
+ private String type;
+
+ @Column(name = "STANDARD_", length = 10)
+ @PropertyDef(label = "妫�楠屼緷鎹�", description = "01-鍥芥爣锛�02-鍏朵粬")
+ private String standard;
+
+ @Column(name = "USER_", length = 50)
+ @PropertyDef(label = "妫�楠屽崟浣嶆垨妫�楠屼汉")
+ private String user;
+
+ @Column(name = "TIME_")
+ @PropertyDef(label = "妫�楠屾椂闂�")
+ private Date time;
+
+ @Column(name = "RESULT_", length = 50)
+ @PropertyDef(label = "妫�楠岀粨璁�")
+ private String result;
+
+ @Column(name = "CHECK_AREA__", length = 50)
+ @PropertyDef(label = "鎵︽牱鍖哄煙")
+ private String checkArea;
+
+ @Column(name = "CHECK_USER_", length = 50)
+ @PropertyDef(label = "鎵︽牱浜�")
+ private String checkUser;
+
+ @Column(name = "CHECK_TIME_")
+ @PropertyDef(label = "鎵︽牱鏃堕棿")
+ private Date checkTime;
+
+ @Column(name = "CHECK_NUM_")
+ @PropertyDef(label = "鏍峰搧鏁伴噺")
+ private Double checkNum;
+
+ @Column(name = "CHECK_REPRESENT_", length = 50)
+ @PropertyDef(label = "鏍峰搧浠ｈ〃")
+ private String checkRepresent;
+
+ @Column(name = "CHECK_LEVEL_", length = 20)
+ @PropertyDef(label = "鏍峰搧绛夌骇")
+ private String checkLevel;
+
+ @Column(name = "NORMAL_YEAR_", length = 10)
+ @PropertyDef(label = "鏄惁姝ｅ父瀛樺偍骞撮檺")
+ private String normalYear;
+
+ @Column(name = "REMARK_", length = 500)
+ @PropertyDef(label = "澶囨敞", description = "澶囨敞淇℃伅")
+ private String remark;
+}
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1310.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1310.java
new file mode 100644
index 0000000..33f9bde
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1310.java
@@ -0,0 +1,137 @@
+package com.fzzy.async.fzzy35.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.*;
+import com.fzzy.api.service.ApiCommonService;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.Api1310Rep;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.api.view.repository.GbCheckItemRep;
+import com.fzzy.async.fzzy35.entity.Fz35CheckItem;
+import com.fzzy.async.fzzy35.entity.Fz35Quality;
+import com.fzzy.async.fzzy35.repository.Fzzy35Sync1203Rep;
+import com.fzzy.async.fzzy35.repository.Fzzy35Sync1310Rep;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.time.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 璐ㄦ鍚屾
+ *
+ * @author chen
+ * @date 2023-05-14 19:51
+ */
+@Slf4j
+@Component
+public class Fzzy35Sync1310 {
+
+ @Autowired
+ private Fzzy35Sync1310Rep fzzySync1310Rep;
+ @Autowired
+ private Fzzy35Sync1203Rep fzzySync1203Rep;
+ @Autowired
+ private GbCheckItemRep gbCheckItemRep;
+ @Autowired
+ private ApiCommonService commonService;
+ @Autowired
+ private Api1310Rep api1310Rep;
+ @Autowired
+ private ApiLogRep apiLogRep;
+
+ /**
+ * 鍚屾骞跺皝瑁呬繚瀛樿川妫�鏁版嵁
+ *
+ * @param deptId 绯荤粺瀵瑰簲搴撳尯缂栫爜
+ * @param start 璧峰鏃堕棿
+ * @param end 鎴鏃堕棿
+ */
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+ log.info("-------------1310鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(deptId);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1304);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+ try {
+ List<Fz35Quality> list = fzzySync1310Rep.findDateByTime(start, end);
+ if (null == list || list.isEmpty()) {
+ return;
+ }
+
+ Api1310 api1310;
+ Api1105 api1105;
+ List<Fz35CheckItem> fz35CheckItems;
+ List<GbCheckItem> gbCheckList;
+ String jyxm;
+ String jyxmz;
+ for (Fz35Quality fz35Quality : list) {
+ api1105 = commonService.getApi1105Cache(fz35Quality.getDepotId());
+ if (null == api1105) {
+ continue;
+ }
+ api1310 = new Api1310();
+ api1310.setZjbgdh(fz35Quality.getId());
+ api1310.setHwdm(api1105.getHwdm());
+ api1310.setKqdm(kqdm);
+ api1310.setLspzdm(fz35Quality.getFoodVariety());
+ api1310.setLsdjdm(fz35Quality.getFoodLevel());
+ api1310.setRkrq(DateUtils.addDays(fz35Quality.getTime(), -30));
+ api1310.setJylb(fz35Quality.getType());
+ api1310.setJysj(fz35Quality.getTime());
+ api1310.setJydw(fz35Quality.getUser());
+ api1310.setJyr(fz35Quality.getUser());
+ api1310.setJyyj(fz35Quality.getStandard());
+ api1310.setZblb("2");
+ //妫�娴嬮」锛屾娴嬪��
+ jyxm = "";
+ jyxmz = "";
+ fz35CheckItems = fzzySync1203Rep.listInoutCheckItem(fz35Quality.getId());
+ if (null != fz35CheckItems && fz35CheckItems.size() > 0) {
+
+ for (Fz35CheckItem fz35CheckItem : fz35CheckItems) {
+ gbCheckList = gbCheckItemRep.findByBizCode(fz35CheckItem.getStandardId());
+
+ if (gbCheckList == null || gbCheckList.isEmpty()) {
+ continue;
+ }
+ jyxm += gbCheckList.get(0).getCode() + ",";
+ jyxmz += fz35CheckItem.getValue() + ",";
+ }
+ }
+ api1310.setJyxm(jyxm);
+ api1310.setJyxmz(jyxmz);
+
+ api1310.setZbjgpd(fz35Quality.getResult());
+ api1310.setQfrq(fz35Quality.getTime());
+ api1310.setBgcjsj(fz35Quality.getTime());
+ api1310.setShrxm(fz35Quality.getCheckUser());
+ api1310.setQysj(fz35Quality.getCheckTime());
+ api1310.setQyqy(fz35Quality.getCheckArea());
+ api1310.setQyrxm(fz35Quality.getCheckUser());
+ api1310.setJdrxm(fz35Quality.getCheckUser());
+
+ api1310.setYpsl(fz35Quality.getCheckNum()==null?0.0:(fz35Quality.getCheckNum()));
+ api1310.setDbsl(StringUtils.isEmpty(fz35Quality.getCheckRepresent())? 0.0:Double.valueOf(fz35Quality.getCheckRepresent()));
+ api1310.setYpdj(StringUtils.isEmpty(fz35Quality.getCheckLevel())?"0": fz35Quality.getCheckLevel());
+ api1310.setSfzcccnx(StringUtils.isEmpty(fz35Quality.getNormalYear())?"0": fz35Quality.getNormalYear());
+ api1310.setBz(fz35Quality.getRemark());
+ api1310.setCzbz(Constant.CZBZ_I);
+ api1310.setZhgxsj(new Date());
+
+ api1310Rep.save(api1310);
+ }
+ } catch (Exception e) {
+ log.error("---鍚屾澶辫触----{}", e);
+ apiLog.setResult("鍚屾澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1403.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1403.java
new file mode 100644
index 0000000..8d4f1df
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1403.java
@@ -0,0 +1,86 @@
+package com.fzzy.async.fzzy35.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.*;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.*;
+import com.fzzy.async.fzzy35.entity.Fz35CheckItem;
+import com.fzzy.async.fzzy35.entity.Fz35Plan;
+import com.fzzy.async.fzzy35.repository.Fzzy35Sync1403Rep;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 杞崲璁″垝鍚屾
+ *
+ * @author chen
+ * @date 2023-05-14 19:51
+ */
+@Slf4j
+@Component
+public class Fzzy35Sync1403 {
+
+ @Autowired
+ private Fzzy35Sync1403Rep fzzy35Sync1403Rep;
+ @Autowired
+ private Api1101Rep api1101Rep;
+ @Autowired
+ private Api1403Rep api1403Rep;
+ @Autowired
+ private ApiLogRep apiLogRep;
+
+ /**
+ * 鍚屾骞跺皝瑁呬繚瀛樿疆鎹㈣鍒掓暟鎹�
+ *
+ * @param deptId 绯荤粺瀵瑰簲搴撳尯缂栫爜
+ * @param start 璧峰鏃堕棿
+ * @param end 鎴鏃堕棿
+ */
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+ log.info("-------------1403鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(deptId);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1304);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+ try {
+ List<Fz35Plan> list = fzzy35Sync1403Rep.findDate("3", start, end);
+ if (null == list || list.isEmpty()) {
+ return;
+ }
+
+ Api1403 api1403;
+ List<Api1101> api1101List;
+ for (Fz35Plan fz35Plan : list) {
+ api1403 = new Api1403();
+ api1403.setLhjhdh(fz35Plan.getId());
+ api1403.setJhwh(fz35Plan.getReferenceNumber());
+ api1403.setJhmc(fz35Plan.getName());
+ api1403.setJhnd(fz35Plan.getYear());
+ api1403.setKszxrq(fz35Plan.getBeginTime());
+ api1403.setJzzxrq(fz35Plan.getEndTime());
+ api1101List = api1101Rep.findPushData(kqdm);
+ if(null != api1101List && api1101List.size() > 0){
+ api1403.setJhxddw(api1101List.get(0).getDwdm());
+ }
+ api1403.setJhxdsj(fz35Plan.getCreateTime());
+ api1403.setCzbz(Constant.CZBZ_I);
+ api1403.setZhgxsj(new Date());
+ api1403.setKqdm(kqdm);
+ api1403.setBizId(fz35Plan.getId());
+ api1403Rep.save(api1403);
+ }
+ } catch (Exception e) {
+ log.error("---鍚屾澶辫触----{}", e);
+ apiLog.setResult("鍚屾澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1404.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1404.java
new file mode 100644
index 0000000..b92681c
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1404.java
@@ -0,0 +1,102 @@
+package com.fzzy.async.fzzy35.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.*;
+import com.fzzy.api.service.ApiCommonService;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.Api1404Rep;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.fzzy35.entity.Fz35Plan;
+import com.fzzy.async.fzzy35.entity.Fz35PlanDetail;
+import com.fzzy.async.fzzy35.repository.Fzzy35Sync1403Rep;
+import com.fzzy.async.fzzy35.repository.Fzzy35Sync1404Rep;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 杞崲璁″垝鏄庣粏
+ *
+ * @author chen
+ * @date 2023-05-14 19:51
+ */
+@Slf4j
+@Component
+public class Fzzy35Sync1404 {
+
+ @Autowired
+ private Fzzy35Sync1403Rep fzzy35Sync1403Rep;
+ @Autowired
+ private Fzzy35Sync1404Rep fzzy35Sync1404Rep;
+ @Autowired
+ private ApiCommonService commonService;
+ @Autowired
+ private Api1404Rep api1404Rep;
+ @Autowired
+ private ApiLogRep apiLogRep;
+
+ /**
+ * 鍚屾骞跺皝瑁呬繚瀛樿川妫�鏁版嵁
+ *
+ * @param deptId 绯荤粺瀵瑰簲搴撳尯缂栫爜
+ * @param start 璧峰鏃堕棿
+ * @param end 鎴鏃堕棿
+ */
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+ log.info("-------------1404鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(deptId);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1304);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+ try {
+ List<Fz35Plan> list = fzzy35Sync1403Rep.findDate("3", start, end);
+
+ if (null == list || list.isEmpty()) {
+ return;
+ }
+
+ Api1404 api1404;
+ List<Fz35PlanDetail> fz35PlanDetails;
+ Api1105 api1105;
+ for (Fz35Plan fz35Plan : list) {
+
+ fz35PlanDetails = fzzy35Sync1404Rep.findDate(fz35Plan.getId());
+ if (null == fz35PlanDetails || fz35PlanDetails.isEmpty()) {
+ continue;
+ }
+ for (Fz35PlanDetail fz35PlanDetail : fz35PlanDetails) {
+ api1105 = commonService.getApi1105Cache(fz35PlanDetail.getDepotId());
+ if (null == api1105) {
+ continue;
+ }
+ api1404 = new Api1404();
+ api1404.setJhmxdh(fz35PlanDetail.getId());
+ api1404.setLhjhdh(fz35PlanDetail.getPlanId());
+ api1404.setLspzdm(fz35PlanDetail.getFoodVariety());
+ api1404.setLsdjdm(fz35PlanDetail.getFoodLevel());
+ api1404.setLsxzdm(fz35PlanDetail.getFoodType());
+ api1404.setShnd(fz35PlanDetail.getYear());
+ api1404.setLhhwdm(fz35PlanDetail.getDepotId());
+ api1404.setLhsl(fz35PlanDetail.getPlanNum());
+ api1404.setLhlx(fz35PlanDetail.getType());
+ api1404.setCzbz(Constant.CZBZ_I);
+ api1404.setZhgxsj(new Date());
+ api1404.setKqdm(kqdm);
+ api1404.setBizId(fz35PlanDetail.getId());
+ api1404Rep.save(api1404);
+ }
+ }
+ } catch (Exception e) {
+ log.error("---鍚屾澶辫触----{}", e);
+ apiLog.setResult("鍚屾澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1310Rep.java b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1310Rep.java
new file mode 100644
index 0000000..c8d6092
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1310Rep.java
@@ -0,0 +1,26 @@
+package com.fzzy.async.fzzy35.repository;
+
+import com.fzzy.async.fzzy35.entity.Fz35Quality;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鏌ヨ璐ㄦ鏁版嵁
+ *
+ * @author chen
+ * @date 2023-05-14 19:55
+ */
+public interface Fzzy35Sync1310Rep extends JpaRepository<Fz35Quality, String> {
+
+ /**
+ * 鏍规嵁鏃堕棿娈垫煡璇㈢伯鎯呮暟鎹�
+ * @param start
+ * @param end
+ * @return
+ */
+ @Query("from Fz35Quality where time >=:start and time <:end order by time ")
+ List<Fz35Quality> findDateByTime(@Param("start") Date start, @Param("end") Date end);
+}
diff --git a/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1403Rep.java b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1403Rep.java
new file mode 100644
index 0000000..0fd24d6
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1403Rep.java
@@ -0,0 +1,26 @@
+package com.fzzy.async.fzzy35.repository;
+
+import com.fzzy.async.fzzy35.entity.Fz35Plan;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鏌ヨ璐ㄨ疆鎹㈣鍒�
+ *
+ * @author chen
+ * @date 2023-05-14 19:55
+ */
+public interface Fzzy35Sync1403Rep extends JpaRepository<Fz35Plan, String> {
+
+ /**
+ *
+ * @param start
+ * @param end
+ * @return
+ */
+ @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);
+}
diff --git a/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1404Rep.java b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1404Rep.java
new file mode 100644
index 0000000..9dd2d9d
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1404Rep.java
@@ -0,0 +1,23 @@
+package com.fzzy.async.fzzy35.repository;
+
+import com.fzzy.async.fzzy35.entity.Fz35PlanDetail;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import java.util.List;
+
+/**
+ * 鏌ヨ杞崲璁″垝璇︾粏
+ *
+ * @author chen
+ * @date 2023-05-14 19:55
+ */
+public interface Fzzy35Sync1404Rep extends JpaRepository<Fz35PlanDetail, String> {
+
+ /**
+ *
+ * @return
+ */
+ @Query("from Fz35PlanDetail where planId =:planId ")
+ List<Fz35PlanDetail> findDate(@Param("planId") String planId);
+}
diff --git a/src/main/java/com/fzzy/push/impl/ComPushService12.java b/src/main/java/com/fzzy/push/impl/ComPushService12.java
index ff951be..c4d8b12 100644
--- a/src/main/java/com/fzzy/push/impl/ComPushService12.java
+++ b/src/main/java/com/fzzy/push/impl/ComPushService12.java
@@ -119,7 +119,7 @@
if (responseDto.getSuccess() == 0) {
if (Constant.CZBZ_I.equals(data.getCzbz())) {
- api1202Rep.updateStatus(data.getId(), Constant.CZBZ_U);
+ api1202Rep.updateStatus(data.getRkywdh(), Constant.CZBZ_U);
}
}
}
@@ -147,7 +147,7 @@
if (responseDto.getSuccess() == 0) {
if (Constant.CZBZ_I.equals(data.getCzbz())) {
- api1203Rep.updateStatus(data.getBizId(), Constant.CZBZ_U);
+ api1203Rep.updateStatus(data.getRkjydh(), Constant.CZBZ_U);
}
}
}
@@ -204,7 +204,7 @@
if (responseDto.getSuccess() == 0) {
if (Constant.CZBZ_I.equals(data.getCzbz())) {
- api1205Rep.updateStatus(data.getId(), Constant.CZBZ_U);
+ api1205Rep.updateStatus(data.getCkywdh(), Constant.CZBZ_U);
}
}
}
diff --git a/src/main/java/com/fzzy/push/shjdjw2023/Shjdjw2023PushService12.java b/src/main/java/com/fzzy/push/shjdjw2023/Shjdjw2023PushService12.java
index 4e3d1f1..5d58ec3 100644
--- a/src/main/java/com/fzzy/push/shjdjw2023/Shjdjw2023PushService12.java
+++ b/src/main/java/com/fzzy/push/shjdjw2023/Shjdjw2023PushService12.java
@@ -43,15 +43,15 @@
log.info("------->>>>绮璐攢 鎺ュ彛妯″潡涓婃姤寮�濮�");
- //TODO 绮鍏ュ簱淇℃伅
+ //绮鍏ュ簱淇℃伅
pushService.pushData1202(apiRemoteService, param);
- //TODO 绮鍏ュ簱璐ㄦ淇℃伅
+ //绮鍏ュ簱璐ㄦ淇℃伅
pushService.pushData1203(apiRemoteService, param);
- //TODO 绮鍑哄簱淇℃伅
+ //绮鍑哄簱淇℃伅
pushService.pushData1205(apiRemoteService, param);
- //TODO 绮搴撳瓨淇℃伅
+ //绮搴撳瓨淇℃伅
pushService.pushData1208(apiRemoteService, param);
- //TODO 鎹熺泭鍗曚俊鎭�
+ //鎹熺泭鍗曚俊鎭�
pushService.pushData1209(apiRemoteService, param);
diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml
index 249c112..5a49efd 100644
--- a/src/main/resources/application-pro.yml
+++ b/src/main/resources/application-pro.yml
@@ -1,4 +1,4 @@
-########################## 骞夸笢娼槼 ##########################
+########################## 涓婃捣鍢夊畾 ##########################
server:
port: 8090
jetty:
@@ -11,13 +11,13 @@
primary:
url: jdbc:mysql://127.0.0.1:3306/igds_api?useUnicode=true&characterEncoding=utf-8
username: root
- password: Abc123..
+ password: root
driver-class-name: com.mysql.jdbc.Driver
#娆℃暟鎹簮
secondary:
url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8
username: root
- password: Abc123..
+ password: root
driver-class-name: com.mysql.jdbc.Driver
jpa:
#涓籮pa閰嶇疆
@@ -38,7 +38,7 @@
dialect: org.hibernate.dialect.MySQL5InnoDBDialect
# Redis鐩稿叧閰嶇疆
redis:
- database: 0
+ database: 1
host: 127.0.0.1
port: 6379
password: Abc123..
@@ -51,7 +51,6 @@
timeout: 6000
igds:
default:
- companyId: 5317
-
- file-path: D:/IGDS-API/FILE/
+ companyId: 5303
+ file-path: C:/app/igds-api/
img-path: D:/IGDS/FILE/
\ No newline at end of file
diff --git a/src/main/resources/application-pro5303.yml b/src/main/resources/application-pro5303.yml
new file mode 100644
index 0000000..5a49efd
--- /dev/null
+++ b/src/main/resources/application-pro5303.yml
@@ -0,0 +1,56 @@
+########################## 涓婃捣鍢夊畾 ##########################
+server:
+ port: 8090
+ jetty:
+ max-http-post-size: 209715200
+ tomcat:
+ max-http-post-size: 209715200
+spring:
+ datasource:
+ #涓绘暟鎹簮
+ primary:
+ url: jdbc:mysql://127.0.0.1:3306/igds_api?useUnicode=true&characterEncoding=utf-8
+ username: root
+ password: root
+ driver-class-name: com.mysql.jdbc.Driver
+ #娆℃暟鎹簮
+ secondary:
+ url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8
+ username: root
+ password: root
+ driver-class-name: com.mysql.jdbc.Driver
+ jpa:
+ #涓籮pa閰嶇疆
+ primary:
+ show-sql: true
+ properties:
+ hibernate:
+ hbm2ddl:
+ auto: update
+ dialect: org.hibernate.dialect.MySQL5InnoDBDialect
+ #娆pa閰嶇疆
+ secondary:
+ show-sql: true
+ properties:
+ hibernate:
+ hbm2ddl:
+ auto: none
+ dialect: org.hibernate.dialect.MySQL5InnoDBDialect
+ # Redis鐩稿叧閰嶇疆
+ redis:
+ database: 1
+ host: 127.0.0.1
+ port: 6379
+ password: Abc123..
+ # 杩炴帴姹犳渶澶ц繛鎺ユ暟锛堜娇鐢ㄨ礋鍊艰〃绀烘病鏈夐檺鍒讹級
+ pool:
+ max-active: 200
+ max-wait: -1
+ max-idle: 10
+ min-idle: 0
+ timeout: 6000
+igds:
+ default:
+ companyId: 5303
+ file-path: C:/app/igds-api/
+ img-path: D:/IGDS/FILE/
\ No newline at end of file
--
Gitblit v1.9.3