From 2f7b25914dae54442b3fe2f91bb0060fcfd81e96 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期六, 09 十一月 2024 09:33:08 +0800
Subject: [PATCH] 宁夏接口升级V1.2-测试调整2
---
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1307.java | 1 -
src/main/java/com/fzzy/push/sx2023/data/SX2023Api1306.java | 2 +-
src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java | 45 ++++++++++++++++++++++++++-------------------
src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java | 4 ++--
4 files changed, 29 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java b/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java
index 50d8abc..1dafcb8 100644
--- a/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java
@@ -81,19 +81,18 @@
//娣诲姞鏃ュ織
ApiLog apiLog = new ApiLog();
apiLog.setId(ContextUtil.getUUID());
-
- //鑾峰彇鎺ュ彛缂栫爜
- String inteId = this.getInteId(param.getInteId());
- apiLog.setInteId(inteId);
-
- if (StringUtils.isEmpty(inteId)) {
+ if (StringUtils.isEmpty(param.getInteId())) {
ResponseDto responseDto = new ResponseDto(99, "娌℃湁鑾峰彇鍒版帴鍙�");
apiLog.setStatus(99);
apiLog.setResult("娌℃湁鑾峰彇鍒版帴鍙�");
apiLogRep.save(apiLog);
return responseDto;
}
+ apiLog.setInteId(param.getInteId());
+ //鑾峰彇鎺ュ彛缂栫爜
+ String inteId = this.getInteId(param.getInteId());
+ //鑾峰彇JSON鎶ユ枃
String jsonData = getJsonData(param.getInteId(), data);
log.info("鎺ュ彛鏁版嵁淇℃伅=" + jsonData);
apiLog.setData(jsonData);
@@ -209,7 +208,7 @@
BeanUtils.copyProperties(data, api1104);
//璁剧疆缁熶竴浠撴埧缂栫爜
if (StringUtils.isEmpty(api1104.getTycfbm())) {
- String tycfbm = apiCommonService.getTykqbm(api1104.getCfbh());
+ String tycfbm = apiCommonService.getTycfbm(api1104.getCfbh());
api1104.setTycfbm(tycfbm);
}
return api1104;
@@ -219,7 +218,7 @@
BeanUtils.copyProperties(data, api1105);
//璁剧疆缁熶竴寤掗棿缂栫爜
if (StringUtils.isEmpty(api1105.getTyajbm())) {
- String tyajbm = apiCommonService.getTykqbm(api1105.getAjdm());
+ String tyajbm = apiCommonService.getTyajbm(api1105.getAjdm());
api1105.setTyajbm(tyajbm);
}
return api1105;
@@ -270,9 +269,6 @@
Nx2023Api1109 api1109 = new Nx2023Api1109();
Api1109 apiData = (Api1109) data;
BeanUtils.copyProperties(apiData, api1109);
- Map<String, String> map = new HashMap<>();
- map.put(apiData.getWjmc(), FileUtils.fileToByteString(apiData.getWjdz()));
- api1109.setWjl(JSON.toJSONString(map));
//璁剧疆缁熶竴搴撳尯缂栫爜
if (StringUtils.isEmpty(api1109.getTykqbm())) {
String tykqbm = apiCommonService.getTykqbm(api1109.getKqdm());
@@ -284,6 +280,11 @@
}
//璁剧疆鏂囦欢璺緞
api1109.setWjlj("V2024/2409/" + api1109.getTykqbm() + "/" + api1109.getWjlx() + "/" + api1109.getWjmc());
+
+ Map<String, String> map = new HashMap<>();
+ map.put(apiData.getWjmc(), FileUtils.fileToByteString(apiData.getWjdz()));
+ api1109.setWjl(JSON.toJSONString(map));
+
return api1109;
}
if (Constant.API_CODE_1110.equals(inteId)) {
@@ -302,7 +303,7 @@
//璁剧疆缁熶竴璐т綅缂栫爜
if (StringUtils.isEmpty(api1110.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(api1110.getHwdm());
- api1110.setTykqbm(tyhwbm);
+ api1110.setTyhwbm(tyhwbm);
}
return api1110;
}
@@ -503,7 +504,7 @@
}
//璁剧疆绮潈鍗曚綅绲变竴缂栫爜
if (StringUtils.isEmpty(api1208.getLqgstydwbm())) {
- String tydwbm = apiCommonService.getTydwbm(api1208.getHwdm());
+ String tydwbm = apiCommonService.getTydwbm(api1208.getLqgsdwdm());
api1208.setLqgstydwbm(tydwbm);
}
return api1208;
@@ -667,9 +668,6 @@
Nx2023Api1307 api1307 = new Nx2023Api1307();
BeanUtils.copyProperties(apiData, api1307);
- Map<String, String> map = new HashMap<>();
- map.put(apiData.getId() + "." + apiData.getTxwjhzm(), FileUtils.fileToByteString(apiData.getWjdz()));
- api1307.setCntxwjl(JSON.toJSONString(map));
//璁剧疆绲变竴搴撳尯缂栫爜
if (StringUtils.isEmpty(api1307.getTykqbm())) {
String tykqbm = apiCommonService.getTykqbm(api1307.getKqdm());
@@ -693,15 +691,19 @@
cntxwjlj += api1307.getSpjksbid() + "/";
cntxwjlj += api1307.getTyhwbm() + "_" + DateFormatUtils.format(api1307.getZpsj(),"yyyyMMdd HHmmss") + "." + api1307.getTxwjhzm();
api1307.setCntxwjlj(cntxwjlj);
+
+ Map<String, String> map = new HashMap<>();
+ String wjmc = api1307.getTyhwbm() + "_" + DateFormatUtils.format(api1307.getZpsj(),"yyyyMMdd HHmmss") + "." + api1307.getTxwjhzm();
+ map.put(wjmc, FileUtils.fileToByteString(apiData.getWjdz()));
+ api1307.setCntxwjl(JSON.toJSONString(map));
+
return api1307;
}
if (Constant.API_CODE_1308.equals(inteId)) {
Api1308 apiData = (Api1308) data;
Nx2023Api1308 api1308 = new Nx2023Api1308();
BeanUtils.copyProperties(apiData, api1308);
- Map<String, String> map = new HashMap<>();
- map.put(api1308.getSpjksbid() + DateFormatUtils.format(api1308.getGjsj(),"yyyyMMddHHmmss") + "." + apiData.getSpwjhzm(), FileUtils.fileToByteString(apiData.getWjdz()));
- api1308.setSpwjl(JSON.toJSONString(map));
+
//璁剧疆绲变竴搴撳尯缂栫爜
if (StringUtils.isEmpty(api1308.getTykqbm())) {
String tykqbm = apiCommonService.getTykqbm(api1308.getKqdm());
@@ -715,6 +717,11 @@
spwjlj += api1308.getSpjksbid() + "/";
spwjlj += api1308.getTykqbm() + "_" + DateFormatUtils.format(api1308.getGjsj(),"yyyyMMdd HHmmss") + "." + api1308.getSpwjhzm();
api1308.setSpwjlj(spwjlj);
+
+ Map<String, String> map = new HashMap<>();
+ String wjmc = api1308.getTykqbm() + "_" + DateFormatUtils.format(api1308.getGjsj(),"yyyyMMdd HHmmss") + "." + api1308.getSpwjhzm();
+ map.put(wjmc, FileUtils.fileToByteString(apiData.getWjdz()));
+ api1308.setSpwjl(JSON.toJSONString(map));
return api1308;
}
if (Constant.API_CODE_1309.equals(inteId)) {
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1307.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1307.java
index a2d55eb..748570d 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1307.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1307.java
@@ -49,7 +49,6 @@
@PropertyDef(label = "鍥惧儚鏂囦欢鍚庣紑鍚�")
private String txwjhzm;
- @JSONField(name="Yzwbh")
@PropertyDef(label = "棰勭疆浣嶇紪鍙�" )
private String yzwbh;
diff --git a/src/main/java/com/fzzy/push/sx2023/data/SX2023Api1306.java b/src/main/java/com/fzzy/push/sx2023/data/SX2023Api1306.java
index 5ce5c9e..2f4622e 100644
--- a/src/main/java/com/fzzy/push/sx2023/data/SX2023Api1306.java
+++ b/src/main/java/com/fzzy/push/sx2023/data/SX2023Api1306.java
@@ -17,7 +17,7 @@
public class SX2023Api1306 implements Serializable {
@PropertyDef(label = "浠撴埧浠ｇ爜")
- @JsonProperty("ZHGXSJ")
+ @JsonProperty("CFDM")
private String cfdm;
@PropertyDef(label = "鐔忚捀浣滀笟鍗曞彿")
diff --git a/src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java b/src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java
index 9c3cb9e..ac7743c 100644
--- a/src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java
@@ -246,7 +246,7 @@
BeanUtils.copyProperties(data, apiData);
//璁剧疆绲变竴浠撴埧缂栫爜
if (StringUtils.isEmpty(apiData.getTycfbm())) {
- String tycfbm = apiCommonService.getTykqbm(apiData.getCfbh());
+ String tycfbm = apiCommonService.getTycfbm(apiData.getCfbh());
apiData.setTycfbm(tycfbm);
}
//璁剧疆绲变竴寤掗棿鍚嶇О
@@ -553,7 +553,7 @@
}
//璁剧疆绮潈鍗曚綅绲变竴缂栫爜
if (StringUtils.isEmpty(apiData.getLqgstydwbm())) {
- String tydwbm = apiCommonService.getTydwbm(apiData.getHwdm());
+ String tydwbm = apiCommonService.getTydwbm(apiData.getLqgsdwdm());
apiData.setLqgstydwbm(tydwbm);
}
return apiData;
--
Gitblit v1.9.3