From 2627c9d3c01458587f9e1873a2a0284b8a08be04 Mon Sep 17 00:00:00 2001
From: WS <1143478319@qq.com>
Date: 星期二, 22 八月 2023 18:54:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/fzzy/push/sh2023/SH2023PushService13.java | 284 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 270 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023PushService13.java b/src/main/java/com/fzzy/push/sh2023/SH2023PushService13.java
index f116bb8..39c62dd 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023PushService13.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023PushService13.java
@@ -1,13 +1,27 @@
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;
+import com.fzzy.api.dto.ResponseDto;
+import com.fzzy.api.entity.*;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.service.PushService11;
+import com.fzzy.api.view.repository.*;
+import com.fzzy.otherview.sh2023.dto.ShApi1311;
+import com.fzzy.otherview.sh2023.dto.ShApi2103;
+import com.fzzy.otherview.sh2023.repository.ShApi1311Rep;
import com.fzzy.push.impl.ComPushService11;
+import com.fzzy.push.sh2023.dto.SH2023Api1311;
+import com.fzzy.push.sh2023.dto.SH2023Api2103;
import lombok.extern.slf4j.Slf4j;
+import org.codehaus.jackson.JsonParser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
/**
* 涓婃捣甯傚钩鍙�2023鐗�-鍩虹鏁版嵁涓婁紶
@@ -22,6 +36,28 @@
@Autowired
private SH2023ApiRemoteService apiRemoteService;
+ @Autowired
+ private Api1301Rep api1301Rep;
+ @Autowired
+ private Api1302Rep api1302Rep;
+ @Autowired
+ private Api1303Rep api1303Rep;
+ @Autowired
+ private Api1304Rep api1304Rep;
+ @Autowired
+ private Api1305Rep api1305Rep;
+ @Autowired
+ private Api1306Rep api1306Rep;
+ @Autowired
+ private Api1307Rep api1307Rep;
+ @Autowired
+ private Api1308Rep api1308Rep;
+ @Autowired
+ private Api1309Rep api1309Rep;
+ @Autowired
+ private Api1310Rep api1310Rep;
+ @Autowired
+ private ApiInfoDataRep apiInfoDataRep;
@Override
public String getProtocol() {
@@ -30,19 +66,48 @@
@Override
public void pushData(ApiParam param) {
- log.info("------->>>>鍩虹淇℃伅 鎺ュ彛妯″潡涓婃姤寮�濮�");
+ log.info("------->>>>绮簱绠＄悊 鎺ュ彛妯″潡涓婃姤寮�濮�");
- //鎺ㄩ�佸崟浣嶄俊鎭�
+ this.pushData1301(apiRemoteService, param);
+ this.pushData1302(apiRemoteService, param);
+ this.pushData1303(apiRemoteService, param);
+ this.pushData1304(apiRemoteService, param);
+ this.pushData1305(apiRemoteService, param);
+ this.pushData1306(apiRemoteService, param);
+ this.pushData1307(apiRemoteService, param);
+ this.pushData1308(apiRemoteService, param);
+ this.pushData1309(apiRemoteService, param);
+ this.pushData1310(apiRemoteService, param);
+ this.pushData1311(apiRemoteService, param);
-
- log.info("------->>>>鍩虹淇℃伅 鎺ュ彛妯″潡涓婃姤缁撴潫");
+ log.info("------->>>>绮簱绠＄悊 鎺ュ彛妯″潡涓婃姤缁撴潫");
}
/**
* 1301 瀹夊叏绠＄悊
*/
public void pushData1301(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //鑾峰彇瀹夊叏绠＄悊
+ List<Api1301> list = api1301Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
+
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌瀹夊叏绠＄悊锛屼笉鎺ㄩ��-----");
+ return;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1301);
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1301 data : list) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1301Rep.save(data);
+ }
+ }
+ }
}
@@ -50,15 +115,54 @@
* 1302 娓╂箍搴︽娴�
*/
public void pushData1302(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //鑾峰彇娓╂箍搴︽娴�
+ List<Api1302> list = api1302Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌娓╂箍搴︽娴嬶紝涓嶆帹閫�-----");
+ return;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1302);
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1302 data : list) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1302Rep.save(data);
+ }
+ }
+ }
}
/**
* 1303 瀹宠櫕妫�娴�
*/
public void pushData1303(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //鑾峰彇瀹宠櫕妫�娴�
+ List<Api1303> list = api1303Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
+
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌瀹宠櫕妫�娴嬶紝涓嶆帹閫�-----");
+ return;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1303);
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1303 data : list) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1303Rep.save(data);
+ }
+ }
+ }
}
@@ -66,7 +170,27 @@
* 1304 姘斾綋妫�娴�
*/
public void pushData1304(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //鑾峰彇姘斾綋妫�娴�
+ List<Api1304> list = api1304Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
+
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌姘斾綋妫�娴嬶紝涓嶆帹閫�-----");
+ return;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1304);
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1304 data : list) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1304Rep.save(data);
+ }
+ }
+ }
}
@@ -74,7 +198,27 @@
* 1305 閫氶浣滀笟
*/
public void pushData1305(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //鑾峰彇閫氶浣滀笟
+ List<Api1305> list = api1305Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
+
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌閫氶浣滀笟锛屼笉鎺ㄩ��-----");
+ return;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1305);
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1305 data : list) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1305Rep.save(data);
+ }
+ }
+ }
}
@@ -82,15 +226,54 @@
* 1306 鐔忚捀浣滀笟
*/
public void pushData1306(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //鑾峰彇鐔忚捀浣滀笟
+ List<Api1306> list = api1306Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌鐔忚捀浣滀笟锛屼笉鎺ㄩ��-----");
+ return;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1306);
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1306 data : list) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1306Rep.save(data);
+ }
+ }
+ }
}
/**
* 1307 浠撳唴瑙嗛鍥惧儚
*/
public void pushData1307(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //鑾峰彇浠撳唴瑙嗛鍥惧儚
+ List<Api1307> list = api1307Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
+
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌浠撳唴瑙嗛鍥惧儚锛屼笉鎺ㄩ��-----");
+ return;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1307);
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1307 data : list) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1307Rep.save(data);
+ }
+ }
+ }
}
@@ -114,15 +297,61 @@
* 1310 璐ㄦ鏁版嵁
*/
public void pushData1310(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //鑾峰彇璐ㄦ鏁版嵁
+ List<Api1310> list = api1310Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌璐ㄦ鏁版嵁锛屼笉鎺ㄩ��-----");
+ return;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1310);
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1310 data : list) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1310Rep.save(data);
+ }
+ }
+ }
}
/**
* 1311 瑙嗛鐩戞帶鎺ュ彛
*/
public void pushData1311(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ // 鑾峰彇 瑙嗛鐩戞帶鎺ュ彛鏁版嵁
+ List<ApiInfoData> items = apiInfoDataRep.getDataByInteId(SH2023Constant.SH_2023_API_CODE_1311);
+
+ if (null == items || items.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌瑙嗛鐩戞帶锛屼笉鎺ㄩ��-----");
+ return;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1311);
+
+ SH2023Api1311 shApi1311;
+ List<SH2023Api1311> list = new ArrayList<>();
+ for (ApiInfoData infoData : items) {
+ shApi1311 = JSONObject.parseObject(infoData.getData(), SH2023Api1311.class);
+ shApi1311.setCzbz(infoData.getCzbz());
+ shApi1311.setZhgxsj(infoData.getUpdateTime());
+ list.add(shApi1311);
+ }
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (ApiInfoData data : items) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ apiInfoDataRep.save(data);
+ }
+ }
+ }
}
@@ -130,7 +359,34 @@
* 2103 绮儏璁惧閰嶇疆
*/
public void pushData2103(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+
+ // 鑾峰彇绮儏璁惧閰嶇疆鏁版嵁
+ List<ApiInfoData> items = apiInfoDataRep.getDataByInteId(SH2023Constant.SH_2023_API_CODE_2103);
+
+ if (null == items || items.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌绮儏璁惧閰嶇疆锛屼笉鎺ㄩ��-----");
+ return;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_2103);
+ SH2023Api2103 shApi2103;
+ List<SH2023Api2103> list = new ArrayList<>();
+ for (ApiInfoData infoData : items) {
+ shApi2103 = JSONObject.parseObject(infoData.getData(), SH2023Api2103.class);
+ shApi2103.setZhgxsj(infoData.getUpdateTime());
+ list.add(shApi2103);
+ }
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (ApiInfoData data : items) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ apiInfoDataRep.save(data);
+ }
+ }
+ }
}
}
--
Gitblit v1.9.3