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/SH2023PushService12.java | 220 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 209 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023PushService12.java b/src/main/java/com/fzzy/push/sh2023/SH2023PushService12.java
index af4414e..db90a98 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023PushService12.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023PushService12.java
@@ -1,13 +1,22 @@
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.push.impl.ComPushService11;
+import com.fzzy.api.view.repository.*;
+import com.fzzy.otherview.sh2023.dto.ShApi2101;
+import com.fzzy.push.sh2023.dto.SH2023Api2101;
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;
/**
* 涓婃捣甯傚钩鍙�2023鐗�-鍩虹鏁版嵁涓婁紶
@@ -22,6 +31,32 @@
@Autowired
private SH2023ApiRemoteService apiRemoteService;
+ @Autowired
+ private Api1201Rep api1201Rep;
+ @Autowired
+ private Api1202Rep api1202Rep;
+ @Autowired
+ private Api1203Rep api1203Rep;
+ @Autowired
+ private Api1204Rep api1204Rep;
+ @Autowired
+ private Api1205Rep api1205Rep;
+ @Autowired
+ private Api1206Rep api1206Rep;
+ @Autowired
+ private Api1207Rep api1207Rep;
+ @Autowired
+ private Api1208Rep api1208Rep;
+ @Autowired
+ private Api1209Rep api1209Rep;
+ @Autowired
+ private Api1210Rep api1210Rep;
+ @Autowired
+ private Api1211Rep api1211Rep;
+ @Autowired
+ private Api1212Rep api1212Rep;
+ @Autowired
+ private ApiInfoDataRep apiInfoDataRep;
@Override
public String getProtocol() {
@@ -30,35 +65,116 @@
@Override
public void pushData(ApiParam param) {
- log.info("------->>>>鍩虹淇℃伅 鎺ュ彛妯″潡涓婃姤寮�濮�");
+ 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);
- log.info("------->>>>鍩虹淇℃伅 鎺ュ彛妯″潡涓婃姤缁撴潫");
+ log.info("------->>>>绮璐攢 鎺ュ彛妯″潡涓婃姤缁撴潫");
}
/**
* 1201 鍚堝悓淇℃伅
*/
public void pushData1201(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //鑾峰彇鍚堝悓淇℃伅
+ List<Api1201> list = api1201Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌鍚堝悓淇℃伅锛屼笉鎺ㄩ��-----");
+ return;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1201);
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1201 data : list) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1201Rep.save(data);
+ }
+ }
+ }
}
/**
* 1202 绮鍏ュ簱淇℃伅
*/
public void pushData1202(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //鑾峰彇绮鍏ュ簱淇℃伅
+ List<Api1202> list = api1202Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌绮鍏ュ簱淇℃伅锛屼笉鎺ㄩ��-----");
+ return;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1202);
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1202 data : list) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1202Rep.save(data);
+ }
+ }
+ }
}
/**
* 1203 绮鍏ュ簱妫�楠屼俊鎭�
*/
public void pushData1203(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //鑾峰彇绮鍏ュ簱妫�楠屼俊鎭�
+ List<Api1203> list = api1203Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
+
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌绮鍏ュ簱妫�楠屼俊鎭紝涓嶆帹閫�-----");
+ return;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1203);
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1203 data : list) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1203Rep.save(data);
+ }
+ }
+ }
}
@@ -66,7 +182,27 @@
* 1204 绮鍏ュ簱缁撶畻淇℃伅
*/
public void pushData1204(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //鑾峰彇绮鍏ュ簱缁撶畻淇℃伅
+ List<Api1204> list = api1204Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
+
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌绮鍏ュ簱缁撶畻淇℃伅锛屼笉鎺ㄩ��-----");
+ return;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1204);
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1204 data : list) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1204Rep.save(data);
+ }
+ }
+ }
}
@@ -74,15 +210,54 @@
* 1205 绮鍑哄簱淇℃伅
*/
public void pushData1205(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //鑾峰彇绮鍑哄簱淇℃伅
+ List<Api1205> list = api1205Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌绮鍑哄簱淇℃伅锛屼笉鎺ㄩ��-----");
+ return;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1205);
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1205 data : list) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1205Rep.save(data);
+ }
+ }
+ }
}
/**
* 1206 绮鍑哄簱缁撶畻淇℃伅
*/
public void pushData1206(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //鑾峰彇绮鍑哄簱缁撶畻淇℃伅
+ List<Api1206> list = api1206Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
+
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌绮鍑哄簱缁撶畻淇℃伅锛屼笉鎺ㄩ��-----");
+ return;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1206);
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1206 data : list) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1206Rep.save(data);
+ }
+ }
+ }
}
@@ -138,8 +313,31 @@
* 2101 妫�鏂ゅ崟
*/
public void pushData2101(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //鑾峰彇 妫�鏂ゅ崟淇℃伅
+ List<ApiInfoData> items = apiInfoDataRep.getDataByInteId(SH2023Constant.SH_2023_API_CODE_2101);
+
+ SH2023Api2101 shApi2101;
+ List<SH2023Api2101> list = new ArrayList<>();
+
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_2101);
+ for (ApiInfoData infoData : items) {
+ shApi2101 = JSONObject.parseObject(infoData.getData(), SH2023Api2101.class);
+ shApi2101.setCzbz(infoData.getCzbz());
+ shApi2101.setZhgxsj(infoData.getUpdateTime());
+ list.add(shApi2101);
+ }
+ 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