From a03d12962c4439cce9193f178c02164db20f734c Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期二, 23 四月 2024 20:30:49 +0800
Subject: [PATCH] 调整指令解析
---
src/main/java/com/fzzy/api/service/ApiTriggerService.java | 2
src/main/java/com/fzzy/api/data/PushProtocol.java | 3 +
src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java | 25 ++++++------
src/main/java/com/fzzy/push/sh2023/SH2023OrderServiceImpl.java | 2
src/main/java/com/fzzy/order/common/OrderCommonManager.java | 2
src/main/java/com/fzzy/push/sh2023/SH2023HttpClientUtil.java | 5 +-
src/main/java/com/fzzy/push/impl/ComPushService11.java | 2
src/main/java/com/fzzy/push/sh2023/dto/SH2023RespDto.java | 2
src/main/java/com/fzzy/order/common/data/OrderCommonResp.java | 2
src/main/java/com/fzzy/push/nx2023/NX2023OrderServiceImpl.java | 2
src/main/java/com/fzzy/api/Constant.java | 1
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 15 ++++---
12 files changed, 33 insertions(+), 30 deletions(-)
diff --git a/src/main/java/com/fzzy/api/Constant.java b/src/main/java/com/fzzy/api/Constant.java
index aac5890..a795e7d 100644
--- a/src/main/java/com/fzzy/api/Constant.java
+++ b/src/main/java/com/fzzy/api/Constant.java
@@ -203,6 +203,7 @@
public static String API_CODE_1405 = "1405";
//璐㈠姟鎶ヨ〃鎺ュ彛
+ public static String API_CODE_1114 = "1114";
public static String API_CODE_1114_1501 = "1501";
public static String API_CODE_1114_1502 = "1502";
public static String API_CODE_1114_1503 = "1503";
diff --git a/src/main/java/com/fzzy/api/data/PushProtocol.java b/src/main/java/com/fzzy/api/data/PushProtocol.java
index 09c9cbe..363c7e9 100644
--- a/src/main/java/com/fzzy/api/data/PushProtocol.java
+++ b/src/main/java/com/fzzy/api/data/PushProtocol.java
@@ -19,7 +19,8 @@
HB_FZZY_JG_2022("HB_FZZY_JG_2022", "椋庢鑷磋繙鐩戠2022鐗堟湰"),
SB_SHJdJW_2023("SB_SHJdJW_2023", "涓婃捣鍢夊畾绾鐩戠骞冲彴2023鐗�"),
SB_SH_2023("SB_SH_2023", "涓婃捣甯傚钩鍙�2023鐗�"),
- SB_NX_2023("SB_NX_2023", "瀹佸鐪佸钩鍙�2023鐗�");
+ SB_NX_2023("SB_NX_2023", "瀹佸鐪佸钩鍙�2023鐗�"),
+ SB_SX_2023("SB_SX_2023", "闄曡タ鐪佸钩鍙�2023鐗�");
private String code;
diff --git a/src/main/java/com/fzzy/api/service/ApiTriggerService.java b/src/main/java/com/fzzy/api/service/ApiTriggerService.java
index 40e5b11..aff72ab 100644
--- a/src/main/java/com/fzzy/api/service/ApiTriggerService.java
+++ b/src/main/java/com/fzzy/api/service/ApiTriggerService.java
@@ -10,7 +10,6 @@
import com.fzzy.api.utils.RedisConst;
import com.fzzy.api.utils.RedisUtil;
import com.fzzy.api.view.repository.ApiTriggerRep;
-
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -191,6 +190,7 @@
list.add(new ApiTrigger(PushProtocol.SB_SHJdJW_2023.getCode(), PushProtocol.SB_SHJdJW_2023.getName()));
list.add(new ApiTrigger(PushProtocol.SB_SH_2023.getCode(), PushProtocol.SB_SH_2023.getName()));
list.add(new ApiTrigger(PushProtocol.SB_NX_2023.getCode(), PushProtocol.SB_NX_2023.getName()));
+ list.add(new ApiTrigger(PushProtocol.SB_SX_2023.getCode(), PushProtocol.SB_SX_2023.getName()));
return list;
}
diff --git a/src/main/java/com/fzzy/order/common/OrderCommonManager.java b/src/main/java/com/fzzy/order/common/OrderCommonManager.java
index edad061..c57a55a 100644
--- a/src/main/java/com/fzzy/order/common/OrderCommonManager.java
+++ b/src/main/java/com/fzzy/order/common/OrderCommonManager.java
@@ -25,7 +25,7 @@
@Slf4j
@Component(OrderCommonManager.BEAN_ID)
public class OrderCommonManager implements ApplicationContextAware {
- public static final String BEAN_ID = "order.orderManager";
+ public static final String BEAN_ID = "order.orderCommonManager";
private static Map<String, OrderCommonService> serviceMap;
diff --git a/src/main/java/com/fzzy/order/common/data/OrderCommonResp.java b/src/main/java/com/fzzy/order/common/data/OrderCommonResp.java
index f57bc67..b0dc234 100644
--- a/src/main/java/com/fzzy/order/common/data/OrderCommonResp.java
+++ b/src/main/java/com/fzzy/order/common/data/OrderCommonResp.java
@@ -10,7 +10,7 @@
* @date 2023/08/17
*/
@Data
-public class OrderCommonResp<T> implements Serializable {
+public class OrderCommonResp implements Serializable {
/**
*
*/
diff --git a/src/main/java/com/fzzy/push/impl/ComPushService11.java b/src/main/java/com/fzzy/push/impl/ComPushService11.java
index 4a0ca1d..5139444 100644
--- a/src/main/java/com/fzzy/push/impl/ComPushService11.java
+++ b/src/main/java/com/fzzy/push/impl/ComPushService11.java
@@ -100,7 +100,7 @@
if (responseDto.getSuccess() == 0) {
if (Constant.CZBZ_I.equals(data.getCzbz())) {
- api1102Rep.updateStatus(data.getDwdm(), Constant.CZBZ_U);
+ api1102Rep.updateStatus(data.getKqdm(), Constant.CZBZ_U);
}
}
}
diff --git a/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java b/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java
index 8442b48..5aa686b 100644
--- a/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java
@@ -1,6 +1,7 @@
package com.fzzy.push.nx2023;
import com.alibaba.fastjson.JSON;
+import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.dto.ResponseDto;
@@ -16,6 +17,7 @@
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;
@@ -82,10 +84,10 @@
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;
+ if (Constant.API_CODE_1114_1501.equals(param.getInteId())
+ || Constant.API_CODE_1114_1502.equals(param.getInteId())
+ || Constant.API_CODE_1114_1503.equals(param.getInteId())) {
+ inteId = Constant.API_CODE_1114;
}
apiLog.setInteId(inteId);
@@ -118,10 +120,9 @@
reqData.setUid(conf.getUserName());
//鎸囦护id
String key = RedisConst.buildKey(RedisConst.KYE_ORDER, conf.getKqdm());
- String orderId = reqData.getId();
- OrderCommonData orderCommonData = (OrderCommonData) redisUtil.get(key);
- if (null != orderCommonData && StringUtils.isNotEmpty(orderCommonData.getOrderid())) {
- orderId = orderCommonData.getOrderid();
+ String orderId = (String) redisUtil.get(key);
+ if (StringUtils.isEmpty(orderId)) {
+ orderId = reqData.getId();
}
reqData.setOrderid(orderId);
@@ -417,7 +418,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();
}
@@ -450,7 +451,7 @@
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 +502,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 +555,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() + "");
diff --git a/src/main/java/com/fzzy/push/nx2023/NX2023OrderServiceImpl.java b/src/main/java/com/fzzy/push/nx2023/NX2023OrderServiceImpl.java
index ce56b7e..e75c4ac 100644
--- a/src/main/java/com/fzzy/push/nx2023/NX2023OrderServiceImpl.java
+++ b/src/main/java/com/fzzy/push/nx2023/NX2023OrderServiceImpl.java
@@ -64,7 +64,7 @@
//鎸囦护瀛樺叆缂撳瓨锛屾椂鏁�24灏忔椂
String key = RedisConst.buildKey(RedisConst.KYE_ORDER, conf.getKqdm());
- redisUtil.set(key, req, 59 * 60 * 24);
+ redisUtil.set(key, req.getOrderid(), 59 * 60 * 24);
ApiParam param = new ApiParam();
param.setPushProtocol(conf.getPushProtocol());
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index 25f783b..c4f80bd 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -1,6 +1,7 @@
package com.fzzy.push.sh2023;
import com.alibaba.fastjson.JSON;
+import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.dto.ResponseDto;
@@ -92,10 +93,10 @@
apiLog.setId(ContextUtil.getUUID());
//鑻ヤ负璐㈠姟1501銆�1502銆�1503鎺ュ彛锛屽垯鎺ュ彛缂栫爜濉啓1114
- if (SH2023Constant.SH_2023_API_CODE_1114_1501.equals(param.getInteId())
- || SH2023Constant.SH_2023_API_CODE_1114_1502.equals(param.getInteId())
- || SH2023Constant.SH_2023_API_CODE_1114_1503.equals(param.getInteId())) {
- inteId = SH2023Constant.SH_2023_API_CODE_1114;
+ if (Constant.API_CODE_1114_1501.equals(param.getInteId())
+ || Constant.API_CODE_1114_1502.equals(param.getInteId())
+ || Constant.API_CODE_1114_1503.equals(param.getInteId())) {
+ inteId = Constant.API_CODE_1114;
}
apiLog.setInteId(inteId);
@@ -123,8 +124,8 @@
//鑾峰彇鎸囦护id
String key = RedisConst.buildKey(RedisConst.KYE_ORDER, conf.getKqdm());
- OrderCommonData orderCommonData = (OrderCommonData) redisUtil.get(key);
- if (null == orderCommonData || StringUtils.isEmpty(orderCommonData.getOrderid())) {
+ String orderId = (String) redisUtil.get(key);
+ if (StringUtils.isEmpty(orderId)) {
log.error("鎸囦护id澶辨晥=" + jsonData);
ResponseDto responseDto = new ResponseDto(99, "鎸囦护id澶辨晥");
apiLog.setStatus(99);
@@ -139,7 +140,7 @@
//鑾峰彇韬唤ID锛屽嵆琛屾斂鍖哄垝鐮�
reqData.setUid(conf.getUserName());
//鎸囦护id
- reqData.setOrderid(orderCommonData.getOrderid());
+ reqData.setOrderid(orderId);
//韬唤绛惧悕锛屼娇鐢ㄨ嚜鏈塕SA绉侀挜杩涜鍔犲瘑(鍦板尯琛屾斂鍖哄垝浠ｇ爜_褰撳ぉ鏃ユ湡)
reqData.setAccess_token(ShRSAUtils.sign(reqData.getUid() + "_" + DateFormatUtils.format(new Date(), "yyyy-MM-dd"), conf.getPassword()));
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023HttpClientUtil.java b/src/main/java/com/fzzy/push/sh2023/SH2023HttpClientUtil.java
index bbaef44..e73271b 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023HttpClientUtil.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023HttpClientUtil.java
@@ -27,7 +27,7 @@
*/
@SuppressWarnings("resource")
public static SH2023RespDto postPushData(String url, String reqData , ApiConfs apiConfs) throws Exception {
- log.info("---------鎺ュ彛璇锋眰鍦板潃锛�" +url+ "----------鍙傛暟锛�" + reqData +"---------");
+ log.debug("---------鎺ュ彛璇锋眰鍦板潃锛�" +url+ "----------鍙傛暟锛�" + reqData +"---------");
BufferedReader in = null;
URL urls = new URL(url);
HttpURLConnection connection = null;
@@ -64,12 +64,11 @@
}
} catch (Exception e) {
- System.out.println("鍙戠敓寮傚父");
log.error(e.getMessage(),e);
rs = null;
return new SH2023RespDto(99,e.getMessage());
}
- log.info("---------鎺ュ彛杩斿洖锛�" + rs +"---------");
+ log.debug("---------鎺ュ彛杩斿洖锛�" + rs +"---------");
responseDto = JSON.parseObject(rs,SH2023RespDto.class);
if(responseDto == null ) return new SH2023RespDto(99,"鎺ュ彛璇锋眰鍙戠敓鏈煡閿欒");
return responseDto;
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023OrderServiceImpl.java b/src/main/java/com/fzzy/push/sh2023/SH2023OrderServiceImpl.java
index e199b0a..1595417 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023OrderServiceImpl.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023OrderServiceImpl.java
@@ -64,7 +64,7 @@
//鎸囦护瀛樺叆缂撳瓨锛屾椂鏁�24灏忔椂
String key = RedisConst.buildKey(RedisConst.KYE_ORDER, conf.getKqdm());
- redisUtil.set(key, req, 59 * 60 * 24);
+ redisUtil.set(key, req.getOrderid(), 59 * 60 * 24);
ApiParam param = new ApiParam();
param.setPushProtocol(conf.getPushProtocol());
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023RespDto.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023RespDto.java
index cc5c7dc..1f3163d 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023RespDto.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023RespDto.java
@@ -9,7 +9,7 @@
* @date 2023/08/17
*/
@Data
-public class SH2023RespDto<T> implements Serializable {
+public class SH2023RespDto implements Serializable {
/**
*
*/
--
Gitblit v1.9.3