From da0dfffe0c57ed3ca0c66b24a68ccc64da0873c9 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期四, 19 十月 2023 20:19:51 +0800
Subject: [PATCH] 调整上海接口-船运时调整每车为一条数据

---
 src/main/java/com/fzzy/push/sh2023/SH2023PushService12.java |  316 ++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 243 insertions(+), 73 deletions(-)

diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023PushService12.java b/src/main/java/com/fzzy/push/sh2023/SH2023PushService12.java
index 6360e29..2ada2b2 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023PushService12.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023PushService12.java
@@ -1,5 +1,6 @@
 package com.fzzy.push.sh2023;
 
+import com.alibaba.fastjson.JSONObject;
 import com.fzzy.api.Constant;
 import com.fzzy.api.data.ApiParam;
 import com.fzzy.api.data.PushProtocol;
@@ -8,11 +9,13 @@
 import com.fzzy.api.service.ApiRemoteService;
 import com.fzzy.api.service.PushService11;
 import com.fzzy.api.view.repository.*;
-import com.fzzy.push.impl.ComPushService11;
+import com.fzzy.push.sh2023.dto.SH2023Api2101;
+import com.fzzy.push.sh2023.dto.SH2023Api2104;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -52,6 +55,8 @@
     private Api1211Rep api1211Rep;
     @Autowired
     private Api1212Rep api1212Rep;
+    @Autowired
+    private ApiInfoDataRep apiInfoDataRep;
 
     @Override
     public String getProtocol() {
@@ -62,31 +67,30 @@
     public void pushData(ApiParam param) {
         log.info("------->>>>绮璐攢 鎺ュ彛妯″潡涓婃姤寮�濮�");
 
-        //鎺ㄩ�佸悎鍚屼俊鎭�
-        this.pushData1201(apiRemoteService, param);
-        //绮鍏ュ簱淇℃伅
-        this.pushData1202(apiRemoteService, param);
-        //绮鍏ュ簱妫�楠屼俊鎭�
-        this.pushData1203(apiRemoteService, param);
-        //绮鍏ュ簱缁撶畻淇℃伅
-        this.pushData1204(apiRemoteService, param);
-        //绮鍑哄簱淇℃伅
-        this.pushData1205(apiRemoteService, param);
-        //绮鍑哄簱缁撶畻淇℃伅
-        this.pushData1206(apiRemoteService, param);
-        //鍊掍粨鍊掑嚭
-        this.pushData1207(apiRemoteService, param);
-        //绮搴撳瓨
-        this.pushData1208(apiRemoteService, param);
-        //鎹熸孩鍗�
-        this.pushData1209(apiRemoteService, param);
-        //绮鎬ц川杞彉鍗�
-        this.pushData1210(apiRemoteService, param);
-        //璐﹂潰搴撳瓨
-        this.pushData1211(apiRemoteService, param);
-        //瀹㈡埛淇℃伅
-        this.pushData1212(apiRemoteService, param);
-
+//        //鎺ㄩ�佸悎鍚屼俊鎭�
+//        this.pushData1201(apiRemoteService, param);
+//        //绮鍏ュ簱淇℃伅
+//        this.pushData1202(apiRemoteService, param);
+//        //绮鍏ュ簱妫�楠屼俊鎭�
+//        this.pushData1203(apiRemoteService, param);
+//        //绮鍏ュ簱缁撶畻淇℃伅
+//        this.pushData1204(apiRemoteService, param);
+//        //绮鍑哄簱淇℃伅
+//        this.pushData1205(apiRemoteService, param);
+//        //绮鍑哄簱缁撶畻淇℃伅
+//        this.pushData1206(apiRemoteService, param);
+//        //鍊掍粨鍊掑嚭
+//        this.pushData1207(apiRemoteService, param);
+//        //绮搴撳瓨
+//        this.pushData1208(apiRemoteService, param);
+//        //鎹熸孩鍗�
+//        this.pushData1209(apiRemoteService, param);
+//        //绮鎬ц川杞彉鍗�
+//        this.pushData1210(apiRemoteService, param);
+//        //璐﹂潰搴撳瓨
+//        this.pushData1211(apiRemoteService, param);
+//        //瀹㈡埛淇℃伅
+//        this.pushData1212(apiRemoteService, param);
 
         log.info("------->>>>绮璐攢 鎺ュ彛妯″潡涓婃姤缁撴潫");
     }
@@ -102,16 +106,16 @@
             log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌鍚堝悓淇℃伅锛屼笉鎺ㄩ��-----");
             return;
         }
+        param.setInteCategory(Constant.API_CATEGORY_12);
+        param.setInteId(SH2023Constant.SH_2023_API_CODE_1201);
 
-        //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
-        ResponseDto responseDto = apiRemoteService.pushData(param, list);
-        if (responseDto.getSuccess() == 0) {
-            //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
-            for (Api1201 data : list) {
+        ResponseDto responseDto;
+        for (Api1201 data : list) {
+            param.setBizId(data.getBizId());
+            responseDto = apiRemoteService.pushData(param, data);
+            if (responseDto.getSuccess() == 0) {
                 if (Constant.CZBZ_I.equals(data.getCzbz())) {
-
                     data.setCzbz(Constant.CZBZ_U);
-                    //鏇存柊鐘舵��
                     api1201Rep.save(data);
                 }
             }
@@ -129,14 +133,15 @@
             log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌绮鍏ュ簱淇℃伅锛屼笉鎺ㄩ��-----");
             return;
         }
+        param.setInteCategory(Constant.API_CATEGORY_12);
+        param.setInteId(SH2023Constant.SH_2023_API_CODE_1202);
 
-        //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
-        ResponseDto responseDto = apiRemoteService.pushData(param, list);
-        if (responseDto.getSuccess() == 0) {
-            //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
-            for (Api1202 data : list) {
+        ResponseDto responseDto;
+        for (Api1202 data : list) {
+            param.setBizId(data.getBizId());
+            responseDto = apiRemoteService.pushData(param, data);
+            if (responseDto.getSuccess() == 0) {
                 if (Constant.CZBZ_I.equals(data.getCzbz())) {
-
                     data.setCzbz(Constant.CZBZ_U);
                     //鏇存柊鐘舵��
                     api1202Rep.save(data);
@@ -156,14 +161,15 @@
             log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌绮鍏ュ簱妫�楠屼俊鎭紝涓嶆帹閫�-----");
             return;
         }
+        param.setInteCategory(Constant.API_CATEGORY_12);
+        param.setInteId(SH2023Constant.SH_2023_API_CODE_1203);
 
-        //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
-        ResponseDto responseDto = apiRemoteService.pushData(param, list);
-        if (responseDto.getSuccess() == 0) {
-            //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
-            for (Api1203 data : list) {
+        ResponseDto responseDto;
+        for (Api1203 data : list) {
+            param.setBizId(data.getBizId());
+            responseDto = apiRemoteService.pushData(param, data);
+            if (responseDto.getSuccess() == 0) {
                 if (Constant.CZBZ_I.equals(data.getCzbz())) {
-
                     data.setCzbz(Constant.CZBZ_U);
                     //鏇存柊鐘舵��
                     api1203Rep.save(data);
@@ -184,21 +190,21 @@
             log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌绮鍏ュ簱缁撶畻淇℃伅锛屼笉鎺ㄩ��-----");
             return;
         }
+        param.setInteCategory(Constant.API_CATEGORY_12);
+        param.setInteId(SH2023Constant.SH_2023_API_CODE_1204);
 
-        //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
-        ResponseDto responseDto = apiRemoteService.pushData(param, list);
-        if (responseDto.getSuccess() == 0) {
-            //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
-            for (Api1204 data : list) {
+        ResponseDto responseDto;
+        for (Api1204 data : list) {
+            param.setBizId(data.getBizId());
+            responseDto = apiRemoteService.pushData(param, data);
+            if (responseDto.getSuccess() == 0) {
                 if (Constant.CZBZ_I.equals(data.getCzbz())) {
-
                     data.setCzbz(Constant.CZBZ_U);
                     //鏇存柊鐘舵��
                     api1204Rep.save(data);
                 }
             }
         }
-
     }
 
     /**
@@ -212,14 +218,15 @@
             log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌绮鍑哄簱淇℃伅锛屼笉鎺ㄩ��-----");
             return;
         }
+        param.setInteCategory(Constant.API_CATEGORY_12);
+        param.setInteId(SH2023Constant.SH_2023_API_CODE_1205);
 
-        //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
-        ResponseDto responseDto = apiRemoteService.pushData(param, list);
-        if (responseDto.getSuccess() == 0) {
-            //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
-            for (Api1205 data : list) {
+        ResponseDto responseDto;
+        for (Api1205 data : list) {
+            param.setBizId(data.getBizId());
+            responseDto = apiRemoteService.pushData(param, data);
+            if (responseDto.getSuccess() == 0) {
                 if (Constant.CZBZ_I.equals(data.getCzbz())) {
-
                     data.setCzbz(Constant.CZBZ_U);
                     //鏇存柊鐘舵��
                     api1205Rep.save(data);
@@ -239,12 +246,13 @@
             log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌绮鍑哄簱缁撶畻淇℃伅锛屼笉鎺ㄩ��-----");
             return;
         }
-
-        //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
-        ResponseDto responseDto = apiRemoteService.pushData(param, list);
-        if (responseDto.getSuccess() == 0) {
-            //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
-            for (Api1206 data : list) {
+        param.setInteCategory(Constant.API_CATEGORY_12);
+        param.setInteId(SH2023Constant.SH_2023_API_CODE_1206);
+        ResponseDto responseDto;
+        for (Api1206 data : list) {
+            param.setBizId(data.getBizId());
+            responseDto = apiRemoteService.pushData(param, data);
+            if (responseDto.getSuccess() == 0) {
                 if (Constant.CZBZ_I.equals(data.getCzbz())) {
 
                     data.setCzbz(Constant.CZBZ_U);
@@ -253,39 +261,120 @@
                 }
             }
         }
-
     }
 
     /**
      * 1207 鍊掍粨鍊掑嚭
      */
     public void pushData1207(ApiRemoteService apiRemoteService, ApiParam param) {
-        //TODO
+        //鑾峰彇鍊掍粨淇℃伅
+        List<Api1207> list = api1207Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
 
+        if (null == list || list.isEmpty()) {
+            log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌鍊掍粨淇℃伅锛屼笉鎺ㄩ��-----");
+            return;
+        }
+        param.setInteCategory(Constant.API_CATEGORY_12);
+        param.setInteId(SH2023Constant.SH_2023_API_CODE_1207);
+
+        ResponseDto responseDto;
+        for (Api1207 data : list) {
+            param.setBizId(data.getBizId());
+            responseDto = apiRemoteService.pushData(param, data);
+            if (responseDto.getSuccess() == 0) {
+                if (Constant.CZBZ_I.equals(data.getCzbz())) {
+                    data.setCzbz(Constant.CZBZ_U);
+                    //鏇存柊鐘舵��
+                    api1207Rep.save(data);
+                }
+            }
+        }
     }
 
     /**
      * 1208 绮搴撳瓨
      */
     public void pushData1208(ApiRemoteService apiRemoteService, ApiParam param) {
-        //TODO
+        //鑾峰彇绮搴撳瓨淇℃伅
+        List<Api1208> list = api1208Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
 
+        if (null == list || list.isEmpty()) {
+            log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌绮搴撳瓨淇℃伅锛屼笉鎺ㄩ��-----");
+            return;
+        }
+        param.setInteCategory(Constant.API_CATEGORY_12);
+        param.setInteId(SH2023Constant.SH_2023_API_CODE_1208);
+
+        ResponseDto responseDto;
+        for (Api1208 data : list) {
+            param.setBizId(data.getBizId());
+            responseDto = apiRemoteService.pushData(param, data);
+            if (responseDto.getSuccess() == 0) {
+                if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+                    data.setCzbz(Constant.CZBZ_U);
+                    //鏇存柊鐘舵��
+                    api1208Rep.save(data);
+                }
+            }
+        }
     }
 
     /**
      * 1209 鎹熸孩鍗�
      */
     public void pushData1209(ApiRemoteService apiRemoteService, ApiParam param) {
-        //TODO
+        //鑾峰彇鎹熺泭鍗曚俊鎭�
+        List<Api1209> list = api1209Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
 
+        if (null == list || list.isEmpty()) {
+            log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌绮搴撳瓨淇℃伅锛屼笉鎺ㄩ��-----");
+            return;
+        }
+        param.setInteCategory(Constant.API_CATEGORY_12);
+        param.setInteId(SH2023Constant.SH_2023_API_CODE_1209);
+
+        ResponseDto responseDto;
+        for (Api1209 data : list) {
+            param.setBizId(data.getBizId());
+            responseDto = apiRemoteService.pushData(param, data);
+            if (responseDto.getSuccess() == 0) {
+                if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+                    data.setCzbz(Constant.CZBZ_U);
+                    //鏇存柊鐘舵��
+                    api1209Rep.save(data);
+                }
+            }
+        }
     }
 
     /**
      * 1210 绮鎬ц川杞彉鍗�
      */
     public void pushData1210(ApiRemoteService apiRemoteService, ApiParam param) {
-        //TODO
+        //绮鎬ц川杞彉鍗�
+        List<Api1210> list = api1210Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
 
+        if (null == list || list.isEmpty()) {
+            log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌绮搴撳瓨淇℃伅锛屼笉鎺ㄩ��-----");
+            return;
+        }
+        param.setInteCategory(Constant.API_CATEGORY_12);
+        param.setInteId(SH2023Constant.SH_2023_API_CODE_1210);
+
+        ResponseDto responseDto;
+        for (Api1210 data : list) {
+            param.setBizId(data.getBizId());
+            responseDto = apiRemoteService.pushData(param, data);
+            if (responseDto.getSuccess() == 0) {
+                if (Constant.CZBZ_I.equals(data.getCzbz())) {
+                    data.setCzbz(Constant.CZBZ_U);
+                    //鏇存柊鐘舵��
+                    api1210Rep.save(data);
+                }
+            }
+        }
     }
 
     /**
@@ -293,23 +382,84 @@
      */
     public void pushData1211(ApiRemoteService apiRemoteService, ApiParam param) {
         //TODO
+        //绮鎬ц川杞彉鍗�
+        List<Api1211> list = api1211Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
 
+        if (null == list || list.isEmpty()) {
+            log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌绮搴撳瓨淇℃伅锛屼笉鎺ㄩ��-----");
+            return;
+        }
+        param.setInteCategory(Constant.API_CATEGORY_12);
+        param.setInteId(SH2023Constant.SH_2023_API_CODE_1210);
+
+        ResponseDto responseDto;
+        for (Api1211 data : list) {
+            param.setBizId(data.getBizId());
+            responseDto = apiRemoteService.pushData(param, data);
+            if (responseDto.getSuccess() == 0) {
+                if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+                    data.setCzbz(Constant.CZBZ_U);
+                    //鏇存柊鐘舵��
+                    api1211Rep.save(data);
+                }
+            }
+        }
     }
 
     /**
      * 1212 瀹㈡埛淇℃伅
      */
     public void pushData1212(ApiRemoteService apiRemoteService, ApiParam param) {
-        //TODO
+        //鑾峰彇瀹㈡埛淇℃伅
+        List<Api1212> list = api1212Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
 
+        if (null == list || list.isEmpty()) {
+            log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌瀹㈡埛淇℃伅锛屼笉鎺ㄩ��-----");
+            return;
+        }
+        param.setInteCategory(Constant.API_CATEGORY_12);
+        param.setInteId(SH2023Constant.SH_2023_API_CODE_1212);
+
+        ResponseDto responseDto;
+        for (Api1212 data : list) {
+            param.setBizId(data.getBizId());
+            responseDto = apiRemoteService.pushData(param, data);
+            if (responseDto.getSuccess() == 0) {
+                if (Constant.CZBZ_I.equals(data.getCzbz())) {
+                    data.setCzbz(Constant.CZBZ_U);
+                    //鏇存柊鐘舵��
+                    api1212Rep.save(data);
+                }
+            }
+        }
     }
 
     /**
      * 2101 妫�鏂ゅ崟
      */
     public void pushData2101(ApiRemoteService apiRemoteService, ApiParam param) {
-        //TODO
-
+        //鑾峰彇 妫�鏂ゅ崟淇℃伅
+//        List<ApiInfoData> items = apiInfoDataRep.getDataByInteId(SH2023Constant.SH_2023_API_CODE_2101);
+//
+//        param.setInteCategory(Constant.API_CATEGORY_12);
+//        param.setInteId(SH2023Constant.SH_2023_API_CODE_2101);
+//
+//        ResponseDto responseDto;
+//        SH2023Api2101 shApi2101;
+//        for (ApiInfoData infoData : items) {
+//            shApi2101 = JSONObject.parseObject(infoData.getData(), SH2023Api2101.class);
+//            shApi2101.setCzbz(infoData.getCzbz());
+//            shApi2101.setZhgxsj(infoData.getUpdateTime());
+//            param.setBizId(infoData.getDataId());
+//            responseDto = apiRemoteService.pushData(param, shApi2101);
+//            if (responseDto.getSuccess() == 0) {
+//                if (Constant.CZBZ_I.equals(infoData.getCzbz())) {
+//                    infoData.setCzbz(Constant.CZBZ_U);
+//                    apiInfoDataRep.save(infoData);
+//                }
+//            }
+//        }
     }
 
     /**
@@ -324,7 +474,27 @@
      * 2104  甯傚偍椹宠繍鍗�
      */
     public void pushData2104(ApiRemoteService apiRemoteService, ApiParam param) {
-        //TODO
+        //鑾峰彇 妫�鏂ゅ崟淇℃伅
+//        List<ApiInfoData> items = apiInfoDataRep.getDataByInteId(SH2023Constant.SH_2023_API_CODE_2104);
 
+//        param.setInteCategory(Constant.API_CATEGORY_12);
+//        param.setInteId(SH2023Constant.SH_2023_API_CODE_2104);
+//
+//        ResponseDto responseDto;
+//        SH2023Api2104 shApi2104;
+//        for (ApiInfoData infoData : items) {
+//            shApi2104 = JSONObject.parseObject(infoData.getData(), SH2023Api2104.class);
+//            shApi2104.setCzbz(infoData.getCzbz());
+//            shApi2104.setZhgxsj(infoData.getUpdateTime());
+//
+//            param.setBizId(infoData.getDataId());
+//            responseDto = apiRemoteService.pushData(param, shApi2104);
+//            if (responseDto.getSuccess() == 0) {
+//                if (Constant.CZBZ_I.equals(infoData.getCzbz())) {
+//                    infoData.setCzbz(Constant.CZBZ_U);
+//                    apiInfoDataRep.save(infoData);
+//                }
+//            }
+//        }
     }
 }

--
Gitblit v1.9.3