From a3a62a367e0654ac81c2f996e9e8fb33d4f257ac Mon Sep 17 00:00:00 2001
From: ws <ws@123.com>
Date: 星期一, 11 十二月 2023 20:07:05 +0800
Subject: [PATCH] 修改武汉接口
---
src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java | 2
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1213.view.xml | 6
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1109.java | 2
src/main/java/com/fzzy/otherview/whhpjl/WhjlConstant.java | 7
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1304.view.xml | 22 +
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1405.view.xml | 12 +
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1414PR.java | 157 ++++++++++++++
src/main/resources/templates/home/home-whjl.html | 3
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlJSMX.java | 2
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1414.view.xml | 319 +++++++++++++++++++++++++++++
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1405.java | 1
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1408.java | 1
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1408.view.xml | 12 +
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1304.java | 3
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1109.view.xml | 26 +-
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1414.java | 40 +++
16 files changed, 589 insertions(+), 26 deletions(-)
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 e503cba..584a5ca 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1109.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1109.view.xml
@@ -38,17 +38,16 @@
<Property name="label">妗ｆ绫诲瀷</Property>
</PropertyDef>
<PropertyDef name="damc">
- <Property></Property>
+ <Property></Property>
<Property name="label">妗ｆ鍚嶇О</Property>
</PropertyDef>
<PropertyDef name="dawj">
- <Property name="dataType">byte</Property>
- <Property></Property>
+ <Property name="dataType">Byte</Property>
<Property name="label">妗ｆ鏂囦欢</Property>
</PropertyDef>
- <PropertyDef name="sfyx">
+ <PropertyDef name="ccssdzdaid">
<Property></Property>
- <Property name="label">鏄惁鏈夋晥</Property>
+ <Property name="label">浠撳偍璁炬柦鐢靛瓙妗ｆ</Property>
</PropertyDef>
<PropertyDef name="bz">
<Property></Property>
@@ -227,10 +226,10 @@
<DataColumn name="dawj">
<Property name="property">dawj</Property>
</DataColumn>
- <DataColumn name="sfyx">
- <Property name="property">sfyx</Property>
+ <DataColumn name="ccssdzdaid">
+ <Property name="property">ccssdzdaid</Property>
</DataColumn>
- <DataColumn name="sfyx">
+ <DataColumn name="ccssdzdaid">
<Property name="property">czbz</Property>
</DataColumn>
</DataGrid>
@@ -273,6 +272,11 @@
<Property name="labelSeparator">:</Property>
<Property name="labelWidth">120</Property>
<Property name="labelAlign">right</Property>
+ <AutoFormElement>
+ <Property name="name">ccssdzdaid</Property>
+ <Property name="property">ccssdzdaid</Property>
+ <Editor/>
+ </AutoFormElement>
<AutoFormElement>
<Property name="name">dadm</Property>
<Property name="property">dadm</Property>
@@ -322,12 +326,6 @@
<AutoFormElement>
<Property name="name">dawj</Property>
<Property name="property">dawj</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">sfyx</Property>
- <Property name="property">sfyx</Property>
- <Property name="trigger">listDropYN</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1213.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1213.view.xml
index e15b8d0..95858f0 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1213.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1213.view.xml
@@ -152,7 +152,7 @@
<Property></Property>
<Property name="label">浠樻鍑瘉鍙�</Property>
</PropertyDef>
- <PropertyDef name="sl">
+ <PropertyDef name="zl">
<Property name="dataType">Double</Property>
<Property name="label">鏁伴噺</Property>
</PropertyDef>
@@ -522,8 +522,8 @@
<DataColumn name="fkpzh">
<Property name="property">fkpzh</Property>
</DataColumn>
- <DataColumn name="sl">
- <Property name="property">sl</Property>
+ <DataColumn name="zl">
+ <Property name="property">zl</Property>
</DataColumn>
<DataColumn name="dj">
<Property name="property">dj</Property>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1304.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1304.view.xml
index d1ae8ef..f425397 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1304.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1304.view.xml
@@ -13,7 +13,7 @@
<Property></Property>
<Property name="label">鍐涚伯浼佷笟缂栧彿</Property>
</PropertyDef>
- <PropertyDef name="ssqymc">
+ <PropertyDef name="jlqymc">
<Property></Property>
<Property name="label">鍐涚伯浼佷笟鍚嶇О</Property>
</PropertyDef>
@@ -28,6 +28,10 @@
<PropertyDef name="ajbh">
<Property></Property>
<Property name="label">寤掗棿缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="jllx">
+ <Property></Property>
+ <Property name="label">璁板綍绫诲瀷</Property>
</PropertyDef>
<PropertyDef name="sbbh">
<Property></Property>
@@ -175,8 +179,8 @@
<DataColumn name="jlqybh">
<Property name="property">jlqybh</Property>
</DataColumn>
- <DataColumn name="ssqymc">
- <Property name="property">ssqymc</Property>
+ <DataColumn name="jlqymc">
+ <Property name="property">jlqymc</Property>
</DataColumn>
<DataColumn name="jgzdbh">
<Property name="property">jgzdbh</Property>
@@ -186,6 +190,9 @@
</DataColumn>
<DataColumn name="ajbh">
<Property name="property">ajbh</Property>
+ </DataColumn>
+ <DataColumn name="jllx">
+ <Property name="property">jllx</Property>
</DataColumn>
<DataColumn name="sbbh">
<Property name="property">sbbh</Property>
@@ -263,8 +270,8 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">ssqymc</Property>
- <Property name="property">ssqymc</Property>
+ <Property name="name">jlqymc</Property>
+ <Property name="property">jlqymc</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -283,6 +290,11 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">jllx</Property>
+ <Property name="property">jllx</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">sbbh</Property>
<Property name="property">sbbh</Property>
<Editor/>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1405.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1405.view.xml
index 3a9f8a3..07eb719 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1405.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1405.view.xml
@@ -9,6 +9,10 @@
<Property></Property>
<Property name="label">鍔ㄥ憳鍗忚id</Property>
</PropertyDef>
+ <PropertyDef name="dyspid">
+ <Property></Property>
+ <Property name="label">鍔ㄥ憳鍟嗗搧ID</Property>
+ </PropertyDef>
<PropertyDef name="dyqynm">
<Property></Property>
<Property name="label">鍔ㄥ憳浼佷笟鍐呯爜</Property>
@@ -268,6 +272,9 @@
<DataColumn name="dyqynm">
<Property name="property">dyqynm</Property>
</DataColumn>
+ <DataColumn name="dyspid">
+ <Property name="property">dyspid</Property>
+ </DataColumn>
<DataColumn name="htkhbh">
<Property name="property">htkhbh</Property>
</DataColumn>
@@ -344,6 +351,11 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">dyspid</Property>
+ <Property name="property">dyspid</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">htkhbh</Property>
<Property name="property">htkhbh</Property>
<Editor/>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1408.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1408.view.xml
index 43d9191..abbf639 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1408.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1408.view.xml
@@ -9,6 +9,10 @@
<Property></Property>
<Property name="label">鍔ㄥ憳浼佷笟缂栧彿</Property>
</PropertyDef>
+ <PropertyDef name="dynlid">
+ <Property></Property>
+ <Property name="label">鍔ㄥ憳鑳藉姏id</Property>
+ </PropertyDef>
<PropertyDef name="pzflbm">
<Property></Property>
<Property name="label">鍝佺鍒嗙被缂栫爜</Property>
@@ -219,6 +223,9 @@
<DataColumn name="dyqynm">
<Property name="property">dyqynm</Property>
</DataColumn>
+ <DataColumn name="dynlid">
+ <Property name="property">dynlid</Property>
+ </DataColumn>
<DataColumn name="pzflbm">
<Property name="property">pzflbm</Property>
</DataColumn>
@@ -293,6 +300,11 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">dynlid</Property>
+ <Property name="property">dynlid</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">pzflbm</Property>
<Property name="property">pzflbm</Property>
<Editor/>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1414.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1414.view.xml
new file mode 100644
index 0000000..a803143
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1414.view.xml
@@ -0,0 +1,319 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ViewConfig>
+ <Arguments/>
+ <Context/>
+ <Model>
+ <DataType name="dtMain">
+ <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1414</Property>
+ <PropertyDef name="jlqybh">
+ <Property/>
+ <Property name="label">鍐涚伯浼佷笟缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="jlqymc">
+ <Property/>
+ <Property name="label">鍐涚伯浼佷笟鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="jgzdbh">
+ <Property/>
+ <Property name="label">鍐涗緵绔欑偣缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="jgzdmc">
+ <Property/>
+ <Property name="label">鍐涗緵绔欑偣鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="bdkh">
+ <Property/>
+ <Property name="label">鍖楁枟鍗″彿</Property>
+ </PropertyDef>
+ <PropertyDef name="sjkh">
+ <Property/>
+ <Property name="label">4G鍗″彿</Property>
+ </PropertyDef>
+ <PropertyDef name="sblx">
+ <Property/>
+ <Property name="label">璁惧绫诲瀷</Property>
+ </PropertyDef>
+ <PropertyDef name="bizId">
+ <Property></Property>
+ <Property name="label">涓氬姟ID</Property>
+ </PropertyDef>
+ <PropertyDef name="updateTime">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鏈�鍚庢洿鏂版椂闂�</Property>
+ </PropertyDef>
+ <PropertyDef name="czbz">
+ <Property></Property>
+ <Property name="label">鎿嶄綔鏍囧織</Property>
+ </PropertyDef>
+ <PropertyDef name="kqdm">
+ <Property></Property>
+ <Property name="label">搴撳尯浠ｇ爜</Property>
+ </PropertyDef>
+ </DataType>
+ </Model>
+ <View layout="regionPadding:10">
+ <Property name="packages">font-awesome,css-common</Property>
+ <DataSet id="dsMain">
+ <Property name="dataType">[dtMain]</Property>
+ <Property name="dataProvider">whjlApi1414PR#listData</Property>
+ </DataSet>
+ <Container layout="regionPadding:10" layoutConstraint="top">
+ <Property name="exClassName">bg-color</Property>
+ <Property name="height">55</Property>
+ <Property name="contentOverflow">hidden</Property>
+ <Label layoutConstraint="left">
+ <Property name="text">鑿滃崟鏍忥細</Property>
+ </Label>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">view.get("#dsMain").insert();
+view.get("#dialogMain").show();</ClientEvent>
+ <Property name="iconClass">fa fa-plus</Property>
+ <Property name="caption">鏂板</Property>
+ <Property name="exClassName">btn-default</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var cur = view.get("#dgMain").getCurrentItem();
+if(cur){
+ view.get("#dialogMain").show();
+}else{
+ $alert("璇峰嬀閫夐渶瑕佷慨鏀圭殑鏁版嵁锛�");
+}</ClientEvent>
+ <Property name="caption">缂栬緫</Property>
+ <Property name="iconClass">fa fa-pencil</Property>
+ <Property name="exClassName">btn-warm</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var cur = view.get("#dgMain").getCurrentItem();
+if(cur){
+ view.get("#ajaxDel").set("parameter",cur).execute(function(result){
+ if(result){
+ $alert(result);
+ } else{
+ cur.remove();
+ }
+ });
+}else{
+ $alert("璇峰嬀閫夐渶瑕佸垹闄ょ殑鏁版嵁锛�");
+}</ClientEvent>
+ <Property name="caption">鍒犻櫎</Property>
+ <Property name="iconClass">fa fa-minus</Property>
+ <Property name="exClassName">btn-warn</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">view.get("#dsMain").flushAsync();</ClientEvent>
+ <Property name="caption">鍒锋柊</Property>
+ <Property name="iconClass">fa fa-search</Property>
+ <Property name="exClassName">btn-flush</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var select = view.get("#dgMain").get("selection");
+if(select && select.length > 0){
+ view.get("#ajaxPush").set("parameter",select).execute(function(result){
+ view.get("#dsMain").flushAsync();
+ $notify(result);
+ });
+}else{
+ $alert("璇峰嬀閫夐渶瑕佷笂鎶ョ殑鏁版嵁锛�");
+}</ClientEvent>
+ <Property name="caption">鎵嬪姩涓婁紶</Property>
+ <Property name="iconClass">fa fa-hand-o-up</Property>
+ <Property name="exClassName">btn-default</Property>
+ </Button>
+ <Button layoutConstraint="right">
+ <ClientEvent name="onClick">//鏄剧ず璁板綍
+view.get("#iFrame").reload();
+view.get("#dialogLog").show();</ClientEvent>
+ <Property name="caption">涓婁紶璁板綍</Property>
+ <Property name="iconClass">fa fa-bars</Property>
+ <Property name="exClassName">btn-flush</Property>
+ </Button>
+ </Container>
+ <Container layoutConstraint="center">
+ <Property name="exClassName">bg-color</Property>
+ <DataGrid id="dgMain">
+ <ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsMain.data:#");
+if(data){
+ view.get("#dialogMain").show();
+}</ClientEvent>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="selectionMode">multiRows</Property>
+ <Property name="readOnly">true</Property>
+ <RowNumColumn/>
+ <RowSelectorColumn>
+ <Property name="caption">涓婁紶</Property>
+ </RowSelectorColumn>
+ <DataColumn name="jlqybh">
+ <Property name="property">jlqybh</Property>
+ </DataColumn>
+ <DataColumn name="jlqymc">
+ <Property name="property">jlqymc</Property>
+ </DataColumn>
+ <DataColumn name="jgzdbh">
+ <Property name="property">jgzdbh</Property>
+ </DataColumn>
+ <DataColumn name="jgzdmc">
+ <Property name="property">jgzdmc</Property>
+ </DataColumn>
+ <DataColumn name="bdkh">
+ <Property name="property">bdkh</Property>
+ </DataColumn>
+ <DataColumn name="sjkh">
+ <Property name="property">sjkh</Property>
+ </DataColumn>
+ <DataColumn name="sblx">
+ <Property name="property">sblx</Property>
+ </DataColumn>
+ <DataColumn name="bizId">
+ <Property name="property">bizId</Property>
+ </DataColumn>
+ <DataColumn name="updateTime">
+ <Property name="property">updateTime</Property>
+ </DataColumn>
+ <DataColumn name="czbz">
+ <Property name="property">czbz</Property>
+ </DataColumn>
+ <DataColumn name="kqdm">
+ <Property name="property">kqdm</Property>
+ </DataColumn>
+ </DataGrid>
+ </Container>
+ <Dialog id="dialogMain">
+ <Property name="width">85%</Property>
+ <Property name="closeable">false</Property>
+ <Property name="iconClass">fa fa-sliders</Property>
+ <Property name="caption">杞﹁締杩愯緭鐜</Property>
+ <Buttons>
+ <Button>
+ <ClientEvent name="onClick">var cur = view.get("#dgMain").getCurrentItem();
+view.get("#updateSave").execute(function(){
+ self.get("parent").hide();
+ view.get("#dsMain").flushAsync();
+});</ClientEvent>
+ <Property name="caption">纭畾</Property>
+ <Property name="iconClass">fa fa-check</Property>
+ </Button>
+ <Button>
+ <ClientEvent name="onClick">var cur = view.get("#dgMain").getCurrentItem();
+self.get("parent").hide();
+if(cur) cur.cancel();</ClientEvent>
+ <Property name="caption">鍙栨秷</Property>
+ <Property name="iconClass">fa fa-times</Property>
+ </Button>
+ </Buttons>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="cols">*,*,*,*</Property>
+ <Property name="labelPosition">top</Property>
+ <Property name="labelSeparator">:</Property>
+ <Property name="labelAlign">left</Property>
+ <AutoFormElement>
+ <Property name="name">jlqybh</Property>
+ <Property name="property">jlqybh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jlqymc</Property>
+ <Property name="property">jlqymc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jgzdbh</Property>
+ <Property name="property">jgzdbh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jgzdmc</Property>
+ <Property name="property">jgzdmc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bdkh</Property>
+ <Property name="property">bdkh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sjkh</Property>
+ <Property name="property">sjkh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sblx</Property>
+ <Property name="property">sblx</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/>
+ </Dialog>
+ <UpdateAction id="updateSave">
+ <Property name="dataResolver">whjlApi1414PR#saveData</Property>
+ <UpdateItem>
+ <Property name="dataPath">[#current]</Property>
+ <Property name="dataSet">dsMain</Property>
+ </UpdateItem>
+ </UpdateAction>
+ <AjaxAction id="ajaxDel">
+ <Property name="confirmMessage">褰撳墠鏁版嵁鍒犻櫎鍚庢棤娉曟仮澶嶏紝璇风‘璁よ鍒犻櫎涔堬紵</Property>
+ <Property name="service">whjlApi1414PR#delData</Property>
+ </AjaxAction>
+ <AjaxAction id="ajaxPush">
+ <Property name="service">whjlApi1414PR#pushData</Property>
+ </AjaxAction>
+ <Dialog id="dialogLog">
+ <Property name="width">90%</Property>
+ <Property name="height">90%</Property>
+ <Property name="caption">涓婁紶璁板綍</Property>
+ <Property name="iconClass">fa fa-sliders</Property>
+ <Buttons>
+ <Button>
+ <ClientEvent name="onClick">self.get("parent").hide();</ClientEvent>
+ <Property name="caption">鍏抽棴</Property>
+ <Property name="iconClass">fa fa-times</Property>
+ </Button>
+ </Buttons>
+ <Children>
+ <Container>
+ <IFrame id="iFrame">
+ <Property name="path">com.fzzy.api.view.ApiLog.d</Property>
+ <Property name="userData">
+ <Entity>
+ <Property name="deptId">deptId</Property>
+ </Entity>
+ </Property>
+ </IFrame>
+ </Container>
+ </Children>
+ <Tools/>
+ </Dialog>
+ <ListDropDown id="listDropYN">
+ <Property name="items">鏄�,鍚�</Property>
+ </ListDropDown>
+ <ListDropDown id="listDropType">
+ <Property name="items">鏃ュ父鍑哄簱,鏃ュ父鍏ュ簱,搴旀�ュ嚭搴�,搴旀�ュ叆搴�</Property>
+ </ListDropDown>
+ <ListDropDown id="listDropInOut">
+ <Property name="items">鍏ュ簱,鍑哄簱</Property>
+ </ListDropDown>
+ </View>
+</ViewConfig>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlConstant.java b/src/main/java/com/fzzy/otherview/whhpjl/WhjlConstant.java
index 4e7e212..d92af2b 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlConstant.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlConstant.java
@@ -259,7 +259,10 @@
* 鎺ュ彛缂栫爜-1413 杩愯緭璺嚎鏁版嵁鎺ュ彛
*/
public static String API_CODE_1413 = "1413";
-
+ /**
+ * 鎺ュ彛缂栫爜-1414 鍖楁枟缁堢璁惧
+ */
+ public static String API_CODE_1414 = "1414";
/*----------鎺ュ彛璺緞----------*/
//鎺ュ彛缂栫爜-1101 鍐涚伯浼佷笟淇℃伅 --璺緞(JLQYXX)
@@ -380,6 +383,8 @@
public static String API_CODE_CLYSHJ = "CLYSHJ";
//鎺ュ彛缂栫爜-1413 杩愯緭璺嚎 --璺緞(YSLX)
public static String API_CODE_YSLX = "YSLX";
+ //鎺ュ彛缂栫爜-1414 鍖楁枟缁堢璁惧 --璺緞(YSLX)
+ public static String API_CODE_BDZDSB = "BDZDSB";
//鎺ュ彛缂栫爜- 搴旀�ヨ皟搴� --璺緞(YJDD)
public static String API_CODE_YJDD = "YJDD";
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 83acc0a..74a0dea 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1109.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1109.java
@@ -30,8 +30,8 @@
private String sscfmc; //浠撴埧鍚嶇О
private String dalx; //妗ｆ绫诲瀷
private String damc; //妗ｆ鍚嶇О
+ private String ccssdzdaid; //浠撳偍璁炬柦鐢靛瓙妗ｆ
private byte dawj; //妗ｆ鏂囦欢
- private String sfyx; //鏄惁鏈夋晥
private String bz; //澶囨敞
//鍗曠嫭澧炲姞锛屼笉杩涜涓婁紶
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 b7a0b38..0a74c18 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1304.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1304.java
@@ -23,10 +23,11 @@
private String chjlid; //鑳借�楄褰昳d
private String jlqybh; //鍐涚伯浼佷笟缂栧彿
- private String ssqymc; //鍐涚伯浼佷笟鍚嶇О
+ private String jlqymc; //鍐涚伯浼佷笟鍚嶇О
private String jgzdbh; //鍐涗緵绔欑偣缂栧彿
private String jgzdmc; //鍐涗緵绔欑偣鍚嶇О
private String ajbh; //寤掗棿缂栧彿
+ private String jllx; //璁板綍绫诲瀷
private String sbbh; //璁惧缂栧彿
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
private Date cjsj; //閲囬泦鏃堕棿
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 993365f..c6c4d33 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1405.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1405.java
@@ -22,6 +22,7 @@
private String dyxyid; //鍔ㄥ憳鍗忚id
private String dyqynm; //鍔ㄥ憳浼佷笟鍐呯爜
+ private String dyspid; //鍔ㄥ憳鍗忚id
private String htkhbh; //鍚堝悓瀹㈡埛缂栧彿
private String htkhmc; //鍚堝悓瀹㈡埛鍚嶇О
private String htbh; //鍚堝悓缂栧彿
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 adebd05..d90662d 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1408.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1408.java
@@ -20,6 +20,7 @@
private static final long serialVersionUID = 1L;
private String dyqynm; //鍔ㄥ憳浼佷笟缂栧彿
+ private String dynlid; //鍔ㄥ憳鑳藉姏id
private String pzflbm; //鍝佺鍒嗙被缂栫爜
private String jldwflbm; //璁￠噺鍗曚綅鍒嗙被缂栫爜
private String dylb; //绫诲埆
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1414.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1414.java
new file mode 100644
index 0000000..cf952b3
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1414.java
@@ -0,0 +1,40 @@
+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;
+import java.util.List;
+
+/**
+ * 鍖楁枟缁堢璁惧
+ *
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class WhjlApi1414 implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ private String jlqybh; //鍐涚伯浼佷笟缂栧彿
+ private String jlqymc; //鍐涚伯浼佷笟鍚嶇О
+ private String jgzdbh; //鍐涗緵绔欑偣缂栧彿
+ private String jgzdmc; //鍐涗緵绔欑偣鍚嶇О
+ private String bdkh; //鍖楁枟鍗″彿
+ private String sjkh; //4G鍗″彿
+ private String sblx; //璁惧绫诲瀷
+
+
+ //鍗曠嫭澧炲姞锛屼笉杩涜涓婁紶
+ @JSONField(serialize = false)
+ private String bizId; //涓氬姟ID
+ @JSONField(serialize = false)
+ private Date updateTime; //鏈�鍚庢洿鏂版椂闂�
+ private String czbz; //鎿嶄綔鏍囧織
+ @JSONField(serialize = false)
+ private String kqdm; //搴撳尯浠ｇ爜
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlJSMX.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlJSMX.java
index 3801916..4c871eb 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlJSMX.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlJSMX.java
@@ -22,7 +22,7 @@
private String rkfkjlmxid; //缁撶畻璁板綍鏄庣粏ID
private String crkmxid;//鍑哄叆搴撴槑缁咺D
private String fkpzh; //浠樻鍑瘉鍙�
- private Double sl; //鏁伴噺
+ private Double zl; //鏁伴噺
private Double dj; //鍗曚环
private Double je; //閲戦
}
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1414PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1414PR.java
new file mode 100644
index 0000000..5ab497e
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1414PR.java
@@ -0,0 +1,157 @@
+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.WhjlApi1414;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 杞﹁締杩愯緭鐜
+ *
+ * @Author:YAN
+ */
+@Component
+public class WhjlApi1414PR {
+ @Autowired
+ private ApiCommonService apiCommonService;
+ @Autowired
+ private ApiPushManager apiPushManager;
+ @Autowired
+ private ApiInfoDataRep apiInfoDataRep;
+
+ /**
+ * 鑾峰彇鍒楄〃淇℃伅
+ * whjlApi1414PR#listData
+ *
+ * @return
+ */
+ @DataProvider
+ public List<WhjlApi1414> listData() {
+ List<ApiInfoData> result = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1414);
+ if (null == result || result.isEmpty()) {
+ return null;
+ }
+ List<WhjlApi1414> list = new ArrayList<>();
+ WhjlApi1414 whjlApi1414;
+ for (ApiInfoData infoData : result) {
+ whjlApi1414 = JSONObject.parseObject(infoData.getData(), WhjlApi1414.class);
+ whjlApi1414.setKqdm(infoData.getKqdm());
+ whjlApi1414.setCzbz(infoData.getCzbz());
+ whjlApi1414.setUpdateTime(infoData.getUpdateTime());
+ whjlApi1414.setBizId(infoData.getDataId());
+ list.add(whjlApi1414);
+ }
+ return list;
+ }
+
+
+ /**
+ * 鏇存柊鎴栦慨鏀�
+ * whjlApi1414PR#saveData
+ *
+ * @param data
+ * @return
+ */
+ @DataResolver
+ public void saveData(WhjlApi1414 data) {
+ ApiInfoData infoData = new ApiInfoData();
+ infoData.setId(data.getBizId());
+ infoData.setKqdm(data.getKqdm());
+ infoData.setInteType(WhjlConstant.API_CATEGORY_14);
+ infoData.setInteId(WhjlConstant.API_CODE_1414);
+ infoData.setUpdateTime(new Date());
+ infoData.setDataId(data.getBizId());
+ infoData.setData(JSON.toJSONString(data));
+ infoData.setCzbz(data.getCzbz());
+ infoData.setRemarks("澶囨敞淇℃伅");
+
+ apiInfoDataRep.save(infoData);
+ }
+
+
+ /**
+ * 鍒犻櫎
+ * whjlApi1414PR#delData
+ *
+ * @param data
+ * @return
+ */
+ @Expose
+ public String delData(WhjlApi1414 data) {
+ apiInfoDataRep.deleteById(data.getBizId());
+ return null;
+ }
+
+ /**
+ * 涓婁紶
+ * whjlApi1414PR#pushData
+ *
+ * @param items
+ * @return
+ */
+ @Expose
+ public String pushData(List<WhjlApi1414> items) {
+
+ 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_14, WhjlConstant.API_CODE_1414);
+
+ //鑾峰彇瀹炵幇鎺ュ彛
+ ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ if (null == apiService) {
+ return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ }
+
+ ApiInfoData infoData;
+ ResponseDto responseDto;
+ for (WhjlApi1414 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_14);
+ infoData.setInteId(WhjlConstant.API_CODE_1414);
+ 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/push/whhpjl/WhjlApiRemoteService.java b/src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java
index 53b42ac..ecd0bba 100644
--- a/src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java
@@ -277,6 +277,8 @@
return WhjlConstant.API_CODE_CLYSHJ;
case "1413":
return WhjlConstant.API_CODE_YSLX;
+ case "1414":
+ return WhjlConstant.API_CODE_BDZDSB;
default:
return inteId;
}
diff --git a/src/main/resources/templates/home/home-whjl.html b/src/main/resources/templates/home/home-whjl.html
index 4793524..56134f4 100644
--- a/src/main/resources/templates/home/home-whjl.html
+++ b/src/main/resources/templates/home/home-whjl.html
@@ -332,6 +332,9 @@
<dd>
<a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1413.d">杩愯緭璺嚎</a>
</dd>
+ <dd>
+ <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1414.d">鍖楁枟缁堢璁惧</a>
+ </dd>
</dl>
</li>
</ul>
--
Gitblit v1.9.3