From b4e8dc09c2af2a331b477904f9d7b205a7224890 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期一, 06 十一月 2023 16:21:25 +0800
Subject: [PATCH] 优化广东省接口
---
src/main/java/com/fzzy/api/entity/Api1502.java | 7 ++++++-
src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1101.java | 3 +++
src/main/java/com/fzzy/api/entity/Api1403.java | 2 +-
src/main/java/com/fzzy/api/entity/Api1503.java | 7 ++++++-
src/main/java/com/fzzy/api/view/Api1502.view.xml | 4 ++++
src/main/java/com/fzzy/api/view/Api1503.view.xml | 4 ++++
src/main/java/com/fzzy/api/entity/Api1501.java | 7 ++++++-
src/main/java/com/fzzy/api/view/Api1501.view.xml | 4 ++++
src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java | 2 +-
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 2 +-
10 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/fzzy/api/entity/Api1403.java b/src/main/java/com/fzzy/api/entity/Api1403.java
index 28a57c4..137abd3 100644
--- a/src/main/java/com/fzzy/api/entity/Api1403.java
+++ b/src/main/java/com/fzzy/api/entity/Api1403.java
@@ -65,7 +65,7 @@
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "璁″垝涓嬭揪鏃堕棿" )
- @Column(name = "jhxdsj",nullable = false)
+ @Column(name = "jhxdsj")
private Date jhxdsj;
@PropertyDef(label = "鎿嶄綔鏍囧織" )
diff --git a/src/main/java/com/fzzy/api/entity/Api1501.java b/src/main/java/com/fzzy/api/entity/Api1501.java
index 8d7569a..f9b71ae 100644
--- a/src/main/java/com/fzzy/api/entity/Api1501.java
+++ b/src/main/java/com/fzzy/api/entity/Api1501.java
@@ -18,7 +18,7 @@
/**
* 鎺ュ彛琛�-璧勪骇璐熷�鸿〃
*
- * @author he
+ * @author czt
*/
@Data
@Entity
@@ -34,6 +34,11 @@
*
*/
@Id
+ @JSONField(serialize = false)
+ @PropertyDef(label = "涓婚敭ID" , description = "yyyyMMdd + 4浣嶉『搴忓彿")
+ @Column(name = "ID_", length = 18)
+ private String id;
+
@PropertyDef(label = "鍗曚綅浠ｇ爜" )
@Column(name = "dwdm", length = 18)
private String dwdm;
diff --git a/src/main/java/com/fzzy/api/entity/Api1502.java b/src/main/java/com/fzzy/api/entity/Api1502.java
index 8b71ce4..1b7af48 100644
--- a/src/main/java/com/fzzy/api/entity/Api1502.java
+++ b/src/main/java/com/fzzy/api/entity/Api1502.java
@@ -18,7 +18,7 @@
/**
* 鎺ュ彛琛�-鐜伴噾娴侀噺琛�
*
- * @author he
+ * @author czt
*/
@Data
@Entity
@@ -34,6 +34,11 @@
*
*/
@Id
+ @JSONField(serialize = false)
+ @PropertyDef(label = "涓婚敭ID" , description = "yyyyMMdd + 4浣嶉『搴忓彿")
+ @Column(name = "ID_", length = 18)
+ private String id;
+
@PropertyDef(label = "鍗曚綅浠ｇ爜" )
@Column(name = "dwdm", length = 18)
private String dwdm;
diff --git a/src/main/java/com/fzzy/api/entity/Api1503.java b/src/main/java/com/fzzy/api/entity/Api1503.java
index 53b31e7..250d8d8 100644
--- a/src/main/java/com/fzzy/api/entity/Api1503.java
+++ b/src/main/java/com/fzzy/api/entity/Api1503.java
@@ -18,7 +18,7 @@
/**
* 鎺ュ彛琛�-鍒╂鼎琛�
*
- * @author he
+ * @author czt
*/
@Data
@Entity
@@ -34,6 +34,11 @@
*
*/
@Id
+ @JSONField(serialize = false)
+ @PropertyDef(label = "涓婚敭ID" , description = "yyyyMMdd + 4浣嶉『搴忓彿")
+ @Column(name = "ID_", length = 18)
+ private String id;
+
@PropertyDef(label = "鍗曚綅浠ｇ爜" )
@Column(name = "dwdm", length = 18)
private String dwdm;
diff --git a/src/main/java/com/fzzy/api/view/Api1501.view.xml b/src/main/java/com/fzzy/api/view/Api1501.view.xml
index 8160068..2d3c98f 100644
--- a/src/main/java/com/fzzy/api/view/Api1501.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1501.view.xml
@@ -5,6 +5,10 @@
<Model>
<DataType name="dtMain">
<Property name="creationType">com.fzzy.api.entity.Api1501</Property>
+ <PropertyDef name="id">
+ <Property/>
+ <Property name="label">涓婚敭ID</Property>
+ </PropertyDef>
<PropertyDef name="bizId">
<Property/>
<Property name="label">涓氬姟id</Property>
diff --git a/src/main/java/com/fzzy/api/view/Api1502.view.xml b/src/main/java/com/fzzy/api/view/Api1502.view.xml
index 6bf537d..baffd7c 100644
--- a/src/main/java/com/fzzy/api/view/Api1502.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1502.view.xml
@@ -5,6 +5,10 @@
<Model>
<DataType name="dtMain">
<Property name="creationType">com.fzzy.api.entity.Api1502</Property>
+ <PropertyDef name="id">
+ <Property/>
+ <Property name="label">涓婚敭ID</Property>
+ </PropertyDef>
<PropertyDef name="bizId">
<Property/>
<Property name="label">涓氬姟id</Property>
diff --git a/src/main/java/com/fzzy/api/view/Api1503.view.xml b/src/main/java/com/fzzy/api/view/Api1503.view.xml
index af30a42..23ec65c 100644
--- a/src/main/java/com/fzzy/api/view/Api1503.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1503.view.xml
@@ -5,6 +5,10 @@
<Model>
<DataType name="dtMain">
<Property name="creationType">com.fzzy.api.entity.Api1503</Property>
+ <PropertyDef name="id">
+ <Property/>
+ <Property name="label">涓婚敭ID</Property>
+ </PropertyDef>
<PropertyDef name="dwdm">
<Property/>
<Property name="label">鍗曚綅浠ｇ爜</Property>
diff --git a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
index d920975..8bfb601 100644
--- a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
+++ b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
@@ -368,7 +368,7 @@
api1308.setFileStorageId((String) responseDto.getData());
return JSON.toJSONString(api1308);
} else {
- changeObject(data);
+// changeObject(data);
return JSON.toJSONString(data);
}
}
diff --git a/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1101.java b/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1101.java
index 5a6bbaf..ba8e088 100644
--- a/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1101.java
+++ b/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1101.java
@@ -97,6 +97,9 @@
@PropertyDef(label = "绾害")
private Double wd;
+ @PropertyDef(label = "鍗曚綅鐘舵��")
+ private String dwzt;
+
@PropertyDef(label = "澶囨绫诲瀷")
private String balx;
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index 7d2b360..1ada75e 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -140,7 +140,7 @@
reqData.setData(ShRSAUtils.encryptByPubKey(jsonData, conf.getPublicKey()));
//鎽樿锛屾暟鎹富浣撶殑MD5鍊�
reqData.setDigst(MyMD5Util.encrypt(jsonData));
-
+ log.info("涓婃姤鏁版嵁淇℃伅=" + JSON.toJSONString(reqData));
SH2023RespDto responseDto = SH2023HttpClientUtil.postPushData(conf.getApiUrl() + inteId, JSON.toJSONString(reqData), conf);
apiLog.setStatus(responseDto.getCode() == 200 ? 0 : responseDto.getCode());
--
Gitblit v1.9.3