From 9ad231b419cfb6c07385d06eb68961126651af2f Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期一, 11 九月 2023 19:03:11 +0800
Subject: [PATCH] 页面修改
---
src/main/java/com/fzzy/otherview/sh2023/ShApi2102.view.xml | 28 ----
src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2101PR.java | 54 ++++---
src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java | 2
src/main/java/com/fzzy/otherview/sh2023/ShApi2104.view.xml | 52 +-----
src/main/java/com/fzzy/otherview/sh2023/ShApi2204.view.xml | 52 +-----
src/main/java/com/fzzy/push/sh2023/dto/ShAreaBjw.java | 21 ---
src/main/java/com/fzzy/otherview/sh2023/ShApi2103.view.xml | 40 ----
src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2104PR.java | 54 +++---
src/main/java/com/fzzy/otherview/sh2023/ShApi2101.view.xml | 28 ----
src/main/java/com/fzzy/otherview/sh2023/ShApi2203.view.xml | 40 ++--
10 files changed, 106 insertions(+), 265 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java
index 25dc873..e1de3c3 100644
--- a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java
+++ b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java
@@ -80,8 +80,6 @@
//鐔忚捀浣滀笟淇℃伅鍚屾
fzzySync1306.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
- fzzySync1023.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
-
}
}
diff --git a/src/main/java/com/fzzy/otherview/sh2023/ShApi2101.view.xml b/src/main/java/com/fzzy/otherview/sh2023/ShApi2101.view.xml
index 9e62fab..a25d949 100644
--- a/src/main/java/com/fzzy/otherview/sh2023/ShApi2101.view.xml
+++ b/src/main/java/com/fzzy/otherview/sh2023/ShApi2101.view.xml
@@ -182,34 +182,6 @@
<Property name="mapValues">
<Collection>
<Entity>
- <Property name="value">榛勬郸鍖�</Property>
- <Property name="key">huangpu</Property>
- </Entity>
- <Entity>
- <Property name="value">寰愭眹鍖�</Property>
- <Property name="key">xuhui</Property>
- </Entity>
- <Entity>
- <Property name="value">闀垮畞鍖�</Property>
- <Property name="key">changning</Property>
- </Entity>
- <Entity>
- <Property name="value">闈欏畨鍖�</Property>
- <Property name="key">jingan</Property>
- </Entity>
- <Entity>
- <Property name="value">鏅檧鍖�</Property>
- <Property name="key">putuo</Property>
- </Entity>
- <Entity>
- <Property name="value">铏瑰彛鍖�</Property>
- <Property name="key">hongkou</Property>
- </Entity>
- <Entity>
- <Property name="value">鏉ㄦ郸鍖�</Property>
- <Property name="key">yangpu</Property>
- </Entity>
- <Entity>
<Property name="value">闂佃鍖�</Property>
<Property name="key">minhang</Property>
</Entity>
diff --git a/src/main/java/com/fzzy/otherview/sh2023/ShApi2102.view.xml b/src/main/java/com/fzzy/otherview/sh2023/ShApi2102.view.xml
index c7e0306..e322be4 100644
--- a/src/main/java/com/fzzy/otherview/sh2023/ShApi2102.view.xml
+++ b/src/main/java/com/fzzy/otherview/sh2023/ShApi2102.view.xml
@@ -69,34 +69,6 @@
<Property name="mapValues">
<Collection>
<Entity>
- <Property name="value">榛勬郸鍖�</Property>
- <Property name="key">huangpu</Property>
- </Entity>
- <Entity>
- <Property name="value">寰愭眹鍖�</Property>
- <Property name="key">xuhui</Property>
- </Entity>
- <Entity>
- <Property name="value">闀垮畞鍖�</Property>
- <Property name="key">changning</Property>
- </Entity>
- <Entity>
- <Property name="value">闈欏畨鍖�</Property>
- <Property name="key">jingan</Property>
- </Entity>
- <Entity>
- <Property name="value">鏅檧鍖�</Property>
- <Property name="key">putuo</Property>
- </Entity>
- <Entity>
- <Property name="value">铏瑰彛鍖�</Property>
- <Property name="key">hongkou</Property>
- </Entity>
- <Entity>
- <Property name="value">鏉ㄦ郸鍖�</Property>
- <Property name="key">yangpu</Property>
- </Entity>
- <Entity>
<Property name="value">闂佃鍖�</Property>
<Property name="key">minhang</Property>
</Entity>
diff --git a/src/main/java/com/fzzy/otherview/sh2023/ShApi2103.view.xml b/src/main/java/com/fzzy/otherview/sh2023/ShApi2103.view.xml
index 5c6c4f0..615bd57 100644
--- a/src/main/java/com/fzzy/otherview/sh2023/ShApi2103.view.xml
+++ b/src/main/java/com/fzzy/otherview/sh2023/ShApi2103.view.xml
@@ -82,34 +82,6 @@
<Property name="mapValues">
<Collection>
<Entity>
- <Property name="value">榛勬郸鍖�</Property>
- <Property name="key">huangpu</Property>
- </Entity>
- <Entity>
- <Property name="value">寰愭眹鍖�</Property>
- <Property name="key">xuhui</Property>
- </Entity>
- <Entity>
- <Property name="value">闀垮畞鍖�</Property>
- <Property name="key">changning</Property>
- </Entity>
- <Entity>
- <Property name="value">闈欏畨鍖�</Property>
- <Property name="key">jingan</Property>
- </Entity>
- <Entity>
- <Property name="value">鏅檧鍖�</Property>
- <Property name="key">putuo</Property>
- </Entity>
- <Entity>
- <Property name="value">铏瑰彛鍖�</Property>
- <Property name="key">hongkou</Property>
- </Entity>
- <Entity>
- <Property name="value">鏉ㄦ郸鍖�</Property>
- <Property name="key">yangpu</Property>
- </Entity>
- <Entity>
<Property name="value">闂佃鍖�</Property>
<Property name="key">minhang</Property>
</Entity>
@@ -186,27 +158,27 @@
<DataType name="dtItem">
<Property name="creationType">com.fzzy.push.sh2023.dto.SH2023Api2103Item</Property>
<PropertyDef name="qh">
- <Property/>
+ <Property></Property>
<Property name="label">鍦堝彿</Property>
</PropertyDef>
<PropertyDef name="qsdlbh">
- <Property/>
+ <Property></Property>
<Property name="label">璧峰鐢电紗缂栧彿</Property>
</PropertyDef>
<PropertyDef name="jsdlbh">
- <Property/>
+ <Property></Property>
<Property name="label">缁撴潫鐢电紗缂栧彿</Property>
</PropertyDef>
<PropertyDef name="cs">
- <Property/>
+ <Property></Property>
<Property name="label">鍚勫湀鎬诲眰鏁�</Property>
</PropertyDef>
<PropertyDef name="ybj">
- <Property/>
+ <Property></Property>
<Property name="label">鍦堝崐寰�</Property>
</PropertyDef>
<PropertyDef name="rowId">
- <Property/>
+ <Property></Property>
<Property name="label">搴忓彿</Property>
</PropertyDef>
</DataType>
diff --git a/src/main/java/com/fzzy/otherview/sh2023/ShApi2104.view.xml b/src/main/java/com/fzzy/otherview/sh2023/ShApi2104.view.xml
index 4994015..e4e14b4 100644
--- a/src/main/java/com/fzzy/otherview/sh2023/ShApi2104.view.xml
+++ b/src/main/java/com/fzzy/otherview/sh2023/ShApi2104.view.xml
@@ -6,11 +6,11 @@
<DataType name="dtMain">
<Property name="creationType">com.fzzy.push.sh2023.dto.SH2023Api2104</Property>
<PropertyDef name="bydh">
- <Property/>
+ <Property></Property>
<Property name="label">椹宠繍鍗曞彿</Property>
</PropertyDef>
<PropertyDef name="kqdm">
- <Property/>
+ <Property></Property>
<Property name="label">搴撳尯浠ｇ爜</Property>
</PropertyDef>
<PropertyDef name="jzrq">
@@ -18,23 +18,23 @@
<Property name="label">璁拌处鏃ユ湡</Property>
</PropertyDef>
<PropertyDef name="khmc">
- <Property/>
+ <Property></Property>
<Property name="label">瀹㈡埛缂栧彿</Property>
</PropertyDef>
<PropertyDef name="psplan">
- <Property/>
+ <Property></Property>
<Property name="label">鏉ョ伯棰勬姤鍙�/鎻愯揣鍗曞彿</Property>
</PropertyDef>
<PropertyDef name="hth">
- <Property/>
+ <Property></Property>
<Property name="label">鍚堝悓鍙�</Property>
</PropertyDef>
<PropertyDef name="cch">
- <Property/>
+ <Property></Property>
<Property name="label">杞﹁埞鍙�</Property>
</PropertyDef>
<PropertyDef name="lspzdm">
- <Property/>
+ <Property></Property>
<Property name="label">鍝佺澶х被</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("LSPZ")}</Property>
@@ -43,7 +43,7 @@
</Property>
</PropertyDef>
<PropertyDef name="lsxzdm">
- <Property/>
+ <Property></Property>
<Property name="label">绮鎬ц川浠ｇ爜</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("LSXZ")}</Property>
@@ -52,7 +52,7 @@
</Property>
</PropertyDef>
<PropertyDef name="lldm">
- <Property/>
+ <Property></Property>
<Property name="label">鏉ョ伯浠ｇ爜</Property>
</PropertyDef>
<PropertyDef name="jz">
@@ -60,7 +60,7 @@
<Property name="label">鍑�閲�</Property>
</PropertyDef>
<PropertyDef name="czbz">
- <Property/>
+ <Property></Property>
<Property name="label">鏁版嵁鐘舵��</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("CZBZ")}</Property>
@@ -73,7 +73,7 @@
<Property name="label">鏈�鍚庢洿鏂版椂闂�</Property>
</PropertyDef>
<PropertyDef name="pch">
- <Property/>
+ <Property></Property>
<Property name="label">鎵规鍙�</Property>
</PropertyDef>
<PropertyDef name="bjw">
@@ -84,34 +84,6 @@
<Property name="valueProperty">value</Property>
<Property name="mapValues">
<Collection>
- <Entity>
- <Property name="value">榛勬郸鍖�</Property>
- <Property name="key">huangpu</Property>
- </Entity>
- <Entity>
- <Property name="value">寰愭眹鍖�</Property>
- <Property name="key">xuhui</Property>
- </Entity>
- <Entity>
- <Property name="value">闀垮畞鍖�</Property>
- <Property name="key">changning</Property>
- </Entity>
- <Entity>
- <Property name="value">闈欏畨鍖�</Property>
- <Property name="key">jingan</Property>
- </Entity>
- <Entity>
- <Property name="value">鏅檧鍖�</Property>
- <Property name="key">putuo</Property>
- </Entity>
- <Entity>
- <Property name="value">铏瑰彛鍖�</Property>
- <Property name="key">hongkou</Property>
- </Entity>
- <Entity>
- <Property name="value">鏉ㄦ郸鍖�</Property>
- <Property name="key">yangpu</Property>
- </Entity>
<Entity>
<Property name="value">闂佃鍖�</Property>
<Property name="key">minhang</Property>
@@ -363,7 +335,7 @@
</ToolBar>
<Dialog id="dialogMain">
<Property name="width">80%</Property>
- <Property name="caption">鍒颁粨淇℃伅</Property>
+ <Property name="caption">甯傚偍椹宠繍鍗曚俊鎭�</Property>
<Property name="iconClass">fa fa-sliders</Property>
<Property name="closeable">false</Property>
<Buttons>
diff --git a/src/main/java/com/fzzy/otherview/sh2023/ShApi2203.view.xml b/src/main/java/com/fzzy/otherview/sh2023/ShApi2203.view.xml
index e7fdf25..71f25a5 100644
--- a/src/main/java/com/fzzy/otherview/sh2023/ShApi2203.view.xml
+++ b/src/main/java/com/fzzy/otherview/sh2023/ShApi2203.view.xml
@@ -6,11 +6,11 @@
<DataType name="dtMain">
<Property name="creationType">com.fzzy.push.sh2023.dto.SH2023Api2203</Property>
<PropertyDef name="htbh">
- <Property/>
+ <Property></Property>
<Property name="label">鍚堝悓鍙�</Property>
</PropertyDef>
<PropertyDef name="bdh">
- <Property/>
+ <Property></Property>
<Property name="label">鏍囩殑鍙�</Property>
</PropertyDef>
<PropertyDef name="cjrq">
@@ -18,7 +18,7 @@
<Property name="label">鎴愪氦鏃ユ湡</Property>
</PropertyDef>
<PropertyDef name="jyzt">
- <Property/>
+ <Property></Property>
<Property name="label">浜ゆ槗鐘舵��</Property>
<Property name="mapping">
<Property name="keyProperty">key</Property>
@@ -26,8 +26,8 @@
<Property name="mapValues">
<Collection>
<Entity>
- <Property name="key"/>
- <Property name="value"/>
+ <Property name="key"></Property>
+ <Property name="value"></Property>
</Entity>
<Entity>
<Property name="key">00</Property>
@@ -82,7 +82,7 @@
</Property>
</PropertyDef>
<PropertyDef name="lsxz">
- <Property/>
+ <Property></Property>
<Property name="label">绮鎬ц川</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("LSXZ")}</Property>
@@ -91,11 +91,11 @@
</Property>
</PropertyDef>
<PropertyDef name="lspzdl">
- <Property/>
+ <Property></Property>
<Property name="label">绮鍝佺澶х被</Property>
</PropertyDef>
<PropertyDef name="lspzmx">
- <Property/>
+ <Property></Property>
<Property name="label">绮鍝佺鏄庣粏</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("LSPZ")}</Property>
@@ -104,19 +104,19 @@
</Property>
</PropertyDef>
<PropertyDef name="scnf">
- <Property/>
+ <Property></Property>
<Property name="label">鐢熶骇骞翠唤</Property>
</PropertyDef>
<PropertyDef name="kd">
- <Property/>
+ <Property></Property>
<Property name="label">搴撶偣</Property>
</PropertyDef>
<PropertyDef name="bmfqc">
- <Property/>
+ <Property></Property>
<Property name="label">涔版柟鍏ㄧО</Property>
</PropertyDef>
<PropertyDef name="smfqc">
- <Property/>
+ <Property></Property>
<Property name="label">鍗栨柟鍏ㄧО</Property>
</PropertyDef>
<PropertyDef name="cjsl">
@@ -150,13 +150,13 @@
<Property name="displayFormat">#0.00鍏�</Property>
</PropertyDef>
<PropertyDef name="smfsxf">
- <Property/>
+ <Property></Property>
<Property name="label">鍗栨柟鎵嬬画璐�</Property>
<Property name="dataType">Double</Property>
<Property name="displayFormat">#0.00鍏�</Property>
</PropertyDef>
<PropertyDef name="lx">
- <Property/>
+ <Property></Property>
<Property name="label">閲囪喘/閿�鍞被鍨�</Property>
<Property name="mapping">
<Property name="keyProperty">key</Property>
@@ -176,7 +176,7 @@
</Property>
</PropertyDef>
<PropertyDef name="bmfxzqh">
- <Property/>
+ <Property></Property>
<Property name="label">涔版柟琛屾斂鍖哄垝</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("gbAreaPR#listAll").getResult()}</Property>
@@ -185,7 +185,7 @@
</Property>
</PropertyDef>
<PropertyDef name="smfxzqh">
- <Property/>
+ <Property></Property>
<Property name="label">鍗栨柟琛屾斂鍖哄垝</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("gbAreaPR#listAll").getResult()}</Property>
@@ -194,11 +194,11 @@
</Property>
</PropertyDef>
<PropertyDef name="hwmc">
- <Property/>
+ <Property></Property>
<Property name="label">璐т綅鍚嶇О</Property>
</PropertyDef>
<PropertyDef name="jyxzqh">
- <Property/>
+ <Property></Property>
<Property name="label">浜ゆ槗琛屾斂鍖哄垝</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("gbAreaPR#listAll").getResult()}</Property>
@@ -207,7 +207,7 @@
</Property>
</PropertyDef>
<PropertyDef name="czbz">
- <Property/>
+ <Property></Property>
<Property name="label">鎿嶄綔鏍囧織</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("CZBZ")}</Property>
@@ -447,7 +447,7 @@
</ToolBar>
<Dialog id="dialogMain">
<Property name="width">80%</Property>
- <Property name="caption">鍒颁粨淇℃伅</Property>
+ <Property name="caption">浜ゆ槗涓績鍚堝悓</Property>
<Property name="iconClass">fa fa-sliders</Property>
<Property name="closeable">false</Property>
<Buttons>
diff --git a/src/main/java/com/fzzy/otherview/sh2023/ShApi2204.view.xml b/src/main/java/com/fzzy/otherview/sh2023/ShApi2204.view.xml
index fee85fa..2ef5cb3 100644
--- a/src/main/java/com/fzzy/otherview/sh2023/ShApi2204.view.xml
+++ b/src/main/java/com/fzzy/otherview/sh2023/ShApi2204.view.xml
@@ -6,15 +6,15 @@
<DataType name="dtMain">
<Property name="creationType">com.fzzy.push.sh2023.dto.SH2023Api2204</Property>
<PropertyDef name="zjbgdh">
- <Property/>
+ <Property></Property>
<Property name="label">璐ㄦ鎶ュ憡鍗曞彿</Property>
</PropertyDef>
<PropertyDef name="hwdm">
- <Property/>
+ <Property></Property>
<Property name="label">璐т綅浠ｇ爜</Property>
</PropertyDef>
<PropertyDef name="lsxzdm">
- <Property/>
+ <Property></Property>
<Property name="label">绮鎬ц川浠ｇ爜</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("LSXZ")}</Property>
@@ -23,7 +23,7 @@
</Property>
</PropertyDef>
<PropertyDef name="lspzdm">
- <Property/>
+ <Property></Property>
<Property name="label">绮鍝佺浠ｇ爜</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("LSPZ")}</Property>
@@ -32,7 +32,7 @@
</Property>
</PropertyDef>
<PropertyDef name="lsdjdm">
- <Property/>
+ <Property></Property>
<Property name="label">绮绛夌骇浠ｇ爜</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("LSDJ")}</Property>
@@ -45,11 +45,11 @@
<Property name="label">妫�楠屾椂闂�</Property>
</PropertyDef>
<PropertyDef name="jyr">
- <Property/>
+ <Property></Property>
<Property name="label">妫�楠屼汉</Property>
</PropertyDef>
<PropertyDef name="jyyj">
- <Property/>
+ <Property></Property>
<Property name="label">妫�楠屼緷鎹�</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("JYYJ")}</Property>
@@ -72,15 +72,15 @@
<Property name="label">鎵︽牱鏃堕棿</Property>
</PropertyDef>
<PropertyDef name="lldm">
- <Property/>
+ <Property></Property>
<Property name="label">鏉ョ伯浠ｇ爜</Property>
</PropertyDef>
<PropertyDef name="bz">
- <Property/>
+ <Property></Property>
<Property name="label">澶囨敞</Property>
</PropertyDef>
<PropertyDef name="czbz">
- <Property/>
+ <Property></Property>
<Property name="label">鎿嶄綔鏍囧織</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("CZBZ")}</Property>
@@ -100,34 +100,6 @@
<Property name="valueProperty">value</Property>
<Property name="mapValues">
<Collection>
- <Entity>
- <Property name="value">榛勬郸鍖�</Property>
- <Property name="key">huangpu</Property>
- </Entity>
- <Entity>
- <Property name="value">寰愭眹鍖�</Property>
- <Property name="key">xuhui</Property>
- </Entity>
- <Entity>
- <Property name="value">闀垮畞鍖�</Property>
- <Property name="key">changning</Property>
- </Entity>
- <Entity>
- <Property name="value">闈欏畨鍖�</Property>
- <Property name="key">jingan</Property>
- </Entity>
- <Entity>
- <Property name="value">鏅檧鍖�</Property>
- <Property name="key">putuo</Property>
- </Entity>
- <Entity>
- <Property name="value">铏瑰彛鍖�</Property>
- <Property name="key">hongkou</Property>
- </Entity>
- <Entity>
- <Property name="value">鏉ㄦ郸鍖�</Property>
- <Property name="key">yangpu</Property>
- </Entity>
<Entity>
<Property name="value">闂佃鍖�</Property>
<Property name="key">minhang</Property>
@@ -169,7 +141,7 @@
</Property>
</PropertyDef>
<PropertyDef name="pch">
- <Property/>
+ <Property></Property>
<Property name="label">鎵规鍙�</Property>
</PropertyDef>
</DataType>
@@ -398,7 +370,7 @@
</ToolBar>
<Dialog id="dialogMain">
<Property name="width">80%</Property>
- <Property name="caption">鍒颁粨淇℃伅</Property>
+ <Property name="caption">瀹氬寲姘存楠�</Property>
<Property name="iconClass">fa fa-sliders</Property>
<Property name="closeable">false</Property>
<Buttons>
diff --git a/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2101PR.java b/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2101PR.java
index 44afe90..01284de 100644
--- a/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2101PR.java
+++ b/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2101PR.java
@@ -17,8 +17,10 @@
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.ApiInfoDataRep;
+import com.fzzy.otherview.gd2022.dto.GdApi1023;
import com.fzzy.otherview.whhpjl.WhjlConstant;
import com.fzzy.otherview.whhpjl.dto.WhjlApi1101;
+import com.fzzy.push.gd2022.ApiCodeConstant;
import com.fzzy.push.sh2023.SH2023Constant;
import com.fzzy.push.sh2023.dto.SH2023Api2101;
import org.apache.commons.lang.StringUtils;
@@ -118,15 +120,22 @@
if (null == data.getPch() || data.getPch() == "") {
data.setPch(data.getHwdm() + DateFormatUtils.format(data.getJjrq(), "yyyy"));
}
- ApiInfoData infoData = new ApiInfoData();
- infoData.setId(data.getJjdh());
- infoData.setKqdm(data.getKqdm());
- infoData.setInteId(SH2023Constant.SH_2023_API_CODE_2101);
- infoData.setUpdateTime(new Date());
- infoData.setDataId(data.getJjdh());
- infoData.setData(JSON.toJSONString(data));
- infoData.setCzbz(data.getCzbz());
- infoData.setRemarks("澶囨敞淇℃伅");
+ ApiInfoData infoData;
+ List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2101, data.getJjdh());
+ if (apiInfoList.size() != 0) {
+ infoData = apiInfoList.get(0);
+ infoData.setData(JSON.toJSONString(data));
+ } else {
+ infoData = new ApiInfoData();
+ infoData.setId(ContextUtil.getUUID());
+ infoData.setKqdm(data.getKqdm());
+ infoData.setInteId(SH2023Constant.SH_2023_API_CODE_2101);
+ infoData.setUpdateTime(new Date());
+ infoData.setDataId(data.getJjdh());
+ infoData.setData(JSON.toJSONString(data));
+ infoData.setCzbz(data.getCzbz());
+ infoData.setRemarks("澶囨敞淇℃伅");
+ }
apiInfoDataRep.save(infoData);
}
@@ -136,19 +145,21 @@
*/
@Expose
public void delData(SH2023Api2101 data) {
- apiInfoDataRep.deleteById(data.getJjdh());
+ List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2101, data.getJjdh());
+ apiInfoDataRep.deleteById(apiInfoList.get(0).getId());
}
/**
* sHApi2101PR#delUpdate
*/
@Expose
- public String delUpdate(SH2023Api2101 entity) {
- if (null == entity) {
+ public String delUpdate(SH2023Api2101 data) {
+ if (null == data) {
return "鏃犳暟鎹墽琛�";
}
- entity.setCzbz(Constant.CZBZ_D);
- apiInfoDataRep.updateStatus(entity.getJjdh(), JSON.toJSONString(entity), Constant.CZBZ_D);
+ List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2101, data.getJjdh());
+ data.setCzbz(Constant.CZBZ_D);
+ apiInfoDataRep.updateStatus(apiInfoList.get(0).getId(), JSON.toJSONString(data), Constant.CZBZ_D);
return null;
}
@@ -177,23 +188,16 @@
responseDto = apiService.pushData(param, apiConf, items);
if (responseDto.getSuccess() == 0) {
//鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
-
ApiInfoData infoData;
for (SH2023Api2101 data : items) {
if (Constant.CZBZ_I.equals(data.getCzbz())) {
-
- infoData = new ApiInfoData();
- infoData.setId(data.getJjdh());
- infoData.setKqdm(data.getKqdm());
- infoData.setInteType("21");
- infoData.setInteId(SH2023Constant.SH_2023_API_CODE_2101);
- infoData.setUpdateTime(new Date());
- infoData.setDataId(data.getJjdh());
-
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2101, data.getJjdh());
data.setCzbz(Constant.CZBZ_U);
+ infoData = apiInfoList.get(0);
+ infoData.setUpdateTime(new Date());
infoData.setCzbz(Constant.CZBZ_U);
infoData.setData(JSON.toJSONString(data));
-
apiInfoDataRep.save(infoData);
}
}
diff --git a/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2104PR.java b/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2104PR.java
index bb2b057..f234eda 100644
--- a/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2104PR.java
+++ b/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2104PR.java
@@ -111,17 +111,22 @@
*/
@DataResolver
public void saveData(SH2023Api2104 data) {
-
- ApiInfoData infoData = new ApiInfoData();
- infoData.setId(data.getBydh());
- infoData.setKqdm(data.getKqdm());
- infoData.setInteId(SH2023Constant.SH_2023_API_CODE_2104);
- infoData.setUpdateTime(new Date());
- infoData.setDataId(data.getBydh());
- infoData.setData(JSON.toJSONString(data));
- infoData.setCzbz(data.getCzbz());
- infoData.setRemarks("澶囨敞淇℃伅");
-
+ ApiInfoData infoData;
+ List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2101, data.getBydh());
+ if (apiInfoList.size() != 0) {
+ infoData = apiInfoList.get(0);
+ infoData.setData(JSON.toJSONString(data));
+ } else {
+ infoData = new ApiInfoData();
+ infoData.setId(ContextUtil.getUUID());
+ infoData.setKqdm(data.getKqdm());
+ infoData.setInteId(SH2023Constant.SH_2023_API_CODE_2104);
+ infoData.setUpdateTime(new Date());
+ infoData.setDataId(data.getBydh());
+ infoData.setData(JSON.toJSONString(data));
+ infoData.setCzbz(data.getCzbz());
+ infoData.setRemarks("澶囨敞淇℃伅");
+ }
apiInfoDataRep.save(infoData);
}
@@ -130,19 +135,21 @@
*/
@Expose
public void delData(SH2023Api2104 data) {
- apiInfoDataRep.deleteById(data.getBydh());
+ List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2104, data.getBydh());
+ apiInfoDataRep.deleteById(apiInfoList.get(0).getId());
}
/**
* sHApi2104PR#delUpdate
*/
@Expose
- public String delUpdate(SH2023Api2104 entity) {
- if (null == entity) {
+ public String delUpdate(SH2023Api2104 data) {
+ if (null == data) {
return "鏃犳暟鎹墽琛�";
}
- entity.setCzbz(Constant.CZBZ_D);
- apiInfoDataRep.updateStatus(entity.getBydh(), JSON.toJSONString(entity), Constant.CZBZ_D);
+ List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2104, data.getBydh());
+ data.setCzbz(Constant.CZBZ_D);
+ apiInfoDataRep.updateStatus(apiInfoList.get(0).getId(), JSON.toJSONString(data), Constant.CZBZ_D);
return null;
}
@@ -171,23 +178,16 @@
responseDto = apiService.pushData(param, apiConf, items);
if (responseDto.getSuccess() == 0) {
//鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
-
ApiInfoData infoData;
for (SH2023Api2104 data : items) {
if (Constant.CZBZ_I.equals(data.getCzbz())) {
-
- infoData = new ApiInfoData();
- infoData.setId(data.getBydh());
- infoData.setKqdm(data.getKqdm());
- infoData.setInteType("21");
- infoData.setInteId(SH2023Constant.SH_2023_API_CODE_2104);
- infoData.setUpdateTime(new Date());
- infoData.setDataId(data.getBydh());
-
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2104, data.getBydh());
data.setCzbz(Constant.CZBZ_U);
+ infoData = apiInfoList.get(0);
+ infoData.setUpdateTime(new Date());
infoData.setCzbz(Constant.CZBZ_U);
infoData.setData(JSON.toJSONString(data));
-
apiInfoDataRep.save(infoData);
}
}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/ShAreaBjw.java b/src/main/java/com/fzzy/push/sh2023/dto/ShAreaBjw.java
index d1e2e02..359f7d5 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/ShAreaBjw.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/ShAreaBjw.java
@@ -5,13 +5,6 @@
*/
public enum ShAreaBjw {
- BJW_310101("310101", "榛勬郸鍖�", "huangpu"),
- BJW_310104("310104", "寰愭眹鍖�", "xuhui"),
- BJW_310105("310105", "闀垮畞鍖�", "changning"),
- BJW_310106("310106", "闈欏畨鍖�", "jingan"),
- BJW_310107("310107", "鏅檧鍖�", "putuo"),
- BJW_310109("310109", "铏瑰彛鍖�", "hongkou"),
- BJW_310110("310110", "鏉ㄦ郸鍖�", "yangpu"),
BJW_310112("310112", "闂佃鍖�", "minhang"),
BJW_310113("310113", "瀹濆北鍖�", "baoshan"),
BJW_310114("310114", "鍢夊畾鍖�", "jiading"),
@@ -47,13 +40,6 @@
public static String getName(String code) {
if (null == code) return null;
- if (ShAreaBjw.BJW_310101.getCode().equals(code)) return ShAreaBjw.BJW_310101.getName();
- if (ShAreaBjw.BJW_310104.getCode().equals(code)) return ShAreaBjw.BJW_310104.getName();
- if (ShAreaBjw.BJW_310105.getCode().equals(code)) return ShAreaBjw.BJW_310105.getName();
- if (ShAreaBjw.BJW_310106.getCode().equals(code)) return ShAreaBjw.BJW_310106.getName();
- if (ShAreaBjw.BJW_310107.getCode().equals(code)) return ShAreaBjw.BJW_310107.getName();
- if (ShAreaBjw.BJW_310109.getCode().equals(code)) return ShAreaBjw.BJW_310109.getName();
- if (ShAreaBjw.BJW_310110.getCode().equals(code)) return ShAreaBjw.BJW_310110.getName();
if (ShAreaBjw.BJW_310112.getCode().equals(code)) return ShAreaBjw.BJW_310112.getName();
if (ShAreaBjw.BJW_310113.getCode().equals(code)) return ShAreaBjw.BJW_310113.getName();
if (ShAreaBjw.BJW_310114.getCode().equals(code)) return ShAreaBjw.BJW_310114.getName();
@@ -70,13 +56,6 @@
public static String getBjw(String code) {
if (null == code) return null;
- if (ShAreaBjw.BJW_310101.getCode().equals(code)) return ShAreaBjw.BJW_310101.getBjw();
- if (ShAreaBjw.BJW_310104.getCode().equals(code)) return ShAreaBjw.BJW_310104.getBjw();
- if (ShAreaBjw.BJW_310105.getCode().equals(code)) return ShAreaBjw.BJW_310105.getBjw();
- if (ShAreaBjw.BJW_310106.getCode().equals(code)) return ShAreaBjw.BJW_310106.getBjw();
- if (ShAreaBjw.BJW_310107.getCode().equals(code)) return ShAreaBjw.BJW_310107.getBjw();
- if (ShAreaBjw.BJW_310109.getCode().equals(code)) return ShAreaBjw.BJW_310109.getBjw();
- if (ShAreaBjw.BJW_310110.getCode().equals(code)) return ShAreaBjw.BJW_310110.getBjw();
if (ShAreaBjw.BJW_310112.getCode().equals(code)) return ShAreaBjw.BJW_310112.getBjw();
if (ShAreaBjw.BJW_310113.getCode().equals(code)) return ShAreaBjw.BJW_310113.getBjw();
if (ShAreaBjw.BJW_310114.getCode().equals(code)) return ShAreaBjw.BJW_310114.getBjw();
--
Gitblit v1.9.3