From 6ad5ee724102a7cc115a4024c00e23b40b87072c Mon Sep 17 00:00:00 2001
From: ws <ws@123.com>
Date: 星期三, 20 九月 2023 17:45:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/fzzy/push/sh2023/SH2023OrderApiServiceImpl.java | 67 ++++++++++++++++++++++++++++++++-
1 files changed, 65 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023OrderApiServiceImpl.java b/src/main/java/com/fzzy/push/sh2023/SH2023OrderApiServiceImpl.java
index eea3602..8ada21d 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023OrderApiServiceImpl.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023OrderApiServiceImpl.java
@@ -4,6 +4,8 @@
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.entity.ApiConfs;
+import com.fzzy.api.utils.RedisConst;
+import com.fzzy.api.utils.RedisUtil;
import com.fzzy.order.OrderApiService;
import com.fzzy.order.data.OrderConstant;
import com.fzzy.order.data.OrderData;
@@ -11,6 +13,8 @@
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
import java.text.ParseException;
/**
@@ -20,8 +24,11 @@
* @date 2023/08/17
*/
@Slf4j
+@Service
public class SH2023OrderApiServiceImpl implements OrderApiService {
+ @Autowired
+ private RedisUtil redisUtil;
@Autowired
private SH2023ApiRemoteService apiRemoteService;
@Autowired
@@ -44,12 +51,18 @@
// 鑻ユ寚浠ょ被鍨嬩笉涓�1锛屽垯杩斿洖
if(!OrderConstant.ORDER_TYPE_1.equals(orderType)){
+ log.error("鎸囦护绫诲瀷涓嶄负1锛屼笉杩涜鏁版嵁涓婃姤={}", req);
return;
}
String ids = req.getContent();
if(StringUtils.isEmpty(ids)){
+ log.error("鎸囦护鎺ュ彛涓虹┖锛屼笉杩涜鏁版嵁涓婃姤={}", req);
return;
}
+
+ //鎸囦护瀛樺叆缂撳瓨锛屾椂鏁�24灏忔椂
+ String key = RedisConst.buildKey(RedisConst.KYE_ORDER, conf.getKqdm());
+ redisUtil.set(key, req, 59 * 60 * 24);
ApiParam param = new ApiParam();
param.setPushProtocol(conf.getPushProtocol());
@@ -57,10 +70,11 @@
param.setStart(DateUtils.parseDate(req.getStarttime(), new String[]{"yyyy-MM-dd HH:mm:ss"}));
param.setEnd(DateUtils.parseDate(req.getEndtime(), new String[]{"yyyy-MM-dd HH:mm:ss"}));
param.setDeptId(conf.getDeptId());
- param.setOrderid(orderid);
- String[] interfaces = ids.split(",");
+ log.info("鎺ユ敹鐨勬寚浠や腑鎺ュ彛鍐呭涓�={}", req.getContent());
+ String[] interfaces = ids.split(";");
for (String inteId : interfaces) {
+ log.info("鎵ц鎺ュ彛={}鐨勬暟鎹笂鎶�", inteId);
param.setInteId(inteId);
getDataToPush(param, inteId);
}
@@ -74,102 +88,151 @@
switch (inteId) {
case "1101":
sh2023PushService11.pushData1101(apiRemoteService, param);
+ break;
case "1102":
sh2023PushService11.pushData1102(apiRemoteService, param);
+ break;
case "1103":
sh2023PushService11.pushData1103(apiRemoteService, param);
+ break;
case "1104":
sh2023PushService11.pushData1104(apiRemoteService, param);
+ break;
case "1105":
sh2023PushService11.pushData1105(apiRemoteService, param);
+ break;
case "1106":
sh2023PushService11.pushData1106(apiRemoteService, param);
+ break;
case "1107":
sh2023PushService11.pushData1107(apiRemoteService, param);
+ break;
case "1108":
sh2023PushService11.pushData1108(apiRemoteService, param);
+ break;
case "1109":
sh2023PushService11.pushData1109(apiRemoteService, param);
+ break;
case "1110":
sh2023PushService11.pushData1110(apiRemoteService, param);
+ break;
case "1111":
sh2023PushService11.pushData1111(apiRemoteService, param);
+ break;
case "1112":
sh2023PushService11.pushData1112(apiRemoteService, param);
+ break;
case "1113":
sh2023PushService11.pushData1113(apiRemoteService, param);
+ break;
case "1114":
sh2023PushService11.pushData1114(apiRemoteService, param);
+ break;
case "1201":
sh2023PushService12.pushData1201(apiRemoteService, param);
+ break;
case "1202":
sh2023PushService12.pushData1202(apiRemoteService, param);
+ break;
case "1203":
sh2023PushService12.pushData1203(apiRemoteService, param);
+ break;
case "1204":
sh2023PushService12.pushData1204(apiRemoteService, param);
+ break;
case "1205":
sh2023PushService12.pushData1205(apiRemoteService, param);
+ break;
case "1206":
sh2023PushService12.pushData1206(apiRemoteService, param);
+ break;
case "1207":
sh2023PushService12.pushData1207(apiRemoteService, param);
+ break;
case "1208":
sh2023PushService12.pushData1209(apiRemoteService, param);
+ break;
case "1209":
sh2023PushService12.pushData1209(apiRemoteService, param);
+ break;
case "1210":
sh2023PushService12.pushData1210(apiRemoteService, param);
+ break;
case "1211":
sh2023PushService12.pushData1211(apiRemoteService, param);
+ break;
case "1212":
sh2023PushService12.pushData1212(apiRemoteService, param);
+ break;
case "2101":
sh2023PushService12.pushData2101(apiRemoteService, param);
+ break;
case "2102":
sh2023PushService12.pushData2102(apiRemoteService, param);
+ break;
case "2104":
sh2023PushService12.pushData2104(apiRemoteService, param);
+ break;
case "1301":
sh2023PushService13.pushData1301(apiRemoteService, param);
+ break;
case "1302":
sh2023PushService13.pushData1302(apiRemoteService, param);
+ break;
case "1303":
sh2023PushService13.pushData1303(apiRemoteService, param);
+ break;
case "1304":
sh2023PushService13.pushData1304(apiRemoteService, param);
+ break;
case "1305":
sh2023PushService13.pushData1305(apiRemoteService, param);
+ break;
case "1306":
sh2023PushService13.pushData1306(apiRemoteService, param);
+ break;
case "1307":
sh2023PushService13.pushData1307(apiRemoteService, param);
+ break;
case "1308":
sh2023PushService13.pushData1308(apiRemoteService, param);
+ break;
case "1309":
sh2023PushService13.pushData1309(apiRemoteService, param);
+ break;
case "1310":
sh2023PushService13.pushData1310(apiRemoteService, param);
+ break;
case "1311":
sh2023PushService13.pushData1311(apiRemoteService, param);
+ break;
case "2103":
sh2023PushService13.pushData2103(apiRemoteService, param);
+ break;
case "1401":
sh2023PushService14.pushData1401(apiRemoteService, param);
+ break;
case "1402":
sh2023PushService14.pushData1402(apiRemoteService, param);
+ break;
case "1403":
sh2023PushService14.pushData1403(apiRemoteService, param);
+ break;
case "1404":
sh2023PushService14.pushData1404(apiRemoteService, param);
+ break;
case "1405":
sh2023PushService14.pushData1405(apiRemoteService, param);
+ break;
case "2203":
sh2023PushService14.pushData2203(apiRemoteService, param);
+ break;
case "2204":
sh2023PushService14.pushData2204(apiRemoteService, param);
+ break;
default:
log.error("-----涓婃捣甯傚钩鍙帮細鏈尮閰嶅埌鎺ュ彛缂栫爜锛屼笉鎺ㄩ��-----");
+ break;
}
}
--
Gitblit v1.9.3