From 1cea258e566720438c0a2457420d8ba61f79681f Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期二, 06 八月 2024 17:05:01 +0800
Subject: [PATCH] 增加潮阳代储配置信息
---
src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java | 67 +++++++++++++++++++--------------
1 files changed, 38 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 a198632..76d1034 100644
--- a/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java
@@ -10,12 +10,12 @@
import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.*;
import com.fzzy.api.view.repository.*;
-import com.fzzy.order.data.OrderData;
import com.fzzy.push.nx2023.dto.*;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateFormatUtils;
+import org.apache.commons.lang.time.DateUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -68,10 +68,8 @@
@Override
public ResponseDto pushData(ApiParam param, ApiConfs conf, Object data) {
- String inteId = param.getInteId();
String kqdm = param.getKqdm();
- //鏌ヨ搴撳尯淇℃伅琛屾斂鍖哄垝鐮�
- List<Api1102> api1102List = api1102Rep.findPushData(kqdm);
+
try {
if (null == conf) {
conf = apiCommonService.getConf(kqdm);
@@ -81,12 +79,8 @@
ApiLog apiLog = new ApiLog();
apiLog.setId(ContextUtil.getUUID());
- //鑻ヤ负璐㈠姟1501銆�1502銆�1503鎺ュ彛锛屽垯鎺ュ彛缂栫爜濉啓1114
- if (NX2023Constant.NX_2023_API_CODE_1114_1501.equals(param.getInteId())
- || NX2023Constant.NX_2023_API_CODE_1114_1502.equals(param.getInteId())
- || NX2023Constant.NX_2023_API_CODE_1114_1503.equals(param.getInteId())) {
- inteId = NX2023Constant.NX_2023_API_CODE_1114;
- }
+ //鑾峰彇鎺ュ彛缂栫爜
+ String inteId = this.getInteId(param.getInteId());
apiLog.setInteId(inteId);
if (StringUtils.isEmpty(inteId)) {
@@ -118,10 +112,9 @@
reqData.setUid(conf.getUserName());
//鎸囦护id
String key = RedisConst.buildKey(RedisConst.KYE_ORDER, conf.getKqdm());
- String orderId = reqData.getId();
- OrderData orderData = (OrderData) redisUtil.get(key);
- if (null != orderData && StringUtils.isNotEmpty(orderData.getOrderid())) {
- orderId = orderData.getOrderid();
+ String orderId = (String) redisUtil.get(key);
+ if (StringUtils.isEmpty(orderId)) {
+ orderId = reqData.getId();
}
reqData.setOrderid(orderId);
@@ -134,7 +127,7 @@
//鎽樿锛屾暟鎹富浣撶殑MD5鍊�
reqData.setDigst(MyMD5Util.encrypt(jsonData));
log.info("涓婃姤鏁版嵁淇℃伅=" + JSON.toJSONString(reqData));
- Nx2023RespDto responseDto = NX2023HttpClientUtil.postPushData(conf.getApiUrl() + inteId, JSON.toJSONString(reqData), conf);
+ Nx2023RespDto responseDto = NX2023HttpClientUtil.postPushData(conf.getApiUrl() + inteId, JSON.toJSONString(reqData));
apiLog.setStatus(responseDto.getCode() == 200 ? 0 : responseDto.getCode());
apiLog.setResult(responseDto.getResult());
@@ -188,7 +181,6 @@
*/
private Object getJsonApiData(String inteId, Object data) {
if (NX2023Constant.NX_2023_API_CODE_1101.equals(inteId)) {
-
Nx2023Api1101 api1101 = new Nx2023Api1101();
BeanUtils.copyProperties(data, api1101);
return api1101;
@@ -196,35 +188,30 @@
if (NX2023Constant.NX_2023_API_CODE_1102.equals(inteId)) {
Nx2023Api1102 api1102 = new Nx2023Api1102();
BeanUtils.copyProperties(data, api1102);
- api1102.setLkxz("1");
+ api1102.setLkxz(null);
return api1102;
}
if (NX2023Constant.NX_2023_API_CODE_1103.equals(inteId)) {
-
Nx2023Api1103 api1103 = new Nx2023Api1103();
BeanUtils.copyProperties(data, api1103);
return api1103;
}
if (NX2023Constant.NX_2023_API_CODE_1104.equals(inteId)) {
-
Nx2023Api1104 api1104 = new Nx2023Api1104();
BeanUtils.copyProperties(data, api1104);
return api1104;
}
if (NX2023Constant.NX_2023_API_CODE_1105.equals(inteId)) {
-
Nx2023Api1105 api1105 = new Nx2023Api1105();
BeanUtils.copyProperties(data, api1105);
return api1105;
}
if (NX2023Constant.NX_2023_API_CODE_1106.equals(inteId)) {
-
Nx2023Api1106 api1106 = new Nx2023Api1106();
BeanUtils.copyProperties(data, api1106);
return api1106;
}
if (NX2023Constant.NX_2023_API_CODE_1107.equals(inteId)) {
-
Nx2023Api1107 api1107 = new Nx2023Api1107();
BeanUtils.copyProperties(data, api1107);
return api1107;
@@ -254,8 +241,9 @@
return api1111;
}
if (NX2023Constant.NX_2023_API_CODE_1112.equals(inteId)) {
+ Api1112 apiData = (Api1112) data;
Nx2023Api1112 api1112 = new Nx2023Api1112();
- BeanUtils.copyProperties(data, api1112);
+ BeanUtils.copyProperties(apiData, api1112);
return api1112;
}
if (NX2023Constant.NX_2023_API_CODE_1113.equals(inteId)) {
@@ -264,8 +252,9 @@
return api1113;
}
if (NX2023Constant.NX_2023_API_CODE_1201.equals(inteId)) {
+ Api1201 apiData = (Api1201) data;
Nx2023Api1201 api1201 = new Nx2023Api1201();
- BeanUtils.copyProperties(data, api1201);
+ BeanUtils.copyProperties(apiData, api1201);
return api1201;
}
if (NX2023Constant.NX_2023_API_CODE_1202.equals(inteId)) {
@@ -290,8 +279,9 @@
return api1205;
}
if (NX2023Constant.NX_2023_API_CODE_1206.equals(inteId)) {
+ Api1206 apiData = (Api1206) data;
Nx2023Api1206 api1206 = new Nx2023Api1206();
- BeanUtils.copyProperties(data, api1206);
+ BeanUtils.copyProperties(apiData, api1206);
return api1206;
}
if (NX2023Constant.NX_2023_API_CODE_1207.equals(inteId)) {
@@ -408,6 +398,24 @@
}
/**
+ * 鑾峰彇涓婁紶鐨勬帴鍙ｇ紪鐮�
+ * @param inteId
+ * @return
+ */
+ private String getInteId(String inteId) {
+ if (NX2023Constant.NX_2023_API_CODE_1114_1501.equals(inteId)) {
+ return NX2023Constant.NX_2023_API_CODE_1114;
+ }
+ if (NX2023Constant.NX_2023_API_CODE_1114_1502.equals(inteId)) {
+ return NX2023Constant.NX_2023_API_CODE_1114;
+ }
+ if (NX2023Constant.NX_2023_API_CODE_1114_1503.equals(inteId)) {
+ return NX2023Constant.NX_2023_API_CODE_1114;
+ }
+ return inteId;
+ }
+
+ /**
* 璧嬪�兼渶鍚庢洿鏂版椂闂�
* @param object
* @return
@@ -417,7 +425,7 @@
try {
Field zhgxsj = object.getClass().getDeclaredField("zhgxsj");
zhgxsj.setAccessible(true);
- zhgxsj.set(object, new Date());
+ zhgxsj.set(object, DateUtils.addSeconds(new Date(), -10));
} catch (Exception e) {
e.printStackTrace();
}
@@ -447,10 +455,11 @@
NxFinanceDto nxFinanceDto = new NxFinanceDto();
nxFinanceDto.setDwdm(api1503.getDwdm());
nxFinanceDto.setKqdm(api1503.getKqdm());
+
nxFinanceDto.setBbsj(DateFormatUtils.format(api1503.getBbsj(), "yyyyMMdd"));
nxFinanceDto.setBbm("03");
nxFinanceDto.setCzbz(api1503.getCzbz());
- nxFinanceDto.setZhgxsj(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
+ nxFinanceDto.setZhgxsj(DateFormatUtils.format(DateUtils.addSeconds(new Date(), -10), "yyyy-MM-dd HH:mm:ss"));
paddingData(nxFinanceDto, list, "0", "椤圭洰//t", "鏈湡閲戦//t", "鏈勾绱//t");
paddingData(nxFinanceDto, list, "1", "涓�銆佽惀涓氭敹鍏�", api1503.getYyzsrbqye() + "", api1503.getYyzsrbnlj() + "");
@@ -501,7 +510,7 @@
nxFinanceDto.setBbsj(DateFormatUtils.format(api1502.getBbsj(), "yyyyMMdd"));
nxFinanceDto.setBbm("02");
nxFinanceDto.setCzbz(api1502.getCzbz());
- nxFinanceDto.setZhgxsj(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
+ nxFinanceDto.setZhgxsj(DateFormatUtils.format(DateUtils.addSeconds(new Date(), -10), "yyyy-MM-dd HH:mm:ss"));
paddingData(nxFinanceDto, list, "0", "椤圭洰//t", "鏈湀鏁�//t", "鏈勾绱鏁�//t");
paddingData(nxFinanceDto, list, "1", "涓�銆佺粡钀ユ椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺锛�", api1502.getJyhdxjllbys() + "", api1502.getJyhdxjllbnljs() + "");
@@ -554,7 +563,7 @@
nxFinanceDto.setBbsj(DateFormatUtils.format(api1501.getBbsj(), "yyyyMMdd"));
nxFinanceDto.setBbm("01");
nxFinanceDto.setCzbz(api1501.getCzbz());
- nxFinanceDto.setZhgxsj(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
+ nxFinanceDto.setZhgxsj(DateFormatUtils.format(DateUtils.addSeconds(new Date(), -10), "yyyy-MM-dd HH:mm:ss"));
paddingData(nxFinanceDto, list, "0", "璧勪骇//t", "鏈熸湯浣欓//t", "骞村垵浣欓//t");
paddingData(nxFinanceDto, list, "1", "娴佸姩璧勪骇锛�", api1501.getLdzchjqmye() + "", api1501.getLdzchjncye() + "");
--
Gitblit v1.9.3