From 323d013281bffdd7d1873af70642bd552dd22814 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期三, 30 十月 2024 00:53:15 +0800
Subject: [PATCH] 基础数据上报
---
src/main/java/com/fzzy/api/entity/Api1505.java | 16 +-
src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1104.java | 8
src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1102.java | 2
src/main/java/com/fzzy/api/entity/Api1108.java | 4
src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1107.java | 8
src/main/java/com/fzzy/api/view/Api1209.view.xml | 29 +++
src/main/java/com/fzzy/api/entity/Api1106.java | 4
src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1110.java | 30 ++-
src/main/java/com/fzzy/api/entity/Api1103.java | 4
src/main/java/com/fzzy/api/entity/Api1507.java | 2
src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java | 215 +++++++++++++++-----------
src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1209.java | 6
src/main/java/com/fzzy/api/entity/Api1506.java | 6
src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1108.java | 4
src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1306.java | 6
src/main/java/com/fzzy/api/entity/Api1209.java | 80 +++++----
src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1103.java | 34 ++--
17 files changed, 273 insertions(+), 185 deletions(-)
diff --git a/src/main/java/com/fzzy/api/entity/Api1103.java b/src/main/java/com/fzzy/api/entity/Api1103.java
index c1879be..c4e44e4 100644
--- a/src/main/java/com/fzzy/api/entity/Api1103.java
+++ b/src/main/java/com/fzzy/api/entity/Api1103.java
@@ -40,6 +40,10 @@
@Column(name = "kqdm", length = 21)
private String kqdm;
+ @PropertyDef(label = "缁熶竴搴撳尯浠ｇ爜")
+ @Column(name = "tykqdm", length = 22)
+ private String tykqdm;
+
@PropertyDef(label = "浠撴埧绫诲瀷浠ｇ爜" )
@Column(name = "cflxdm", length = 8)
private String cflxdm;
diff --git a/src/main/java/com/fzzy/api/entity/Api1106.java b/src/main/java/com/fzzy/api/entity/Api1106.java
index 97801eb..f5428c8 100644
--- a/src/main/java/com/fzzy/api/entity/Api1106.java
+++ b/src/main/java/com/fzzy/api/entity/Api1106.java
@@ -46,6 +46,10 @@
@Column(name = "kqdm", length = 21)
private String kqdm;
+ @PropertyDef(label = "缁熶竴搴撳尯" )
+ @Column(name = "tykqbm", length = 22)
+ private String tykqbm;
+
@PropertyDef(label = "缃愬" )
@Column(name = "gr", precision = 20, scale = 6)
private double gr;
diff --git a/src/main/java/com/fzzy/api/entity/Api1108.java b/src/main/java/com/fzzy/api/entity/Api1108.java
index 594f71a..2a9fb26 100644
--- a/src/main/java/com/fzzy/api/entity/Api1108.java
+++ b/src/main/java/com/fzzy/api/entity/Api1108.java
@@ -43,6 +43,10 @@
@Column(name = "dwdm", length = 18)
private String dwdm;
+ @PropertyDef(label = "缁熶竴鍗曚綅浠ｇ爜")
+ @Column(name = "tydwbm", length = 20)
+ private String tydwbm;
+
@PropertyDef(label = "搴撳尯鍚嶇О")
@Column(name = "kqmc", length = 256)
private String kqmc;
diff --git a/src/main/java/com/fzzy/api/entity/Api1209.java b/src/main/java/com/fzzy/api/entity/Api1209.java
index 7583de5..01ed372 100644
--- a/src/main/java/com/fzzy/api/entity/Api1209.java
+++ b/src/main/java/com/fzzy/api/entity/Api1209.java
@@ -24,67 +24,67 @@
public class Api1209 extends ApiParent implements Serializable {
/**
- *
- */
- private static final long serialVersionUID = -8920645721282111145L;
-
-
- public static String SORT_PROP = "sydh";
-
+ *
+ */
+ private static final long serialVersionUID = -8920645721282111145L;
- @Id
- @PropertyDef(label = "鎹熸孩鍗曞彿" )
+
+ public static String SORT_PROP = "sydh";
+
+
+ @Id
+ @PropertyDef(label = "鎹熸孩鍗曞彿")
@Column(name = "sydh", length = 60)
private String sydh;
- @PropertyDef(label = "璐т綅浠ｇ爜" )
+ @PropertyDef(label = "璐т綅浠ｇ爜")
@Column(name = "hwdm", length = 30)
private String hwdm;
- @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜")
@Column(name = "tyhwbm", length = 28)
private String tyhwbm;
@JSONField(format = "yyyy-MM-dd")
- @PropertyDef(label = "涓氬姟鏃ユ湡" )
+ @PropertyDef(label = "涓氬姟鏃ユ湡")
@Column(name = "ywrq")
private Date ywrq;
- @PropertyDef(label = "鍏ュ簱鍑�閲�(鍏枻)" )
+ @PropertyDef(label = "鍏ュ簱鍑�閲�(鍏枻)")
@Column(name = "rkjz", precision = 20, scale = 6)
private double rkjz;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
- @PropertyDef(label = "鍏ュ簱鏃堕棿" )
+ @PropertyDef(label = "鍏ュ簱鏃堕棿")
@Column(name = "rksj")
private Date rksj;
- @PropertyDef(label = "鍏ュ簱姘村垎(%)" )
+ @PropertyDef(label = "鍏ュ簱姘村垎(%)")
@Column(name = "rksf", precision = 20, scale = 6)
private double rksf;
- @PropertyDef(label = "鍏ュ簱鏉傝川(%)" )
+ @PropertyDef(label = "鍏ュ簱鏉傝川(%)")
@Column(name = "rkzz", precision = 20, scale = 6)
private double rkzz;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
- @PropertyDef(label = "鍑哄簱鏃堕棿" )
+ @PropertyDef(label = "鍑哄簱鏃堕棿")
@Column(name = "cksj")
private Date cksj;
- @PropertyDef(label = "鍑哄簱鍑�閲�(鍏枻)" )
+ @PropertyDef(label = "鍑哄簱鍑�閲�(鍏枻)")
@Column(name = "ckjz", precision = 20, scale = 6)
private double ckjz;
- @PropertyDef(label = "鍑哄簱姘村垎(%)" )
+ @PropertyDef(label = "鍑哄簱姘村垎(%)")
@Column(name = "cksf", precision = 20, scale = 6)
private double cksf;
- @PropertyDef(label = "鍑哄簱鏉傝川(%)" )
+ @PropertyDef(label = "鍑哄簱鏉傝川(%)")
@Column(name = "ckzz", precision = 20, scale = 6)
private double ckzz;
- @PropertyDef(label = "鍑�閲嶆崯婧㈡暟閲�(鍏枻)" )
+ @PropertyDef(label = "鍑�閲嶆崯婧㈡暟閲�(鍏枻)")
@Column(name = "jzsysl", precision = 20, scale = 6)
private double jzsysl;
@@ -92,55 +92,63 @@
@Column(name = "qzchwqsh", precision = 20, scale = 6)
private double qzchwqsh;
- @PropertyDef(label = "鍏朵腑姘存潅鍑忛噺(鍏枻)" )
+ @PropertyDef(label = "鍏朵腑姘存潅鍑忛噺(鍏枻)")
@Column(name = "qzszkl", precision = 20, scale = 6)
private double qzszkl;
- @PropertyDef(label = "鍏朵腑锛氳嚜鐒舵崯鑰楀畾棰�(鍏枻)" )
+ @PropertyDef(label = "鍏朵腑锛氳嚜鐒舵崯鑰楀畾棰�(鍏枻)")
@Column(name = "qzzrshde", precision = 20, scale = 6)
private double qzzrshde;
- @PropertyDef(label = "瓒呰�楁暟閲�(鍏枻)" )
+ @PropertyDef(label = "瓒呰�楁暟閲�(鍏枻)")
@Column(name = "chsl", precision = 20, scale = 6)
private double chsl;
- @PropertyDef(label = "鎹熺泭鏄惁姝ｅ父" )
+ @PropertyDef(label = "鎹熺泭鏄惁姝ｅ父")
@Column(name = "sysfzc", length = 1)
private String sysfzc;
- @PropertyDef(label = "鎹熸孩绫诲瀷",description = "1:鎹熻�楋紝2锛氭崯澶憋紝3.鍏朵粬")
- @Column(name = "sylx",length = 1)
+ @PropertyDef(label = "鎹熸孩绫诲瀷", description = "1:鎹熻�楋紝2锛氭崯澶憋紝3.鍏朵粬")
+ @Column(name = "sylx", length = 1)
private String sylx;
- @PropertyDef(label = "鎹熸孩鐜妭",description = "1:鍏ュ簱鎹熸孩锛�2锛氬嚭搴撴崯婧紝3.鍏朵粬")
- @Column(name = "syhj",length = 1)
+ @PropertyDef(label = "鍌ㄥ鏃堕暱")
+ @Column(name = "ccsc", length = 4)
+ private String ccsc;
+
+ @PropertyDef(label = "鏄惁瓒呰��", description = "1:鏄紝2锛氬惁")
+ @Column(name = "sfch", length = 1)
+ private String sfch;
+
+ @PropertyDef(label = "鎹熸孩鐜妭", description = "1:鍏ュ簱鎹熸孩锛�2锛氬嚭搴撴崯婧紝3.鍏朵粬")
+ @Column(name = "syhj", length = 1)
private String syhj;
- @PropertyDef(label = "鎹熸孩鍘熷洜" )
+ @PropertyDef(label = "鎹熸孩鍘熷洜")
@Column(name = "syyy", length = 400)
private String syyy;
- @PropertyDef(label = "浠撳偍瀹℃牳浜�" )
+ @PropertyDef(label = "浠撳偍瀹℃牳浜�")
@Column(name = "ccshr", length = 64)
private String ccshr;
- @PropertyDef(label = "璐ㄦ瀹℃牳浜�" )
+ @PropertyDef(label = "璐ㄦ瀹℃牳浜�")
@Column(name = "zjshr", length = 64)
private String zjshr;
- @PropertyDef(label = "缁熻瀹℃牳浜�" )
+ @PropertyDef(label = "缁熻瀹℃牳浜�")
@Column(name = "tjshr", length = 64)
private String tjshr;
- @PropertyDef(label = "浼氳瀹℃牳浜�" )
+ @PropertyDef(label = "浼氳瀹℃牳浜�")
@Column(name = "kjshr", length = 64)
private String kjshr;
- @PropertyDef(label = "棰嗗瀹℃牳浜�" )
+ @PropertyDef(label = "棰嗗瀹℃牳浜�")
@Column(name = "ldshr", length = 64)
private String ldshr;
- @PropertyDef(label = "澶囨敞" )
+ @PropertyDef(label = "澶囨敞")
@Column(name = "bz", length = 400)
private String bz;
diff --git a/src/main/java/com/fzzy/api/entity/Api1505.java b/src/main/java/com/fzzy/api/entity/Api1505.java
index 0f9869f..cad095d 100644
--- a/src/main/java/com/fzzy/api/entity/Api1505.java
+++ b/src/main/java/com/fzzy/api/entity/Api1505.java
@@ -39,7 +39,7 @@
@JSONField(serialize = false)
@PropertyDef(label = "骞村害")
@Column(name = "cYear", length = 4)
- private Double cYear;
+ private String cYear;
@PropertyDef(label = "绉戠洰缂栫爜")
@Column(name = "cCode", length = 80)
@@ -69,11 +69,11 @@
*/
@PropertyDef(label = "浣欓鏂瑰悜")
@Column(name = "cDc", length = 3)
- private Double cDc;
+ private String cDc;
@PropertyDef(label = "鏈骇绉戠洰")
@Column(name = "bL")
- private Double bL;
+ private String bL;
@PropertyDef(label = "绉戠洰绾ф")
@Column(name = "nGrade", length = 8)
@@ -81,23 +81,23 @@
@PropertyDef(label = "鏁伴噺绉戠洰")
@Column(name = "bQ")
- private Double bQ;
+ private String bQ;
@PropertyDef(label = "鏁伴噺鍗曚綅")
@Column(name = "cQUnit")
- private Double cQUnit;
+ private String cQUnit;
@PropertyDef(label = "鐜伴噾绫荤鐩�")
@Column(name = "bCash")
- private Double bCash;
+ private String bCash;
@PropertyDef(label = "閾惰绫荤鐩�")
@Column(name = "bBank")
- private Double bBank;
+ private String bBank;
@PropertyDef(label = "鐜伴噾娴侀噺绫荤鐩�")
@Column(name = "bXjll")
- private Double bXjll;
+ private String bXjll;
@PropertyDef(label = "鍐荤粨")
@Column(name = "bF")
diff --git a/src/main/java/com/fzzy/api/entity/Api1506.java b/src/main/java/com/fzzy/api/entity/Api1506.java
index 267c90b..2c0e13a 100644
--- a/src/main/java/com/fzzy/api/entity/Api1506.java
+++ b/src/main/java/com/fzzy/api/entity/Api1506.java
@@ -38,11 +38,11 @@
@PropertyDef(label = "鏈熼棿")
@Column(name = "cYear", length = 3)
- private Double cYear;
+ private String cYear;
@PropertyDef(label = "骞村害")
@Column(name = "nNo", length = 4)
- private Double nNo;
+ private String nNo;
@PropertyDef(label = "鏈熷垵鏈綅甯佷綑棰�")
@Column(name = "bM", precision = 20, scale = 4)
@@ -65,7 +65,7 @@
*/
@PropertyDef(label = "浣欓鏂瑰悜")
@Column(name = "cDc", length = 3)
- private Double cDc;
+ private String cDc;
@PropertyDef(label = "鍊熸柟鏈綅甯佸彂鐢熼")
@Column(name = "dM", precision = 20, scale = 4)
diff --git a/src/main/java/com/fzzy/api/entity/Api1507.java b/src/main/java/com/fzzy/api/entity/Api1507.java
index 98c9d02..03b166e 100644
--- a/src/main/java/com/fzzy/api/entity/Api1507.java
+++ b/src/main/java/com/fzzy/api/entity/Api1507.java
@@ -82,7 +82,7 @@
*/
@PropertyDef(label = "鏂瑰悜")
@Column(name = "cDc", precision = 3)
- private Double cDc;
+ private String cDc;
@PropertyDef(label = "瀹℃牳浜�")
@Column(name = "cCkEr", length = 32)
diff --git a/src/main/java/com/fzzy/api/view/Api1209.view.xml b/src/main/java/com/fzzy/api/view/Api1209.view.xml
index cd959b4..d13d5bf 100644
--- a/src/main/java/com/fzzy/api/view/Api1209.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1209.view.xml
@@ -151,7 +151,7 @@
</Entity>
<Entity>
<Property name="key">3</Property>
- <Property name="value">3:鍏朵粬</Property>
+ <Property name="value">3:婧綑</Property>
</Entity>
</Collection>
</Property>
@@ -180,6 +180,18 @@
</Collection>
</Property>
</Property>
+ </PropertyDef>
+ <PropertyDef name="syncTime">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鍚屾鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="ccsc">
+ <Property/>
+ <Property name="label">鍌ㄥ鏃堕暱</Property>
+ </PropertyDef>
+ <PropertyDef name="sfch">
+ <Property/>
+ <Property name="label">鏄惁瓒呰��</Property>
</PropertyDef>
</DataType>
<DataType name="dtParam">
@@ -575,6 +587,21 @@
<Property name="property">bizId</Property>
<Editor/>
</AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bz</Property>
+ <Property name="property">bz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ccsc</Property>
+ <Property name="property">ccsc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sfch</Property>
+ <Property name="property">sfch</Property>
+ <Editor/>
+ </AutoFormElement>
</AutoForm>
</Children>
</GroupBox>
diff --git a/src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java b/src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java
index 8bbe665..005b0fd 100644
--- a/src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java
+++ b/src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java
@@ -315,7 +315,7 @@
BeanUtils.copyProperties(data, api1102);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
if (StringUtils.isEmpty(api1102.getTydwbm())) {
- String tydwbm = apiCommonService.getTydwbm(api1102.getTydwbm());
+ String tydwbm = apiCommonService.getTydwbm(api1102.getDwdm());
api1102.setTydwbm(tydwbm);
}
api1102.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
@@ -326,8 +326,8 @@
BeanUtils.copyProperties(data, api1103);
changeObject(api1103);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1103.getTykqbm())) {
- String tykqbm = apiCommonService.getTykqbm(api1103.getTykqbm());
+ if ("0".equals(api1103.getTykqbm()) || StringUtils.isEmpty(api1103.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(api1103.getKqdm());
api1103.setTykqbm(tykqbm);
}
api1103.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
@@ -338,8 +338,8 @@
BeanUtils.copyProperties(data, api1104);
changeObject(api1104);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1104.getTycfbm())) {
- String tydfbm = apiCommonService.getTycfbm(api1104.getTycfbm());
+ if ("0".equals(api1104.getTycfbm()) || StringUtils.isEmpty(api1104.getTycfbm())) {
+ String tydfbm = apiCommonService.getTycfbm(api1104.getCfbh());
api1104.setTycfbm(tydfbm);
}
api1104.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
@@ -350,7 +350,7 @@
BeanUtils.copyProperties(data, api1105);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
if (StringUtils.isEmpty(api1105.getTyajbm())) {
- String tyajbm = apiCommonService.getTyajbm(api1105.getTyajbm());
+ String tyajbm = apiCommonService.getTyajbm(api1105.getAjdm());
api1105.setTyajbm(tyajbm);
}
api1105.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
@@ -361,13 +361,14 @@
api1106.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
if (StringUtils.isEmpty(api1106.getTykqbm())) {
- String tykqbm = apiCommonService.getTykqbm(api1106.getTykqbm());
+ String tykqbm = apiCommonService.getTykqbm(api1106.getKqdm());
api1106.setTykqbm(tykqbm);
}
return JSON.toJSONString(api1106);
}
if (Constant.API_CODE_1107.equals(inteId)) {
- Gd2023Api1107 api1107 = (Gd2023Api1107) data;
+ Gd2023Api1107 api1107 = new Gd2023Api1107();
+ BeanUtils.copyProperties(data, api1107);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
if (StringUtils.isEmpty(api1107.getTykqbm())) {
String tykqbm = apiCommonService.getTykqbm(api1107.getKqdm());
@@ -381,7 +382,8 @@
return JSON.toJSONString(api1107);
}
if (Constant.API_CODE_1108.equals(inteId)) {
- Gd2023Api1108 api1108 = (Gd2023Api1108) data;
+ Gd2023Api1108 api1108 = new Gd2023Api1108();
+ BeanUtils.copyProperties(data, api1108);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
if (StringUtils.isEmpty(api1108.getTykqbm())) {
String tykqbm = apiCommonService.getTykqbm(api1108.getKqdm());
@@ -408,7 +410,7 @@
//璁剧疆涓婁紶鏂囦欢id
api1109.setFileStorageId((String) responseDto.getData());
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1109.getTykqbm())) {
+ if ("0".equals(api1109.getTykqbm()) || StringUtils.isEmpty(api1109.getTykqbm())) {
String tykqbm = apiCommonService.getTykqbm(api1109.getKqdm());
api1109.setTykqbm(tykqbm);
}
@@ -416,13 +418,18 @@
return JSON.toJSONString(api1109);
}
if (Constant.API_CODE_1110.equals(inteId)) {
- Gd2023Api1110 api1110 = (Gd2023Api1110) data;
+ Gd2023Api1110 api1110 = new Gd2023Api1110();
+ BeanUtils.copyProperties(data, api1110);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1110.getTyhwbm())) {
+ if ("0".equals(api1110.getTyhwbm()) || StringUtils.isEmpty(api1110.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(api1110.getHwdm());
api1110.setTyhwbm(tyhwbm);
}
- if (StringUtils.isEmpty(api1110.getTydwbm())) {
+ if ("0".equals(api1110.getTykqbm()) || StringUtils.isEmpty(api1110.getTykqbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(api1110.getHwdm());
+ api1110.setTykqbm(tyhwbm.substring(0, 22));
+ }
+ if ("0".equals(api1110.getTydwbm()) || StringUtils.isEmpty(api1110.getTydwbm())) {
String tydwbm = apiCommonService.getTydwbm(api1110.getDwdm());
api1110.setTydwbm(tydwbm);
}
@@ -435,11 +442,11 @@
Api1102 api1102List = api1102Rep.findDataByKqdm(api1111.getKqdm());
if (null != api1102List) {
api1111.setKqmc(api1102List.getKqmc());
- if (StringUtils.isEmpty(api1111.getTykqbm())) {
+ if ("0".equals(api1111.getTykqbm()) || StringUtils.isEmpty(api1111.getTykqbm())) {
api1111.setTykqbm(api1102List.getTykqbm());
}
- if (StringUtils.isEmpty(api1111.getTydwbm())) {
- api1111.setTydwbm(apiCommonService.getTydwbm(api1111.getTydwbm()));
+ if ("0".equals(api1111.getTydwbm()) || StringUtils.isEmpty(api1111.getTydwbm())) {
+ api1111.setTydwbm(apiCommonService.getTydwbm(api1111.getDwdm()));
}
}
Api1101 api1101List = api1101Rep.findData(api1111.getDwdm());
@@ -447,11 +454,11 @@
api1111.setDwmc(api1101List.getDwmc());
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1111.getTykqbm())) {
+ if ("0".equals(api1111.getTydwbm()) || StringUtils.isEmpty(api1111.getTykqbm())) {
String tykqbm = apiCommonService.getTykqbm(api1111.getKqdm());
api1111.setTykqbm(tykqbm);
}
- if (StringUtils.isEmpty(api1111.getTydwbm())) {
+ if ("0".equals(api1111.getTydwbm()) || StringUtils.isEmpty(api1111.getTydwbm())) {
String tydwbm = apiCommonService.getTydwbm(api1111.getDwdm());
api1111.setTydwbm(tydwbm);
}
@@ -459,14 +466,15 @@
return JSON.toJSONString(api1111);
}
if (Constant.API_CODE_1112.equals(inteId)) {
- Gd2023Api1112 api1112 = (Gd2023Api1112) data;
+ Gd2023Api1112 api1112 = new Gd2023Api1112();
+ BeanUtils.copyProperties(data, api1112);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1112.getTydwbm())) {
+ if ("0".equals(api1112.getTydwbm()) || StringUtils.isEmpty(api1112.getTydwbm())) {
String tydwbm = apiCommonService.getTydwbm(api1112.getDwdm());
api1112.setTydwbm(tydwbm);
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1112.getTykqbm())) {
+ if ("0".equals(api1112.getTykqbm()) || StringUtils.isEmpty(api1112.getTykqbm())) {
String tykqbm = apiCommonService.getTykqbm(api1112.getKqdm());
api1112.setTykqbm(tykqbm);
}
@@ -474,9 +482,10 @@
return JSON.toJSONString(api1112);
}
if (Constant.API_CODE_1113.equals(inteId)) {
- Gd2023Api1113 api1113 = (Gd2023Api1113) data;
+ Gd2023Api1113 api1113 = new Gd2023Api1113();
+ BeanUtils.copyProperties(data, api1113);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1113.getTydwbm())) {
+ if ("0".equals(api1113.getTydwbm()) || StringUtils.isEmpty(api1113.getTydwbm())) {
String tydwbm = apiCommonService.getTydwbm(api1113.getDwdm());
api1113.setTydwbm(tydwbm);
}
@@ -484,9 +493,10 @@
return JSON.toJSONString(api1113);
}
if (Constant.API_CODE_1201.equals(inteId)) {
- Gd2023Api1201 apiData = (Gd2023Api1201) data;
+ Gd2023Api1201 apiData = new Gd2023Api1201();
+ BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTydwbm())) {
+ if ("0".equals(apiData.getTydwbm()) || StringUtils.isEmpty(apiData.getTydwbm())) {
String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
apiData.setTydwbm(tydwbm);
}
@@ -494,13 +504,14 @@
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1202.equals(inteId)) {
- Gd2023Api1202 apiData = (Gd2023Api1202) data;
+ Gd2023Api1202 apiData = new Gd2023Api1202();
+ BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ if ("0".equals(apiData.getTyhwbm()) || StringUtils.isEmpty(apiData.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
apiData.setTyhwbm(tyhwbm);
}
- if (StringUtils.isEmpty(apiData.getLqgsdwtybm())) {
+ if ("0".equals(apiData.getLqgsdwtybm()) || StringUtils.isEmpty(apiData.getLqgsdwtybm())) {
String tydwbm = apiCommonService.getTydwbm(apiData.getLqgsdwdm());
apiData.setLqgsdwtybm(tydwbm);
}
@@ -508,9 +519,10 @@
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1203.equals(inteId)) {
- Gd2023Api1203 apiData = (Gd2023Api1203) data;
+ Gd2023Api1203 apiData = new Gd2023Api1203();
+ BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ if ("0".equals(apiData.getTyhwbm()) || StringUtils.isEmpty(apiData.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
apiData.setTyhwbm(tyhwbm);
}
@@ -518,9 +530,10 @@
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1204.equals(inteId)) {
- Gd2023Api1204 apiData = (Gd2023Api1204) data;
+ Gd2023Api1204 apiData = new Gd2023Api1204();
+ BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ if ("0".equals(apiData.getTyhwbm()) || StringUtils.isEmpty(apiData.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
apiData.setTyhwbm(tyhwbm);
}
@@ -528,9 +541,10 @@
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1205.equals(inteId)) {
- Gd2023Api1205 apiData = (Gd2023Api1205) data;
+ Gd2023Api1205 apiData = new Gd2023Api1205();
+ BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ if ("0".equals(apiData.getTyhwbm()) || StringUtils.isEmpty(apiData.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
apiData.setTyhwbm(tyhwbm);
}
@@ -538,9 +552,10 @@
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1206.equals(inteId)) {
- Gd2023Api1206 apiData = (Gd2023Api1206) data;
+ Gd2023Api1206 apiData = new Gd2023Api1206();
+ BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTydwbm())) {
+ if ("0".equals(apiData.getTydwbm()) || StringUtils.isEmpty(apiData.getTydwbm())) {
String tydwbm = apiCommonService.getTydwbm(apiData.getKqdm().substring(0, 18));
apiData.setTydwbm(tydwbm);
}
@@ -548,22 +563,23 @@
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1207.equals(inteId)) {
- Gd2023Api1207 apiData = (Gd2023Api1207) data;
+ Gd2023Api1207 apiData = new Gd2023Api1207();
+ BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getDckqtybm())) {
+ if ("0".equals(apiData.getDckqtybm()) || StringUtils.isEmpty(apiData.getDckqtybm())) {
String dckqtybm = apiCommonService.getTykqbm(apiData.getDcdw());
apiData.setDckqtybm(dckqtybm);
}
- if (StringUtils.isEmpty(apiData.getDrkqtybm())) {
+ if ("0".equals(apiData.getDrkqtybm()) || StringUtils.isEmpty(apiData.getDrkqtybm())) {
String drkqtybm = apiCommonService.getTykqbm(apiData.getDrdw());
apiData.setDrkqtybm(drkqtybm);
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getDchwtybm())) {
+ if ("0".equals(apiData.getDchwtybm()) || StringUtils.isEmpty(apiData.getDchwtybm())) {
String dchwtybm = apiCommonService.getTyhwbm(apiData.getDchwdm());
apiData.setDchwtybm(dchwtybm);
}
- if (StringUtils.isEmpty(apiData.getDrhwtybm())) {
+ if ("0".equals(apiData.getDrhwtybm()) || StringUtils.isEmpty(apiData.getDrhwtybm())) {
String drhwtybm = apiCommonService.getTyhwbm(apiData.getDrhwdm());
apiData.setDrhwtybm(drhwtybm);
}
@@ -581,21 +597,23 @@
api1208.setBclbs((int) (api1208.getSjsl() / 25));
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1208.getLqgstydwbm())) {
+ if ("0".equals(api1208.getLqgstydwbm()) || StringUtils.isEmpty(api1208.getLqgstydwbm())) {
String lqgstydwbm = apiCommonService.getTydwbm(api1208.getLqgsdwdm());
api1208.setLqgstydwbm(lqgstydwbm);
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1208.getTyhwbm())) {
+ if ("0".equals(api1208.getTyhwbm()) || StringUtils.isEmpty(api1208.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(api1208.getHwdm());
api1208.setTyhwbm(tyhwbm);
}
return JSON.toJSONString(api1208);
}
if (Constant.API_CODE_1209.equals(inteId)) {
- Gd2023Api1209 apiData = (Gd2023Api1209) data;
+ Gd2023Api1209 apiData = new Gd2023Api1209();
+ BeanUtils.copyProperties(data, apiData);
+ apiData.setRksl(apiData.getRkjz());
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ if ("0".equals(apiData.getTyhwbm()) || StringUtils.isEmpty(apiData.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
apiData.setTyhwbm(tyhwbm);
}
@@ -606,7 +624,7 @@
Gd2023Api1210 api1210 = new Gd2023Api1210();
BeanUtils.copyProperties(data, api1210);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1210.getTyhwbm())) {
+ if ("0".equals(api1210.getTyhwbm()) || StringUtils.isEmpty(api1210.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(api1210.getHwdm());
api1210.setTyhwbm(tyhwbm);
}
@@ -614,9 +632,10 @@
return JSON.toJSONString(api1210);
}
if (Constant.API_CODE_1211.equals(inteId)) {
- Gd2023Api1211 apiData = (Gd2023Api1211) data;
+ Gd2023Api1211 apiData = new Gd2023Api1211();
+ BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTykqbm())) {
+ if ("0".equals(apiData.getTykqbm()) || StringUtils.isEmpty(apiData.getTykqbm())) {
String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
apiData.setTykqbm(tykqbm);
}
@@ -624,14 +643,15 @@
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1212.equals(inteId)) {
- Gd2023Api1212 apiData = (Gd2023Api1212) data;
+ Gd2023Api1212 apiData = new Gd2023Api1212();
+ BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTydwbm())) {
+ if ("0".equals(apiData.getTydwbm()) || StringUtils.isEmpty(apiData.getTydwbm())) {
String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
apiData.setTydwbm(tydwbm);
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTykqbm())) {
+ if ("0".equals(apiData.getTykqbm()) || StringUtils.isEmpty(apiData.getTykqbm())) {
String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
apiData.setTykqbm(tykqbm);
}
@@ -639,14 +659,15 @@
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1301.equals(inteId)) {
- Gd2023Api1301 apiData = (Gd2023Api1301) data;
+ Gd2023Api1301 apiData = new Gd2023Api1301();
+ BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTydwbm())) {
+ if ("0".equals(apiData.getTydwbm()) || StringUtils.isEmpty(apiData.getTydwbm())) {
String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
apiData.setTydwbm(tydwbm);
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTykqbm())) {
+ if ("0".equals(apiData.getTykqbm()) || StringUtils.isEmpty(apiData.getTykqbm())) {
String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
apiData.setTykqbm(tykqbm);
}
@@ -654,9 +675,10 @@
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1302.equals(inteId)) {
- Gd2023Api1302 apiData = (Gd2023Api1302) data;
+ Gd2023Api1302 apiData = new Gd2023Api1302();
+ BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ if ("0".equals(apiData.getTyhwbm()) || StringUtils.isEmpty(apiData.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
apiData.setTyhwbm(tyhwbm);
}
@@ -664,66 +686,68 @@
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1303.equals(inteId)) {
- Gd2023Api1303 apiData = (Gd2023Api1303) data;
+ Gd2023Api1303 apiData = new Gd2023Api1303();
+ BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ if ("0".equals(apiData.getTyhwbm()) || StringUtils.isEmpty(apiData.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
apiData.setTyhwbm(tyhwbm);
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTyajbm())) {
- String tyajbm = apiCommonService.getTyajbm(apiData.getHwdm().substring(0,26));
+ if ("0".equals(apiData.getTyajbm()) || StringUtils.isEmpty(apiData.getTyajbm())) {
+ String tyajbm = apiCommonService.getTyajbm(apiData.getHwdm().substring(0, 26));
apiData.setTyajbm(tyajbm);
}
apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1304.equals(inteId)) {
- Gd2023Api1304 apiData = (Gd2023Api1304) data;
+ Gd2023Api1304 apiData = new Gd2023Api1304();
+ BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ if ("0".equals(apiData.getTyhwbm()) || StringUtils.isEmpty(apiData.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
apiData.setTyhwbm(tyhwbm);
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTyajbm())) {
- String tyajbm = apiCommonService.getTyajbm(apiData.getHwdm().substring(0,28));
+ if ("0".equals(apiData.getTyajbm()) || StringUtils.isEmpty(apiData.getTyajbm())) {
+ String tyajbm = apiCommonService.getTyajbm(apiData.getHwdm().substring(0, 28));
apiData.setTyajbm(tyajbm);
}
apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1305.equals(inteId)) {
- Gd2023Api1305 apiData = (Gd2023Api1305) data;
+ Gd2023Api1305 apiData = new Gd2023Api1305();
+ BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTycfbm())) {
+ if ("0".equals(apiData.getTycfbm()) || StringUtils.isEmpty(apiData.getTycfbm())) {
String tycfbm = apiCommonService.getTycfbm(apiData.getCfdm());
apiData.setTycfbm(tycfbm);
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTyajbm())) {
- String tyajbm = apiCommonService.getTyajbm(apiData.getTfzydh().substring(0,28));
+ if ("0".equals(apiData.getTyajbm()) || StringUtils.isEmpty(apiData.getTyajbm())) {
+ String tyajbm = apiCommonService.getTyajbm(apiData.getTfzydh().substring(0, 28));
apiData.setTyajbm(tyajbm);
}
apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1306.equals(inteId)) {
- Api1306 apiData = (Api1306) data;
Gd2023Api1306 api1306 = new Gd2023Api1306();
- BeanUtils.copyProperties(apiData, api1306);
+ BeanUtils.copyProperties(data, api1306);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTycfbm())) {
- String tycfbm = apiCommonService.getTycfbm(apiData.getCfdm());
- apiData.setTycfbm(tycfbm);
+ if ("0".equals(api1306.getTycfbm()) || StringUtils.isEmpty(api1306.getTycfbm())) {
+ String tycfbm = apiCommonService.getTycfbm(api1306.getCfdm());
+ api1306.setTycfbm(tycfbm);
}
// 鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1306.getTyajbm())) {
- String tyajbm = apiCommonService.getTyajbm(apiData.getHwdm().substring(0,28));
+ if ("0".equals(api1306.getTyajbm()) || StringUtils.isEmpty(api1306.getTyajbm())) {
+ String tyajbm = apiCommonService.getTyajbm(api1306.getHwdm().substring(0, 28));
api1306.setTyajbm(tyajbm);
}
- apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
- return JSON.toJSONString(apiData);
+ api1306.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(api1306);
}
if (Constant.API_CODE_1307.equals(inteId)) {
//灏佽鏁版嵁
@@ -738,17 +762,17 @@
//璁剧疆涓婁紶鏂囦欢id
api1307.setFileStorageId((String) responseDto.getData());
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1307.getTykqbm())) {
+ if ("0".equals(api1307.getTykqbm()) || StringUtils.isEmpty(api1307.getTykqbm())) {
String tykqbm = apiCommonService.getTykqbm(api1307.getKqdm());
api1307.setTykqbm(tykqbm);
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1307.getTycfbm())) {
+ if ("0".equals(api1307.getTycfbm()) || StringUtils.isEmpty(api1307.getTycfbm())) {
String tycfbm = apiCommonService.getTycfbm(api1307.getCfdm());
api1307.setTycfbm(tycfbm);
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1307.getTyhwbm())) {
+ if ("0".equals(api1307.getTyhwbm()) || StringUtils.isEmpty(api1307.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(api1307.getHwdm());
api1307.setTyhwbm(tyhwbm);
}
@@ -776,9 +800,10 @@
return JSON.toJSONString(api1308);
}
if (Constant.API_CODE_1309.equals(inteId)) {
- Gd2023Api1309 apiData = (Gd2023Api1309) data;
+ Gd2023Api1309 apiData = new Gd2023Api1309();
+ BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getWgdwtybm())) {
+ if ("0".equals(apiData.getWgdwtybm()) || StringUtils.isEmpty(apiData.getWgdwtybm())) {
String tydwbm = apiCommonService.getTydwbm(apiData.getQydm());
apiData.setWgdwtybm(tydwbm);
}
@@ -789,7 +814,7 @@
Gd2023Api1310 api1310 = new Gd2023Api1310();
BeanUtils.copyProperties(data, api1310);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1310.getTyhwbm())) {
+ if ("0".equals(api1310.getTyhwbm()) || StringUtils.isEmpty(api1310.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(api1310.getHwdm());
api1310.setTyhwbm(tyhwbm);
}
@@ -797,9 +822,10 @@
return JSON.toJSONString(api1310);
}
if (Constant.API_CODE_1401.equals(inteId)) {
- Gd2023Api1401 apiData = (Gd2023Api1401) data;
+ Gd2023Api1401 apiData = new Gd2023Api1401();
+ BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTydwbm())) {
+ if ("0".equals(apiData.getTydwbm()) || StringUtils.isEmpty(apiData.getTydwbm())) {
String tydwbm = apiCommonService.getTydwbm(apiData.getCcqy());
apiData.setTydwbm(tydwbm);
}
@@ -807,7 +833,8 @@
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1402.equals(inteId)) {
- Gd2023Api1402 apiData = (Gd2023Api1402) data;
+ Gd2023Api1402 apiData = new Gd2023Api1402();
+ BeanUtils.copyProperties(data, apiData);
apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(apiData);
}
@@ -847,7 +874,7 @@
//璁剧疆涓婁紶鏂囦欢id
api1403.setFileStorageId((String) responseDto.getData());
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1403.getJhxddwtybm())) {
+ if ("0".equals(api1403.getJhxddwtybm()) || StringUtils.isEmpty(api1403.getJhxddwtybm())) {
String tydwbm = apiCommonService.getTydwbm(api1403.getJhxddw());
api1403.setJhxddwtybm(tydwbm);
}
@@ -869,14 +896,15 @@
return JSON.toJSONString(apiData);
}
if (com.fzzy.push.gd2023.ApiCodeConstant.API_2001.equals(inteId)) {
- Gd2023Api2001 apiData = (Gd2023Api2001) data;
+ Gd2023Api2001 apiData = new Gd2023Api2001();
+ BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTycfbm())) {
+ if ("0".equals(apiData.getTycfbm()) || StringUtils.isEmpty(apiData.getTycfbm())) {
String tycfbm = apiCommonService.getTycfbm(apiData.getCfdm());
apiData.setTycfbm(tycfbm);
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTycfbm())) {
+ if ("0".equals(apiData.getTycfbm()) || StringUtils.isEmpty(apiData.getTycfbm())) {
String tycfbm = apiCommonService.getTycfbm(apiData.getCfdm());
apiData.setTycfbm(tycfbm);
}
@@ -884,14 +912,15 @@
return JSON.toJSONString(apiData);
}
if (com.fzzy.push.gd2023.ApiCodeConstant.API_2002.equals(inteId)) {
- Gd2023Api2002 apiData = (Gd2023Api2002) data;
+ Gd2023Api2002 apiData = new Gd2023Api2002();
+ BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTycfbm())) {
+ if ("0".equals(apiData.getTycfbm()) || StringUtils.isEmpty(apiData.getTycfbm())) {
String tycfbm = apiCommonService.getTycfbm(apiData.getCfdm());
apiData.setTycfbm(tycfbm);
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTyajbm())) {
+ if ("0".equals(apiData.getTyajbm()) || StringUtils.isEmpty(apiData.getTyajbm())) {
String tyajbm = apiCommonService.getTyajbm(apiData.getAjdm());
apiData.setTyajbm(tyajbm);
}
diff --git a/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1102.java b/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1102.java
index faea1d1..a8f5717 100644
--- a/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1102.java
+++ b/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1102.java
@@ -43,7 +43,7 @@
private String xzqhdm;
@PropertyDef(label = "搴撳尯浜ф潈", description = "1锛� 鑷湁 2锛氱璧� 3锛氬叡鏈� 4锛氭贩鍚� 9锛氬叾浠�")
- private Integer kqcq;
+ private String kqcq;
@PropertyDef(label = "鏈夋晥浠撳")
private Double yxcr;
diff --git a/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1103.java b/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1103.java
index b32cdf4..e14bbf3 100644
--- a/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1103.java
+++ b/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1103.java
@@ -119,58 +119,58 @@
private String cfsfwh;
@PropertyDef(label = "鍌ㄧ伯鍔熸晥")
- private Integer clgx;
+ private String clgx;
@PropertyDef(label = "鑳藉惁闅旂儹淇濇俯")
- private Integer nfgrbw;
+ private String nfgrbw;
@PropertyDef(label = "闅旂儹淇濇俯鎺柦")
private String grbwcs;
@PropertyDef(label = "闅旂儹鎬ц兘")
- private Integer grxn;
+ private String grxn;
@PropertyDef(label = "缁撴瀯鏉愭枡")
- private Integer jgcl;
+ private String jgcl;
@PropertyDef(label = "姘斿瘑鎬�")
- private Integer qmx;
+ private String qmx;
@PropertyDef(label = "鏄惁宸茶繘琛屼俊鎭寲鏀归��")
- private Integer sfyjxxxhgz;
+ private String sfyjxxxhgz;
@PropertyDef(label = "绮儏鎶�鏈�")
- private Integer lqjs;
+ private String lqjs;
@PropertyDef(label = "鑳藉惁鏁ｈ鍌ㄥ瓨")
- private Integer nfszcc;
+ private String nfszcc;
@PropertyDef(label = "鏈夋棤闃查紶闃查泙闃茶櫕瑁呯疆鍙婅鏂�")
- private Integer ywfsfqfczz;
+ private String ywfsfqfczz;
@PropertyDef(label = "鏈夋棤闃茬伀闃茬垎闃茬洍璁炬柦")
- private Integer ywfhfbfdss;
+ private String ywfhfbfdss;
@PropertyDef(label = "鏈夋棤鏈烘閫氶璁炬柦")
- private Integer ywjxtfss;
+ private String ywjxtfss;
@PropertyDef(label = "閫氶绯荤粺鍨嬪紡")
- private Integer tfxtxs;
+ private String tfxtxs;
@PropertyDef(label = "閫氶鎶�鏈�")
- private Integer tfjs;
+ private String tfjs;
@PropertyDef(label = "鑳藉惁鐜祦鐔忚捀鏉�铏�")
- private Integer nfhlxzsc;
+ private String nfhlxzsc;
@PropertyDef(label = "鏉�铏妧鏈�")
- private Integer scjs;
+ private String scjs;
@PropertyDef(label = "鑳藉惁瀵屾爱浣庢哀姘旇皟鍌ㄧ伯")
- private Integer nffddyqtcl;
+ private String nffddyqtcl;
@PropertyDef(label = "鎺ф俯鎶�鏈�")
- private Integer kwjs;
+ private String kwjs;
@PropertyDef(label = "瀹宠櫕妫�娴嬫柟寮�")
private String hcjcfs;
diff --git a/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1104.java b/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1104.java
index 7a13367..beddfa3 100644
--- a/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1104.java
+++ b/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1104.java
@@ -47,13 +47,13 @@
@PropertyDef(label = "寤掗棿璁捐浠撳")
private Double ajsjcr;
-
+
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "寤掗棿鍚敤鏃ユ湡")
private Date ajqyrq;
-
+
@PropertyDef(label = "寤掗棿鐘舵��")
- private Integer ajzt;
+ private String ajzt;
@PropertyDef(label = "鎿嶄綔鏍囧織")
private String czbz;
@@ -61,5 +61,5 @@
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
private Date zhgxsj;
-
+
}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1107.java b/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1107.java
index cc8e764..9b8c9d6 100644
--- a/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1107.java
+++ b/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1107.java
@@ -4,6 +4,7 @@
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
+import javax.persistence.Column;
import java.io.Serializable;
import java.util.Date;
@@ -34,7 +35,7 @@
private String kqmc;
@PropertyDef(label = "璁惧缂栧彿")
- private Double sbbh;
+ private String sbbh;
@PropertyDef(label = "璁惧浠櫒鍚嶇О")
private String sbyqmc;
@@ -45,6 +46,11 @@
@PropertyDef(label = "鐢熶骇鍘傚")
private String sccj;
+ @PropertyDef(label = "璁惧浠櫒浠ｇ爜" )
+ @Column(name = "sbyqdm", length = 8)
+ private String sbyqdm;
+
+
@PropertyDef(label = "鐢熶骇鏃ユ湡")
@JSONField(format = "yyyy-MM-dd")
private Date scrq;
diff --git a/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1108.java b/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1108.java
index 70e4e1d..cb0a92f 100644
--- a/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1108.java
+++ b/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1108.java
@@ -34,7 +34,7 @@
private String kqmc;
@PropertyDef(label = "鑽墏缂栧彿")
- private Double yjbh;
+ private String yjbh;
@PropertyDef(label = "鑽墏鍚嶇О")
private String yjmc;
@@ -74,7 +74,7 @@
private String bzq;
@PropertyDef(label = "搴撳瓨鏁伴噺")
- private String kcsl;
+ private Double kcsl;
@PropertyDef(label = "搴撳瓨鏁伴噺鍗曚綅")
private String kcsldw;
diff --git a/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1110.java b/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1110.java
index 976af90..4a721e0 100644
--- a/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1110.java
+++ b/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1110.java
@@ -10,46 +10,48 @@
/**
* 鎺ュ彛琛�-搴撳尯鍥句粨鎴跨偣浣嶆爣娉ㄦ帴鍙�
- *
*/
@Data
-@EqualsAndHashCode(callSuper=false)
+@EqualsAndHashCode(callSuper = false)
public class Gd2023Api1110 implements Serializable {
/**
- *
- */
- private static final long serialVersionUID = -2000199652473542869L;
+ *
+ */
+ private static final long serialVersionUID = -2000199652473542869L;
- @PropertyDef(label = "鍗曚綅浠ｇ爜" )
+ @PropertyDef(label = "鍗曚綅浠ｇ爜")
private String dwdm;
- @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜" )
+ @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
private String tydwbm;
- @PropertyDef(label = "搴撳尯浠ｇ爜" )
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
private String kqdm;
- @PropertyDef(label = "璐т綅浠ｇ爜" )
+ @PropertyDef(label = "缁熶竴搴撳尯浠ｇ爜")
+ private String tykqbm;
+
+ @PropertyDef(label = "璐т綅浠ｇ爜")
private String hwdm;
@PropertyDef(label = "缁熶竴璐т綅缂栫爜")
private String tyhwbm;
- @PropertyDef(label = "璐т綅鐩稿浣嶇疆" )
+ @PropertyDef(label = "璐т綅鐩稿浣嶇疆")
private String hwxdwz;
- @PropertyDef(label = "璐т綅浣嶇疆鏍峰紡" )
+ @PropertyDef(label = "璐т綅浣嶇疆鏍峰紡")
private String hwwzys;
- @PropertyDef(label = "澶囨敞" )
+ @PropertyDef(label = "澶囨敞")
private String bz;
- @PropertyDef(label = "鎿嶄綔鏍囧織" )
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
private String czbz;
- @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�" )
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
private Date zhgxsj;
diff --git a/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1209.java b/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1209.java
index 6013fca..4b87d2d 100644
--- a/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1209.java
+++ b/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1209.java
@@ -10,7 +10,7 @@
import java.util.Date;
/**
- * 鎺ュ彛琛�-绮搴撳瓨
+ * 鎺ュ彛琛�-鎹熺泭鍗�
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -72,10 +72,10 @@
private Double ckzz;
@PropertyDef(label = "鍌ㄥ瓨鏃堕暱" )
- private Double ccsc;
+ private String ccsc;
@PropertyDef(label = "瀹為檯鎹熺泭鏁伴噺" )
- private Double sjsysl;
+ private Double jzsysl;
@PropertyDef(label = "鍏朵腑姘存潅鍑忛噺(鍏枻)" )
private Double qzszkl;
diff --git a/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1306.java b/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1306.java
index 533431d..e17389f 100644
--- a/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1306.java
+++ b/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1306.java
@@ -5,6 +5,7 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
+import javax.persistence.Column;
import java.io.Serializable;
import java.util.Date;
@@ -228,6 +229,9 @@
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�" )
private Date zhgxsj;
-
+ @JSONField(serialize = false)
+ @PropertyDef(label = "璐т綅浠ｇ爜" )
+ @Column(name = "hwdm", length = 30)
+ private String hwdm;
}
\ No newline at end of file
--
Gitblit v1.9.3