From dc66963d36e0a479e7334092241834b60bf8bbe2 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期五, 27 十月 2023 19:42:43 +0800
Subject: [PATCH] 优化武汉接口
---
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1105.view.xml | 8 +-
src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java | 18 +++--
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1108.view.xml | 8 +-
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1108PR.java | 8 +-
src/main/java/com/fzzy/otherview/whhpjl/WhjlConstant.java | 20 +++---
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1107PR.java | 10 +-
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1106.view.xml | 24 +------
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1112PR.java | 8 +-
src/main/java/com/fzzy/push/whhpjl/WhjlPushService11.java | 16 ++--
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1107.view.xml | 8 +-
10 files changed, 58 insertions(+), 70 deletions(-)
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1105.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1105.view.xml
index 04773e2..846d802 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1105.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1105.view.xml
@@ -281,12 +281,12 @@
<Property name="property">cfzt</Property>
<Property name="align">center</Property>
</DataColumn>
- <DataColumn name="cfsyzt">
- <Property name="property">cfsyzt</Property>
+ <DataColumn name="czbz">
+ <Property name="property">czbz</Property>
<Property name="align">center</Property>
</DataColumn>
- <DataColumn name="sfyx">
- <Property name="property">sfyx</Property>
+ <DataColumn name="updateTime">
+ <Property name="property">updateTime</Property>
<Property name="align">center</Property>
</DataColumn>
</DataGrid>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1106.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1106.view.xml
index 0b8567d..44a3e15 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1106.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1106.view.xml
@@ -217,22 +217,6 @@
<Property name="property">ygbh</Property>
<Property name="align">center</Property>
</DataColumn>
- <DataColumn name="jlqybh">
- <Property name="property">jlqybh</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="jlqymc">
- <Property name="property">jlqymc</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="jgzdbh">
- <Property name="property">jgzdbh</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="jgzdmc">
- <Property name="property">jgzdmc</Property>
- <Property name="align">center</Property>
- </DataColumn>
<DataColumn name="ygmc">
<Property name="property">ygmc</Property>
<Property name="align">center</Property>
@@ -261,12 +245,12 @@
<Property name="property">ygzt</Property>
<Property name="align">center</Property>
</DataColumn>
- <DataColumn name="ygsyzt">
- <Property name="property">ygsyzt</Property>
+ <DataColumn name="czbz">
+ <Property name="property">czbz</Property>
<Property name="align">center</Property>
</DataColumn>
- <DataColumn name="sfyx">
- <Property name="property">sfyx</Property>
+ <DataColumn name="updateTime">
+ <Property name="property">updateTime</Property>
<Property name="align">center</Property>
</DataColumn>
</DataGrid>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1107.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1107.view.xml
index 5289bc7..ee75bd1 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1107.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1107.view.xml
@@ -257,12 +257,12 @@
<Property name="property">ajzt</Property>
<Property name="align">center</Property>
</DataColumn>
- <DataColumn name="ajsyzt">
- <Property name="property">ajsyzt</Property>
+ <DataColumn name="czbz">
+ <Property name="property">czbz</Property>
<Property name="align">center</Property>
</DataColumn>
- <DataColumn name="sfyx">
- <Property name="property">sfyx</Property>
+ <DataColumn name="updateTime">
+ <Property name="property">updateTime</Property>
<Property name="align">center</Property>
</DataColumn>
</DataGrid>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1108.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1108.view.xml
index f0d944a..c8c130d 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1108.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1108.view.xml
@@ -237,12 +237,12 @@
<Property name="property">clfs</Property>
<Property name="align">center</Property>
</DataColumn>
- <DataColumn name="hwrl">
- <Property name="property">hwrl</Property>
+ <DataColumn name="czbz">
+ <Property name="property">czbz</Property>
<Property name="align">center</Property>
</DataColumn>
- <DataColumn name="sfyx">
- <Property name="property">sfyx</Property>
+ <DataColumn name="updateTime">
+ <Property name="property">updateTime</Property>
<Property name="align">center</Property>
</DataColumn>
</DataGrid>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlConstant.java b/src/main/java/com/fzzy/otherview/whhpjl/WhjlConstant.java
index 4c82b37..750c1b8 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlConstant.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlConstant.java
@@ -206,23 +206,25 @@
public static String API_CODE_FXLYD = "FXLYD";
//鎺ュ彛缂栫爜-1105 浠撴埧淇℃伅 --璺緞(CFXX)
public static String API_CODE_CFXX = "CFXX";
- //鎺ュ彛缂栫爜-1106 寤掗棿淇℃伅 --璺緞(AJXX)
+ //鎺ュ彛缂栫爜-1106 浠撴埧淇℃伅 --璺緞(YGXX)
+ public static String API_CODE_YGXX = "YGXX";
+ //鎺ュ彛缂栫爜-1107 寤掗棿淇℃伅 --璺緞(AJXX)
public static String API_CODE_AJXX = "AJXX";
- //鎺ュ彛缂栫爜-1107 璐т綅淇℃伅 --璺緞(HWXX)
+ //鎺ュ彛缂栫爜-1108 璐т綅淇℃伅 --璺緞(HWXX)
public static String API_CODE_HWXX = "HWXX";
- //鎺ュ彛缂栫爜-1108 浠撳偍璁炬柦鐢靛瓙妗ｆ --璺緞(CCSSDZDA)
+ //鎺ュ彛缂栫爜-1109 浠撳偍璁炬柦鐢靛瓙妗ｆ --璺緞(CCSSDZDA)
public static String API_CODE_CCSSDZDA = "CCSSDZDA";
- //鎺ュ彛缂栫爜-1109 浠撳偍璁炬柦缁存姢璁板綍 --璺緞(CCSSWHJL)
+ //鎺ュ彛缂栫爜-1110 浠撳偍璁炬柦缁存姢璁板綍 --璺緞(CCSSWHJL)
public static String API_CODE_CCSSWHJL = "CCSSWHJL";
- //鎺ュ彛缂栫爜-1110 浠撳偍璁惧鎶ュ簾璁板綍 --璺緞(CCSBBFJL)
+ //鎺ュ彛缂栫爜-1111 浠撳偍璁惧鎶ュ簾璁板綍 --璺緞(CCSBBFJL)
public static String API_CODE_CCSSBFJL = "CCSSBFJL";
- //鎺ュ彛缂栫爜-1111 浠撳偍璁惧淇℃伅 --璺緞(CCSBXX)
+ //鎺ュ彛缂栫爜-11112 浠撳偍璁惧淇℃伅 --璺緞(CCSBXX)
public static String API_CODE_CCSBXX = "CCSBXX";
- //鎺ュ彛缂栫爜-1112 浠撳偍璁惧缁存姢璁板綍 --璺緞(CCSBWHJL)
+ //鎺ュ彛缂栫爜-1113 浠撳偍璁惧缁存姢璁板綍 --璺緞(CCSBWHJL)
public static String API_CODE_CCSBWHJL = "CCSBWHJL";
- //鎺ュ彛缂栫爜-1113 浠撳偍璁惧缁翠慨璁板綍 --璺緞(CCSBWXJL)
+ //鎺ュ彛缂栫爜-1114 浠撳偍璁惧缁翠慨璁板綍 --璺緞(CCSBWXJL)
public static String API_CODE_CCSBWXJL = "CCSBWXJL";
- //鎺ュ彛缂栫爜-1114 浠撳偍璁惧鎶ュ簾璁板綍 --璺緞(CCSBBFJL)
+ //鎺ュ彛缂栫爜-1115 浠撳偍璁惧鎶ュ簾璁板綍 --璺緞(CCSBBFJL)
public static String API_CODE_CCSBBFJL = "CCSBBFJL";
//鎺ュ彛缂栫爜-1201 鍓渚涘簲鍟嗕俊鎭� --璺緞(FSGYSXX)
public static String API_CODE_FSGYSXX = "FSGYSXX";
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1107PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1107PR.java
index 59d6835..774d9ac 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1107PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1107PR.java
@@ -46,7 +46,7 @@
*/
@DataProvider
public List<WhjlApi1107> listData() {
- List<ApiInfoData> result = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1106);
+ List<ApiInfoData> result = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1107);
if (null == result || result.isEmpty()) {
return null;
}
@@ -76,7 +76,7 @@
infoData.setId(data.getBizId());
infoData.setKqdm(data.getKqdm());
infoData.setInteType(WhjlConstant.API_CATEGORY_11);
- infoData.setInteId(WhjlConstant.API_CODE_1106);
+ infoData.setInteId(WhjlConstant.API_CODE_1107);
infoData.setUpdateTime(new Date());
infoData.setDataId(data.getBizId());
infoData.setData(JSON.toJSONString(data));
@@ -119,7 +119,7 @@
}
//灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_11, WhjlConstant.API_CODE_1106);
+ ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_11, WhjlConstant.API_CODE_1107);
//鑾峰彇瀹炵幇鎺ュ彛
ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
@@ -135,10 +135,10 @@
if (Constant.CZBZ_I.equals(data.getCzbz())) {
infoData = new ApiInfoData();
- infoData.setId(data.getBizId());
+ infoData.setId(data.getAjbh());
infoData.setKqdm(data.getKqdm());
infoData.setInteType(WhjlConstant.API_CATEGORY_11);
- infoData.setInteId(WhjlConstant.API_CODE_1106);
+ infoData.setInteId(WhjlConstant.API_CODE_1107);
infoData.setUpdateTime(new Date());
infoData.setDataId(data.getBizId());
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1108PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1108PR.java
index 172370a..dc482bb 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1108PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1108PR.java
@@ -47,7 +47,7 @@
*/
@DataProvider
public List<WhjlApi1108> listData() {
- List<ApiInfoData> result = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1107);
+ List<ApiInfoData> result = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1108);
if (null == result || result.isEmpty()) {
return null;
}
@@ -77,7 +77,7 @@
infoData.setId(data.getBizId());
infoData.setKqdm(data.getKqdm());
infoData.setInteType(WhjlConstant.API_CATEGORY_11);
- infoData.setInteId(WhjlConstant.API_CODE_1107);
+ infoData.setInteId(WhjlConstant.API_CODE_1108);
infoData.setUpdateTime(new Date());
infoData.setDataId(data.getBizId());
infoData.setData(JSON.toJSONString(data));
@@ -120,7 +120,7 @@
}
//灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_11, WhjlConstant.API_CODE_1107);
+ ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_11, WhjlConstant.API_CODE_1108);
//鑾峰彇瀹炵幇鎺ュ彛
ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
@@ -143,7 +143,7 @@
infoData.setId(data.getBizId());
infoData.setKqdm(data.getKqdm());
infoData.setInteType(WhjlConstant.API_CATEGORY_11);
- infoData.setInteId(WhjlConstant.API_CODE_1107);
+ infoData.setInteId(WhjlConstant.API_CODE_1108);
infoData.setUpdateTime(new Date());
infoData.setDataId(data.getBizId());
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1112PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1112PR.java
index 52d5571..b458ef1 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1112PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1112PR.java
@@ -47,7 +47,7 @@
*/
@DataProvider
public List<WhjlApi1112> listData() {
- List<ApiInfoData> result = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1111);
+ List<ApiInfoData> result = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1112);
if (null == result || result.isEmpty()) {
return null;
}
@@ -77,7 +77,7 @@
infoData.setId(data.getBizId());
infoData.setKqdm(data.getKqdm());
infoData.setInteType(WhjlConstant.API_CATEGORY_11);
- infoData.setInteId(WhjlConstant.API_CODE_1111);
+ infoData.setInteId(WhjlConstant.API_CODE_1112);
infoData.setUpdateTime(new Date());
infoData.setDataId(data.getBizId());
infoData.setData(JSON.toJSONString(data));
@@ -120,7 +120,7 @@
}
//灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_11, WhjlConstant.API_CODE_1111);
+ ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_11, WhjlConstant.API_CODE_1112);
//鑾峰彇瀹炵幇鎺ュ彛
ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
@@ -139,7 +139,7 @@
infoData.setId(data.getBizId());
infoData.setKqdm(data.getKqdm());
infoData.setInteType(WhjlConstant.API_CATEGORY_11);
- infoData.setInteId(WhjlConstant.API_CODE_1111);
+ infoData.setInteId(WhjlConstant.API_CODE_1112);
infoData.setUpdateTime(new Date());
infoData.setDataId(data.getBizId());
diff --git a/src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java b/src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java
index 9db3102..9c5ac6b 100644
--- a/src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java
@@ -159,22 +159,24 @@
case "1105":
return WhjlConstant.API_CODE_CFXX;
case "1106":
- return WhjlConstant.API_CODE_AJXX;
+ return WhjlConstant.API_CODE_YGXX;
case "1107":
- return WhjlConstant.API_CODE_HWXX;
+ return WhjlConstant.API_CODE_AJXX;
case "1108":
- return WhjlConstant.API_CODE_CCSSDZDA;
+ return WhjlConstant.API_CODE_HWXX;
case "1109":
- return WhjlConstant.API_CODE_CCSSWHJL;
+ return WhjlConstant.API_CODE_CCSSDZDA;
case "1110":
- return WhjlConstant.API_CODE_CCSSBFJL;
+ return WhjlConstant.API_CODE_CCSSWHJL;
case "1111":
- return WhjlConstant.API_CODE_CCSBXX;
+ return WhjlConstant.API_CODE_CCSSBFJL;
case "1112":
- return WhjlConstant.API_CODE_CCSBWHJL;
+ return WhjlConstant.API_CODE_CCSBXX;
case "1113":
- return WhjlConstant.API_CODE_CCSBWXJL;
+ return WhjlConstant.API_CODE_CCSBWHJL;
case "1114":
+ return WhjlConstant.API_CODE_CCSBWXJL;
+ case "11145":
return WhjlConstant.API_CODE_CCSBBFJL;
case "1201":
return WhjlConstant.API_CODE_FSGYSXX;
diff --git a/src/main/java/com/fzzy/push/whhpjl/WhjlPushService11.java b/src/main/java/com/fzzy/push/whhpjl/WhjlPushService11.java
index 9393d8c..c185009 100644
--- a/src/main/java/com/fzzy/push/whhpjl/WhjlPushService11.java
+++ b/src/main/java/com/fzzy/push/whhpjl/WhjlPushService11.java
@@ -51,9 +51,9 @@
// 鎺ㄩ�佷粨鎴夸俊鎭�
this.pushData1105(apiRemoteService, param);
// 鎺ㄩ�佸粧闂翠俊鎭�
- this.pushData1106(apiRemoteService, param);
- // 鎺ㄩ�佽揣浣嶄俊鎭�
this.pushData1107(apiRemoteService, param);
+ // 鎺ㄩ�佽揣浣嶄俊鎭�
+ this.pushData1108(apiRemoteService, param);
// 鎺ㄩ�佷粨鍌ㄨ澶囦俊鎭�
this.pushData1111(apiRemoteService, param);
@@ -215,16 +215,16 @@
/**
* 1106 寤掗棿淇℃伅
*/
- private void pushData1106(ApiRemoteService apiRemoteService, ApiParam param) {
+ private void pushData1107(ApiRemoteService apiRemoteService, ApiParam param) {
//鑾峰彇鍐涘伐浼佷笟淇℃伅
- List<ApiInfoData> items = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1106);
+ List<ApiInfoData> items = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1107);
if (null == items || items.isEmpty()) {
return;
}
param.setInteCategory(WhjlConstant.API_CATEGORY_11);
- param.setInteId(WhjlConstant.API_CODE_1106);
+ param.setInteId(WhjlConstant.API_CODE_1107);
List<WhjlApi1107> list = new ArrayList<>();
WhjlApi1107 whjlApi1106;
for (ApiInfoData infoData : items) {
@@ -253,16 +253,16 @@
/**
* 1107 璐т綅淇℃伅
*/
- private void pushData1107(ApiRemoteService apiRemoteService, ApiParam param) {
+ private void pushData1108(ApiRemoteService apiRemoteService, ApiParam param) {
//鑾峰彇鍐涘伐浼佷笟淇℃伅
- List<ApiInfoData> items = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1107);
+ List<ApiInfoData> items = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1108);
if (null == items || items.isEmpty()) {
return;
}
param.setInteCategory(WhjlConstant.API_CATEGORY_11);
- param.setInteId(WhjlConstant.API_CODE_1107);
+ param.setInteId(WhjlConstant.API_CODE_1108);
List<WhjlApi1108> list = new ArrayList<>();
WhjlApi1108 whjlApi1107;
for (ApiInfoData infoData : items) {
--
Gitblit v1.9.3