From f3d2007e78e8df1064ee7a3b4b9b4c790717fba7 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 22 四月 2024 16:09:33 +0800
Subject: [PATCH] 调整广东省平台市局推送-增加指令推送,测试使用

---
 src/main/java/com/fzzy/push/sh2023/SH2023OrderApiServiceImpl.java |  178 ++++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 120 insertions(+), 58 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..78c288c 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023OrderApiServiceImpl.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023OrderApiServiceImpl.java
@@ -1,16 +1,20 @@
 package com.fzzy.push.sh2023;
 
-import com.fzzy.api.Constant;
 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;
+import com.fzzy.push.impl.*;
 import lombok.extern.slf4j.Slf4j;
 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,18 +24,23 @@
  * @date 2023/08/17
  */
 @Slf4j
+@Service
 public class SH2023OrderApiServiceImpl implements OrderApiService {
 
     @Autowired
+    private RedisUtil redisUtil;
+    @Autowired
     private SH2023ApiRemoteService apiRemoteService;
     @Autowired
-    private SH2023PushService11 sh2023PushService11;
+    private ComPushService11 pushService11;
     @Autowired
-    private SH2023PushService12 sh2023PushService12;
+    private ComPushService12 pushService12;
     @Autowired
-    private SH2023PushService13 sh2023PushService13;
+    private ComPushService13 pushService13;
     @Autowired
-    private SH2023PushService14 sh2023PushService14;
+    private ComPushService14 pushService14;
+    @Autowired
+    private ComPushService99 pushService99;
 
     @Override
     public String getProtocol() {
@@ -44,12 +53,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,119 +72,166 @@
         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) {
-            param.setInteId(inteId);
+            log.info("鎵ц鎺ュ彛={}鐨勬暟鎹笂鎶�", inteId);
             getDataToPush(param, inteId);
         }
 
     }
 
     private void getDataToPush(ApiParam param, String inteId) {
-        param.setInteCategory(Constant.API_CATEGORY_11);
-        param.setInteId(inteId);
 
         switch (inteId) {
             case "1101":
-                sh2023PushService11.pushData1101(apiRemoteService, param);
+                pushService11.pushData1101(apiRemoteService, param);
+                break;
             case "1102":
-                sh2023PushService11.pushData1102(apiRemoteService, param);
+                pushService11.pushData1102(apiRemoteService, param);
+                break;
             case "1103":
-                sh2023PushService11.pushData1103(apiRemoteService, param);
+                pushService11.pushData1103(apiRemoteService, param);
+                break;
             case "1104":
-                sh2023PushService11.pushData1104(apiRemoteService, param);
+                pushService11.pushData1104(apiRemoteService, param);
+                break;
             case "1105":
-                sh2023PushService11.pushData1105(apiRemoteService, param);
+                pushService11.pushData1105(apiRemoteService, param);
+                break;
             case "1106":
-                sh2023PushService11.pushData1106(apiRemoteService, param);
+                pushService11.pushData1106(apiRemoteService, param);
+                break;
             case "1107":
-                sh2023PushService11.pushData1107(apiRemoteService, param);
+                pushService11.pushData1107(apiRemoteService, param);
+                break;
             case "1108":
-                sh2023PushService11.pushData1108(apiRemoteService, param);
+                pushService11.pushData1108(apiRemoteService, param);
+                break;
             case "1109":
-                sh2023PushService11.pushData1109(apiRemoteService, param);
+                pushService12.pushData1109(apiRemoteService, param);
+                break;
             case "1110":
-                sh2023PushService11.pushData1110(apiRemoteService, param);
+                pushService11.pushData1110(apiRemoteService, param);
+                break;
             case "1111":
-                sh2023PushService11.pushData1111(apiRemoteService, param);
+                pushService11.pushData1111(apiRemoteService, param);
+                break;
             case "1112":
-                sh2023PushService11.pushData1112(apiRemoteService, param);
+                pushService11.pushData1112(apiRemoteService, param);
+                break;
             case "1113":
-                sh2023PushService11.pushData1113(apiRemoteService, param);
+                pushService11.pushData1113(apiRemoteService, param);
+                break;
             case "1114":
-                sh2023PushService11.pushData1114(apiRemoteService, param);
+                pushService11.pushData1114(apiRemoteService, param);
+                break;
             case "1201":
-                sh2023PushService12.pushData1201(apiRemoteService, param);
+                pushService12.pushData1201(apiRemoteService, param);
+                break;
             case "1202":
-                sh2023PushService12.pushData1202(apiRemoteService, param);
+                pushService12.pushData1202(apiRemoteService, param);
+                break;
             case "1203":
-                sh2023PushService12.pushData1203(apiRemoteService, param);
+                pushService12.pushData1203(apiRemoteService, param);
+                break;
             case "1204":
-                sh2023PushService12.pushData1204(apiRemoteService, param);
+                pushService12.pushData1204(apiRemoteService, param);
+                break;
             case "1205":
-                sh2023PushService12.pushData1205(apiRemoteService, param);
+                pushService12.pushData1205(apiRemoteService, param);
+                break;
             case "1206":
-                sh2023PushService12.pushData1206(apiRemoteService, param);
+                pushService12.pushData1206(apiRemoteService, param);
+                break;
             case "1207":
-                sh2023PushService12.pushData1207(apiRemoteService, param);
+                pushService12.pushData1207(apiRemoteService, param);
+                break;
             case "1208":
-                sh2023PushService12.pushData1209(apiRemoteService, param);
+                pushService12.pushData1208(apiRemoteService, param);
+                break;
             case "1209":
-                sh2023PushService12.pushData1209(apiRemoteService, param);
+                pushService12.pushData1209(apiRemoteService, param);
+                break;
             case "1210":
-                sh2023PushService12.pushData1210(apiRemoteService, param);
+                pushService12.pushData1210(apiRemoteService, param);
+                break;
             case "1211":
-                sh2023PushService12.pushData1211(apiRemoteService, param);
+                pushService12.pushData1211(apiRemoteService, param);
+                break;
             case "1212":
-                sh2023PushService12.pushData1212(apiRemoteService, param);
+                pushService12.pushData1212(apiRemoteService, param);
+                break;
             case "2101":
-                sh2023PushService12.pushData2101(apiRemoteService, param);
+                pushService99.pushData2101(apiRemoteService, param);
+                break;
             case "2102":
-                sh2023PushService12.pushData2102(apiRemoteService, param);
+                pushService99.pushData2102(apiRemoteService, param);
+                break;
             case "2104":
-                sh2023PushService12.pushData2104(apiRemoteService, param);
+                pushService99.pushData2104(apiRemoteService, param);
+                break;
             case "1301":
-                sh2023PushService13.pushData1301(apiRemoteService, param);
+                pushService13.pushData1301(apiRemoteService, param);
+                break;
             case "1302":
-                sh2023PushService13.pushData1302(apiRemoteService, param);
+                pushService13.pushData1302(apiRemoteService, param);
+                break;
             case "1303":
-                sh2023PushService13.pushData1303(apiRemoteService, param);
+                pushService13.pushData1303(apiRemoteService, param);
+                break;
             case "1304":
-                sh2023PushService13.pushData1304(apiRemoteService, param);
+                pushService13.pushData1304(apiRemoteService, param);
+                break;
             case "1305":
-                sh2023PushService13.pushData1305(apiRemoteService, param);
+                pushService13.pushData1305(apiRemoteService, param);
+                break;
             case "1306":
-                sh2023PushService13.pushData1306(apiRemoteService, param);
+                pushService13.pushData1306(apiRemoteService, param);
+                break;
             case "1307":
-                sh2023PushService13.pushData1307(apiRemoteService, param);
+                pushService13.pushData1307(apiRemoteService, param);
+                break;
             case "1308":
-                sh2023PushService13.pushData1308(apiRemoteService, param);
+                pushService13.pushData1308(apiRemoteService, param);
+                break;
             case "1309":
-                sh2023PushService13.pushData1309(apiRemoteService, param);
+                pushService13.pushData1309(apiRemoteService, param);
+                break;
             case "1310":
-                sh2023PushService13.pushData1310(apiRemoteService, param);
+                pushService13.pushData1310(apiRemoteService, param);
+                break;
             case "1311":
-                sh2023PushService13.pushData1311(apiRemoteService, param);
+                pushService99.pushData1311(apiRemoteService, param);
+                break;
             case "2103":
-                sh2023PushService13.pushData2103(apiRemoteService, param);
+                pushService99.pushData2103(apiRemoteService, param);
+                break;
             case "1401":
-                sh2023PushService14.pushData1401(apiRemoteService, param);
+                pushService14.pushData1401(apiRemoteService, param);
+                break;
             case "1402":
-                sh2023PushService14.pushData1402(apiRemoteService, param);
+                pushService14.pushData1402(apiRemoteService, param);
+                break;
             case "1403":
-                sh2023PushService14.pushData1403(apiRemoteService, param);
+                pushService14.pushData1403(apiRemoteService, param);
+                break;
             case "1404":
-                sh2023PushService14.pushData1404(apiRemoteService, param);
+                pushService14.pushData1404(apiRemoteService, param);
+                break;
             case "1405":
-                sh2023PushService14.pushData1405(apiRemoteService, param);
+                pushService14.pushData1405(apiRemoteService, param);
+                break;
             case "2203":
-                sh2023PushService14.pushData2203(apiRemoteService, param);
+                pushService99.pushData2203(apiRemoteService, param);
+                break;
             case "2204":
-                sh2023PushService14.pushData2204(apiRemoteService, param);
+                pushService99.pushData2204(apiRemoteService, param);
+                break;
             default:
                 log.error("-----涓婃捣甯傚钩鍙帮細鏈尮閰嶅埌鎺ュ彛缂栫爜锛屼笉鎺ㄩ��-----");
+                break;
         }
 
     }

--
Gitblit v1.9.3