From 95dfe7d0073fd85c465f49bd66c1c39542ffdb55 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期四, 09 四月 2026 14:28:56 +0800
Subject: [PATCH] 调整上海核验接口
---
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1510.java | 5 +
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1509.java | 3
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1506.java | 19 ++--
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1505.java | 5 +
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1110.java | 5 +
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1508.java | 3
src/main/java/com/fzzy/otherview/sh2023/pr/SHApi1115PR.java | 2
src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2103PR.java | 4
src/main/resources/application-pro.yml | 25 +++--
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 61 +++++++++++----
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1504.java | 7 +
src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2101PR.java | 2
src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2102PR.java | 2
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1111.java | 2
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1507.java | 24 ++++-
src/main/resources/application-pro2.yml | 4
src/main/java/com/fzzy/otherview/sh2023/pr/SHApi1311PR.java | 2
src/main/java/com/fzzy/api/entity/Api1504.java | 2
src/main/java/com/fzzy/api/view/Api1510.view.xml | 6
19 files changed, 126 insertions(+), 57 deletions(-)
diff --git a/src/main/java/com/fzzy/api/entity/Api1504.java b/src/main/java/com/fzzy/api/entity/Api1504.java
index 5e7457e..f695c09 100644
--- a/src/main/java/com/fzzy/api/entity/Api1504.java
+++ b/src/main/java/com/fzzy/api/entity/Api1504.java
@@ -46,7 +46,7 @@
private String cacctchief;
@JSONField(format = "yyyyMM")
- @PropertyDef(label = "鍚敤鏈熼棿", description = "yyyyMM")
+ @PropertyDef(label = "鍚敤鏈熼棿", description = "yyyy-MM-dd")
@Column(name = "cperiodstart", length = 10)
private Date cperiodstart;
diff --git a/src/main/java/com/fzzy/api/view/Api1510.view.xml b/src/main/java/com/fzzy/api/view/Api1510.view.xml
index 223e767..a485fd5 100644
--- a/src/main/java/com/fzzy/api/view/Api1510.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1510.view.xml
@@ -84,7 +84,7 @@
<Property name="dataType">Double</Property>
<Property name="label">鏈勾绱鎶樻棫璋冨</Property>
</PropertyDef>
- <PropertyDef name="yaccuDeprDecrease">
+ <PropertyDef name="yaccudeprdecrease">
<Property name="dataType">Double</Property>
<Property name="label">鏈勾绱鎶樻棫璋冨噺</Property>
</PropertyDef>
@@ -411,8 +411,8 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">yaccuDeprDecrease</Property>
- <Property name="property">yaccuDeprDecrease</Property>
+ <Property name="name">yaccudeprdecrease</Property>
+ <Property name="property">yaccudeprdecrease</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
diff --git a/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi1115PR.java b/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi1115PR.java
index 3fa345f..be785f4 100644
--- a/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi1115PR.java
+++ b/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi1115PR.java
@@ -175,7 +175,7 @@
infoData.setId(data.getKqdm() + DateFormatUtils.format(data.getSjtjsj(), "yyyyMMddHHmmss"));
infoData.setKqdm(data.getKqdm());
infoData.setInteType("11");
- infoData.setInteId(Constant.API_CODE_9101);
+ infoData.setInteId(SH2023Constant.SH_2023_API_CODE_1115);
infoData.setUpdateTime(new Date());
infoData.setDataId(infoData.getId());
diff --git a/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi1311PR.java b/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi1311PR.java
index 567965d..690a962 100644
--- a/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi1311PR.java
+++ b/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi1311PR.java
@@ -175,7 +175,7 @@
}
//灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, "90", Constant.API_CODE_9102);
+ ApiParam param = new ApiParam(apiConf, "90", SH2023Constant.SH_2023_API_CODE_1311);
//鑾峰彇瀹炵幇鎺ュ彛
ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
diff --git a/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2101PR.java b/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2101PR.java
index c403fdf..5522f0a 100644
--- a/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2101PR.java
+++ b/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2101PR.java
@@ -169,7 +169,7 @@
}
//灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, "90", Constant.API_CODE_9105);
+ ApiParam param = new ApiParam(apiConf, "90", SH2023Constant.SH_2023_API_CODE_2101);
//鑾峰彇瀹炵幇鎺ュ彛
ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
diff --git a/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2102PR.java b/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2102PR.java
index 4d35b98..d5fd092 100644
--- a/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2102PR.java
+++ b/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2102PR.java
@@ -162,7 +162,7 @@
}
//灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, "90", Constant.API_CODE_9103);
+ ApiParam param = new ApiParam(apiConf, "90", SH2023Constant.SH_2023_API_CODE_2102);
//鑾峰彇瀹炵幇鎺ュ彛
ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
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 be61bf7..5938415 100644
--- a/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2103PR.java
+++ b/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2103PR.java
@@ -169,7 +169,7 @@
}
//灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_90, Constant.API_CODE_9104);
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_90, SH2023Constant.SH_2023_API_CODE_2103);
//鑾峰彇瀹炵幇鎺ュ彛
ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
@@ -187,7 +187,7 @@
infoData.setId(data.getHwdm());
infoData.setKqdm(data.getHwdm().substring(0, 21));
infoData.setInteType("21");
- infoData.setInteId(Constant.API_CODE_9104);
+ infoData.setInteId(SH2023Constant.SH_2023_API_CODE_2103);
infoData.setUpdateTime(new Date());
infoData.setDataId(data.getHwdm());
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index 84de7a4..2528443 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -402,15 +402,16 @@
Api1110 apiData = (Api1110) data;
BeanUtils.copyProperties(apiData, api1110);
api1110.setBjw(ShAreaBjw.getBjw(code));
- //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1110.getTyajbm())) {
- String tyhwbm = apiCommonService.getTyhwbm(api1110.getAjdm());
- api1110.setTyajbm(tyhwbm);
- }
api1110.setAjdm(apiData.getHwdm().substring(0, 28));
api1110.setAjxdwz(apiData.getHwxdwz());
api1110.setAjwzys(apiData.getHwwzys());
+
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(api1110.getTyajbm())) {
+ String tyhwbm = apiCommonService.getTyajbm(api1110.getAjdm());
+ api1110.setTyajbm(tyhwbm);
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1110);
@@ -422,7 +423,7 @@
api1111.setBjw(ShAreaBjw.getBjw(code));
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
if (StringUtils.isEmpty(api1111.getTykqbm())) {
- String tyhwbm = apiCommonService.getTyhwbm(api1111.getKqdm());
+ String tyhwbm = apiCommonService.getTykqbm(api1111.getKqdm());
api1111.setTykqbm(tyhwbm);
}
@@ -937,7 +938,7 @@
api1301.setBjw(ShAreaBjw.getBjw(code));
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
if (StringUtils.isEmpty(api1301.getTykqbm())) {
- String tykqbm = apiCommonService.getTykqbm(api1301.getDwdm());
+ String tykqbm = apiCommonService.getTykqbm(api1301.getKqdm());
api1301.setTykqbm(tykqbm);
}
//璁剧疆绌哄睘鎬т负榛樿鍊�
@@ -1162,10 +1163,9 @@
BeanUtils.copyProperties(data, api1311);
api1311.setBjw(ShAreaBjw.getBjw(code));
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1311.getTykqbm())) {
- String tykqbm = apiCommonService.getTykqbm(api1311.getKqdm());
- api1311.setTykqbm(tykqbm);
- }
+ String tykqbm = apiCommonService.getTykqbm(api1311.getKqdm());
+ api1311.setTykqbm(tykqbm);
+
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1311);
return api1311;
@@ -1219,8 +1219,8 @@
}
}
}
- api1403.setLrsl(lrsl + "");
- api1403.setLcsl(lcsl + "");
+ api1403.setLrsl(String.format("%.2f", lrsl));
+ api1403.setLcsl(String.format("%.2f", lcsl));
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1403);
@@ -1271,10 +1271,9 @@
SH2023Api2103 apiData = new SH2023Api2103();
BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTyhwbm())) {
- String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
- apiData.setTyhwbm(tyhwbm);
- }
+ String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+ apiData.setTyhwbm(tyhwbm);
+
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(apiData);
return apiData;
@@ -1299,6 +1298,10 @@
Api1504 api1504 = (Api1504) data;
SH2023Api1504 apiData = new SH2023Api1504();
BeanUtils.copyProperties(api1504, apiData);
+ if(apiData.getNacctid().startsWith(api1504.getKqdm())){
+ apiData.setNacctid(apiData.getNacctid().replace(api1504.getKqdm(),api1504.getTykqbm()));
+ }
+ apiData.setBjw(ShAreaBjw.getBjw(code));
return apiData;
}
if (Constant.API_CODE_1505.equals(inteId)) {
@@ -1316,6 +1319,10 @@
apiData.setBbank(api1505.getBbank() + "");
apiData.setBxjll(api1505.getBxjll() + "");
apiData.setBf(api1505.getBf() + "");
+ if(apiData.getNacctid().startsWith(api1505.getKqdm())){
+ apiData.setNacctid(apiData.getNacctid().replace(api1505.getKqdm(),api1505.getTykqbm()));
+ }
+ apiData.setBjw(ShAreaBjw.getBjw(code));
return apiData;
}
if (Constant.API_CODE_1506.equals(inteId)) {
@@ -1325,6 +1332,10 @@
apiData.setCyear(api1506.getCyear() + "");
apiData.setNno(api1506.getNno() + "");
apiData.setCdc(api1506.getCdc() + "");
+ if(apiData.getNacctid().startsWith(api1506.getKqdm())){
+ apiData.setNacctid(apiData.getNacctid().replace(api1506.getKqdm(),api1506.getTykqbm()));
+ }
+ apiData.setBjw(ShAreaBjw.getBjw(code));
return apiData;
}
if (Constant.API_CODE_1507.equals(inteId)) {
@@ -1339,6 +1350,10 @@
apiData.setBpt(api1507.getBpt() + "");
apiData.setNanum(api1507.getNanum() + "");
apiData.setBtmp(api1507.getBtmp() + "");
+ if(apiData.getNacctid().startsWith(api1507.getKqdm())){
+ apiData.setNacctid(apiData.getNacctid().replace(api1507.getKqdm(),api1507.getTykqbm()));
+ }
+ apiData.setBjw(ShAreaBjw.getBjw(code));
return apiData;
}
if (Constant.API_CODE_1508.equals(inteId)) {
@@ -1350,6 +1365,10 @@
apiData.setNvno(api1508.getNvno() + "");
apiData.setNrowno(api1508.getNrowno() + "");
apiData.setCdc(api1508.getCdc() + "");
+ if(apiData.getNacctid().startsWith(api1508.getKqdm())){
+ apiData.setNacctid(apiData.getNacctid().replace(api1508.getKqdm(),api1508.getTykqbm()));
+ }
+ apiData.setBjw(ShAreaBjw.getBjw(code));
return apiData;
}
if (Constant.API_CODE_1509.equals(inteId)) {
@@ -1359,6 +1378,10 @@
apiData.setDeprmethodid(api1509.getDeprmethodid() + "");
apiData.setSourceid(api1509.getSourceid() + "");
apiData.setUsingperiods(api1509.getUsingperiods() + "");
+ if(apiData.getNacctid().startsWith(api1509.getKqdm())){
+ apiData.setNacctid(apiData.getNacctid().replace(api1509.getKqdm(),api1509.getTykqbm()));
+ }
+ apiData.setBjw(ShAreaBjw.getBjw(code));
return apiData;
}
if (Constant.API_CODE_1510.equals(inteId)) {
@@ -1367,6 +1390,10 @@
BeanUtils.copyProperties(api1510, apiData);
apiData.setPeriod(api1510.getPeriod() + "");
apiData.setAcctyear(api1510.getAcctyear() + "");
+ if(apiData.getNacctid().startsWith(api1510.getKqdm())){
+ apiData.setNacctid(apiData.getNacctid().replace(api1510.getKqdm(),api1510.getTykqbm()));
+ }
+ apiData.setBjw(ShAreaBjw.getBjw(code));
return apiData;
}
//璁剧疆绌哄睘鎬т负榛樿鍊�
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1110.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1110.java
index 853e929..6186d23 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1110.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1110.java
@@ -17,13 +17,16 @@
*/
private static final long serialVersionUID = 2592349036859314053L;
+ @PropertyDef(label = "鍗曚綅浠ｇ爜")
+ private String dwdm;
+
@PropertyDef(label = "搴撳尯浠ｇ爜")
private String kqdm;
@PropertyDef(label = "寤掗棿浠ｇ爜")
private String ajdm;
- @PropertyDef(label = "寤掗棿浠ｇ爜")
+ @PropertyDef(label = "缁熶竴寤掗棿浠ｇ爜")
private String tyajbm;
@PropertyDef(label = "寤掗棿鐩稿浣嶇疆")
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1111.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1111.java
index 2b8b748..850d6df 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1111.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1111.java
@@ -16,6 +16,8 @@
*
*/
private static final long serialVersionUID = -2000199652473542869L;
+ @PropertyDef(label = "鍗曚綅浠ｇ爜")
+ private String dwdm;
@PropertyDef(label = "搴撳尯浠ｇ爜")
private String kqdm;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1504.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1504.java
index f8a4d2e..ea8111f 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1504.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1504.java
@@ -33,14 +33,14 @@
@JsonProperty("cAcctChief")
private String cacctchief;
- @JSONField(format = "yyyyMM")
+ @JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "鍚敤鏈熼棿")
@JsonProperty("cPeriodStart")
private Date cperiodstart;
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "鍚敤鏃ユ湡")
- @JsonProperty("cYearBmd")
+ @JsonProperty("cYearBMD")
private Date cyearbmd;
@PropertyDef(label = "鏈熼棿鏁�")
@@ -79,6 +79,9 @@
@JsonProperty("czbz")
private String czbz;
+ @PropertyDef(label = "鏍囪浣�")
+ private String bjw;
+
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
@JsonProperty("zhgxsj")
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1505.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1505.java
index 4bc79e2..93301dd 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1505.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1505.java
@@ -83,7 +83,7 @@
private String bbank;
@PropertyDef(label = "鐜伴噾娴侀噺绫荤鐩�")
- @JsonProperty("bXjll")
+ @JsonProperty("bXJLL")
private String bxjll;
@PropertyDef(label = "鍐荤粨")
@@ -94,6 +94,9 @@
@JsonProperty("czbz")
private String czbz;
+ @PropertyDef(label = "鏍囪浣�")
+ private String bjw;
+
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
@JsonProperty("zhgxsj")
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1506.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1506.java
index cda88ed..c7b5d6a 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1506.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1506.java
@@ -61,41 +61,44 @@
private String cdc;
@PropertyDef(label = "鍊熸柟鏈綅甯佸彂鐢熼")
- @JsonProperty("dM")
+ @JsonProperty("DM")
private Double dm;
@PropertyDef(label = "璐锋柟鏈綅甯佸彂鐢熼")
- @JsonProperty("cM")
+ @JsonProperty("CM")
private Double cm;
@PropertyDef(label = "鍊熸柟鍙戠敓鏁伴噺")
- @JsonProperty("dQ")
+ @JsonProperty("DQ")
private Double dq;
@PropertyDef(label = "璐锋柟鍙戠敓鏁伴噺")
- @JsonProperty("cQ")
+ @JsonProperty("CQ")
private Double cq;
@PropertyDef(label = "鏈熷垵澶栧竵浣欓")
- @JsonProperty("bFm")
+ @JsonProperty("bFM")
private Double bfm;
@PropertyDef(label = "鏈熸湯澶栧竵浣欓")
- @JsonProperty("eFm")
+ @JsonProperty("eFM")
private Double efm;
@PropertyDef(label = "鍊熸柟澶栧竵鍙戠敓棰�")
- @JsonProperty("dFm")
+ @JsonProperty("DFM")
private Double dfm;
@PropertyDef(label = "璐锋柟澶栧竵鍙戠敓棰�")
- @JsonProperty("cFm")
+ @JsonProperty("CFM")
private Double cfm;
@PropertyDef(label = "鎿嶄綔鏍囧織")
@JsonProperty("czbz")
private String czbz;
+ @PropertyDef(label = "鏍囪浣�")
+ private String bjw;
+
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
@JsonProperty("zhgxsj")
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1507.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1507.java
index bacf404..4b41c38 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1507.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1507.java
@@ -58,7 +58,7 @@
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "鍑瘉鏃ユ湡")
- @JsonProperty("cVSmallDatetime")
+ @JsonProperty("cVsmalldatetime")
private Date ccsmalldatetime;
@PropertyDef(label = "鍒跺崟浜�")
@@ -73,11 +73,11 @@
private String cdc;
@PropertyDef(label = "瀹℃牳浜�")
- @JsonProperty("cCkEr")
+ @JsonProperty("cCker")
private String ccker;
@PropertyDef(label = "璁拌处浜�")
- @JsonProperty("cPtEr")
+ @JsonProperty("cPTer")
private String cpter;
/**
* 0:鍚�
@@ -103,26 +103,38 @@
@JsonProperty("nPrice")
private Double nprice;
+ @PropertyDef(label = "缁撶畻鏂瑰紡")
+ @JsonProperty("cSettleKind")
+ private String cSettleKind;
+
+ @PropertyDef(label = "缁撶畻鍙�")
+ @JsonProperty("cSettleNo")
+ private String cSettleNo;
+
+
@PropertyDef(label = "鍑虹撼")
@JsonProperty("cCashier")
private String ccashier;
@PropertyDef(label = "姹囩巼")
- @JsonProperty("rate")
+ @JsonProperty("Rate")
private Double rate;
@PropertyDef(label = "澶栧竵閲戦")
- @JsonProperty("nFm")
+ @JsonProperty("nFM")
private Double nfm;
@PropertyDef(label = "璁￠噺鍗曚綅",description = "璁￠噺鍗曚綅姹夊瓧")
- @JsonProperty("meterUnitId")
+ @JsonProperty("MeterUnitID")
private String meterunitid;
@PropertyDef(label = "鎿嶄綔鏍囧織")
@JsonProperty("czbz")
private String czbz;
+ @PropertyDef(label = "鏍囪浣�")
+ private String bjw;
+
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
@JsonProperty("zhgxsj")
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1508.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1508.java
index 4b45bad..eb7732b 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1508.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1508.java
@@ -72,6 +72,9 @@
@JsonProperty("czbz")
private String czbz;
+ @PropertyDef(label = "鏍囪浣�")
+ private String bjw;
+
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
@JsonProperty("zhgxsj")
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1509.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1509.java
index f43708d..573343a 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1509.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1509.java
@@ -164,6 +164,9 @@
@JsonProperty("czbz")
private String czbz;
+ @PropertyDef(label = "鏍囪浣�")
+ private String bjw;
+
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
@JsonProperty("zhgxsj")
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1510.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1510.java
index 9fec5b9..a4afb9e 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1510.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1510.java
@@ -98,12 +98,15 @@
@PropertyDef(label = "鏈勾绱鎶樻棫璋冨噺")
@JsonProperty("YAccuDeprDecrease")
- private Double yaccudeprdecrease;
+ private Double yaccudeprdecrease = 1.0;
@PropertyDef(label = "鎿嶄綔鏍囧織")
@JsonProperty("czbz")
private String czbz;
+ @PropertyDef(label = "鏍囪浣�")
+ private String bjw;
+
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
@JsonProperty("zhgxsj")
diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml
index 2e2abcc..eb88f33 100644
--- a/src/main/resources/application-pro.yml
+++ b/src/main/resources/application-pro.yml
@@ -1,4 +1,4 @@
-########################## 澶ф咕鍖� ##########################
+########################## 涓婃捣鍢夊畾 -C鐩� pro ##########################
server:
port: 8090
jetty:
@@ -9,16 +9,16 @@
datasource:
#涓绘暟鎹簮
primary:
- url: jdbc:mysql://127.0.0.1:3306/igds_api?useUnicode=true&characterEncoding=utf-8
+ url: jdbc:mysql://192.168.200.3:3306/igds_api?useUnicode=true&characterEncoding=utf-8&useSSL=false
+ driver-class-name: com.mysql.jdbc.Driver
username: root
password: Abc123..
- driver-class-name: com.mysql.jdbc.Driver
#娆℃暟鎹簮
secondary:
- url: jdbc:mysql://127.0.0.1:3306/igds_master_v40?useUnicode=true&characterEncoding=utf-8
+ url: jdbc:mysql://192.168.200.3:3306/igds_master?useUnicode=true&characterEncoding=utf-8&useSSL=false
+ driver-class-name: com.mysql.jdbc.Driver
username: root
password: Abc123..
- driver-class-name: com.mysql.jdbc.Driver
jpa:
#涓籮pa閰嶇疆
primary:
@@ -38,8 +38,8 @@
dialect: org.hibernate.dialect.MySQL5InnoDBDialect
# Redis鐩稿叧閰嶇疆
redis:
- database: 2
- host: 127.0.0.1
+ database: 1
+ host: 192.168.200.3
port: 6379
password: Abc123..
# 杩炴帴姹犳渶澶ц繛鎺ユ暟锛堜娇鐢ㄨ礋鍊艰〃绀烘病鏈夐檺鍒讹級
@@ -51,6 +51,11 @@
timeout: 6000
igds:
default:
- companyId: 5016
- file-path: C:/app/igds-api/
- img-path: D:/IGDS/FILE/
\ No newline at end of file
+ companyId: 5303
+ file-path: C:/IGDS-API/FILE/
+ img-path: C:/IGDS/FILE/
+ # 鐪佸钩鍙癛SA瀵嗛挜瀵逛俊鎭�
+ #鍏挜锛歁IGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCsoiS5Q5CKAT9w5EbZXCxJO/5J2iV3i2HrTW/YcGs2EGeQsQc97EWPdFE1SPXGH5p9TO8nCFRJScj4WeeKUVcuRpzR7czQQ+c6kf6cR9LLQrAiGEMQSk13j/5UsJho23IQDGKWoH18f5aPdX8tJn/o4aR6mMxUY9jdaSKEBck1TQIDAQAB
+ # 鍖虹骇骞冲彴RSA瀵嗛挜瀵逛俊鎭�
+ #鍏挜锛歁IGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCRsamMiP5Op2JJtp3+IIJADFYhL256ZW0KsOkMHruJ3hVwgvoimPHKuUWRI/CS365v4BwUzzfBRdbECMFsLA1e1FHPPA0uSsAIuSVwRzHXG4drX7ZCDa9GFZ+qyIFAU25j2e2PC9olvKbGLBfZ8cL1FLXGxSVyDCX4t/UMZdDULwIDAQAB
+ #绉侀挜锛歁IICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAJGxqYyI/k6nYkm2nf4ggkAMViEvbnplbQqw6Qweu4neFXCC+iKY8cq5RZEj8JLfrm/gHBTPN8FF1sQIwWwsDV7UUc88DS5KwAi5JXBHMdcbh2tftkINr0YVn6rIgUBTbmPZ7Y8L2iW8psYsF9nxwvUUtcbFJXIMJfi39Qxl0NQvAgMBAAECgYBKWLHfoCy9sFbMrN7UxnwQ+PqetpiW5tkNApf58ljbErQ4FO5V51xDieXBGejy2igmuOM7jz6xZtUgdiNV8uji/RtiNRqsBekVBPMeYAnPwA4GQ0HNwyHJ3ebJNQqT9bwrk8QpRUuCnrx/U1l7P1QNR5o52H1HpEKPlS0ga0fuQQJBAMdiSFYKt8/PwsYclvU/GqXrPy4cxMBhtE/ZssH9KourxnJcyfRz7EPgfSZykxlGHn8j/r8C2XxtAIYW6mRckqECQQC7EIZCZ3eV8abSIB33oKmw2jZlPQrHXMt8DWz8FYbNIA/9bvk9e9O42iQwMUtHfOMcNMWbcvKR/J+83bcE08TPAkA1ErdYl+/H1HDvVUrlq0+HnPArcSL6ZsedfcB0nNRHa4kehg6IEJdylf4aTuNTFfQmOcmkxLhpw4YhK1ZnMrEhAkEAuiMLNXA3MmCumk+TAiBAOdYoYjyHSTEw2VOSqpPQ+rN4tbmDEIbyefG2KK4kNhIy+pIYP0H11QYG/KuxvX/rSQJBALs0TqUgcGOp9+IkOq4jCXiVkP5/r7JWinQ4d6bYhJ4wspQYloYFCHljKKXtst1m8I3PC+vJY8R6va/3xtQKT8U=
diff --git a/src/main/resources/application-pro2.yml b/src/main/resources/application-pro2.yml
index 918aee1..044f45d 100644
--- a/src/main/resources/application-pro2.yml
+++ b/src/main/resources/application-pro2.yml
@@ -54,8 +54,10 @@
companyId: 5303
file-path: C:/IGDS-API/FILE/
img-path: C:/IGDS/FILE/
+ # 鎺ュ彛娴嬭瘯鍦板潃锛歨ttp://61.172.246.55:18001/api_shgms/api_recv/service/API/UPLOAD/V2023/
+ # 鎺ュ彛姝ｅ紡鍦板潃锛歨ttp://183.194.252.199:9006/service/API/UPLOAD/V2023/
# 鐪佸钩鍙癛SA瀵嗛挜瀵逛俊鎭�
- #鍏挜锛歁IGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCsoiS5Q5CKAT9w5EbZXCxJO/5J2iV3i2HrTW/YcGs2EGeQsQc97EWPdFE1SPXGH5p9TO8nCFRJScj4WeeKUVcuRpzR7czQQ+c6kf6cR9LLQrAiGEMQSk13j/5UsJho23IQDGKWoH18f5aPdX8tJn/o4aR6mMxUY9jdaSKEBck1TQIDAQAB
+ #鍏挜锛歁IGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCXODBhhLeKjcvadaLdpgXHX9Ue6pqxwNoftV0/se2LGN+BBoNnRztFbU5nGan8QlapAi0cQxKJPpccEpWTbHerVrLX0hrMn2L9vAhjLa2JFa6nnuEh5tZ+xh/VvbIzANxm0u5z0bfG9YKY/6MqbwGwAc7er+HOpAPVl/ifObLPswIDAQAB
# 鍖虹骇骞冲彴RSA瀵嗛挜瀵逛俊鎭�
#鍏挜锛歁IGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCRsamMiP5Op2JJtp3+IIJADFYhL256ZW0KsOkMHruJ3hVwgvoimPHKuUWRI/CS365v4BwUzzfBRdbECMFsLA1e1FHPPA0uSsAIuSVwRzHXG4drX7ZCDa9GFZ+qyIFAU25j2e2PC9olvKbGLBfZ8cL1FLXGxSVyDCX4t/UMZdDULwIDAQAB
#绉侀挜锛歁IICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAJGxqYyI/k6nYkm2nf4ggkAMViEvbnplbQqw6Qweu4neFXCC+iKY8cq5RZEj8JLfrm/gHBTPN8FF1sQIwWwsDV7UUc88DS5KwAi5JXBHMdcbh2tftkINr0YVn6rIgUBTbmPZ7Y8L2iW8psYsF9nxwvUUtcbFJXIMJfi39Qxl0NQvAgMBAAECgYBKWLHfoCy9sFbMrN7UxnwQ+PqetpiW5tkNApf58ljbErQ4FO5V51xDieXBGejy2igmuOM7jz6xZtUgdiNV8uji/RtiNRqsBekVBPMeYAnPwA4GQ0HNwyHJ3ebJNQqT9bwrk8QpRUuCnrx/U1l7P1QNR5o52H1HpEKPlS0ga0fuQQJBAMdiSFYKt8/PwsYclvU/GqXrPy4cxMBhtE/ZssH9KourxnJcyfRz7EPgfSZykxlGHn8j/r8C2XxtAIYW6mRckqECQQC7EIZCZ3eV8abSIB33oKmw2jZlPQrHXMt8DWz8FYbNIA/9bvk9e9O42iQwMUtHfOMcNMWbcvKR/J+83bcE08TPAkA1ErdYl+/H1HDvVUrlq0+HnPArcSL6ZsedfcB0nNRHa4kehg6IEJdylf4aTuNTFfQmOcmkxLhpw4YhK1ZnMrEhAkEAuiMLNXA3MmCumk+TAiBAOdYoYjyHSTEw2VOSqpPQ+rN4tbmDEIbyefG2KK4kNhIy+pIYP0H11QYG/KuxvX/rSQJBALs0TqUgcGOp9+IkOq4jCXiVkP5/r7JWinQ4d6bYhJ4wspQYloYFCHljKKXtst1m8I3PC+vJY8R6va/3xtQKT8U=
--
Gitblit v1.9.3