From 07ff6686da8e9922a6f5a4f276e69d045e12a044 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期五, 20 十月 2023 15:59:23 +0800
Subject: [PATCH] 调整上海接口：粮食管理相关同步
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1109.java | 115 ++++++++++++
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1306.java | 7
src/main/java/com/fzzy/async/fzzy40/entity/Fz40AreationData.java | 42 ++--
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1303.java | 3
src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2103PR.java | 23 +-
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1305.java | 6
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java | 32 ++-
src/main/java/com/fzzy/api/entity/Api1305.java | 126 +++++++-------
src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLog.java | 14
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 10
src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1306Rep.java | 4
src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java | 50 ++--
src/main/java/com/fzzy/api/entity/Api1306.java | 32 ++-
src/main/java/com/fzzy/api/view/Api1305.view.xml | 2
src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java | 50 ++--
src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1305Rep.java | 2
16 files changed, 329 insertions(+), 189 deletions(-)
diff --git a/src/main/java/com/fzzy/api/entity/Api1305.java b/src/main/java/com/fzzy/api/entity/Api1305.java
index eba6aa1..bc7e097 100644
--- a/src/main/java/com/fzzy/api/entity/Api1305.java
+++ b/src/main/java/com/fzzy/api/entity/Api1305.java
@@ -35,23 +35,23 @@
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "閫氶鏃ユ湡" )
- @Column(name = "tfrq", nullable = false)
+ @Column(name = "tfrq")
private Date tfrq;
@PropertyDef(label = "浠撴埧浠ｇ爜" )
- @Column(name = "cfdm", length = 25, nullable = false)
+ @Column(name = "cfdm", length = 25)
private String cfdm;
@PropertyDef(label = "閫氶鐩殑" )
- @Column(name = "tfmd", length = 128, nullable = false)
+ @Column(name = "tfmd", length = 128)
private String tfmd;
@PropertyDef(label = "绮爢瀛旈殭搴�" )
- @Column(name = "ldkxd", precision = 10, scale = 3)
- private double ldkxd;
+ @Column(name = "ldkxd")
+ private Double ldkxd;
@PropertyDef(label = "閫氶绫诲瀷" )
- @Column(name = "tflx", length = 1, nullable = false)
+ @Column(name = "tflx", length = 1)
private String tflx;
@PropertyDef(label = "椋庨亾鍨嬪紡" )
@@ -59,28 +59,28 @@
private String fdxs;
@PropertyDef(label = "椋庣綉璁剧疆鏂瑰紡" )
- @Column(name = "fwszfs", length = 64, nullable = false)
+ @Column(name = "fwszfs", length = 64)
private String fwszfs;
@PropertyDef(label = "涓婚閬撴埅闈㈢Н" )
- @Column(name = "zfdjmj", precision = 10, scale = 3)
- private double zfdjmj;
+ @Column(name = "zfdjmj")
+ private Double zfdjmj;
@PropertyDef(label = "鏀閬撴埅闈㈢Н" )
- @Column(name = "zhfdjmj", precision = 10, scale = 3)
- private double zhfdjmj;
+ @Column(name = "zhfdjmj")
+ private Double zhfdjmj;
@PropertyDef(label = "鏀閬撴�婚暱搴�" )
@Column(name = "zfdzcd", precision = 20, scale = 3)
- private double zfdzcd;
+ private Double zfdzcd;
@PropertyDef(label = "椋庣綉寮�瀛旂巼" )
- @Column(name = "fwkkl", precision = 10, scale = 3)
- private double fwkkl;
+ @Column(name = "fwkkl")
+ private Double fwkkl;
@PropertyDef(label = "绌烘皵閫斿緞姣�" )
- @Column(name = "kqtjb", precision = 10, scale = 3)
- private double kqtjb;
+ @Column(name = "kqtjb")
+ private Double kqtjb;
@PropertyDef(label = "閫氶鍙ｈ缃釜鏁�" )
@Column(name = "tfkszgs")
@@ -95,76 +95,76 @@
private Integer tfjts;
@PropertyDef(label = "鍗曞彴椋庢満棰濆畾鍏ㄥ帇" )
- @Column(name = "dtfjedqy", precision = 10, scale = 3)
- private double dtfjedqy;
+ @Column(name = "dtfjedqy")
+ private Double dtfjedqy;
@PropertyDef(label = "鍗曞彴椋庢満棰濆畾椋庨噺" )
- @Column(name = "dtfjedfl", precision = 10, scale = 3)
- private double dtfjedfl;
+ @Column(name = "dtfjedfl")
+ private Double dtfjedfl;
@PropertyDef(label = "鍗曞彴椋庢満棰濆畾鍔熺巼" )
- @Column(name = "dtfjedgl", precision = 10, scale = 3)
- private double dtfjedgl;
+ @Column(name = "dtfjedgl")
+ private Double dtfjedgl;
@PropertyDef(label = "閫侀鏂瑰紡" )
- @Column(name = "sffs", length = 1, nullable = false)
+ @Column(name = "sffs", length = 1)
private String sffs;
@PropertyDef(label = "鍗曞彴椋庢満瀹炴祴椋庨噺" )
- @Column(name = "dtfjscfl", precision = 10, scale = 3)
- private double dtfjscfl;
+ @Column(name = "dtfjscfl")
+ private Double dtfjscfl;
@PropertyDef(label = "鍗曞彴椋庢満杞村姛鐜�" )
- @Column(name = "dtfjzgl", precision = 10, scale = 3)
- private double dtfjzgl;
+ @Column(name = "dtfjzgl")
+ private Double dtfjzgl;
@PropertyDef(label = "鎬婚閲�" )
- @Column(name = "zfl", precision = 10, scale = 3)
- private double zfl;
+ @Column(name = "zfl")
+ private Double zfl;
@PropertyDef(label = "鍗曚綅閫氶閲�" )
- @Column(name = "dwtfl", precision = 10, scale = 3)
- private double dwtfl;
+ @Column(name = "dwtfl")
+ private Double dwtfl;
@PropertyDef(label = "瀹炴祴绯荤粺闃诲姏" )
- @Column(name = "scxtzl", precision = 10, scale = 3)
- private double scxtzl;
+ @Column(name = "scxtzl")
+ private Double scxtzl;
@PropertyDef(label = "鎬昏�楃數閲�" )
- @Column(name = "zhdl", precision = 10, scale = 3)
- private double zhdl;
+ @Column(name = "zhdl")
+ private Double zhdl;
@PropertyDef(label = "浣滀笟鏃舵皵娓�" )
- @Column(name = "zysqw", precision = 10, scale = 3)
- private double zysqw;
+ @Column(name = "zysqw")
+ private Double zysqw;
@PropertyDef(label = "浣滀笟鏃舵皵婀�" )
- @Column(name = "zysqs", precision = 10, scale = 3)
- private double zysqs;
+ @Column(name = "zysqs")
+ private Double zysqs;
@PropertyDef(label = "閫氶鏃堕暱" )
- @Column(name = "tfsc", precision = 10, scale = 3)
- private double tfsc;
+ @Column(name = "tfsc")
+ private Double tfsc;
@PropertyDef(label = "浣滀笟鍓嶅钩鍧囩伯娓�" )
- @Column(name = "zyqpjlw", precision = 10, scale = 3, nullable = false)
- private double zyqpjlw;
+ @Column(name = "zyqpjlw")
+ private Double zyqpjlw;
@PropertyDef(label = "缁撴潫鍚庡钩鍧囩伯娓�" )
- @Column(name = "jshpjlw", precision = 10, scale = 3, nullable = false)
- private double jshpjlw;
+ @Column(name = "jshpjlw")
+ private Double jshpjlw;
@PropertyDef(label = "闄嶆俯骞呭害" )
- @Column(name = "jwfd", precision = 10, scale = 3)
- private double jwfd;
+ @Column(name = "jwfd")
+ private Double jwfd;
@PropertyDef(label = "鍚ㄧ伯闄嶆俯鑳借��" )
- @Column(name = "dljwnh", precision = 10, scale = 3)
- private double dljwnh;
+ @Column(name = "dljwnh")
+ private Double dljwnh;
@PropertyDef(label = "澶辨按鐜�" )
- @Column(name = "ssl_", precision = 10, scale = 3)
- private double ssl;
+ @Column(name = "ssl_")
+ private Double ssl;
@PropertyDef(label = "淇濇按鏁堟灉璇勪环缁撴灉" )
@Column(name = "bsxgpjjg", length = 128)
@@ -187,20 +187,20 @@
private String tfjwjyxpjxc;
@PropertyDef(label = "浣滀笟鍓嶅钩鍧囨按鍒�" )
- @Column(name = "zyqpjsf", precision = 10, scale = 3, nullable = false)
- private double zyqpjsf;
+ @Column(name = "zyqpjsf")
+ private Double zyqpjsf;
@PropertyDef(label = "缁撴潫鍚庡钩鍧囨按鍒�" )
- @Column(name = "zyhpjsf", precision = 10, scale = 3, nullable = false)
- private double zyhpjsf;
+ @Column(name = "zyhpjsf")
+ private Double zyhpjsf;
@PropertyDef(label = "闄嶆按骞呭害" )
- @Column(name = "jsfd", precision = 10, scale = 3)
- private double jsfd;
+ @Column(name = "jsfd")
+ private Double jsfd;
@PropertyDef(label = "鍚ㄧ伯闄嶆按鑳借��" )
- @Column(name = "dljsnh", precision = 10, scale = 3)
- private double dljsnh;
+ @Column(name = "dljsnh")
+ private Double dljsnh;
@PropertyDef(label = "閫氶闄嶆按鍧囧寑鎬у垎鏋恄鏁翠粨" )
@Column(name = "tfjsjyxfxzc", length = 128)
@@ -219,20 +219,20 @@
private String tfjsjyxfxxc;
@PropertyDef(label = "閫氶浣滀笟璐熻矗浜�" )
- @Column(name = "tfzyfzr", length = 64, nullable = false)
+ @Column(name = "tfzyfzr", length = 64)
private String tfzyfzr;
@PropertyDef(label = "閫氶浣滀笟浜哄憳" )
- @Column(name = "tfzyry", length = 128, nullable = false)
+ @Column(name = "tfzyry", length = 128)
private String tfzyry;
@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/Api1306.java b/src/main/java/com/fzzy/api/entity/Api1306.java
index 1768258..9843ea5 100644
--- a/src/main/java/com/fzzy/api/entity/Api1306.java
+++ b/src/main/java/com/fzzy/api/entity/Api1306.java
@@ -30,29 +30,29 @@
@Id
@PropertyDef(label = "鐔忚捀浣滀笟鍗曞彿" )
- @Column(name = "xzzydh", length = 36, nullable = false)
+ @Column(name = "xzzydh", length = 36)
private String xzzydh;
@PropertyDef(label = "浠撴埧浠ｇ爜" )
- @Column(name = "cfdm", length = 25, nullable = false)
+ @Column(name = "cfdm", length = 25)
private String cfdm;
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "鐔忚捀寮�濮嬫椂闂�" )
- @Column(name = "xzkssj", nullable = false)
+ @Column(name = "xzkssj")
private Date xzkssj;
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "鐔忚捀缁撴潫鏃堕棿" )
- @Column(name = "xzjssj", nullable = false)
+ @Column(name = "xzjssj")
private Date xzjssj;
@PropertyDef(label = "瀹宠櫕妫�娴嬪崟鍙�" )
- @Column(name = "hcjcdh", length = 42, nullable = false)
+ @Column(name = "hcjcdh", length = 42)
private String hcjcdh;
@PropertyDef(label = "灏佷粨鍚庣啅钂哥殑娆℃暟 绗嚑娆＄啅钂�" )
- @Column(name = "djcxz", nullable = false)
+ @Column(name = "djcxz")
private Integer djcxz;
@PropertyDef(label = "甯歌鐔忚捀鏂瑰紡" )
@@ -92,7 +92,7 @@
private String syzzsh;
@PropertyDef(label = "鑽墏鍚嶇О" )
- @Column(name = "yjmc", length = 64, nullable = false)
+ @Column(name = "yjmc", length = 64)
private String yjmc;
@PropertyDef(label = "鍓傚瀷" )
@@ -116,7 +116,7 @@
private Double zyyl;
@PropertyDef(label = "鏂借嵂鏂规硶" )
- @Column(name = "syff", length = 1, nullable = false)
+ @Column(name = "syff", length = 1)
private String syff;
@PropertyDef(label = "杈呭姪鏂借嵂鎺柦" )
@@ -213,7 +213,7 @@
private Date sqrq;
@PropertyDef(label = "鏁ｆ皵鏂规硶" )
- @Column(name = "sqff", length = 128, nullable = false)
+ @Column(name = "sqff", length = 128)
private String sqff;
@PropertyDef(label = "鏁ｆ皵鎵瑰噯浜�" )
@@ -221,7 +221,7 @@
private String sqpzr;
@PropertyDef(label = "鏁ｆ皵鎸佺画澶╂暟" )
- @Column(name = "sqcsts", nullable = false)
+ @Column(name = "sqcsts")
private Integer sqcsts;
@PropertyDef(label = "鏁ｆ皵缁撴潫鏃剁７鍖栨阿娴撳害" )
@@ -274,7 +274,7 @@
private Integer pysswthhcs;
@PropertyDef(label = "鐔忚捀鏁堟灉璇勪环" )
- @Column(name = "xzxgpj", length = 1, nullable = false)
+ @Column(name = "xzxgpj", length = 1)
private String xzxgpj;
@PropertyDef(label = "鐔忚捀璐熻矗浜�" )
@@ -286,12 +286,18 @@
private String xzzyry;
@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;
+ /*---------绯荤粺鍐呬娇鐢�:鍥芥爣鍜屽箍涓滅啅钂稿崟鍙凤細浠撴埧浠ｇ爜+yyyyMMdd+3浣嶉『搴忓彿锛涗笂娴风啅钂稿崟鍙凤細璐т綅浠ｇ爜+yyyyMMdd+3浣嶉『搴忓彿----------*/
+ @JSONField(serialize = false)
+ @PropertyDef(label = "璐т綅浠ｇ爜" )
+ @Column(name = "hwdm", length = 30)
+ private String hwdm;
+
}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/api/view/Api1305.view.xml b/src/main/java/com/fzzy/api/view/Api1305.view.xml
index 92aec4e..2dfe1c6 100644
--- a/src/main/java/com/fzzy/api/view/Api1305.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1305.view.xml
@@ -290,7 +290,7 @@
<Property></Property>
<Property name="label">鎿嶄綔鏍囧織</Property>
<Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("triggerUtil#czbz").getResult()}</Property>
+ <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("CZBZ")}</Property>
<Property name="keyProperty">code</Property>
<Property name="valueProperty">name</Property>
</Property>
diff --git a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
index 6cafadf..e90c117 100644
--- a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
+++ b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
@@ -60,38 +60,38 @@
Date start = param.getStart();
Date end = param.getEnd();
- //瀹㈡埛鍚屾
- fzzySync1212.syncData(kqdm, deptId, start, end);
-
- //鍚堝悓鍚屾
- fzzySync1201.syncData(kqdm, deptId, start, end);
-
- //绮鍏ュ簱鍚屾
- fzzySync1202.syncData(kqdm, deptId, start, end);
-
- //绮鍏ュ簱璐ㄦ
+// //瀹㈡埛鍚屾
+// fzzySync1212.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);
- //鍊掍粨淇℃伅鍚屾
- fzzySync1207.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);
+// //鍊掍粨淇℃伅鍚屾
+// fzzySync1207.syncData(kqdm, deptId, start, end);
+//
+// //鍑哄叆搴撴枃浠朵俊鎭悓姝�
// fzzySync1109.syncData(kqdm, deptId, start, end);
//绮搴撳瓨鍚屾
fzzySync1208.syncData(kqdm, deptId, start, end);
//绮鎬ц川杞彉淇℃伅鍚屾
- fzzySync1210.syncData(kqdm, deptId, start, end);
+// fzzySync1210.syncData(kqdm, deptId, start, end);
/*-----鍚勭渷鐙湁鎺ュ彛淇℃伅鍚屾-----*/
// if (StringUtils.isNotEmpty(param.getPushProtocol()) && PushProtocol.SB_SH_2023.getCode().equals(param.getPushProtocol())) {
diff --git a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java
index 05cb5f6..5325c26 100644
--- a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java
+++ b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java
@@ -51,31 +51,31 @@
//鐔忚捀澶囨鏁版嵁鍚屾
fzzySync1023.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
}
- if (StringUtils.isNotEmpty(param.getPushProtocol()) && PushProtocol.SB_SH_2023.getCode().equals(param.getPushProtocol())) {
- //涓婃捣甯傚钩鍙�2023鐗堬紝闇�瑕佸悓姝ョ伯鎯呰澶囬厤缃俊鎭�
-
- //鍚屾绮儏璁惧閰嶇疆淇℃伅
- fzzy40Sync2103.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
- //瑙嗛鐩戞帶淇℃伅鍚屾
- fzzySync1311.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
- }
-
- /*-----鍏叡鎺ュ彛-----*/
-
- //娓╂箍搴︽娴嬫暟鎹悓姝�
- fzzySync1302.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
-
- //铏妫�娴嬪悓姝�
- fzzySync1303.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
-
- //姘斾綋妫�娴嬪悓姝�
- fzzySync1304.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
-
- //璐ㄦ鍚屾
- fzzySync1310.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
-
- //閫氶浣滀笟淇℃伅鍚屾
- fzzySync1305.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+// if (StringUtils.isNotEmpty(param.getPushProtocol()) && PushProtocol.SB_SH_2023.getCode().equals(param.getPushProtocol())) {
+// //涓婃捣甯傚钩鍙�2023鐗堬紝闇�瑕佸悓姝ョ伯鎯呰澶囬厤缃俊鎭�
+//
+// //鍚屾绮儏璁惧閰嶇疆淇℃伅
+// fzzy40Sync2103.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+// //瑙嗛鐩戞帶淇℃伅鍚屾
+// fzzySync1311.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+// }
+//
+// /*-----鍏叡鎺ュ彛-----*/
+//
+// //娓╂箍搴︽娴嬫暟鎹悓姝�
+// fzzySync1302.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+//
+// //铏妫�娴嬪悓姝�
+// fzzySync1303.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+//
+// //姘斾綋妫�娴嬪悓姝�
+// fzzySync1304.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+//
+// //璐ㄦ鍚屾
+// fzzySync1310.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+//
+// //閫氶浣滀笟淇℃伅鍚屾
+// fzzySync1305.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
//鐔忚捀浣滀笟淇℃伅鍚屾
fzzySync1306.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
diff --git a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40AreationData.java b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40AreationData.java
index 4d63d84..f409ed8 100644
--- a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40AreationData.java
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40AreationData.java
@@ -47,7 +47,7 @@
@PropertyDef(label = "绮爢瀛旈殭搴�")
@Column(name = "ldkxd", precision = 10, scale = 3)
- private double ldkxd;
+ private Double ldkxd;
/**
* 1锛氳嚜鐒剁┖姘旈�氶
@@ -79,23 +79,23 @@
@PropertyDef(label = "涓婚閬撴埅闈㈢Н")
@Column(name = "zfdjmj", precision = 10, scale = 3)
- private double zfdjmj;
+ private Double zfdjmj;
@PropertyDef(label = "鏀閬撴埅闈㈢Н")
@Column(name = "zhfdjmj", precision = 10, scale = 3)
- private double zhfdjmj;
+ private Double zhfdjmj;
@PropertyDef(label = "鏀閬撴�婚暱搴�")
@Column(name = "zfdzcd", precision = 20, scale = 3)
- private double zfdzcd;
+ private Double zfdzcd;
@PropertyDef(label = "椋庣綉寮�瀛旂巼")
@Column(name = "fwkkl", precision = 10, scale = 3)
- private double fwkkl;
+ private Double fwkkl;
@PropertyDef(label = "绌烘皵閫斿緞姣�")
@Column(name = "kqtjb", precision = 10, scale = 3)
- private double kqtjb;
+ private Double kqtjb;
@PropertyDef(label = "閫氶鍙ｈ缃釜鏁�")
@Column(name = "tfkszgs")
@@ -111,15 +111,15 @@
@PropertyDef(label = "鍗曞彴椋庢満棰濆畾鍏ㄥ帇")
@Column(name = "dtfjedqy", precision = 10, scale = 3)
- private double dtfjedqy;
+ private Double dtfjedqy;
@PropertyDef(label = "鍗曞彴椋庢満棰濆畾椋庨噺")
@Column(name = "dtfjedfl", precision = 10, scale = 3)
- private double dtfjedfl;
+ private Double dtfjedfl;
@PropertyDef(label = "鍗曞彴椋庢満棰濆畾鍔熺巼")
@Column(name = "dtfjedgl", precision = 10, scale = 3)
- private double dtfjedgl;
+ private Double dtfjedgl;
/**
* 1锛氬帇鍏ュ紡閫氶
@@ -134,23 +134,23 @@
@PropertyDef(label = "鍗曞彴椋庢満瀹炴祴椋庨噺")
@Column(name = "dtfjscfl", precision = 10, scale = 3)
- private double dtfjscfl;
+ private Double dtfjscfl;
@PropertyDef(label = "鍗曞彴椋庢満杞村姛鐜�")
@Column(name = "dtfjzgl", precision = 10, scale = 3)
- private double dtfjzgl;
+ private Double dtfjzgl;
@PropertyDef(label = "鎬婚閲�")
@Column(name = "zfl", precision = 10, scale = 3)
- private double zfl;
+ private Double zfl;
@PropertyDef(label = "鍗曚綅閫氶閲�")
@Column(name = "dwtfl", precision = 10, scale = 3)
- private double dwtfl;
+ private Double dwtfl;
@PropertyDef(label = "瀹炴祴绯荤粺闃诲姏")
@Column(name = "scxtzl", precision = 10, scale = 3)
- private double scxtzl;
+ private Double scxtzl;
/**
* 鎬昏�楃數閲� 鍗冪摝
@@ -161,11 +161,11 @@
@PropertyDef(label = "浣滀笟鏃舵皵娓�")
@Column(name = "zysqw", precision = 10, scale = 3)
- private double zysqw;
+ private Double zysqw;
@PropertyDef(label = "浣滀笟鏃舵皵婀�")
@Column(name = "zysqs", precision = 10, scale = 3)
- private double zysqs;
+ private Double zysqs;
@Column(name = "BEFORE_TEMP_AVG_")
@PropertyDef(label = "浣滀笟鍓嶅钩鍧囩伯娓�")
@@ -177,15 +177,15 @@
@PropertyDef(label = "闄嶆俯骞呭害")
@Column(name = "jwfd", precision = 10, scale = 3)
- private double jwfd;
+ private Double jwfd;
@PropertyDef(label = "鍚ㄧ伯闄嶆俯鑳借��")
@Column(name = "dljwnh", precision = 10, scale = 3)
- private double dljwnh;
+ private Double dljwnh;
@PropertyDef(label = "澶辨按鐜�")
@Column(name = "ssl_", precision = 10, scale = 3)
- private double ssl;
+ private Double ssl;
@PropertyDef(label = "淇濇按鏁堟灉璇勪环缁撴灉")
@Column(name = "bsxgpjjg", length = 128)
@@ -217,11 +217,11 @@
@PropertyDef(label = "闄嶆按骞呭害")
@Column(name = "jsfd", precision = 10, scale = 3)
- private double jsfd;
+ private Double jsfd;
@PropertyDef(label = "鍚ㄧ伯闄嶆按鑳借��")
@Column(name = "dljsnh", precision = 10, scale = 3)
- private double dljsnh;
+ private Double dljsnh;
@PropertyDef(label = "閫氶闄嶆按鍧囧寑鎬у垎鏋恄鏁翠粨")
@Column(name = "tfjsjyxfxzc", length = 128)
diff --git a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLog.java b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLog.java
index 5b5ccb1..e5a740c 100644
--- a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLog.java
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLog.java
@@ -147,7 +147,7 @@
@PropertyDef(label = "琛ヨ嵂鍓嶄粨鍐呯７鍖栨阿娴撳害")
@Column(name = "byqcnlhqnd", precision = 20, scale = 3)
- private double byqcnlhqnd;
+ private Double byqcnlhqnd;
@PropertyDef(label = "纾峰寲姘㈡祿搴﹀崟浣�", description = "1锛歡/m鲁(榛樿);2锛歱pm;3:ml/m鲁;4锛�%VOL")
@Column(name = "nlhqnddw", length = 1)
@@ -155,15 +155,15 @@
@PropertyDef(label = "鐩爣娴撳害", description = "鍗曚綅锛歡/m鲁")
@Column(name = "mbnd", precision = 20, scale = 3)
- private double mbnd;
+ private Double mbnd;
@PropertyDef(label = "璁＄畻琛ヨ嵂閲�", description = "鍗曚綅锛歡")
@Column(name = "jsbyl", precision = 20, scale = 3)
- private double jsbyl;
+ private Double jsbyl;
@PropertyDef(label = "瀹為檯琛ヨ嵂閲�", description = "鍗曚綅锛歡")
@Column(name = "sjbyl", precision = 20, scale = 3)
- private double sjbyl;
+ private Double sjbyl;
@PropertyDef(label = "琛ヨ嵂鏂规硶")
@Column(name = "byff", length = 128)
@@ -183,7 +183,7 @@
@PropertyDef(label = "宄板�兼祿搴�", description = "鍗曚綅锛歡/m鲁")
@Column(name = "fznd", precision = 20, scale = 3)
- private double fznd;
+ private Double fznd;
@PropertyDef(label = "鐩爣娴撳害缁存寔澶╂暟", description = "鍗曚綅锛氬ぉ")
@Column(name = "mbndwcts")
@@ -203,11 +203,11 @@
@PropertyDef(label = "CT鍊�")
@Column(name = "ctz", precision = 20, scale = 3)
- private double ctz;
+ private Double ctz;
@PropertyDef(label = "鏁ｆ皵鍓嶇７鍖栨阿娴撳害", description = "鍗曚綅锛歡/m鲁")
@Column(name = "sqqlhqnd", precision = 20, scale = 3)
- private double sqqlhqnd;
+ private Double sqqlhqnd;
@Column(name = "VENTILATE_TIME_")
@PropertyDef(label = "鏁ｆ皵鏃堕棿")
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1109.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1109.java
index 39421a0..8dfe38f 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1109.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1109.java
@@ -174,6 +174,121 @@
}
}
+
+// /**
+// * 鍚屾鏂囦欢鎺ュ彛
+// *
+// * @param deptId
+// * @param start
+// * @param end
+// */
+// public void syncData(String kqdm, String deptId, Date start, Date end) {
+//
+// log.info("-------------1109鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+//
+// //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+// ApiLog apiLog = new ApiLog();
+// apiLog.setType(ApiLog.TYPE_SYNC);
+// apiLog.setKqdm(deptId);
+// apiLog.setUploadTime(new Date());
+// apiLog.setInteId(Constant.API_CODE_1109);
+// apiLog.setStatus(99);
+// apiLog.setId(ContextUtil.getUUID());
+// try {
+// List<Fz40FileInfo> list = fzzySync1109Rep.listFileInfo(start, end);
+//
+// if (null == list || list.isEmpty()) {
+// log.info("-------------娌℃湁鑾峰彇鍒版枃浠朵俊鎭�------------------");
+// return;
+// }
+//
+// Map<String, Integer> map = new HashMap<>();
+// Api1109 apiData;
+// String wjlx;
+// String wjmc;
+// List<Api1109> api1109List;
+// List<Api1202> api1202List;
+// List<Api1205> api1205List;
+// String str = "";
+// for (Fz40FileInfo sysData : list) {
+// if (StringUtils.isEmpty(sysData.getBizId())) {
+// continue;
+// }
+// //鏍规嵁鍥剧墖id鏌ヨ瀵瑰簲鍑哄叆搴撲俊鎭�
+// if(sysData.getBizId().startsWith(IMG_START_R)){
+// api1202List = api1202Rep.getDataByBizId(sysData.getBizId());
+// if (null == api1202List || api1202List.isEmpty()) {
+// continue;
+// }
+// str = api1202List.get(0).getRkywdh();
+// }
+// if(sysData.getBizId().startsWith(IMG_START_C)){
+// api1205List = api1205Rep.getDataByBizId(sysData.getBizId());
+// if (null == api1205List || api1205List.isEmpty()) {
+// continue;
+// }
+// str = api1205List.get(0).getCkywdh();
+// }
+//
+// //鍙悓姝ョО閲�
+// if (BIZ_TAG_WEIGHT_FULL.equals(sysData.getBizTag()) || BIZ_TAG_WEIGHT_EMPTY.equals(sysData.getBizTag())) {
+// wjlx = "";
+// wjmc = kqdm;
+// //鍏ュ簱鎶撴媿鍥�
+// if (sysData.getBizId().startsWith(IMG_START_R)) {
+// wjlx = IMG_TYPE_2;
+// wjmc += "_" + Constant.INOUT_TYPE_14 + sysData.getBizId().substring(4);
+// }
+// //鍑哄簱鎶撴媿鍥�
+// if (sysData.getBizId().startsWith(IMG_START_C)) {
+// wjlx = IMG_TYPE_3;
+// wjmc += "_" + Constant.INOUT_TYPE_15 + sysData.getBizId().substring(4);
+// }
+// //鑻ユ枃浠剁被鍨嬩负绌猴紝鍒欒烦杩�
+// if (StringUtils.isEmpty(wjlx)) {
+// continue;
+// }
+//
+// apiData = new Api1109();
+//
+// //涓婚敭id
+// apiData.setId(UUID.randomUUID().toString());
+// //鏂囦欢璺緞
+// apiData.setWjdz(fileUtil.getInoutFilePath(sysData.getCreateTime()) + sysData.getFileName());
+//
+// //鏂囦欢鍚嶇О
+// wjmc = getImgNameType(wjmc, sysData.getBizTag(), str, sysData.getFileName(), map);
+// apiData.setWjmc(wjmc);
+// //鏂囦欢绫诲瀷
+// apiData.setWjlx(wjlx);
+//
+// //鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
+// apiData.setZhgxsj(sysData.getCreateTime());
+//
+// //涓氬姟id銆佸簱鍖虹紪鐮併�佸悓姝ユ椂闂�
+// apiData.setBizId(sysData.getFileId());
+// apiData.setKqdm(kqdm);
+// apiData.setSyncTime(new Date());
+//
+// api1109List = api1109Rep.getDataByBizId(apiData.getBizId());
+// if (null == api1109List || api1109List.isEmpty()) {
+// apiData.setCzbz(Constant.CZBZ_I);
+// } else {
+// apiData.setCzbz(api1109List.get(0).getCzbz());
+// }
+//
+// //淇濆瓨鏁版嵁
+// api1109Rep.save(apiData);
+// log.info("1109---鍚屾鏁版嵁锛歿}", apiData.toString());
+// }
+// }
+// } catch (Exception e) {
+// log.error("---鏂囦欢鍚屾鎵ц澶辫触----{}", e);
+// apiLog.setResult("鍚屾鏂囦欢淇℃伅澶辫触锛�" + e.getMessage());
+// apiLogRep.save(apiLog);
+// }
+// }
+
/**
* 鑾峰彇鍥剧墖鍛藉悕绫诲瀷
*
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1303.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1303.java
index 29888bf..d1dcf33 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1303.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1303.java
@@ -90,6 +90,9 @@
api1303.setHczl("21212");
//铏彛瀵嗗害鍊奸泦鍚�
+ if(StringUtils.isEmpty(fz40Pest.getPoints())){
+ continue;
+ }
String ckmdzjh = this.geeCkmdzjh(fz40Pest.getPestMax(), fz40Pest.getPoints());
api1303.setCkmdzjh(ckmdzjh);
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1305.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1305.java
index f68c530..0d9cfac 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1305.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1305.java
@@ -76,9 +76,9 @@
BeanUtils.copyProperties(fzAreationData, api1305);
- api1305.setTfzydh(fzAreationData.getId());
+ api1305.setTfzydh(api1105.getHwdm() + fzAreationData.getId());
api1305.setTfrq(fzAreationData.getStartTime());
- api1305.setCfdm(fzAreationData.getDepotId());
+ api1305.setCfdm(api1105.getHwdm().substring(0,25));
api1305.setTfmd(fzAreationData.getObjective());
api1305.setTflx(fzAreationData.getType());
api1305.setFdxs(fzAreationData.getWindNetType());
@@ -94,6 +94,8 @@
api1305.setTfsc(fzAreationData.getLongTime());
api1305.setZhgxsj(fzAreationData.getUpdateTime());
+ api1305.setKqdm(kqdm);
+ api1305.setBizId(fzAreationData.getId());
api1305List = api1305Rep.getDataById(api1305.getTfzydh());
if (null == api1305List || api1305List.isEmpty()) {
api1305.setCzbz(Constant.CZBZ_I);
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1306.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1306.java
index 860e04e..03c7f7d 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1306.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1306.java
@@ -75,8 +75,8 @@
api1306 = new Api1306();
BeanUtils.copyProperties(fz40DrugLog, api1306);
- api1306.setXzzydh(fz40DrugLog.getId());
- api1306.setCfdm(fz40DrugLog.getDepotId());
+ api1306.setXzzydh(api1105.getHwdm().substring(0,25) + fz40DrugLog.getId());
+ api1306.setCfdm(api1105.getHwdm().substring(0,25));
api1306.setXzkssj(fz40DrugLog.getStart());
api1306.setXzjssj(fz40DrugLog.getEnd());
api1306.setHcjcdh(fz40DrugLog.getPestBatchId());
@@ -94,6 +94,9 @@
api1306.setXzxgpj(fz40DrugLog.getEvaluate());
api1306.setZhgxsj(fz40DrugLog.getUpdateTime());
+ api1306.setHwdm(api1105.getHwdm());
+ api1306.setKqdm(kqdm);
+ api1306.setBizId(fz40DrugLog.getId());
api1306List = api1306Rep.getDataById(api1306.getXzzydh());
if (null == api1306List || api1306List.isEmpty()) {
api1306.setCzbz(Constant.CZBZ_I);
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java
index 0478e46..dbeb58e 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java
@@ -6,6 +6,7 @@
import com.fzzy.api.entity.ApiLog;
import com.fzzy.api.entity.GbCheckItem;
import com.fzzy.api.service.ApiCommonService;
+import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.Api1310Rep;
import com.fzzy.api.view.repository.ApiLogRep;
@@ -43,6 +44,8 @@
@Autowired
private ApiCommonService commonService;
@Autowired
+ private ApiTriggerService apiTriggerService;
+ @Autowired
private Api1310Rep api1310Rep;
@Autowired
private ApiLogRep apiLogRep;
@@ -74,8 +77,8 @@
Api1105 api1105;
List<Fz40CheckItem> fz40CheckItems;
List<GbCheckItem> gbCheckList;
- StringBuilder jyxm;
- StringBuilder jyxmz;
+ String jyxm;
+ String jyxmz;
List<Api1310> api1310List;
int index = 10001;
for (Fz40Quality fz40Quality : list) {
@@ -87,8 +90,13 @@
api1310.setZjbgdh(fz40Quality.getType() + DateFormatUtils.format(fz40Quality.getTime(), "yyyyMMdd") + String.valueOf(index).substring(1));
api1310.setHwdm(api1105.getHwdm());
api1310.setKqdm(kqdm);
- api1310.setLspzdm(fz40Quality.getFoodVariety());
- api1310.setLsdjdm(fz40Quality.getFoodLevel());
+ //绮鍝佺
+ String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, fz40Quality.getFoodVariety().substring(0,3));
+ api1310.setLspzdm(mappingCode);
+
+ //绮绛夌骇
+ mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSDJ, fz40Quality.getFoodLevel());
+ api1310.setLsdjdm(mappingCode);
api1310.setRkrq(DateUtils.addDays(fz40Quality.getTime(), -30));
api1310.setJylb(fz40Quality.getType());
api1310.setJysj(fz40Quality.getTime());
@@ -97,8 +105,8 @@
api1310.setJyyj(fz40Quality.getStandard());
api1310.setZblb("2");
//妫�娴嬮」锛屾娴嬪��
- jyxm = new StringBuilder();
- jyxmz = new StringBuilder();
+ jyxm = "";
+ jyxmz = "";
fz40CheckItems = fzzySync1203Rep.listInoutCheckItem(fz40Quality.getId(), deptId.substring(0, 4));
if (null != fz40CheckItems && fz40CheckItems.size() > 0) {
@@ -110,12 +118,12 @@
if (gbCheckList == null || gbCheckList.isEmpty()) {
continue;
}
- jyxm.append(",").append(gbCheckList.get(0).getCode());
- jyxmz.append(",").append(fz40CheckItem.getValue());
+ jyxm += gbCheckList.get(0).getCode() + ",";
+ jyxmz += fz40CheckItem.getValue() + ",";
}
}
- api1310.setJyxm(jyxm.toString().substring(1));
- api1310.setJyxmz(jyxmz.toString().substring(1));
+ api1310.setJyxm(jyxm);
+ api1310.setJyxmz(jyxmz);
api1310.setZbjgpd(fz40Quality.getResult());
api1310.setQfrq(fz40Quality.getTime());
@@ -126,8 +134,8 @@
api1310.setQyrxm(fz40Quality.getCheckUser());
api1310.setJdrxm(fz40Quality.getCheckUser());
- api1310.setYpsl(fz40Quality.getYpsl());
- api1310.setDbsl(fz40Quality.getDbsl());
+ api1310.setYpsl(fz40Quality.getYpsl() == null ? 0.0 : fz40Quality.getYpsl());
+ api1310.setDbsl(fz40Quality.getDbsl() == null ? 0.0 : fz40Quality.getDbsl());
api1310.setYpdj(StringUtils.isEmpty(fz40Quality.getYpdj())?"0": fz40Quality.getYpdj());
api1310.setSfzcccnx(StringUtils.isEmpty(fz40Quality.getNormalYear())?"0": fz40Quality.getNormalYear());
api1310.setBz(fz40Quality.getRemark());
diff --git a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1305Rep.java b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1305Rep.java
index 5934e8a..ef630c7 100644
--- a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1305Rep.java
+++ b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1305Rep.java
@@ -23,6 +23,6 @@
* @param end
* @return
*/
- @Query("from Fz40AreationData where startTime >=:start and startTime <:end order by startTime ")
+ @Query("from Fz40AreationData where updateTime >=:start and updateTime <:end order by updateTime ")
List<Fz40AreationData> findByReceiveDate(@Param("start") Date start, @Param("end") Date end);
}
diff --git a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1306Rep.java b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1306Rep.java
index 13258c6..ae44a9e 100644
--- a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1306Rep.java
+++ b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1306Rep.java
@@ -1,11 +1,9 @@
package com.fzzy.async.fzzy40.repository;
-import com.fzzy.async.fzzy40.entity.Fz40AreationData;
import com.fzzy.async.fzzy40.entity.Fz40DrugLog;
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;
@@ -23,6 +21,6 @@
* @param end
* @return
*/
- @Query("from Fz40DrugLog where start >=:start and start <:end order by start ")
+ @Query("from Fz40DrugLog where updateTime >=:start and updateTime <:end order by updateTime ")
List<Fz40DrugLog> findByReceiveDate(@Param("start") Date start, @Param("end") Date end);
}
diff --git a/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2103PR.java b/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2103PR.java
index 5b6c37e..a539e34 100644
--- a/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2103PR.java
+++ b/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2103PR.java
@@ -182,17 +182,20 @@
for (SH2023Api2103 data : items) {
responseDto = apiService.pushData(param, apiConf, data);
if (responseDto.getSuccess() == 0) {
- infoData = new ApiInfoData();
- infoData.setId(data.getHwdm());
- infoData.setKqdm(data.getHwdm().substring(0, 21));
- infoData.setInteType("21");
- infoData.setInteId(SH2023Constant.SH_2023_API_CODE_2103);
- infoData.setUpdateTime(new Date());
- infoData.setDataId(data.getHwdm());
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ infoData = new ApiInfoData();
+ infoData.setId(data.getHwdm());
+ infoData.setKqdm(data.getHwdm().substring(0, 21));
+ infoData.setInteType("21");
+ infoData.setInteId(SH2023Constant.SH_2023_API_CODE_2103);
+ infoData.setUpdateTime(new Date());
+ infoData.setDataId(data.getHwdm());
- infoData.setCzbz(Constant.CZBZ_U);
- infoData.setData(JSON.toJSONString(data));
- apiInfoDataRep.save(infoData);
+ infoData.setCzbz(Constant.CZBZ_U);
+ data.setCzbz(Constant.CZBZ_U);
+ infoData.setData(JSON.toJSONString(data));
+ apiInfoDataRep.save(infoData);
+ }
}
result += responseDto.toString();
}
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index 2961e6b..3a84775 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -513,6 +513,9 @@
BeanUtils.copyProperties(apiData, api1305);
api1305.setBjw(ShAreaBjw.getBjw(code));
api1305.setAjdm(apiData.getTfzydh().substring(0, 28));
+ //涓婃捣閫氶浣滀笟鍗曞彿锛氬粧闂翠唬鐮�+yyyyMMdd+3浣嶉『搴忓彿
+ api1305.setAjdm(apiData.getTfzydh().substring(0, 28));
+ api1305.setTfzydh(apiData.getTfzydh().substring(0, 28) + apiData.getTfzydh().substring(30));
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1305);
@@ -524,7 +527,9 @@
BeanUtils.copyProperties(apiData, api1306);
api1306.setBjw(ShAreaBjw.getBjw(code));
api1306.setPch(apiData.getXzzydh().substring(0, 30) + DateFormatUtils.format(apiData.getXzkssj(), "yyyy"));
- api1306.setAjdm(apiData.getXzzydh().substring(0, 28));
+ api1306.setAjdm(apiData.getHwdm().substring(0, 28));
+ //涓婃捣鐔忚捀浣滀笟鍗曞彿锛氳揣浣嶄唬鐮�+yyyyMMdd + 3浣嶉『搴忓彿
+ api1306.setXzzydh(apiData.getHwdm() + apiData.getBizId());
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1306);
@@ -572,9 +577,6 @@
api1310.setBjw(ShAreaBjw.getBjw(code));
api1310.setJyrq(apiData.getJysj());
api1310.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getJysj(), "yyyy"));
- List<Api1202> api1202List = api1202Rep.getDataByHwdm(apiData.getHwdm());
- api1310.setLspzdm(api1202List.get(0).getLspzdm());
- api1310.setLsxzdm("123");
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1310);
--
Gitblit v1.9.3