From 58c47f9f7fdd6e6991db9b43607e36d2175c35ad Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期二, 26 十一月 2024 13:48:41 +0800
Subject: [PATCH] 调试上海接口，调整对应字段
---
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1510.java | 6
src/main/java/com/fzzy/push/sx2024/data/SX2024Api1505.java | 2
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1509.java | 60 +++++-----
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1506.java | 14 +-
src/main/java/com/fzzy/api/view/Api1506.view.xml | 4
src/main/java/com/fzzy/inte/sh2023/controller/ControllerSh2023.java | 10
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1505.java | 22 +-
src/main/java/com/fzzy/push/sx2024/data/SX2024Api1510.java | 1
src/main/java/com/fzzy/inte/sh2023/service/SHDNService.java | 87 ++++++++++++--
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1508.java | 14 +-
src/main/java/com/fzzy/api/entity/Api9109.java | 4
src/main/java/com/fzzy/api/entity/Api9114.java | 4
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 67 +++++++++-
src/main/java/com/fzzy/api/view/repository/ApiConfsRep.java | 8 +
src/main/java/com/fzzy/api/view/Api1507.view.xml | 9 +
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1504.java | 4
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1504.java | 2
src/main/java/com/fzzy/api/entity/Api1507.java | 4
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1507.java | 20 ++-
src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java | 5
src/main/java/com/fzzy/push/sx2024/data/SX2024Api1504.java | 4
src/main/resources/application-dev.yml | 2
src/main/java/com/fzzy/api/view/Api9109.view.xml | 4
src/main/resources/application.yml | 2
24 files changed, 246 insertions(+), 113 deletions(-)
diff --git a/src/main/java/com/fzzy/api/entity/Api1507.java b/src/main/java/com/fzzy/api/entity/Api1507.java
index 57857a3..633bbd3 100644
--- a/src/main/java/com/fzzy/api/entity/Api1507.java
+++ b/src/main/java/com/fzzy/api/entity/Api1507.java
@@ -57,6 +57,10 @@
@Column(name = "nno")
private Integer nno;
+ @PropertyDef(label = "鍑瘉鍒嗙被")
+ @Column(name = "btmp")
+ private Integer btmp;
+
@PropertyDef(label = "鎽樿")
@Column(name = "digest", length = 512)
private String digest;
diff --git a/src/main/java/com/fzzy/api/entity/Api9109.java b/src/main/java/com/fzzy/api/entity/Api9109.java
index 99c9b55..c527bbb 100644
--- a/src/main/java/com/fzzy/api/entity/Api9109.java
+++ b/src/main/java/com/fzzy/api/entity/Api9109.java
@@ -80,8 +80,8 @@
private Integer cfs;
@PropertyDef(label = "娌圭綈鏁�")
- @Column(name = "ygs")
- private Integer ygs;
+ @Column(name = "ajs")
+ private Integer ajs;
@PropertyDef(label = "缁忓害")
@Column(name = "jd", precision = 20, scale = 6)
diff --git a/src/main/java/com/fzzy/api/entity/Api9114.java b/src/main/java/com/fzzy/api/entity/Api9114.java
index 1c4a6ff..503a566 100644
--- a/src/main/java/com/fzzy/api/entity/Api9114.java
+++ b/src/main/java/com/fzzy/api/entity/Api9114.java
@@ -63,10 +63,6 @@
@Column(name = "xxdz", length = 256)
private String xxdz;
- @PropertyDef(label = "韬唤璇佸彿")
- @Column(name = "sfzh", length = 18)
- private String sfzh;
-
@PropertyDef(label = "杩愯緭宸ュ叿")
@Column(name = "ysgj", length = 1)
private String ysgj;
diff --git a/src/main/java/com/fzzy/api/view/Api1506.view.xml b/src/main/java/com/fzzy/api/view/Api1506.view.xml
index 8de0a7e..84a8df5 100644
--- a/src/main/java/com/fzzy/api/view/Api1506.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1506.view.xml
@@ -26,11 +26,11 @@
</PropertyDef>
<PropertyDef name="cyear">
<Property name="dataType">Integer</Property>
- <Property name="label">鏈熼棿</Property>
+ <Property name="label">骞村害</Property>
</PropertyDef>
<PropertyDef name="nno">
<Property name="dataType">Integer</Property>
- <Property name="label">骞村害</Property>
+ <Property name="label">鏈熼棿</Property>
</PropertyDef>
<PropertyDef name="ccode">
<Property></Property>
diff --git a/src/main/java/com/fzzy/api/view/Api1507.view.xml b/src/main/java/com/fzzy/api/view/Api1507.view.xml
index ec28b7d..86e3c0f 100644
--- a/src/main/java/com/fzzy/api/view/Api1507.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1507.view.xml
@@ -44,6 +44,10 @@
<Property name="dataType">Integer</Property>
<Property name="label">鍒嗗綍搴忓彿</Property>
</PropertyDef>
+ <PropertyDef name="btmp">
+ <Property name="dataType">Integer</Property>
+ <Property name="label">鍑瘉鍒嗙被</Property>
+ </PropertyDef>
<PropertyDef name="digest">
<Property></Property>
<Property name="label">鎽樿</Property>
@@ -391,6 +395,11 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">btmp</Property>
+ <Property name="property">btmp</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">digest</Property>
<Property name="property">digest</Property>
<Editor/>
diff --git a/src/main/java/com/fzzy/api/view/Api9109.view.xml b/src/main/java/com/fzzy/api/view/Api9109.view.xml
index 0aebcea..acce760 100644
--- a/src/main/java/com/fzzy/api/view/Api9109.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api9109.view.xml
@@ -57,9 +57,9 @@
<Property name="dataType">Integer</Property>
<Property name="label">浠撴埧鏁�</Property>
</PropertyDef>
- <PropertyDef name="ygs">
+ <PropertyDef name="ajs">
<Property name="dataType">Integer</Property>
- <Property name="label">娌圭綈鏁�</Property>
+ <Property name="label">寤掗棿鏁�</Property>
</PropertyDef>
<PropertyDef name="jd">
<Property name="dataType">Double</Property>
diff --git a/src/main/java/com/fzzy/api/view/repository/ApiConfsRep.java b/src/main/java/com/fzzy/api/view/repository/ApiConfsRep.java
index df2f371..706a080 100644
--- a/src/main/java/com/fzzy/api/view/repository/ApiConfsRep.java
+++ b/src/main/java/com/fzzy/api/view/repository/ApiConfsRep.java
@@ -16,4 +16,12 @@
*/
@Query("from ApiConfs where kqdm =:kqdm ")
List<ApiConfs> getDataByKqdm(@Param("kqdm") String kqdm);
+
+ /**
+ * 鏍规嵁绮簱绯荤粺搴撳尯缂栫爜鑾峰彇閰嶇疆淇℃伅
+ * @param deptId
+ * @return
+ */
+ @Query("from ApiConfs where deptId =:deptId ")
+ ApiConfs getDataByDeptId(@Param("deptId") String deptId);
}
diff --git a/src/main/java/com/fzzy/inte/sh2023/controller/ControllerSh2023.java b/src/main/java/com/fzzy/inte/sh2023/controller/ControllerSh2023.java
index f658192..e9e3302 100644
--- a/src/main/java/com/fzzy/inte/sh2023/controller/ControllerSh2023.java
+++ b/src/main/java/com/fzzy/inte/sh2023/controller/ControllerSh2023.java
@@ -43,10 +43,10 @@
}
//瑙ｅ瘑鎶ユ枃
- dataStr = RSAUtils.decrypt(dataStr, PRIVATE_KEY);
- if(StringUtils.isEmpty(dataStr)){
- return new ApiResp(ApiRespCode.R_500.getCode(),ApiRespCode.R_500.getMsg());
- }
+// dataStr = RSAUtils.decrypt(dataStr, PRIVATE_KEY);
+// if(StringUtils.isEmpty(dataStr)){
+// return new ApiResp(ApiRespCode.R_500.getCode(),ApiRespCode.R_500.getMsg());
+// }
SHDN2023ReqDto shdn2023ReqDto = JSONObject.parseObject(dataStr, SHDN2023ReqDto.class);
if(null == shdn2023ReqDto){
@@ -58,7 +58,7 @@
}
//寮傛淇濆瓨
- shdnService.syncData(interfaceId, shdn2023ReqDto.getData());
+ shdnService.syncData(interfaceId, shdn2023ReqDto.getData(), shdn2023ReqDto.getDeptId());
return new ApiResp();
}
diff --git a/src/main/java/com/fzzy/inte/sh2023/service/SHDNService.java b/src/main/java/com/fzzy/inte/sh2023/service/SHDNService.java
index 7eb81d5..4ca20d1 100644
--- a/src/main/java/com/fzzy/inte/sh2023/service/SHDNService.java
+++ b/src/main/java/com/fzzy/inte/sh2023/service/SHDNService.java
@@ -2,22 +2,22 @@
import com.alibaba.fastjson.JSONObject;
import com.fzzy.api.entity.*;
+import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.view.repository.*;
-import com.fzzy.inte.sh2023.dto.SHDN2023ReqDto;
import com.fzzy.push.sh2023.SH2023Constant;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
-import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
@Slf4j
@Service
public class SHDNService {
+ @Autowired
+ private ApiConfsRep apiConfsRep;
@Autowired
private Api9109Rep api9109Rep;
@Autowired
@@ -37,55 +37,114 @@
@Async
- public void syncData(String interfaceId, String dataStr){
+ public void syncData(String interfaceId, String dataStr, String deptId){
-
+ ApiConfs apiConfs = apiConfsRep.getDataByDeptId(deptId);
+ if(null == apiConfs){
+ log.error("-----鏈幏鍙栧埌搴撳尯淇℃伅閰嶇疆锛屼笉瑙ｆ瀽---------");
+ return;
+ }
//鍗曚綅淇℃伅
if(SH2023Constant.SH_2023_API_CODE_3101.equals(interfaceId)){
List<Api9109> list = JSONObject.parseArray(dataStr, Api9109.class);
- api9109Rep.saveAll(list);
+ if(null == list || list.isEmpty()){
+ log.error("-----鏈幏鍙栧埌淇℃伅锛屼笉瑙ｆ瀽---------");
+ return;
+ }
+ for (Api9109 apiData : list) {
+ apiData.setKqdm(apiConfs.getKqdm());
+ apiData.setZhgxsj(new Date());
+ api9109Rep.save(apiData);
+ }
}
//鏀剁撼搴撲俊鎭�
if(SH2023Constant.SH_2023_API_CODE_3102.equals(interfaceId)){
List<Api9110> list = JSONObject.parseArray(dataStr, Api9110.class);
- api9110Rep.saveAll(list);
+ if(null == list || list.isEmpty()){
+ return;
+ }
+ for (Api9110 apiData : list) {
+ apiData.setZhgxsj(new Date());
+ api9110Rep.save(apiData);
+ }
}
//浠撴埧淇℃伅
if(SH2023Constant.SH_2023_API_CODE_3103.equals(interfaceId)){
List<Api9111> list = JSONObject.parseArray(dataStr, Api9111.class);
- api9111Rep.saveAll(list);
+ if(null == list || list.isEmpty()){
+ return;
+ }
+ for (Api9111 apiData : list) {
+ apiData.setZhgxsj(new Date());
+ api9111Rep.save(apiData);
+ }
}
//寤掗棿淇℃伅
if(SH2023Constant.SH_2023_API_CODE_3104.equals(interfaceId)){
List<Api9112> list = JSONObject.parseArray(dataStr, Api9112.class);
- api9112Rep.saveAll(list);
+ if(null == list || list.isEmpty()){
+ return;
+ }
+ for (Api9112 apiData : list) {
+ apiData.setKqdm(apiConfs.getKqdm());
+ apiData.setZhgxsj(new Date());
+ api9112Rep.save(apiData);
+ }
}
//璐т綅淇℃伅
if(SH2023Constant.SH_2023_API_CODE_3105.equals(interfaceId)){
List<Api9113> list = JSONObject.parseArray(dataStr, Api9113.class);
- api9113Rep.saveAll(list);
+ if(null == list || list.isEmpty()){
+ return;
+ }
+ for (Api9113 apiData : list) {
+ apiData.setKqdm(apiConfs.getKqdm());
+ apiData.setZhgxsj(new Date());
+ api9113Rep.save(apiData);
+ }
}
//绮鍏ュ簱淇℃伅
if(SH2023Constant.SH_2023_API_CODE_3201.equals(interfaceId)){
List<Api9114> list = JSONObject.parseArray(dataStr, Api9114.class);
- api9114Rep.saveAll(list);
+ if(null == list || list.isEmpty()){
+ return;
+ }
+ for (Api9114 apiData : list) {
+ apiData.setKqdm(apiConfs.getKqdm());
+ apiData.setZhgxsj(new Date());
+ api9114Rep.save(apiData);
+ }
}
//鏉ョ伯妫�楠屼俊鎭�
if(SH2023Constant.SH_2023_API_CODE_3202.equals(interfaceId)){
List<Api9115> list = JSONObject.parseArray(dataStr, Api9115.class);
- api9115Rep.saveAll(list);
+ if(null == list || list.isEmpty()){
+ return;
+ }
+ for (Api9115 apiData : list) {
+ apiData.setKqdm(apiConfs.getKqdm());
+ apiData.setZhgxsj(new Date());
+ api9115Rep.save(apiData);
+ }
}
//绮鏀惰喘鍩虹淇℃伅
if(SH2023Constant.SH_2023_API_CODE_3203.equals(interfaceId)){
List<Api9116> list = JSONObject.parseArray(dataStr, Api9116.class);
- api9116Rep.saveAll(list);
+ if(null == list || list.isEmpty()){
+ return;
+ }
+ for (Api9116 apiData : list) {
+ apiData.setKqdm(apiConfs.getKqdm());
+ apiData.setZhgxsj(new Date());
+ api9116Rep.save(apiData);
+ }
}
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1504.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1504.java
index 4db1387..1781d9b 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1504.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1504.java
@@ -72,7 +72,7 @@
private String tydwbm;
@PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
- @JsonProperty("xkqdm")
+ @JsonProperty("tykqbm")
private String tykqbm;
@PropertyDef(label = "鎿嶄綔鏍囧織")
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index e31462a..b152c6a 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -50,6 +50,8 @@
@Autowired
private Api1102Rep api1102Rep;
@Autowired
+ private Api9110Rep api9110Rep;
+ @Autowired
private Api1103Rep api1103Rep;
@Autowired
private Api1104Rep api1104Rep;
@@ -84,8 +86,17 @@
public ResponseDto pushData(ApiParam param, ApiConfs conf, Object data) {
String kqdm = param.getKqdm();
- //鏌ヨ搴撳尯淇℃伅琛屾斂鍖哄垝鐮�
- List<Api1102> api1102List = api1102Rep.findPushData(kqdm);
+ String xzqhdm= "";
+ if(param.getInteId().startsWith("91")){
+ //鏌ヨ搴撳尯淇℃伅琛屾斂鍖哄垝鐮�
+ List<Api9110> api9110List = api9110Rep.findPushData(kqdm);
+ xzqhdm = api9110List.get(0).getXzqhdm();
+ }else {
+ //鏌ヨ搴撳尯淇℃伅琛屾斂鍖哄垝鐮�
+ List<Api1102> api1102List = api1102Rep.findPushData(kqdm);
+ xzqhdm = api1102List.get(0).getXzqhdm();
+ }
+
try {
if (null == conf) {
conf = apiCommonService.getConf(kqdm);
@@ -106,7 +117,7 @@
//鑾峰彇鎺ュ彛缂栫爜
String inteId = this.getInteId(param.getInteId());
//鑾峰彇JSON鎶ユ枃
- String jsonData = getJsonData(param.getInteId(), data, api1102List.get(0).getXzqhdm());
+ String jsonData = getJsonData(param.getInteId(), data, xzqhdm);
log.info("鎺ュ彛鏁版嵁淇℃伅=" + jsonData);
apiLog.setData(jsonData);
apiLog.setKqdm(kqdm);
@@ -1271,33 +1282,71 @@
return apiData;
}
if (Constant.API_CODE_1505.equals(inteId)) {
+ Api1505 api1505 = (Api1505)data;
SH2023Api1505 apiData = new SH2023Api1505();
- BeanUtils.copyProperties(data, apiData);
+ BeanUtils.copyProperties(api1505, apiData);
+ apiData.setCqunit(api1505.getCqunit() +"");
+ apiData.setCyear(api1505.getCyear() +"");
+ apiData.setCdc(api1505.getCdc() +"");
+ apiData.setBl(api1505.getBl() +"");
+ apiData.setNgrade(api1505.getNgrade() +"");
+ apiData.setBq(api1505.getBq() +"");
+ apiData.setCqunit(api1505.getCqunit() +"");
+ apiData.setBcash(api1505.getBcash() +"");
+ apiData.setBbank(api1505.getBbank() +"");
+ apiData.setBxjll(api1505.getBxjll() +"");
+ apiData.setBf(api1505.getBf() +"");
return apiData;
}
if (Constant.API_CODE_1506.equals(inteId)) {
+ Api1506 api1506 = (Api1506)data;
SH2023Api1506 apiData = new SH2023Api1506();
- BeanUtils.copyProperties(data, apiData);
+ BeanUtils.copyProperties(api1506, apiData);
+ apiData.setCyear(api1506.getCyear() +"");
+ apiData.setNno(api1506.getNno() +"");
+ apiData.setCdc(api1506.getCdc() +"");
return apiData;
}
if (Constant.API_CODE_1507.equals(inteId)) {
+ Api1507 api1507 = (Api1507)data;
SH2023Api1507 apiData = new SH2023Api1507();
- BeanUtils.copyProperties(data, apiData);
+ BeanUtils.copyProperties(api1507, apiData);
+ apiData.setCmon(api1507.getCmon() +"");
+ apiData.setCyear(api1507.getCyear() +"");
+ apiData.setNvno(api1507.getNvno() +"");
+ apiData.setNno(api1507.getNno() +"");
+ apiData.setCdc(api1507.getCdc() +"");
+ apiData.setBpt(api1507.getBpt() +"");
+ apiData.setNanum(api1507.getNanum() +"");
+ apiData.setBtmp(api1507.getBtmp() +"");
return apiData;
}
if (Constant.API_CODE_1508.equals(inteId)) {
+ Api1508 api1508 = (Api1508)data;
SH2023Api1508 apiData = new SH2023Api1508();
- BeanUtils.copyProperties(data, apiData);
+ BeanUtils.copyProperties(api1508, apiData);
+ apiData.setCmon(api1508.getCmon() +"");
+ apiData.setCyear(api1508.getCyear() +"");
+ apiData.setNvno(api1508.getNvno() +"");
+ apiData.setNrowno(api1508.getNrowno() +"");
+ apiData.setCdc(api1508.getCdc() +"");
return apiData;
}
if (Constant.API_CODE_1509.equals(inteId)) {
+ Api1509 api1509 = (Api1509)data;
SH2023Api1509 apiData = new SH2023Api1509();
- BeanUtils.copyProperties(data, apiData);
+ BeanUtils.copyProperties(api1509, apiData);
+ apiData.setDeprmethodid(api1509.getDeprmethodid() + "");
+ apiData.setSourceid(api1509.getSourceid() + "");
+ apiData.setUsingperiods(api1509.getUsingperiods() + "");
return apiData;
}
if (Constant.API_CODE_1510.equals(inteId)) {
+ Api1510 api1510 = (Api1510)data;
SH2023Api1510 apiData = new SH2023Api1510();
- BeanUtils.copyProperties(data, apiData);
+ BeanUtils.copyProperties(api1510, apiData);
+ apiData.setPeriod(api1510.getPeriod() + "");
+ apiData.setAcctyear(api1510.getAcctyear() + "");
return apiData;
}
//璁剧疆绌哄睘鎬т负榛樿鍊�
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 2ef064b..f8a4d2e 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1504.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1504.java
@@ -18,7 +18,7 @@
@PropertyDef(label = "璐﹀鍙�")
- @JsonProperty("nAcctId")
+ @JsonProperty("nAcctID")
private String nacctid;
@PropertyDef(label = "璐﹀鍚嶇О")
@@ -68,7 +68,7 @@
private String corgcode;
@PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
- @JsonProperty("xqydm")
+ @JsonProperty("tydwbm")
private String tydwbm;
@PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
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 f7b7b2f..4bc79e2 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1505.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1505.java
@@ -21,12 +21,12 @@
private String id;
@PropertyDef(label = "璐﹀鍙�")
- @JsonProperty("nAcctId")
+ @JsonProperty("nAcctID")
private String nacctid;
@PropertyDef(label = "骞村害")
@JsonProperty("cYear")
- private Integer cyear;
+ private String cyear;
@PropertyDef(label = "绉戠洰缂栫爜")
@JsonProperty("cCode")
@@ -56,39 +56,39 @@
*/
@PropertyDef(label = "浣欓鏂瑰悜")
@JsonProperty("cDc")
- private Integer cdc;
+ private String cdc;
@PropertyDef(label = "鏈骇绉戠洰")
@JsonProperty("bL")
- private Integer bl;
+ private String bl;
@PropertyDef(label = "绉戠洰绾ф")
@JsonProperty("nGrade")
- private Integer ngrade;
+ private String ngrade;
@PropertyDef(label = "鏁伴噺绉戠洰")
@JsonProperty("bQ")
- private Integer bq;
+ private String bq;
@PropertyDef(label = "鏁伴噺鍗曚綅")
@JsonProperty("cQUnit")
- private Integer cqunit;
+ private String cqunit;
@PropertyDef(label = "鐜伴噾绫荤鐩�")
@JsonProperty("bCash")
- private Integer bcash;
+ private String bcash;
@PropertyDef(label = "閾惰绫荤鐩�")
@JsonProperty("bBank")
- private Integer bbank;
+ private String bbank;
@PropertyDef(label = "鐜伴噾娴侀噺绫荤鐩�")
@JsonProperty("bXjll")
- private Integer bxjll;
+ private String bxjll;
@PropertyDef(label = "鍐荤粨")
@JsonProperty("bF")
- private Integer bf;
+ private String bf;
@PropertyDef(label = "鎿嶄綔鏍囧織")
@JsonProperty("czbz")
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 41f6a6a..cda88ed 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1506.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1506.java
@@ -22,16 +22,16 @@
private String id;
@PropertyDef(label = "璐﹀鍙�")
- @JsonProperty("nAcctId")
+ @JsonProperty("nAcctID")
private String nacctid;
- @PropertyDef(label = "鏈熼棿")
- @JsonProperty("cYear")
- private Integer cyear;
-
@PropertyDef(label = "骞村害")
+ @JsonProperty("cYear")
+ private String cyear;
+
+ @PropertyDef(label = "鏈熼棿")
@JsonProperty("nNo")
- private Integer nno;
+ private String nno;
@PropertyDef(label = "绉戠洰缂栫爜")
@JsonProperty("cCode")
@@ -58,7 +58,7 @@
*/
@PropertyDef(label = "浣欓鏂瑰悜")
@JsonProperty("cDc")
- private Integer cdc;
+ private String cdc;
@PropertyDef(label = "鍊熸柟鏈綅甯佸彂鐢熼")
@JsonProperty("dM")
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 7c14bf7..bacf404 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1507.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1507.java
@@ -21,7 +21,7 @@
private String id;
@PropertyDef(label = "璐﹀鍙�")
- @JsonProperty("nAcctId")
+ @JsonProperty("nAcctID")
private String nacctid;
@PropertyDef(label = "鍑瘉绫诲瀷")
@@ -30,19 +30,23 @@
@PropertyDef(label = "鏈熼棿")
@JsonProperty("cMon")
- private Integer cmon;
+ private String cmon;
@PropertyDef(label = "骞村害")
@JsonProperty("cYear")
- private Integer cyear;
+ private String cyear;
@PropertyDef(label = "鍑瘉鍙�")
@JsonProperty("nVNo")
- private Integer nvno;
+ private String nvno;
@PropertyDef(label = "鍒嗗綍搴忓彿")
@JsonProperty("nNo")
- private Integer nno;
+ private String nno;
+
+ @PropertyDef(label = "鍑瘉鍒嗙被")
+ @JsonProperty("bTmp")
+ private String btmp;
@PropertyDef(label = "鎽樿")
@JsonProperty("Digest")
@@ -66,7 +70,7 @@
*/
@PropertyDef(label = "鏂瑰悜")
@JsonProperty("cDc")
- private Integer cdc;
+ private String cdc;
@PropertyDef(label = "瀹℃牳浜�")
@JsonProperty("cCkEr")
@@ -81,11 +85,11 @@
*/
@PropertyDef(label = "璁拌处鏍囧織")
@JsonProperty("bPt")
- private Integer bpt;
+ private String bpt;
@PropertyDef(label = "闄勪欢寮犳暟")
@JsonProperty("nANum")
- private Integer nanum;
+ private String nanum;
@PropertyDef(label = "閲戦")
@JsonProperty("nM")
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 2eb700c..4b45bad 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1508.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1508.java
@@ -21,7 +21,7 @@
private String id;
@PropertyDef(label = "璐﹀鍙�")
- @JsonProperty("nAcctId")
+ @JsonProperty("nAcctID")
private String nacctid;
@PropertyDef(label = "鍑瘉绫诲瀷")
@@ -30,15 +30,15 @@
@PropertyDef(label = "鏈熼棿")
@JsonProperty("cMon")
- private Integer cmon;
+ private String cmon;
@PropertyDef(label = "骞村害")
@JsonProperty("cYear")
- private Integer cyear;
+ private String cyear;
@PropertyDef(label = "鍑瘉鍙�")
@JsonProperty("nVNo")
- private Integer nvno;
+ private String nvno;
@PropertyDef(label = "绉戠洰缂栫爜")
@JsonProperty("cCode")
@@ -53,8 +53,8 @@
private String ccashcode;
@PropertyDef(label = "鍒嗗綍搴忓彿")
- @JsonProperty("nNo")
- private Integer nrowno;
+ @JsonProperty("nRowNo")
+ private String nrowno;
@PropertyDef(label = "閲戦")
@JsonProperty("nM")
@@ -66,7 +66,7 @@
*/
@PropertyDef(label = "鏂瑰悜")
@JsonProperty("cDc")
- private Integer cdc;
+ private String cdc;
@PropertyDef(label = "鎿嶄綔鏍囧織")
@JsonProperty("czbz")
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 bffd330..f43708d 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1509.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1509.java
@@ -21,35 +21,35 @@
private String id;
@PropertyDef(label = "璐﹀鍙�")
- @JsonProperty("nAcctId")
+ @JsonProperty("nAcctID")
private String nacctid;
@PropertyDef(label = "鍥哄畾璧勪骇缂栫爜")
- @JsonProperty("fixAssetCode")
+ @JsonProperty("FixAssetCode")
private String fixassetcode;
@PropertyDef(label = "鍥哄畾璧勪骇鑷紪鐮�")
- @JsonProperty("origFixAssetCode")
+ @JsonProperty("OrigFixAssetCode")
private String origfixassetcode;
@PropertyDef(label = "璧勪骇绫诲埆缂栫爜")
- @JsonProperty("groupCode")
+ @JsonProperty("GroupCode")
private String groupcode;
@PropertyDef(label = "鍥哄畾璧勪骇鍚嶇О")
- @JsonProperty("fixAssetName")
+ @JsonProperty("FixAssetName")
private String fixassetname;
@PropertyDef(label = "璁￠噺鍗曚綅鍚嶇О")
- @JsonProperty("unitName")
+ @JsonProperty("UnitName")
private String unitname;
@PropertyDef(label = "鍘熷��")
- @JsonProperty("valueOrg")
+ @JsonProperty("ValueOrg")
private Double valueorg;
@PropertyDef(label = "褰撳墠鍘熷��")
- @JsonProperty("dresentValueOrg")
+ @JsonProperty("PresentValueOrg")
private Double dresentvalueorg;
/**
@@ -61,8 +61,8 @@
* 6:鍙屽�嶄綑棰濋�掑噺娉�
*/
@PropertyDef(label = "鎶樻棫鏂规硶")
- @JsonProperty("deprMethodId")
- private Integer deprmethodid;
+ @JsonProperty("DeprMethodId")
+ private String deprmethodid;
/**
* 1:鎶曡祫
@@ -75,73 +75,73 @@
* 8:鎹㈠叆
*/
@PropertyDef(label = "鍥哄畾璧勪骇鏉ユ簮")
- @JsonProperty("sourceid")
- private Integer sourceid;
+ @JsonProperty("Sourceid")
+ private String sourceid;
@PropertyDef(label = "鍨嬪彿")
- @JsonProperty("model")
+ @JsonProperty("Model")
private String model;
@PropertyDef(label = "瑙勬牸")
- @JsonProperty("specs")
+ @JsonProperty("Specs")
private String specs;
@PropertyDef(label = "鍒堕�犲晢")
- @JsonProperty("manufacturer")
+ @JsonProperty("Manufacturer")
private String manufacturer;
@PropertyDef(label = "浜у湴")
- @JsonProperty("makingPlace")
+ @JsonProperty("MakingPlace")
private String makingplace;
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "杩涘崟浣嶆棩鏈�")
- @JsonProperty("enterDay")
+ @JsonProperty("EnterDay")
private Date enterday;
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "寮�濮嬩娇鐢ㄦ棩鏈�")
- @JsonProperty("beginUseDay")
+ @JsonProperty("BeginUseDay")
private Date beginuseday;
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "寤哄崱鏃ユ湡")
- @JsonProperty("makinDay")
+ @JsonProperty("MakinDay")
private Date makinday;
@PropertyDef(label = "绠＄悊浜�")
- @JsonProperty("keeper")
+ @JsonProperty("Keeper")
private String keeper;
@PropertyDef(label = "寤哄崱浜�")
- @JsonProperty("maker")
+ @JsonProperty("Maker")
private String maker;
@PropertyDef(label = "棰勮浣跨敤鏈熼棿鏁�")
- @JsonProperty("usingPeriods")
- private Integer usingperiods;
+ @JsonProperty("UsingPeriods")
+ private String usingperiods;
@PropertyDef(label = "棰勮鍑�娈嬪��")
- @JsonProperty("expecRemain")
+ @JsonProperty("ExpecRemain")
private Double expecremain;
@PropertyDef(label = "鍥哄畾璧勪骇瀵瑰簲绉戠洰缂栫爜")
- @JsonProperty("assetAcctCode")
+ @JsonProperty("AssetAcctCode")
private String assetacctcode;
@PropertyDef(label = "绱鎶樻棫瀵瑰簲绉戠洰缂栫爜")
- @JsonProperty("deprAcctCode")
+ @JsonProperty("DeprAcctCode")
private String depracctcode;
@PropertyDef(label = "绱鎶樻棫")
- @JsonProperty("accumulateDepr")
+ @JsonProperty("AccumulateDepr")
private Double accumulatedepr;
/**
* 0:鍚�
* 1:鏄�
*/
@PropertyDef(label = "鏄惁鎶ュ簾娓呯悊")
- @JsonProperty("abadoned")
+ @JsonProperty("Abadoned")
private String abadoned;
/**
@@ -153,11 +153,11 @@
* 6:鐩樹簭
*/
@PropertyDef(label = "褰撳墠浣跨敤鐘舵�佸悕绉�")
- @JsonProperty("presentStatus")
+ @JsonProperty("PresentStatus")
private String presentstatus;
@PropertyDef(label = "澶囨敞")
- @JsonProperty("notes")
+ @JsonProperty("Notes")
private String notes;
@PropertyDef(label = "鎿嶄綔鏍囧織")
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 a2da307..2a9988f 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1510.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1510.java
@@ -21,7 +21,7 @@
private String id;
@PropertyDef(label = "璐﹀鍙�")
- @JsonProperty("nAcctId")
+ @JsonProperty("nAcctID")
private String nacctid;
@PropertyDef(label = "鍥哄畾璧勪骇缂栫爜")
@@ -30,11 +30,11 @@
@PropertyDef(label = "鏈熼棿")
@JsonProperty("period")
- private Integer period;
+ private String period;
@PropertyDef(label = "骞村害")
@JsonProperty("AcctYear")
- private Integer acctyear;
+ private String acctyear;
@PropertyDef(label = "鏈熷垵鍘熷��")
@JsonProperty("bValueOrg")
diff --git a/src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java b/src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java
index 1700e65..629b77c 100644
--- a/src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java
@@ -26,6 +26,7 @@
import org.springframework.stereotype.Service;
import java.lang.reflect.Field;
+import java.math.BigDecimal;
import java.util.*;
/**
@@ -868,8 +869,10 @@
return apiData;
}
if (Constant.API_CODE_1505.equals(inteId)) {
+ Api1505 api1505 = (Api1505)data;
SX2024Api1505 apiData = new SX2024Api1505();
- BeanUtils.copyProperties(data, apiData);
+ BeanUtils.copyProperties(api1505, apiData);
+ apiData.setCqunit(api1505.getCqunit() + "");
return apiData;
}
if (Constant.API_CODE_1506.equals(inteId)) {
diff --git a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1504.java b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1504.java
index 2c14333..e523d2f 100644
--- a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1504.java
+++ b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1504.java
@@ -67,11 +67,11 @@
private String corgcode;
@PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
- @JsonProperty("xqydm")
+ @JsonProperty("tydwbm")
private String tydwbm;
@PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
- @JsonProperty("tydwbm")
+ @JsonProperty("tykqbm")
private String tykqbm;
@PropertyDef(label = "鎿嶄綔鏍囧織")
diff --git a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1505.java b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1505.java
index c4ddb3a..c5f9ced 100644
--- a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1505.java
+++ b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1505.java
@@ -71,7 +71,7 @@
@PropertyDef(label = "鏁伴噺鍗曚綅")
@JsonProperty("cQUnit")
- private Integer cqunit;
+ private String cqunit;
@PropertyDef(label = "鐜伴噾绫荤鐩�")
@JsonProperty("bCash")
diff --git a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1510.java b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1510.java
index 9b0c8c5..2871ad0 100644
--- a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1510.java
+++ b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1510.java
@@ -5,6 +5,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.util.Date;
/**
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index a489eed..52331f3 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -39,7 +39,7 @@
#娆℃暟鎹簮
secondary:
# url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5016?useUnicode=true&useSSL=false&characterEncoding=utf-8 #澶ф咕鍖�
-# url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5303?useUnicode=true&useSSL=false&characterEncoding=utf-8 #涓婃捣鍢夊畾
+ url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5303?useUnicode=true&useSSL=false&characterEncoding=utf-8 #涓婃捣鍢夊畾
# url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5306?useUnicode=true&useSSL=false&characterEncoding=utf-8 #瀹佸鐭冲槾灞�
# url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5311?useUnicode=true&useSSL=false&characterEncoding=utf-8 #骞挎境
# url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5317?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼搴�
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 86a70b3..bbeeabd 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,7 +1,7 @@
########################## Server ##########################
spring:
profiles:
- active: pro
+ active: dev
application:
name: igds-api
main:
--
Gitblit v1.9.3