From 14f79528513e0f7c08f47c4d34efd7d6fa847a60 Mon Sep 17 00:00:00 2001 From: ws <ws@123.com> Date: 星期五, 03 十一月 2023 19:13:47 +0800 Subject: [PATCH] 提交武汉接口2 --- src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1209.java | 1 src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1110PR.java | 2 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1109.java | 3 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1309.java | 1 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1203.java | 3 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1303.java | 1 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1403.java | 1 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1409.java | 1 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1220.java | 1 src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1104.view.xml | 19 ++ src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1112PR.java | 6 src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1111PR.java | 2 src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1113PR.java | 2 src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1114PR.java | 8 src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1115PR.java | 4 src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1205.view.xml | 6 src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1401.view.xml | 5 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1212.java | 1 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1308.java | 1 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1112.java | 7 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1208.java | 1 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1408.java | 1 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1104.java | 14 + src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1204.java | 1 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1304.java | 1 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1404.java | 1 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1412.java | 1 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1108.java | 1 src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1114.view.xml | 20 + src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1111.view.xml | 35 ++- src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1213.java | 1 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1216.java | 1 src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1206.view.xml | 35 +++- src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1201PR.java | 2 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1413.java | 1 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1205.java | 3 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1407.java | 1 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1207.java | 1 src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1203PR.java | 2 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1202.java | 1 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1210.java | 1 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1402.java | 1 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1410.java | 1 src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1109PR.java | 2 src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1113.view.xml | 14 + src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1218.java | 1 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1103.java | 2 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1106.java | 2 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1111.java | 1 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1114.java | 2 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1306.java | 1 src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1112.view.xml | 39 ++++ src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1104PR.java | 102 ++++++++++++ src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1115.java | 1 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1107.java | 1 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1215.java | 1 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1101.java | 2 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1201.java | 1 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1301.java | 1 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1405.java | 1 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1401.java | 1 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1219.java | 1 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1113.java | 1 src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java | 21 +- src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1203.view.xml | 6 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1307.java | 1 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1305.java | 1 src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1202PR.java | 2 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1110.java | 1 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1102.java | 2 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1302.java | 1 src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1110.view.xml | 5 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1214.java | 1 src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1109.view.xml | 34 ++++ src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1217.java | 1 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1211.java | 1 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1411.java | 1 src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1115.view.xml | 5 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1206.java | 3 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1406.java | 1 80 files changed, 327 insertions(+), 139 deletions(-) diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1104.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1104.view.xml index 6784fc4..4752f4e 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1104.view.xml +++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1104.view.xml @@ -69,6 +69,10 @@ <Property></Property> <Property name="label">鍦板潃</Property> </PropertyDef> + <PropertyDef name="sfyx"> + <Property></Property> + <Property name="label">鏄惁鍚敤</Property> + </PropertyDef> <PropertyDef name="bz"> <Property></Property> <Property name="label">澶囨敞</Property> @@ -361,6 +365,12 @@ <Editor/> </AutoFormElement> <AutoFormElement> + <Property name="name">sfyx</Property> + <Property name="property">sfyx</Property> + <Property name="trigger">listDropYN</Property> + <Editor/> + </AutoFormElement> + <AutoFormElement> <Property name="name">bizId</Property> <Property name="property">bizId</Property> <Editor/> @@ -390,7 +400,7 @@ <Tools/> </Dialog> <UpdateAction id="updateSave"> - <Property name="dataResolver">whjlApi1101PR#saveData</Property> + <Property name="dataResolver">whjlApi1104PR#saveData</Property> <UpdateItem> <Property name="dataPath">[#current]</Property> <Property name="dataSet">dsMain</Property> @@ -398,10 +408,10 @@ </UpdateAction> <AjaxAction id="ajaxDel"> <Property name="confirmMessage">褰撳墠鏁版嵁鍒犻櫎鍚庢棤娉曟仮澶嶏紝璇风‘璁よ鍒犻櫎涔堬紵</Property> - <Property name="service">whjlApi1101PR#delData</Property> + <Property name="service">whjlApi1104PR#delData</Property> </AjaxAction> <AjaxAction id="ajaxPush"> - <Property name="service">whjlApi1101PR#pushData</Property> + <Property name="service">whjlApi1104PR#pushData</Property> </AjaxAction> <CustomDropDown id="cddGbArea"> <Property name="assignmentMap">xzqhbm=code,xzqhmc=name</Property> @@ -476,5 +486,8 @@ </Children> <Tools/> </Dialog> + <ListDropDown id="listDropYN"> + <Property name="items">鏄�,鍚�</Property> + </ListDropDown> </View> </ViewConfig> diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1109.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1109.view.xml index 2c73a9a..4451c78 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1109.view.xml +++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1109.view.xml @@ -64,6 +64,11 @@ <PropertyDef name="czbz"> <Property></Property> <Property name="label">鎿嶄綔鏍囧織</Property> + <Property name="mapping"> + <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("CZBZ")}</Property> + <Property name="keyProperty">code</Property> + <Property name="valueProperty">name</Property> + </Property> </PropertyDef> <PropertyDef name="kqdm"> <Property></Property> @@ -224,6 +229,9 @@ <DataColumn name="sfyx"> <Property name="property">sfyx</Property> </DataColumn> + <DataColumn name="sfyx"> + <Property name="property">czbz</Property> + </DataColumn> </DataGrid> </Container> <Container layoutConstraint="bottom"> @@ -316,10 +324,36 @@ <Editor/> </AutoFormElement> <AutoFormElement> + <Property name="name">sfyx</Property> + <Property name="property">sfyx</Property> + <Property name="trigger">listDropYN</Property> + <Editor/> + </AutoFormElement> + <AutoFormElement> + <Property name="name">bz</Property> + <Property name="property">bz</Property> + <Editor/> + </AutoFormElement> + <AutoFormElement> + <Property name="name">bizId</Property> + <Property name="property">bizId</Property> + <Editor/> + </AutoFormElement> + <AutoFormElement> + <Property name="name">updateTime</Property> + <Property name="property">updateTime</Property> + <Editor/> + </AutoFormElement> + <AutoFormElement> <Property name="name">czbz</Property> <Property name="property">czbz</Property> <Editor/> </AutoFormElement> + <AutoFormElement> + <Property name="name">kqdm</Property> + <Property name="property">kqdm</Property> + <Editor/> + </AutoFormElement> </AutoForm> </Children> <Tools/> diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1110.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1110.view.xml index 43061f8..776e257 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1110.view.xml +++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1110.view.xml @@ -84,6 +84,11 @@ <PropertyDef name="czbz"> <Property></Property> <Property name="label">鎿嶄綔鏍囧織</Property> + <Property name="mapping"> + <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("CZBZ")}</Property> + <Property name="keyProperty">code</Property> + <Property name="valueProperty">name</Property> + </Property> </PropertyDef> <PropertyDef name="kqdm"> <Property></Property> diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1111.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1111.view.xml index b72d734..41bc207 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1111.view.xml +++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1111.view.xml @@ -6,31 +6,31 @@ <DataType name="dtMain"> <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1111</Property> <PropertyDef name="ssbfjlbh"> - <Property/> + <Property></Property> <Property name="label">璁炬柦鎶ュ簾璁板綍缂栧彿</Property> </PropertyDef> <PropertyDef name="jlqybh"> - <Property/> + <Property></Property> <Property name="label">鍐涚伯浼佷笟缂栧彿</Property> </PropertyDef> <PropertyDef name="jlqymc"> - <Property/> + <Property></Property> <Property name="label">鍐涚伯浼佷笟鍚嶇О</Property> </PropertyDef> <PropertyDef name="jgzdbh"> - <Property/> + <Property></Property> <Property name="label">鍐涗緵绔欑偣缂栧彿</Property> </PropertyDef> <PropertyDef name="jgzdmc"> - <Property/> + <Property></Property> <Property name="label">鍐涗緵绔欑偣鍚嶇О</Property> </PropertyDef> <PropertyDef name="cfbh"> - <Property/> + <Property></Property> <Property name="label">浠撴埧缂栧彿</Property> </PropertyDef> <PropertyDef name="sscfmc"> - <Property/> + <Property></Property> <Property name="label">浠撴埧鍚嶇О</Property> </PropertyDef> <PropertyDef name="sqrq"> @@ -38,15 +38,15 @@ <Property name="label">鐢宠鏃ユ湡</Property> </PropertyDef> <PropertyDef name="bfyy"> - <Property/> + <Property></Property> <Property name="label">鎶ュ簾鍘熷洜</Property> </PropertyDef> <PropertyDef name="sqr"> - <Property/> + <Property></Property> <Property name="label">鐢宠浜�</Property> </PropertyDef> <PropertyDef name="spr"> - <Property/> + <Property></Property> <Property name="label">瀹℃壒浜�</Property> </PropertyDef> <PropertyDef name="sprq"> @@ -54,15 +54,15 @@ <Property name="label">瀹℃壒鏃ユ湡</Property> </PropertyDef> <PropertyDef name="spyj"> - <Property/> + <Property></Property> <Property name="label">瀹℃壒鎰忚</Property> </PropertyDef> <PropertyDef name="bz"> - <Property/> + <Property></Property> <Property name="label">澶囨敞</Property> </PropertyDef> <PropertyDef name="bizId"> - <Property/> + <Property></Property> <Property name="label">涓氬姟ID</Property> </PropertyDef> <PropertyDef name="updateTime"> @@ -70,11 +70,16 @@ <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> + <Property name="keyProperty">code</Property> + <Property name="valueProperty">name</Property> + </Property> </PropertyDef> <PropertyDef name="kqdm"> - <Property/> + <Property></Property> <Property name="label">搴撳尯浠g爜</Property> </PropertyDef> </DataType> diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1112.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1112.view.xml index fff8f68..8d43e64 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1112.view.xml +++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1112.view.xml @@ -9,6 +9,10 @@ <Property></Property> <Property name="label">璁惧缂栧彿</Property> </PropertyDef> + <PropertyDef name="sbsjbh"> + <Property></Property> + <Property name="label">璁惧涓婄骇缂栧彿</Property> + </PropertyDef> <PropertyDef name="jlqybh"> <Property></Property> <Property name="label">鍐涚伯浼佷笟缂栧彿</Property> @@ -130,6 +134,7 @@ <PropertyDef name="sdkdk"> <Property></Property> <Property name="label">Sdk绔彛</Property> + <Property name="dataType">Integer</Property> </PropertyDef> <PropertyDef name="zh"> <Property></Property> @@ -158,6 +163,20 @@ <PropertyDef name="sfyx"> <Property></Property> <Property name="label">鏄惁鏈夋晥</Property> + </PropertyDef> + <PropertyDef name="gqrtspdz"> + <Property></Property> + <Property name="label">楂樻竻rtsp鍦板潃</Property> + </PropertyDef> + <PropertyDef name="sjtdh"> + <Property></Property> + <Property name="label">涓婄骇閫氶亾鍙�</Property> + <Property name="dataType">Integer</Property> + </PropertyDef> + <PropertyDef name="tdh"> + <Property></Property> + <Property name="label">閫氶亾鍙�</Property> + <Property name="dataType">Integer</Property> </PropertyDef> <PropertyDef name="bz"> <Property></Property> @@ -385,6 +404,11 @@ <Editor/> </AutoFormElement> <AutoFormElement> + <Property name="name">sbsjbh</Property> + <Property name="property">sbsjbh</Property> + <Editor/> + </AutoFormElement> + <AutoFormElement> <Property name="name">jlqybh</Property> <Property name="property">jlqybh</Property> <Editor/> @@ -553,6 +577,21 @@ <Editor/> </AutoFormElement> <AutoFormElement> + <Property name="name">gqrtspdz</Property> + <Property name="property">gqrtspdz</Property> + <Editor/> + </AutoFormElement> + <AutoFormElement> + <Property name="name">sjtdh</Property> + <Property name="property">sjtdh</Property> + <Editor/> + </AutoFormElement> + <AutoFormElement> + <Property name="name">tdh</Property> + <Property name="property">tdh</Property> + <Editor/> + </AutoFormElement> + <AutoFormElement> <Property name="name">bizId</Property> <Property name="property">bizId</Property> <Editor/> diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1113.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1113.view.xml index b5092e7..aaf8ca1 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1113.view.xml +++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1113.view.xml @@ -102,10 +102,11 @@ <Property></Property> <Property name="label">搴撳尯浠g爜</Property> </PropertyDef> - <Reference name="whjlzp"> + <PropertyDef name="whjlzp"> + <Property></Property> <Property name="label">缁存姢璁板綍鐓х墖</Property> <Property name="dataType">[dtWhjlzp]</Property> - </Reference> + </PropertyDef> </DataType> <DataType name="dtParam"> <Property name="creationType">com.fzzy.api.data.ApiParam</Property> @@ -134,15 +135,15 @@ <DataType name="dtWhjlzp"> <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlWHJLZP</Property> <PropertyDef name="zpid"> - <Property/> + <Property></Property> <Property name="label">鐓х墖id</Property> </PropertyDef> <PropertyDef name="zpmc"> - <Property/> + <Property></Property> <Property name="label">鐓х墖鍚嶇О</Property> </PropertyDef> <PropertyDef name="zplj"> - <Property/> + <Property></Property> <Property name="label">鐓х墖璺緞</Property> </PropertyDef> <PropertyDef name="zpdx"> @@ -451,7 +452,8 @@ </Label> <Button layoutConstraint="left"> <ClientEvent name="onClick">var list = view.get("#dsMain.data:#").get("whjlzp");
 -list.insert({});</ClientEvent> +list.insert({});
 +</ClientEvent> <Property name="caption">鏂板</Property> <Property name="exClassName">btn-default</Property> <Property name="iconClass">fa fa-plus</Property> diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1114.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1114.view.xml index f764bb2..86f20f7 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1114.view.xml +++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1114.view.xml @@ -116,10 +116,15 @@ <Property></Property> <Property name="label">搴撳尯浠g爜</Property> </PropertyDef> - <Reference name="whjlzp"> + <PropertyDef name="whjlzp"> + <Property></Property> <Property name="label">缁存姢璁板綍鐓х墖</Property> <Property name="dataType">[dtWhjlzp]</Property> - </Reference> + </PropertyDef> + <PropertyDef name="sqr"> + <Property></Property> + <Property name="label">鐢宠浜�</Property> + </PropertyDef> </DataType> <DataType name="dtParam"> <Property name="creationType">com.fzzy.api.data.ApiParam</Property> @@ -148,15 +153,15 @@ <DataType name="dtWhjlzp"> <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlWHJLZP</Property> <PropertyDef name="zpid"> - <Property/> + <Property></Property> <Property name="label">鐓х墖id</Property> </PropertyDef> <PropertyDef name="zpmc"> - <Property/> + <Property></Property> <Property name="label">鐓х墖鍚嶇О</Property> </PropertyDef> <PropertyDef name="zplj"> - <Property/> + <Property></Property> <Property name="label">鐓х墖璺緞</Property> </PropertyDef> <PropertyDef name="zpdx"> @@ -445,6 +450,11 @@ <Editor/> </AutoFormElement> <AutoFormElement> + <Property name="name">sqr</Property> + <Property name="property">sqr</Property> + <Editor/> + </AutoFormElement> + <AutoFormElement> <Property name="name">jl</Property> <Property name="property">jl</Property> <Editor/> diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1115.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1115.view.xml index 3a8f000..51db8e2 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1115.view.xml +++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1115.view.xml @@ -76,6 +76,11 @@ <PropertyDef name="czbz"> <Property></Property> <Property name="label">鎿嶄綔鏍囧織</Property> + <Property name="mapping"> + <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("CZBZ")}</Property> + <Property name="keyProperty">code</Property> + <Property name="valueProperty">name</Property> + </Property> </PropertyDef> <PropertyDef name="kqdm"> <Property></Property> diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1203.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1203.view.xml index 387952f..21a6951 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1203.view.xml +++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1203.view.xml @@ -29,7 +29,7 @@ <Property></Property> <Property name="label">鍔犲伐浼佷笟缂栧彿</Property> </PropertyDef> - <PropertyDef name="jlppid"> + <PropertyDef name="jlppbh"> <Property></Property> <Property name="label">鍝佺墝ID</Property> </PropertyDef> @@ -532,8 +532,8 @@ <Editor/> </AutoFormElement> <AutoFormElement> - <Property name="name">jlppid</Property> - <Property name="property">jlppid</Property> + <Property name="name">jlppbh</Property> + <Property name="property">jlppbh</Property> <Editor/> </AutoFormElement> <AutoFormElement> diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1205.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1205.view.xml index d7d3739..7d1fdfd 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1205.view.xml +++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1205.view.xml @@ -65,7 +65,7 @@ <Property></Property> <Property name="label">浜у搧鍚嶇О</Property> </PropertyDef> - <PropertyDef name="sjjldjbh"> + <PropertyDef name="sjjldj"> <Property></Property> <Property name="label">瀹為檯鍐涚伯绛夌骇缂栧彿</Property> </PropertyDef> @@ -401,8 +401,8 @@ <Editor/> </AutoFormElement> <AutoFormElement> - <Property name="name">sjjldjbh</Property> - <Property name="property">sjjldjbh</Property> + <Property name="name">sjjldj</Property> + <Property name="property">sjjldj</Property> <Editor/> </AutoFormElement> <AutoFormElement> diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1206.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1206.view.xml index 2b11472..08e7708 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1206.view.xml +++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1206.view.xml @@ -28,11 +28,6 @@ <PropertyDef name="htlx"> <Property></Property> <Property name="label">鍚堝悓绫诲瀷</Property> - <Property name="mapping"> - <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("HT_YWLX")}</Property> - <Property name="keyProperty">code</Property> - <Property name="valueProperty">name</Property> - </Property> </PropertyDef> <PropertyDef name="htbh"> <Property></Property> @@ -118,11 +113,6 @@ <PropertyDef name="zffs"> <Property></Property> <Property name="label">鏀粯鏂瑰紡</Property> - <Property name="mapping"> - <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("JSFS")}</Property> - <Property name="keyProperty">code</Property> - <Property name="valueProperty">name</Property> - </Property> </PropertyDef> <PropertyDef name="ywcsl"> <Property name="dataType">Double</Property> @@ -144,6 +134,14 @@ <PropertyDef name="sfyx"> <Property></Property> <Property name="label">鏄惁鏈夋晥</Property> + </PropertyDef> + <PropertyDef name="htzt"> + <Property></Property> + <Property name="label">鍚堝悓鐘舵��</Property> + </PropertyDef> + <PropertyDef name="hrqdr"> + <Property></Property> + <Property name="label">鍚堝悓绛捐浜�</Property> </PropertyDef> <PropertyDef name="bz"> <Property></Property> @@ -171,7 +169,7 @@ <Property name="label">搴撳尯浠g爜</Property> </PropertyDef> <PropertyDef name="htspqdList"> - <Property/> + <Property></Property> </PropertyDef> <Reference name="htspqd"> <Property name="parameter">$${this.htspqdList}</Property> @@ -602,6 +600,21 @@ <Editor/> </AutoFormElement> <AutoFormElement> + <Property name="name">hrqdr</Property> + <Property name="property">hrqdr</Property> + <Editor/> + </AutoFormElement> + <AutoFormElement> + <Property name="name">htzt</Property> + <Property name="property">htzt</Property> + <Editor/> + </AutoFormElement> + <AutoFormElement> + <Property name="name">htlx</Property> + <Property name="property">htlx</Property> + <Editor/> + </AutoFormElement> + <AutoFormElement> <Property name="name">xh</Property> <Property name="property">xh</Property> <Editor/> diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1401.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1401.view.xml index b489e5e..6d530af 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1401.view.xml +++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1401.view.xml @@ -281,11 +281,6 @@ <Property name="property">kqdm</Property> <Editor/> </AutoFormElement> - <AutoFormElement> - <Property name="name">jcbgfjmx</Property> - <Property name="property">jcbgfjmx</Property> - <Editor/> - </AutoFormElement> </AutoForm> <Panel> <Property name="caption">妫�鏌ユ姤鍛婇檮浠朵笂閾炬槑缁�</Property> diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1101.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1101.java index 73854f2..af71331 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1101.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1101.java @@ -57,7 +57,7 @@ private String bizId; //涓氬姟ID @JSONField(serialize = false) private Date updateTime; //鏈�鍚庢洿鏂版椂闂� - @JSONField(serialize = false) +// @JSONField(serialize = false) private String czbz; //鎿嶄綔鏍囧織 @JSONField(serialize = false) private String kqdm; //搴撳尯浠g爜 diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1102.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1102.java index 190fa8e..62a356e 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1102.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1102.java @@ -53,7 +53,7 @@ private String bizId; //涓氬姟ID @JSONField(serialize = false) private Date updateTime; //鏈�鍚庢洿鏂版椂闂� - @JSONField(serialize = false) +// @JSONField(serialize = false) private String czbz; //鎿嶄綔鏍囧織 @JSONField(serialize = false) private String kqdm; //搴撳尯浠g爜 diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1103.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1103.java index 378f062..2ed7938 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1103.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1103.java @@ -39,7 +39,7 @@ private String bizId; //涓氬姟ID @JSONField(serialize = false) private Date updateTime; //鏈�鍚庢洿鏂版椂闂� - @JSONField(serialize = false) +// @JSONField(serialize = false) private String czbz; //鎿嶄綔鏍囧織 @JSONField(serialize = false) private String kqdm; //搴撳尯浠g爜 diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1104.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1104.java index 1b8b805..225074d 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1104.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1104.java @@ -1,9 +1,11 @@ package com.fzzy.otherview.whhpjl.dto; +import com.alibaba.fastjson.annotation.JSONField; import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serializable; +import java.util.Date; /** * 鍐涚伯浼佷笟-鏀惧績绮补搴� @@ -34,6 +36,18 @@ private Double wd; //绾害 private Double sjcr; //瀹為檯浠撳 private String dz; //鍦板潃 + private String sfyx; //鏄惁鍚敤 private String bz; //澶囨敞 + + //鍗曠嫭澧炲姞锛屼笉杩涜涓婁紶 + @JSONField(serialize = false) + private String bizId; //涓氬姟ID + @JSONField(serialize = false) + private Date updateTime; //鏈�鍚庢洿鏂版椂闂� + + private String czbz; //鎿嶄綔鏍囧織 + @JSONField(serialize = false) + private String kqdm; //搴撳尯浠g爜 + } \ No newline at end of file diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1106.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1106.java index 16a1894..0c4d962 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1106.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1106.java @@ -46,7 +46,7 @@ private String bizId; //涓氬姟ID @JSONField(serialize = false) private Date updateTime; //鏈�鍚庢洿鏂版椂闂� - @JSONField(serialize = false) +// @JSONField(serialize = false) private String czbz; //鎿嶄綔鏍囧織 @JSONField(serialize = false) private String kqdm; //搴撳尯浠g爜 diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1107.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1107.java index 8f6209f..35f1618 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1107.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1107.java @@ -49,7 +49,6 @@ private String bizId; //涓氬姟ID @JSONField(serialize = false) private Date updateTime; //鏈�鍚庢洿鏂版椂闂� - @JSONField(serialize = false) private String czbz; //鎿嶄綔鏍囧織 @JSONField(serialize = false) private String kqdm; //搴撳尯浠g爜 diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1108.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1108.java index 92b50de..7c4d911 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1108.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1108.java @@ -44,7 +44,6 @@ private String bizId; //涓氬姟ID @JSONField(serialize = false) private Date updateTime; //鏈�鍚庢洿鏂版椂闂� - @JSONField(serialize = false) private String czbz; //鎿嶄綔鏍囧織 @JSONField(serialize = false) private String kqdm; //搴撳尯浠g爜 diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1109.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1109.java index dc1fdd1..2f623ab 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1109.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1109.java @@ -30,7 +30,7 @@ private String sscfmc; //浠撴埧鍚嶇О private String dalx; //妗f绫诲瀷 private String damc; //妗f鍚嶇О - private String dawj; //妗f鏂囦欢 + private byte[] dawj; //妗f鏂囦欢 private String sfyx; //鏄惁鏈夋晥 private String bz; //澶囨敞 @@ -39,7 +39,6 @@ private String bizId; //涓氬姟ID @JSONField(serialize = false) private Date updateTime; //鏈�鍚庢洿鏂版椂闂� - @JSONField(serialize = false) private String czbz; //鎿嶄綔鏍囧織 @JSONField(serialize = false) private String kqdm; //搴撳尯浠g爜 diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1110.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1110.java index 36ba16a..7b2c35e 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1110.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1110.java @@ -46,7 +46,6 @@ private String bizId; //涓氬姟ID @JSONField(serialize = false) private Date updateTime; //鏈�鍚庢洿鏂版椂闂� - @JSONField(serialize = false) private String czbz; //鎿嶄綔鏍囧織 @JSONField(serialize = false) private String kqdm; //搴撳尯浠g爜 diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1111.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1111.java index b3f4935..a1dc47b 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1111.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1111.java @@ -43,7 +43,6 @@ private String bizId; //涓氬姟ID @JSONField(serialize = false) private Date updateTime; //鏈�鍚庢洿鏂版椂闂� - @JSONField(serialize = false) private String czbz; //鎿嶄綔鏍囧織 @JSONField(serialize = false) private String kqdm; //搴撳尯浠g爜 diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1112.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1112.java index 1119f2f..5f4a7c0 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1112.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1112.java @@ -22,6 +22,7 @@ private static final long serialVersionUID = 1L; private String sbbh; //璁惧缂栧彿 + private String sbsjbh; //璁惧涓婄骇缂栧彿 private String jlqybh; //鍐涚伯浼佷笟缂栧彿 private String jlqymc; //鍐涚伯浼佷笟鍚嶇О private String jgzdbh; //鍐涗緵绔欑偣缂栧彿 @@ -52,19 +53,21 @@ private String sdkdk; //Sdk绔彛 private String zh; //甯愬彿 private String mm; //瀵嗙爜 - private Integer rstpdz; //Rtsp鍦板潃 + private String rstpdz; //Rtsp鍦板潃 private String rtspdk; //rtsp绔彛 private String sbxlh; //璁惧搴忓垪鍙� private String jklx; //鐩戞帶绫诲瀷 private String sfyx; //鏄惁鏈夋晥 private String bz; //澶囨敞 + private String gqrtspdz; //楂樻竻rtsp鍦板潃 + private Integer sjtdh; //涓婄骇閫氶亾鍙� + private Integer tdh; //閫氶亾鍙� //鍗曠嫭澧炲姞锛屼笉杩涜涓婁紶 @JSONField(serialize = false) private String bizId; //涓氬姟ID @JSONField(serialize = false) private Date updateTime; //鏈�鍚庢洿鏂版椂闂� - @JSONField(serialize = false) private String czbz; //鎿嶄綔鏍囧織 @JSONField(serialize = false) private String kqdm; //搴撳尯浠g爜 diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1113.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1113.java index 75fc08f..ca319a8 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1113.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1113.java @@ -50,7 +50,6 @@ private String bizId; //涓氬姟ID @JSONField(serialize = false) private Date updateTime; //鏈�鍚庢洿鏂版椂闂� - @JSONField(serialize = false) private String czbz; //鎿嶄綔鏍囧織 @JSONField(serialize = false) private String kqdm; //搴撳尯浠g爜 diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1114.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1114.java index 5939097..3842e6e 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1114.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1114.java @@ -44,6 +44,7 @@ private int sysj; //璇曠敤鏃堕棿 private String wxfy; //缁翠慨璐圭敤 private String ysr; //楠屾敹浜� + private String sqr; //鐢宠浜� private String jl; //缁撹 private List<WhjlWHJLZP> whjlzp; //缁存姢璁板綍鐓х墖 private String bz; //澶囨敞 @@ -53,7 +54,6 @@ private String bizId; //涓氬姟ID @JSONField(serialize = false) private Date updateTime; //鏈�鍚庢洿鏂版椂闂� - @JSONField(serialize = false) private String czbz; //鎿嶄綔鏍囧織 @JSONField(serialize = false) private String kqdm; //搴撳尯浠g爜 diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1115.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1115.java index c2550d5..a79ffa5 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1115.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1115.java @@ -44,7 +44,6 @@ private String bizId; //涓氬姟ID @JSONField(serialize = false) private Date updateTime; //鏈�鍚庢洿鏂版椂闂� - @JSONField(serialize = false) private String czbz; //鎿嶄綔鏍囧織 @JSONField(serialize = false) private String kqdm; //搴撳尯浠g爜 diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1201.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1201.java index 5b45280..7d3aba5 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1201.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1201.java @@ -69,7 +69,6 @@ private String bizId; //涓氬姟ID @JSONField(serialize = false) private Date updateTime; //鏈�鍚庢洿鏂版椂闂� - @JSONField(serialize = false) private String czbz; //鎿嶄綔鏍囧織 @JSONField(serialize = false) private String kqdm; //搴撳尯浠g爜 diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1202.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1202.java index a2272b5..8d62a57 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1202.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1202.java @@ -38,7 +38,6 @@ private String bizId; //涓氬姟ID @JSONField(serialize = false) private Date updateTime; //鏈�鍚庢洿鏂版椂闂� - @JSONField(serialize = false) private String czbz; //鎿嶄綔鏍囧織 @JSONField(serialize = false) private String kqdm; //搴撳尯浠g爜 diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1203.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1203.java index fc09fbe..341fc23 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1203.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1203.java @@ -27,7 +27,7 @@ private String jgzdbh; //鍐涗緵绔欑偣缂栧彿 private String jgzdmc; //鍐涗緵绔欑偣鍚嶇О private String jljgqybh; //鍔犲伐浼佷笟缂栧彿 - private String jlppid; //鍝佺墝ID + private String jlppbh; //鍝佺墝ID private String jlppmc; //鍝佺墝鍚嶇О private String lspzbm; //鍝佺缂栧彿 private String lspzmc; //鍝佺鍚嶇О @@ -78,7 +78,6 @@ private String bizId; //涓氬姟ID @JSONField(serialize = false) private Date updateTime; //鏈�鍚庢洿鏂版椂闂� - @JSONField(serialize = false) private String czbz; //鎿嶄綔鏍囧織 @JSONField(serialize = false) private String kqdm; //搴撳尯浠g爜 diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1204.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1204.java index 7d25f8a..28a561c 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1204.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1204.java @@ -50,7 +50,6 @@ private String bizId; //涓氬姟ID @JSONField(serialize = false) private Date updateTime; //鏈�鍚庢洿鏂版椂闂� - @JSONField(serialize = false) private String czbz; //鎿嶄綔鏍囧織 @JSONField(serialize = false) private String kqdm; //搴撳尯浠g爜 diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1205.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1205.java index f520b98..a79ba03 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1205.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1205.java @@ -37,7 +37,7 @@ private String sjjlppbh ;//瀹為檯鍐涚伯鍝佺墝缂栧彿 private String jlcpbh ;//鍐涚伯浜у搧缂栧彿 private String cpmc ;//浜у搧鍚嶇О - private String sjjldjbh ;//瀹為檯鍐涚伯绛夌骇缂栧彿 + private String sjjldj ;//瀹為檯鍐涚伯绛夌骇缂栧彿 private Double sjjlsl ;//瀹為檯鍐涚伯鏁伴噺 private Double sjjlzl ;//瀹為檯鍐涚伯閲嶉噺 private Double sjdj ;//瀹為檯鍗曚环 @@ -58,7 +58,6 @@ private String bizId; //涓氬姟ID @JSONField(serialize = false) private Date updateTime; //鏈�鍚庢洿鏂版椂闂� - @JSONField(serialize = false) private String czbz; //鎿嶄綔鏍囧織 @JSONField(serialize = false) private String kqdm; //搴撳尯浠g爜 diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1206.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1206.java index b19fd89..00ccc12 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1206.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1206.java @@ -53,6 +53,8 @@ private Double ywcsl; //宸插畬鎴愭暟閲� private Double ywcslje; //宸插畬鎴愭暟閲忛噾棰� private String htbz; //鍚堝悓澶囨敞 + private String htzt; //鍚堝悓鐘舵�� + private String hrqdr; //鍚堝悓鐘舵�� private Integer xh; //搴忓彿 private String sfyx; //鏄惁鏈夋晥 private String bz; //澶囨敞 @@ -63,7 +65,6 @@ private String bizId; //涓氬姟ID @JSONField(serialize = false) private Date updateTime; //鏈�鍚庢洿鏂版椂闂� - @JSONField(serialize = false) private String czbz; //鎿嶄綔鏍囧織 @JSONField(serialize = false) private String kqdm; //搴撳尯浠g爜 diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1207.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1207.java index 84014bb..ddc93f6 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1207.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1207.java @@ -69,7 +69,6 @@ private String bizId; //涓氬姟ID @JSONField(serialize = false) private Date updateTime; //鏈�鍚庢洿鏂版椂闂� - @JSONField(serialize = false) private String czbz; //鎿嶄綔鏍囧織 @JSONField(serialize = false) private String kqdm; //搴撳尯浠g爜 diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1208.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1208.java index 472d74f..1ad54ea 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1208.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1208.java @@ -70,7 +70,6 @@ private String bizId; //涓氬姟ID @JSONField(serialize = false) private Date updateTime; //鏈�鍚庢洿鏂版椂闂� - @JSONField(serialize = false) private String czbz; //鎿嶄綔鏍囧織 @JSONField(serialize = false) private String kqdm; //搴撳尯浠g爜 diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1209.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1209.java index dcbec6a..789fc25 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1209.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1209.java @@ -43,7 +43,6 @@ private String bizId; //涓氬姟ID @JSONField(serialize = false) private Date updateTime; //鏈�鍚庢洿鏂版椂闂� - @JSONField(serialize = false) private String czbz; //鎿嶄綔鏍囧織 @JSONField(serialize = false) private String kqdm; //搴撳尯浠g爜 diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1210.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1210.java index 73f743c..8e1163c 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1210.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1210.java @@ -43,7 +43,6 @@ private String bizId; //涓氬姟ID @JSONField(serialize = false) private Date updateTime; //鏈�鍚庢洿鏂版椂闂� - @JSONField(serialize = false) private String czbz; //鎿嶄綔鏍囧織 @JSONField(serialize = false) private String kqdm; //搴撳尯浠g爜 diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1211.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1211.java index ee3caa9..8e8f923 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1211.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1211.java @@ -46,7 +46,6 @@ private String bizId; //涓氬姟ID @JSONField(serialize = false) private Date updateTime; //鏈�鍚庢洿鏂版椂闂� - @JSONField(serialize = false) private String czbz; //鎿嶄綔鏍囧織 @JSONField(serialize = false) private String kqdm; //搴撳尯浠g爜 diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1212.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1212.java index 6a67678..20a369d 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1212.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1212.java @@ -58,7 +58,6 @@ private String bizId; //涓氬姟ID @JSONField(serialize = false) private Date updateTime; //鏈�鍚庢洿鏂版椂闂� - @JSONField(serialize = false) private String czbz; //鎿嶄綔鏍囧織 @JSONField(serialize = false) private String kqdm; //搴撳尯浠g爜 diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1213.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1213.java index 8174f26..09fcf84 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1213.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1213.java @@ -54,7 +54,6 @@ private String bizId; //涓氬姟ID @JSONField(serialize = false) private Date updateTime; //鏈�鍚庢洿鏂版椂闂� - @JSONField(serialize = false) private String czbz; //鎿嶄綔鏍囧織 @JSONField(serialize = false) private String kqdm; //搴撳尯浠g爜 diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1214.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1214.java index 5e10cd9..ca8fe04 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1214.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1214.java @@ -63,7 +63,6 @@ private String bizId; //涓氬姟ID @JSONField(serialize = false) private Date updateTime; //鏈�鍚庢洿鏂版椂闂� - @JSONField(serialize = false) private String czbz; //鎿嶄綔鏍囧織 @JSONField(serialize = false) private String kqdm; //搴撳尯浠g爜 diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1215.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1215.java index 4bc2d7c..487905c 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1215.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1215.java @@ -50,7 +50,6 @@ private String bizId; //涓氬姟ID @JSONField(serialize = false) private Date updateTime; //鏈�鍚庢洿鏂版椂闂� - @JSONField(serialize = false) private String czbz; //鎿嶄綔鏍囧織 @JSONField(serialize = false) private String kqdm; //搴撳尯浠g爜 diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1216.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1216.java index afe8718..71c1955 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1216.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1216.java @@ -40,7 +40,6 @@ private String bizId; //涓氬姟ID @JSONField(serialize = false) private Date updateTime; //鏈�鍚庢洿鏂版椂闂� - @JSONField(serialize = false) private String czbz; //鎿嶄綔鏍囧織 @JSONField(serialize = false) private String kqdm; //搴撳尯浠g爜 diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1217.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1217.java index d0715db..042d362 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1217.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1217.java @@ -41,7 +41,6 @@ private String bizId; //涓氬姟ID @JSONField(serialize = false) private Date updateTime; //鏈�鍚庢洿鏂版椂闂� - @JSONField(serialize = false) private String czbz; //鎿嶄綔鏍囧織 @JSONField(serialize = false) private String kqdm; //搴撳尯浠g爜 diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1218.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1218.java index 14da32b..e351c16 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1218.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1218.java @@ -39,7 +39,6 @@ private String bizId; //涓氬姟ID @JSONField(serialize = false) private Date updateTime; //鏈�鍚庢洿鏂版椂闂� - @JSONField(serialize = false) private String czbz; //鎿嶄綔鏍囧織 @JSONField(serialize = false) private String kqdm; //搴撳尯浠g爜 diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1219.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1219.java index a4b4f4e..74d8144 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1219.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1219.java @@ -39,7 +39,6 @@ private String bizId; //涓氬姟ID @JSONField(serialize = false) private Date updateTime; //鏈�鍚庢洿鏂版椂闂� - @JSONField(serialize = false) private String czbz; //鎿嶄綔鏍囧織 @JSONField(serialize = false) private String kqdm; //搴撳尯浠g爜 diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1220.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1220.java index 9ac2906..c3b00fe 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1220.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1220.java @@ -39,7 +39,6 @@ private String bizId; //涓氬姟ID @JSONField(serialize = false) private Date updateTime; //鏈�鍚庢洿鏂版椂闂� - @JSONField(serialize = false) private String czbz; //鎿嶄綔鏍囧織 @JSONField(serialize = false) private String kqdm; //搴撳尯浠g爜 diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1301.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1301.java index a09856c..29fab2c 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1301.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1301.java @@ -51,7 +51,6 @@ private String bizId; //涓氬姟ID @JSONField(serialize = false) private Date updateTime; //鏈�鍚庢洿鏂版椂闂� - @JSONField(serialize = false) private String czbz; //鎿嶄綔鏍囧織 @JSONField(serialize = false) private String kqdm; //搴撳尯浠g爜 diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1302.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1302.java index 24f11b5..68f4547 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1302.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1302.java @@ -39,7 +39,6 @@ private String bizId; //涓氬姟ID @JSONField(serialize = false) private Date updateTime; //鏈�鍚庢洿鏂版椂闂� - @JSONField(serialize = false) private String czbz; //鎿嶄綔鏍囧織 @JSONField(serialize = false) private String kqdm; //搴撳尯浠g爜 diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1303.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1303.java index 74cb6c0..01f991d 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1303.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1303.java @@ -33,7 +33,6 @@ private String bizId; //涓氬姟ID @JSONField(serialize = false) private Date updateTime; //鏈�鍚庢洿鏂版椂闂� - @JSONField(serialize = false) private String czbz; //鎿嶄綔鏍囧織 @JSONField(serialize = false) private String kqdm; //搴撳尯浠g爜 diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1304.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1304.java index 6eae608..8614015 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1304.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1304.java @@ -40,7 +40,6 @@ private String bizId; //涓氬姟ID @JSONField(serialize = false) private Date updateTime; //鏈�鍚庢洿鏂版椂闂� - @JSONField(serialize = false) private String czbz; //鎿嶄綔鏍囧織 @JSONField(serialize = false) private String kqdm; //搴撳尯浠g爜 diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1305.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1305.java index 343033e..40f5af1 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1305.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1305.java @@ -46,7 +46,6 @@ private String bizId; //涓氬姟ID @JSONField(serialize = false) private Date updateTime; //鏈�鍚庢洿鏂版椂闂� - @JSONField(serialize = false) private String czbz; //鎿嶄綔鏍囧織 @JSONField(serialize = false) private String kqdm; //搴撳尯浠g爜 diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1306.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1306.java index ae63f8f..bbe5c2e 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1306.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1306.java @@ -34,7 +34,6 @@ private String bizId; //涓氬姟ID @JSONField(serialize = false) private Date updateTime; //鏈�鍚庢洿鏂版椂闂� - @JSONField(serialize = false) private String czbz; //鎿嶄綔鏍囧織 @JSONField(serialize = false) private String kqdm; //搴撳尯浠g爜 diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1307.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1307.java index b28b0d1..4eaf215 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1307.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1307.java @@ -35,7 +35,6 @@ private String bizId; //涓氬姟ID @JSONField(serialize = false) private Date updateTime; //鏈�鍚庢洿鏂版椂闂� - @JSONField(serialize = false) private String czbz; //鎿嶄綔鏍囧織 @JSONField(serialize = false) private String kqdm; //搴撳尯浠g爜 diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1308.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1308.java index 059e98c..8385838 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1308.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1308.java @@ -35,7 +35,6 @@ private String bizId; //涓氬姟ID @JSONField(serialize = false) private Date updateTime; //鏈�鍚庢洿鏂版椂闂� - @JSONField(serialize = false) private String czbz; //鎿嶄綔鏍囧織 @JSONField(serialize = false) private String kqdm; //搴撳尯浠g爜 diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1309.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1309.java index 8df8981..e6c8d8c 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1309.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1309.java @@ -40,7 +40,6 @@ private String bizId; //涓氬姟ID @JSONField(serialize = false) private Date updateTime; //鏈�鍚庢洿鏂版椂闂� - @JSONField(serialize = false) private String czbz; //鎿嶄綔鏍囧織 @JSONField(serialize = false) private String kqdm; //搴撳尯浠g爜 diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1401.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1401.java index d8a5078..5b99c0d 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1401.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1401.java @@ -39,7 +39,6 @@ private String bizId; //涓氬姟ID @JSONField(serialize = false) private Date updateTime; //鏈�鍚庢洿鏂版椂闂� - @JSONField(serialize = false) private String czbz; //鎿嶄綔鏍囧織 @JSONField(serialize = false) private String kqdm; //搴撳尯浠g爜 diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1402.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1402.java index 3c97b87..e849e88 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1402.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1402.java @@ -49,7 +49,6 @@ private String bizId; //涓氬姟ID @JSONField(serialize = false) private Date updateTime; //鏈�鍚庢洿鏂版椂闂� - @JSONField(serialize = false) private String czbz; //鎿嶄綔鏍囧織 @JSONField(serialize = false) private String kqdm; //搴撳尯浠g爜 diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1403.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1403.java index a2e1f5f..0a7a663 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1403.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1403.java @@ -66,7 +66,6 @@ private String bizId; //涓氬姟ID @JSONField(serialize = false) private Date updateTime; //鏈�鍚庢洿鏂版椂闂� - @JSONField(serialize = false) private String czbz; //鎿嶄綔鏍囧織 @JSONField(serialize = false) private String kqdm; //搴撳尯浠g爜 diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1404.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1404.java index f1d3e09..36c5474 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1404.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1404.java @@ -48,7 +48,6 @@ private String bizId; //涓氬姟ID @JSONField(serialize = false) private Date updateTime; //鏈�鍚庢洿鏂版椂闂� - @JSONField(serialize = false) private String czbz; //鎿嶄綔鏍囧織 @JSONField(serialize = false) private String kqdm; //搴撳尯浠g爜 diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1405.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1405.java index 14597f6..a20d97c 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1405.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1405.java @@ -61,7 +61,6 @@ private String bizId; //涓氬姟ID @JSONField(serialize = false) private Date updateTime; //鏈�鍚庢洿鏂版椂闂� - @JSONField(serialize = false) private String czbz; //鎿嶄綔鏍囧織 @JSONField(serialize = false) private String kqdm; //搴撳尯浠g爜 diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1406.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1406.java index 27ce3dc..143e55b 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1406.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1406.java @@ -32,7 +32,6 @@ private String bizId; //涓氬姟ID @JSONField(serialize = false) private Date updateTime; //鏈�鍚庢洿鏂版椂闂� - @JSONField(serialize = false) private String czbz; //鎿嶄綔鏍囧織 @JSONField(serialize = false) private String kqdm; //搴撳尯浠g爜 diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1407.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1407.java index 55a862f..1355d1b 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1407.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1407.java @@ -34,7 +34,6 @@ private String bizId; //涓氬姟ID @JSONField(serialize = false) private Date updateTime; //鏈�鍚庢洿鏂版椂闂� - @JSONField(serialize = false) private String czbz; //鎿嶄綔鏍囧織 @JSONField(serialize = false) private String kqdm; //搴撳尯浠g爜 diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1408.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1408.java index 42d11f2..27ab0b9 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1408.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1408.java @@ -49,7 +49,6 @@ private String bizId; //涓氬姟ID @JSONField(serialize = false) private Date updateTime; //鏈�鍚庢洿鏂版椂闂� - @JSONField(serialize = false) private String czbz; //鎿嶄綔鏍囧織 @JSONField(serialize = false) private String kqdm; //搴撳尯浠g爜 diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1409.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1409.java index e8e1c68..a8fc17d 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1409.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1409.java @@ -35,7 +35,6 @@ private String bizId; //涓氬姟ID @JSONField(serialize = false) private Date updateTime; //鏈�鍚庢洿鏂版椂闂� - @JSONField(serialize = false) private String czbz; //鎿嶄綔鏍囧織 @JSONField(serialize = false) private String kqdm; //搴撳尯浠g爜 diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1410.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1410.java index 6f52f57..73e5634 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1410.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1410.java @@ -51,7 +51,6 @@ private String bizId; //涓氬姟ID @JSONField(serialize = false) private Date updateTime; //鏈�鍚庢洿鏂版椂闂� - @JSONField(serialize = false) private String czbz; //鎿嶄綔鏍囧織 @JSONField(serialize = false) private String kqdm; //搴撳尯浠g爜 diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1411.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1411.java index 339fef3..9d26e0e 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1411.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1411.java @@ -50,7 +50,6 @@ private String bizId; //涓氬姟ID @JSONField(serialize = false) private Date updateTime; //鏈�鍚庢洿鏂版椂闂� - @JSONField(serialize = false) private String czbz; //鎿嶄綔鏍囧織 @JSONField(serialize = false) private String kqdm; //搴撳尯浠g爜 diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1412.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1412.java index bb3e8bc..5a777d6 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1412.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1412.java @@ -41,7 +41,6 @@ private String bizId; //涓氬姟ID @JSONField(serialize = false) private Date updateTime; //鏈�鍚庢洿鏂版椂闂� - @JSONField(serialize = false) private String czbz; //鎿嶄綔鏍囧織 @JSONField(serialize = false) private String kqdm; //搴撳尯浠g爜 diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1413.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1413.java index 18dee0b..9e57573 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1413.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1413.java @@ -42,7 +42,6 @@ private String bizId; //涓氬姟ID @JSONField(serialize = false) private Date updateTime; //鏈�鍚庢洿鏂版椂闂� - @JSONField(serialize = false) private String czbz; //鎿嶄綔鏍囧織 @JSONField(serialize = false) private String kqdm; //搴撳尯浠g爜 diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1104PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1104PR.java index a9f9c00..b1b653a 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1104PR.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1104PR.java @@ -1,11 +1,27 @@ package com.fzzy.otherview.whhpjl.pr; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.bstek.dorado.annotation.DataProvider; import com.bstek.dorado.annotation.DataResolver; import com.bstek.dorado.annotation.Expose; +import com.fzzy.api.Constant; +import com.fzzy.api.data.ApiParam; +import com.fzzy.api.dto.ResponseDto; +import com.fzzy.api.entity.ApiConfs; +import com.fzzy.api.entity.ApiInfoData; +import com.fzzy.api.service.ApiCommonService; +import com.fzzy.api.service.ApiPushManager; +import com.fzzy.api.service.ApiRemoteService; +import com.fzzy.api.view.repository.ApiInfoDataRep; +import com.fzzy.otherview.whhpjl.WhjlConstant; import com.fzzy.otherview.whhpjl.dto.WhjlApi1104; +import com.fzzy.otherview.whhpjl.dto.WhjlApi1104; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.util.ArrayList; +import java.util.Date; import java.util.List; /** @@ -15,6 +31,13 @@ */ @Component public class WhjlApi1104PR { + @Autowired + private ApiCommonService apiCommonService; + @Autowired + private ApiPushManager apiPushManager; + @Autowired + private ApiInfoDataRep apiInfoDataRep; + /** * 鑾峰彇鍒楄〃淇℃伅 * whjlApi1104PR#listData @@ -23,8 +46,23 @@ */ @DataProvider public List<WhjlApi1104> listData() { - return null; + List<ApiInfoData> result = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1104); + if (null == result || result.isEmpty()) { + return null; + } + List<WhjlApi1104> list = new ArrayList<>(); + WhjlApi1104 whjlApi1104; + for (ApiInfoData infoData : result) { + whjlApi1104 = JSONObject.parseObject(infoData.getData(), WhjlApi1104.class); + whjlApi1104.setKqdm(infoData.getKqdm()); + whjlApi1104.setCzbz(infoData.getCzbz()); + whjlApi1104.setUpdateTime(infoData.getUpdateTime()); + whjlApi1104.setBizId(infoData.getDataId()); + list.add(whjlApi1104); + } + return list; } + /** * 鏇存柊鎴栦慨鏀� @@ -34,9 +72,21 @@ * @return */ @DataResolver - public String saveData(WhjlApi1104 data) { - return null; + public void saveData(WhjlApi1104 data) { + ApiInfoData infoData = new ApiInfoData(); + infoData.setId(data.getBizId()); + infoData.setKqdm(data.getKqdm()); + infoData.setInteType(WhjlConstant.API_CATEGORY_11); + infoData.setInteId(WhjlConstant.API_CODE_1104); + infoData.setUpdateTime(new Date()); + infoData.setDataId(data.getBizId()); + infoData.setData(JSON.toJSONString(data)); + infoData.setCzbz(data.getCzbz()); + infoData.setRemarks("澶囨敞淇℃伅"); + + apiInfoDataRep.save(infoData); } + /** * 鍒犻櫎 @@ -47,6 +97,7 @@ */ @Expose public String delData(WhjlApi1104 data) { + apiInfoDataRep.deleteById(data.getBizId()); return null; } @@ -59,6 +110,49 @@ */ @Expose public String pushData(List<WhjlApi1104> items) { - return null; + + String result = ""; + + String kqdm = items.get(0).getKqdm(); + ApiConfs apiConf = apiCommonService.getConf(kqdm); + + if (null == apiConf) { + return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触"; + } + + //灏佽鍙傛暟 + ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_11, WhjlConstant.API_CODE_1104); + + //鑾峰彇瀹炵幇鎺ュ彛 + ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol()); + if (null == apiService) { + return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触"; + } + + ApiInfoData infoData; + ResponseDto responseDto; + for (WhjlApi1104 data : items) { + responseDto = apiService.pushData(param, apiConf, data); + if (responseDto.getSuccess() == 0) { + if (Constant.CZBZ_I.equals(data.getCzbz())) { + + infoData = new ApiInfoData(); + infoData.setId(data.getBizId()); + infoData.setKqdm(data.getKqdm()); + infoData.setInteType(WhjlConstant.API_CATEGORY_11); + infoData.setInteId(WhjlConstant.API_CODE_1104); + infoData.setUpdateTime(new Date()); + infoData.setDataId(data.getBizId()); + + data.setCzbz(Constant.CZBZ_U); + infoData.setCzbz(Constant.CZBZ_U); + infoData.setData(JSON.toJSONString(data)); + + apiInfoDataRep.save(infoData); + } + } + result += responseDto.toString(); + } + return result; } } diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1109PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1109PR.java index faea22a..edd2105 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1109PR.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1109PR.java @@ -175,7 +175,7 @@ ResponseDto responseDto; ApiInfoData infoData; for (WhjlApi1109 data : items) { - responseDto = apiService.pushData(param, apiConf, items); + responseDto = apiService.pushData(param, apiConf, data); if (responseDto.getSuccess() == 0) { if (Constant.CZBZ_I.equals(data.getCzbz())) { infoData = new ApiInfoData(); diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1110PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1110PR.java index 0338e8e..8dcdeda 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1110PR.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1110PR.java @@ -177,7 +177,7 @@ ResponseDto responseDto; ApiInfoData infoData; for (WhjlApi1110 data : items) { - responseDto = apiService.pushData(param, apiConf, items); + responseDto = apiService.pushData(param, apiConf, data); if (responseDto.getSuccess() == 0) { if (Constant.CZBZ_I.equals(data.getCzbz())) { infoData = new ApiInfoData(); diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1111PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1111PR.java index 5ed3b18..46a598b 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1111PR.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1111PR.java @@ -176,7 +176,7 @@ ResponseDto responseDto; ApiInfoData infoData; for (WhjlApi1111 data : items) { - responseDto = apiService.pushData(param, apiConf, items); + responseDto = apiService.pushData(param, apiConf, data); if (responseDto.getSuccess() == 0) { if (Constant.CZBZ_I.equals(data.getCzbz())) { infoData = new ApiInfoData(); 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 4d06230..ffd9928 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1112PR.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1112PR.java @@ -121,7 +121,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)); @@ -164,7 +164,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()); @@ -183,7 +183,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/otherview/whhpjl/pr/WhjlApi1113PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1113PR.java index fc0e551..e3177a0 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1113PR.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1113PR.java @@ -176,7 +176,7 @@ ResponseDto responseDto; ApiInfoData infoData; for (WhjlApi1113 data : items) { - responseDto = apiService.pushData(param, apiConf, items); + responseDto = apiService.pushData(param, apiConf, data); if (responseDto.getSuccess() == 0) { if (Constant.CZBZ_I.equals(data.getCzbz())) { infoData = new ApiInfoData(); diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1114PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1114PR.java index e1ebaef..16cffd4 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1114PR.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1114PR.java @@ -120,7 +120,7 @@ ApiInfoData infoData = new ApiInfoData(); infoData.setId(data.getBizId()); infoData.setKqdm(data.getKqdm()); - infoData.setInteType(WhjlConstant.API_CATEGORY_12); + infoData.setInteType(WhjlConstant.API_CATEGORY_11); infoData.setInteId(WhjlConstant.API_CODE_1114); infoData.setUpdateTime(new Date()); infoData.setDataId(data.getBizId()); @@ -164,7 +164,7 @@ } //灏佽鍙傛暟 - ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_12, WhjlConstant.API_CODE_1114); + ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_11, WhjlConstant.API_CODE_1114); //鑾峰彇瀹炵幇鎺ュ彛 ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol()); @@ -175,13 +175,13 @@ ResponseDto responseDto; ApiInfoData infoData; for (WhjlApi1114 data : items) { - responseDto = apiService.pushData(param, apiConf, items); + responseDto = apiService.pushData(param, apiConf, data); if (responseDto.getSuccess() == 0) { if (Constant.CZBZ_I.equals(data.getCzbz())) { infoData = new ApiInfoData(); infoData.setId(data.getBizId()); infoData.setKqdm(data.getKqdm()); - infoData.setInteType(WhjlConstant.API_CATEGORY_12); + infoData.setInteType(WhjlConstant.API_CATEGORY_11); infoData.setInteId(WhjlConstant.API_CODE_1114); infoData.setUpdateTime(new Date()); infoData.setDataId(data.getBizId()); diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1115PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1115PR.java index 45d1946..4dfd34d 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1115PR.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1115PR.java @@ -163,7 +163,7 @@ } //灏佽鍙傛暟 - ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_12, WhjlConstant.API_CODE_1115); + ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_11, WhjlConstant.API_CODE_1115); //鑾峰彇瀹炵幇鎺ュ彛 ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol()); @@ -174,7 +174,7 @@ ResponseDto responseDto; ApiInfoData infoData; for (WhjlApi1115 data : items) { - responseDto = apiService.pushData(param, apiConf, items); + responseDto = apiService.pushData(param, apiConf, data); if (responseDto.getSuccess() == 0) { if (Constant.CZBZ_I.equals(data.getCzbz())) { infoData = new ApiInfoData(); diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1201PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1201PR.java index cc8f9ca..d9249b5 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1201PR.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1201PR.java @@ -176,7 +176,7 @@ ResponseDto responseDto; ApiInfoData infoData; for (WhjlApi1201 data : items) { - responseDto = apiService.pushData(param, apiConf, items); + responseDto = apiService.pushData(param, apiConf, data); if (responseDto.getSuccess() == 0) { if (Constant.CZBZ_I.equals(data.getCzbz())) { infoData = new ApiInfoData(); diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1202PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1202PR.java index 26071f0..4ef326f 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1202PR.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1202PR.java @@ -130,7 +130,7 @@ ResponseDto responseDto; ApiInfoData infoData; for (WhjlApi1202 data : items) { - responseDto = apiService.pushData(param, apiConf, items); + responseDto = apiService.pushData(param, apiConf, data); if (responseDto.getSuccess() == 0) { if (Constant.CZBZ_I.equals(data.getCzbz())) { infoData = new ApiInfoData(); diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1203PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1203PR.java index 2760db2..d7ba8a4 100644 --- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1203PR.java +++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1203PR.java @@ -130,7 +130,7 @@ ResponseDto responseDto; ApiInfoData infoData; for (WhjlApi1203 data : items) { - responseDto = apiService.pushData(param, apiConf, items); + responseDto = apiService.pushData(param, apiConf, data); if (responseDto.getSuccess() == 0) { if (Constant.CZBZ_I.equals(data.getCzbz())) { infoData = new ApiInfoData(); diff --git a/src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java b/src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java index 1497798..e9aa15d 100644 --- a/src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java +++ b/src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java @@ -17,6 +17,7 @@ import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; +import org.codehaus.jackson.map.ObjectMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.*; @@ -186,6 +187,8 @@ return WhjlConstant.API_CODE_CCSBWHJL; case "1114": return WhjlConstant.API_CODE_CCSBWXJL; + case "1115": + return WhjlConstant.API_CODE_CCSBBFJL; case "11145": return WhjlConstant.API_CODE_CCSBBFJL; case "1201": @@ -197,23 +200,23 @@ case "1204": return WhjlConstant.API_CODE_KHXX; case "1205": - return WhjlConstant.API_CODE_CCJL; - case "1206": return WhjlConstant.API_CODE_DDXX; - case "1207": + case "1206": return WhjlConstant.API_CODE_HTXX; - case "1208": + case "1207": return WhjlConstant.API_CODE_KCTZ; - case "1209": + case "1208": return WhjlConstant.API_CODE_KCTZPCXX; - case "1210": + case "1209": return WhjlConstant.API_CODE_KCTZCRJL; - case "1211": + case "1210": return WhjlConstant.API_CODE_KCPDJL; - case "1212": + case "1211": return WhjlConstant.API_CODE_KNZCJL; - case "1213": + case "1212": return WhjlConstant.API_CODE_CRKJL; + case "1213": + return WhjlConstant.API_CODE_ZJJG; case "1301": return WhjlConstant.API_CODE_ZJJG; case "1302": -- Gitblit v1.9.3