From 9f6dacf7b39e5aeba37d8faf575c9e56d8cbe51a Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期六, 11 十月 2025 13:35:42 +0800
Subject: [PATCH] 武汉黄陂军粮-质检报告共享接口同步及推送
---
src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java | 60 +++++++++++++++++++++++++++++++-----------------------------
1 files changed, 31 insertions(+), 29 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..204324a 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(api1109.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;
}
@@ -461,6 +462,7 @@
String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
api1206.setTyckjsdh(api1206.getCkjsdh().replace(apiData.getKqdm(), tykqbm));
}
+ api1206.setFpzt("1");
return api1206;
}
if (Constant.API_CODE_1207.equals(inteId)) {
@@ -503,7 +505,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 +669,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());
@@ -685,6 +684,10 @@
String tyhwbm = apiCommonService.getTyhwbm(api1307.getHwdm());
api1307.setTyhwbm(tyhwbm);
}
+ //璁剧疆棰勭疆浣嶇紪鐮�
+ if (api1307.getYzwbh().startsWith(api1307.getHwdm())) {
+ api1307.setYzwbh(api1307.getYzwbh().replace(api1307.getHwdm(), api1307.getTyhwbm()));
+ }
//璁剧疆鏂囦欢璺緞
String cntxwjlj = "V2024/2432/";
@@ -693,15 +696,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 +722,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)) {
@@ -763,16 +775,6 @@
Api1504 api1504 = (Api1504)data;
Nx2023Api1504 apiData = new Nx2023Api1504();
BeanUtils.copyProperties(api1504, apiData);
- //璁剧疆绲变竴鍗曚綅缂栫爜
- if (StringUtils.isEmpty(apiData.getXqydm())) {
- String tydwbm = apiCommonService.getTydwbm(apiData.getCOrgCode());
- apiData.setXqydm(tydwbm);
- }
- //璁剧疆绲变竴搴撳尯缂栫爜
- if (StringUtils.isEmpty(apiData.getXkqdm())) {
- String tykqbm = apiCommonService.getTykqbm(api1504.getKqdm());
- apiData.setXkqdm(tykqbm);
- }
return apiData;
}
if (Constant.API_CODE_1505.equals(inteId)) {
--
Gitblit v1.9.3