From 0a6c8a0f85275adf4f18c3eb17c1e42fd0bafd13 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 03 十一月 2025 18:57:10 +0800
Subject: [PATCH] 陕西2025版接口调整4-新增接口页面
---
src/main/java/com/fzzy/push/impl/ComPushService90.java | 52 +++++++++++++++++++++++++++++-----------------------
1 files changed, 29 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/fzzy/push/impl/ComPushService90.java b/src/main/java/com/fzzy/push/impl/ComPushService90.java
index b280337..1491262 100644
--- a/src/main/java/com/fzzy/push/impl/ComPushService90.java
+++ b/src/main/java/com/fzzy/push/impl/ComPushService90.java
@@ -1,6 +1,7 @@
package com.fzzy.push.impl;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
@@ -9,6 +10,10 @@
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.view.repository.*;
import com.fzzy.push.gd2022.dto.Gd2022Api1023;
+import com.fzzy.push.gd2022.dto.Gd2022Api1023Dtl;
+import com.fzzy.push.gd2022.dto.Gd2022Api1023People;
+import com.fzzy.push.gd2022.dto.Gd2022Api1023Way;
+import com.fzzy.push.gd2023.dto.Gd2023Api1023;
import com.fzzy.push.sh2023.SH2023Constant;
import com.fzzy.push.sh2023.dto.SH2023Api1115;
import com.fzzy.push.sh2023.dto.SH2023Api1311;
@@ -30,6 +35,8 @@
@Autowired
private ApiInfoDataRep apiInfoDataRep;
@Autowired
+ private Api9201Rep api9201Rep;
+ @Autowired
private Api9109Rep api9109Rep;
@Autowired
private Api9110Rep api9110Rep;
@@ -47,11 +54,12 @@
private Api9116Rep api9116Rep;
/*==========涓婃捣甯傚钩鍙板畾鍒舵帴鍙� -- 寮�濮�==========*/
+
/**
* 9101 鏁版嵁鐩哥鎬ф帴鍙�--涓婃捣甯傚钩鍙�
*/
public void pushData9101(ApiRemoteService apiRemoteService, ApiParam param) {
- // 鑾峰彇 瑙嗛鐩戞帶鎺ュ彛鏁版嵁
+ // 鑾峰彇 鏁版嵁鐩哥鎬ф帴鍙ｆ暟鎹�
List<ApiInfoData> items = apiInfoDataRep.getDataByInteId(Constant.API_CODE_9101);
if (null == items || items.isEmpty()) {
@@ -196,7 +204,7 @@
List<Api9109> items = api9109Rep.getDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == items || items.isEmpty()) {
- log.info("-------------娌℃湁杞崲璁″垝闇�瑕佹帹閫�-----------");
+ log.info("-------------娌℃湁鍗曚綅淇℃伅闇�瑕佹帹閫�-----------");
return;
}
@@ -227,7 +235,7 @@
List<Api9110> items = api9110Rep.getDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == items || items.isEmpty()) {
- log.info("-------------娌℃湁杞崲璁″垝闇�瑕佹帹閫�-----------");
+ log.info("-------------娌℃湁鏀剁撼搴撲俊鎭渶瑕佹帹閫�-----------");
return;
}
@@ -258,7 +266,7 @@
List<Api9111> items = api9111Rep.getDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == items || items.isEmpty()) {
- log.info("-------------娌℃湁杞崲璁″垝闇�瑕佹帹閫�-----------");
+ log.info("-------------娌℃湁浠撴埧淇℃伅闇�瑕佹帹閫�-----------");
return;
}
@@ -289,7 +297,7 @@
List<Api9112> items = api9112Rep.getDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == items || items.isEmpty()) {
- log.info("-------------娌℃湁杞崲璁″垝闇�瑕佹帹閫�-----------");
+ log.info("-------------娌℃湁寤掗棿淇℃伅闇�瑕佹帹閫�-----------");
return;
}
@@ -320,7 +328,7 @@
List<Api9113> items = api9113Rep.getDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == items || items.isEmpty()) {
- log.info("-------------娌℃湁杞崲璁″垝闇�瑕佹帹閫�-----------");
+ log.info("-------------娌℃湁璐т綅淇℃伅闇�瑕佹帹閫�-----------");
return;
}
@@ -351,7 +359,7 @@
List<Api9114> items = api9114Rep.getDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == items || items.isEmpty()) {
- log.info("-------------娌℃湁杞崲璁″垝闇�瑕佹帹閫�-----------");
+ log.info("-------------娌℃湁绮鍏ュ簱淇℃伅闇�瑕佹帹閫�-----------");
return;
}
@@ -382,7 +390,7 @@
List<Api9115> items = api9115Rep.getDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == items || items.isEmpty()) {
- log.info("-------------娌℃湁杞崲璁″垝闇�瑕佹帹閫�-----------");
+ log.info("-------------娌℃湁鏉ョ伯妫�楠屼俊鎭渶瑕佹帹閫�-----------");
return;
}
@@ -413,7 +421,7 @@
List<Api9116> items = api9116Rep.getDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == items || items.isEmpty()) {
- log.info("-------------娌℃湁杞崲璁″垝闇�瑕佹帹閫�-----------");
+ log.info("-------------娌℃湁绮鏀惰喘鍩虹淇℃伅闇�瑕佹帹閫�-----------");
return;
}
@@ -438,34 +446,32 @@
/*==========涓婃捣甯傚钩鍙板畾鍒舵帴鍙� -- 缁撴潫==========*/
/*==========骞夸笢鐪佸钩鍙板畾鍒舵帴鍙� -- 寮�濮�==========*/
+
/**
* 9201 鐔忚捀澶囨鎺ュ彛
*/
public void pushData9201(ApiRemoteService apiRemoteService, ApiParam param) {
//鑾峰彇鐔忚捀澶囨淇℃伅
- List<ApiInfoData> items = apiInfoDataRep.getDataByInteId(Constant.API_CODE_9201);
+// List<ApiInfoData> items = apiInfoDataRep.getDataByInteId(Constant.API_CODE_9201);
+ List<Api9201> items = api9201Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == items || items.isEmpty()) {
- log.error("-----骞夸笢鐪佸钩鍙�2022鐗堬細鏈幏鍙栧埌鐔忚捀澶囨淇℃伅锛屼笉鎺ㄩ��-----");
+ log.error("-----骞夸笢鐪佸钩鍙�2023鐗堬細鏈幏鍙栧埌鐔忚捀澶囨淇℃伅锛屼笉鎺ㄩ��-----");
return;
}
param.setInteCategory(Constant.API_CATEGORY_90);
param.setInteId(Constant.API_CODE_9201);
- Gd2022Api1023 gd2022Api1023;
ResponseDto responseDto;
- for (ApiInfoData infoData : items) {
- gd2022Api1023 = JSONObject.parseObject(infoData.getData(), Gd2022Api1023.class);
- gd2022Api1023.setZhgxsj(infoData.getUpdateTime());
-
- param.setBizId(infoData.getDataId());
- responseDto = apiRemoteService.pushData(param, gd2022Api1023);
+ for (Api9201 api9201 : items) {
+ api9201.setDtls(JSONArray.parseArray(api9201.getDtl(), Gd2022Api1023Dtl.class));
+ api9201.setPeoples(JSONArray.parseArray(api9201.getPeople(), Gd2022Api1023People.class));
+ api9201.setWays(JSONArray.parseArray(api9201.getWay(), Gd2022Api1023Way.class));
+ responseDto = apiRemoteService.pushData(param, api9201);
if (responseDto.getSuccess() == 0) {
- if (Constant.CZBZ_I.equals(infoData.getCzbz())) {
- infoData.setCzbz(Constant.CZBZ_U);
- gd2022Api1023.setCzbz(Constant.CZBZ_U);
- infoData.setData(JSON.toJSONString(gd2022Api1023));
- apiInfoDataRep.save(infoData);
+ if (Constant.CZBZ_I.equals(api9201.getCzbz())) {
+ api9201.setCzbz(Constant.CZBZ_U);
+ api9201Rep.save(api9201);
}
}
}
--
Gitblit v1.9.3