From 40776beb224799d5dd51ca1d92ea2f5e883ff4f5 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期五, 02 八月 2024 11:30:18 +0800
Subject: [PATCH] 增加增城东部粮油中心库配置信息
---
src/main/java/com/fzzy/push/sx2023/SX2023ApiRemoteService.java | 197 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 141 insertions(+), 56 deletions(-)
diff --git a/src/main/java/com/fzzy/push/sx2023/SX2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sx2023/SX2023ApiRemoteService.java
index ca9813a..454826d 100644
--- a/src/main/java/com/fzzy/push/sx2023/SX2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sx2023/SX2023ApiRemoteService.java
@@ -84,9 +84,8 @@
return responseDto;
}
- List<Map<String, Object>> listData = getListData(param.getInteId(), data, conf);
- log.info("鎺ュ彛鏁版嵁淇℃伅=" + listData);
- apiLog.setData(listData.toString());
+ String jsonData = getListData(param.getInteId(), data, conf);
+ apiLog.setData(jsonData);
apiLog.setKqdm(kqdm);
apiLog.setUploadTime(new Date());
@@ -113,12 +112,17 @@
//鍗曚綅鍚嶇О
reqData.setOrgName(conf.getKqmc());
//鍙戣捣鏃堕棿
- reqData.setSendTime(new Date());
+ reqData.setSendTime(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
//18浣嶅崟浣嶄唬鐮�
reqData.setDwdm(conf.getKqdm().substring(0, 18));
//鍔犲瘑鏁版嵁涓讳綋
- reqData.setBody(SXAESUtils.encryptByAES(conf.getPublicKey(), JSON.toJSONString(listData)));
- log.debug("涓婃姤鏁版嵁淇℃伅=" + JSON.toJSONString(reqData));
+ reqData.setBody(jsonData);
+ log.info("涓婃姤鏁版嵁淇℃伅-鍔犲瘑鍓�=" + JSON.toJSONString(reqData));
+
+ reqData.setBody(SXAESUtils.encryptByAES(conf.getPublicKey(), jsonData));
+ log.info("涓婃姤鏁版嵁淇℃伅-鍔犲瘑鍚�=" + JSON.toJSONString(reqData));
+
+ reqData.setBody(SXAESUtils.encryptByAES(conf.getPublicKey(), jsonData));
String resp = SX2023HttpClientUtil.postPushData(conf.getApiUrl(), JSON.toJSONString(reqData));
if (StringUtils.isEmpty(resp)) {
log.error("鏁版嵁涓婁紶闄曡タ鐪佸钩鍙板け璐ワ紝鏁版嵁={}", reqData);
@@ -128,8 +132,8 @@
apiLogRep.save(apiLog);
return responseDto;
}
- resp = SXAESUtils.decryptByAES(conf.getPassword(), resp);
- SX2023RespDto sx2023RespDto = JSONObject.parseObject(JSONObject.toJSONString(resp), SX2023RespDto.class);
+
+ SX2023RespDto sx2023RespDto = JSONObject.parseObject(resp, SX2023RespDto.class);
if (null == sx2023RespDto || null == sx2023RespDto.getMsgBody()) {
log.error("鏁版嵁涓婁紶闄曡タ鐪佸钩鍙板け璐ワ紝鏁版嵁={}", reqData);
@@ -157,8 +161,9 @@
/**
* 鎷夊彇鏁版嵁鎺ュ彛-褰撳墠鍗忚鏆傛棤瀹炵幇
+ *
* @param param 鍙傛暟
- * @param conf 閰嶇疆锛屽彲浠ヤ负绌�
+ * @param conf 閰嶇疆锛屽彲浠ヤ负绌�
* @return
*/
@Override
@@ -169,12 +174,13 @@
/**
* 鎺ュ彛鏁版嵁灏佽
+ *
* @param inteId
* @param data
* @param conf
* @return
*/
- private List<Map<String, Object>> getListData(String inteId, Object data, ApiConfs conf) {
+ private String getListData(String inteId, Object data, ApiConfs conf) {
List<Map<String, Object>> result = new ArrayList<>();
Map<String, Object> map = new HashMap<>();
String inteIdUrl = getInteId(inteId);
@@ -195,11 +201,12 @@
map.put(inteIdUrl, list);
}
result.add(map);
- return result;
+ return JSON.toJSONString(result);
}
/**
* 甯歌鎺ュ彛鏁版嵁灏佽
+ *
* @param inteId
* @param data
* @return
@@ -213,127 +220,199 @@
return apiData;
}
if (Constant.API_CODE_1102.equals(inteId)) {
-
- return null;
+ SX2023Api1102 apiData = new SX2023Api1102();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
}
if (Constant.API_CODE_1103.equals(inteId)) {
-
- return null;
+ SX2023Api1103 apiData = new SX2023Api1103();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
}
if (Constant.API_CODE_1104.equals(inteId)) {
-
- return null;
+ SX2023Api1104 apiData = new SX2023Api1104();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
}
if (Constant.API_CODE_1105.equals(inteId)) {
-
- return null;
+ SX2023Api1105 apiData = new SX2023Api1105();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
}
if (Constant.API_CODE_1106.equals(inteId)) {
-
- return null;
+ SX2023Api1106 apiData = new SX2023Api1106();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
}
if (Constant.API_CODE_1107.equals(inteId)) {
-
- return null;
+ SX2023Api1107 apiData = new SX2023Api1107();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
}
if (Constant.API_CODE_1108.equals(inteId)) {
- return null;
+ SX2023Api1108 apiData = new SX2023Api1108();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
}
if (Constant.API_CODE_1109.equals(inteId)) {
- return null;
+ Api1109 api1109 = (Api1109) data;
+ SX2023Api1109 apiData = new SX2023Api1109();
+ BeanUtils.copyProperties(api1109, apiData);
+
+ //璁剧疆鏂囦欢娴�
+ apiData.setWjl(FileUtils.fileToByteString(api1109.getWjdz()));
+ return apiData;
}
if (Constant.API_CODE_1110.equals(inteId)) {
- return null;
+ SX2023Api1110 apiData = new SX2023Api1110();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
}
if (Constant.API_CODE_1111.equals(inteId)) {
- return null;
+ SX2023Api1111 apiData = new SX2023Api1111();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
}
if (Constant.API_CODE_1112.equals(inteId)) {
- return null;
- }
- if (Constant.API_CODE_1113.equals(inteId)) {
- return null;
+ SX2023Api1112 apiData = new SX2023Api1112();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
}
if (Constant.API_CODE_1201.equals(inteId)) {
- return null;
+ SX2023Api1201 apiData = new SX2023Api1201();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
}
if (Constant.API_CODE_1202.equals(inteId)) {
- return null;
+ SX2023Api1202 apiData = new SX2023Api1202();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
}
if (Constant.API_CODE_1203.equals(inteId)) {
- return null;
+ SX2023Api1203 apiData = new SX2023Api1203();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
}
if (Constant.API_CODE_1204.equals(inteId)) {
- return null;
+ SX2023Api1204 apiData = new SX2023Api1204();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
}
if (Constant.API_CODE_1205.equals(inteId)) {
- return null;
+ SX2023Api1205 apiData = new SX2023Api1205();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
}
if (Constant.API_CODE_1206.equals(inteId)) {
- return null;
+ SX2023Api1206 apiData = new SX2023Api1206();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
}
if (Constant.API_CODE_1207.equals(inteId)) {
- return null;
+ SX2023Api1207 apiData = new SX2023Api1207();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
}
if (Constant.API_CODE_1208.equals(inteId)) {
- return null;
+ SX2023Api1208 apiData = new SX2023Api1208();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
}
if (Constant.API_CODE_1209.equals(inteId)) {
- return null;
+ SX2023Api1209 apiData = new SX2023Api1209();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
}
if (Constant.API_CODE_1210.equals(inteId)) {
- return null;
+ SX2023Api1210 apiData = new SX2023Api1210();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
}
if (Constant.API_CODE_1211.equals(inteId)) {
- return null;
+ SX2023Api1211 apiData = new SX2023Api1211();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
}
if (Constant.API_CODE_1212.equals(inteId)) {
- return null;
+ SX2023Api1212 apiData = new SX2023Api1212();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
}
if (Constant.API_CODE_1301.equals(inteId)) {
- return null;
+ SX2023Api1301 apiData = new SX2023Api1301();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
}
if (Constant.API_CODE_1302.equals(inteId)) {
- return null;
+ SX2023Api1302 apiData = new SX2023Api1302();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
}
if (Constant.API_CODE_1303.equals(inteId)) {
- return null;
+ SX2023Api1303 apiData = new SX2023Api1303();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
}
if (Constant.API_CODE_1304.equals(inteId)) {
- return null;
+ SX2023Api1304 apiData = new SX2023Api1304();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
}
if (Constant.API_CODE_1305.equals(inteId)) {
- return null;
+ SX2023Api1305 apiData = new SX2023Api1305();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
}
if (Constant.API_CODE_1306.equals(inteId)) {
- return null;
+ SX2023Api1306 apiData = new SX2023Api1306();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
}
if (Constant.API_CODE_1307.equals(inteId)) {
- return null;
+ Api1307 api1307 = (Api1307) data;
+ SX2023Api1307 apiData = new SX2023Api1307();
+ BeanUtils.copyProperties(api1307, apiData);
+
+ //璁剧疆鏂囦欢娴�
+ apiData.setCntxwjl(FileUtils.fileToByteString(api1307.getWjdz()));
+ return apiData;
}
if (Constant.API_CODE_1308.equals(inteId)) {
- return null;
+ SX2023Api1308 apiData = new SX2023Api1308();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
}
if (Constant.API_CODE_1309.equals(inteId)) {
- return null;
+ SX2023Api1309 apiData = new SX2023Api1309();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
}
if (Constant.API_CODE_1310.equals(inteId)) {
- return null;
+ SX2023Api1310 apiData = new SX2023Api1310();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
}
if (Constant.API_CODE_1401.equals(inteId)) {
- return null;
+ SX2023Api1401 apiData = new SX2023Api1401();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
}
if (Constant.API_CODE_1403.equals(inteId)) {
- return null;
+ SX2023Api1403 apiData = new SX2023Api1403();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
}
if (Constant.API_CODE_1404.equals(inteId)) {
- return null;
+ SX2023Api1404 apiData = new SX2023Api1404();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
}
return data;
}
/**
* 鏈�鍚庢洿鏂版椂闂达紝璧嬪�间负褰撳墠鏃堕棿
+ *
* @param object
* @return
*/
@@ -351,6 +430,7 @@
/**
* 鑾峰彇璐㈠姟灏佽鏁版嵁
+ *
* @param inteId
* @param data
* @return
@@ -368,6 +448,7 @@
/**
* 灏佽1501-璧勪骇璐熷�烘暟鎹�
+ *
* @param api1503
* @return
*/
@@ -424,6 +505,7 @@
/**
* 灏佽1502-鐜伴噾娴佹暟鎹�
+ *
* @param api1502
* @return
*/
@@ -482,6 +564,7 @@
/**
* 灏佽1503-鍒╂鼎琛ㄦ暟鎹�
+ *
* @param api1501
* @return
*/
@@ -576,6 +659,7 @@
/**
* 璐㈠姟鏁版嵁灏佽
+ *
* @param common
* @param list
* @param zbxh
@@ -595,6 +679,7 @@
/**
* 鏍规嵁鎺ュ彛缂栫爜鑾峰彇瀵瑰簲鐨勬帴鍙ｆ暟鎹簱琛ㄥ悕
+ *
* @param inteId
* @return
*/
--
Gitblit v1.9.3