From 39cb7288879f63112c92c189e4a7fd7f9e0cc342 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期五, 27 十月 2023 20:16:41 +0800
Subject: [PATCH] 武汉接口
---
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1113.java | 10
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1110PR.java | 201 +++
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1109.java | 11
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1112.view.xml | 83
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1201PR.java | 60
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1201.view.xml | 36
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1112PR.java | 73 +
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1110.java | 10
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1111PR.java | 200 +++
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1113PR.java | 200 +++
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1114PR.java | 199 +++
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1109PR.java | 199 +++
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1113.view.xml | 477 ++++++++
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1110.view.xml | 437 +++++++
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1109.view.xml | 370 ++++++
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1114.view.xml | 538 +++++++++
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1111.java | 10
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1111.view.xml | 410 ++++++
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1114.java | 11
19 files changed, 3,488 insertions(+), 47 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
new file mode 100644
index 0000000..179c296
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1109.view.xml
@@ -0,0 +1,370 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ViewConfig>
+ <Arguments/>
+ <Context/>
+ <Model>
+ <DataType name="dtMain">
+ <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1109</Property>
+ <PropertyDef name="dadm">
+ <Property/>
+ <Property name="label">妗ｆ浠ｇ爜</Property>
+ </PropertyDef>
+ <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="cfbh">
+ <Property/>
+ <Property name="label">浠撴埧缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="sscfmc">
+ <Property/>
+ <Property name="label">浠撴埧鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="dalx">
+ <Property/>
+ <Property name="label">妗ｆ绫诲瀷</Property>
+ </PropertyDef>
+ <PropertyDef name="damc">
+ <Property/>
+ <Property name="label">妗ｆ鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="dawj">
+ <Property/>
+ <Property name="label">妗ｆ鏂囦欢</Property>
+ </PropertyDef>
+ <PropertyDef name="sfyx">
+ <Property/>
+ <Property name="label">鏄惁鏈夋晥</Property>
+ </PropertyDef>
+ <PropertyDef name="bz">
+ <Property/>
+ <Property name="label">澶囨敞</Property>
+ </PropertyDef>
+ <PropertyDef name="bizId">
+ <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 name="label">鎿嶄綔鏍囧織</Property>
+ </PropertyDef>
+ <PropertyDef name="kqdm">
+ <Property/>
+ <Property name="label">搴撳尯浠ｇ爜</Property>
+ </PropertyDef>
+ </DataType>
+ <DataType name="dtParam">
+ <Property name="creationType">com.fzzy.api.data.ApiParam</Property>
+ <PropertyDef name="kqdm">
+ <Property></Property>
+ <Property name="label">鎵�灞炲簱鍖�</Property>
+ </PropertyDef>
+ <PropertyDef name="start">
+ <Property name="dataType">Date</Property>
+ <Property name="label">寮�濮嬫椂闂�</Property>
+ </PropertyDef>
+ <PropertyDef name="end">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鎴鏃堕棿</Property>
+ </PropertyDef>
+ <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>
+ </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">whjlApi1110PR#listData</Property>
+ <Property name="pageSize">20</Property>
+ </DataSet>
+ <DataSet id="dsQuery">
+ <ClientEvent name="onReady">self.insert();</ClientEvent>
+ <Property name="dataType">dtParam</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="dadm">
+ <Property name="property">dadm</Property>
+ </DataColumn>
+ <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="cfbh">
+ <Property name="property">cfbh</Property>
+ </DataColumn>
+ <DataColumn name="sscfmc">
+ <Property name="property">sscfmc</Property>
+ </DataColumn>
+ <DataColumn name="dalx">
+ <Property name="property">dalx</Property>
+ </DataColumn>
+ <DataColumn name="damc">
+ <Property name="property">damc</Property>
+ </DataColumn>
+ <DataColumn name="dawj">
+ <Property name="property">dawj</Property>
+ </DataColumn>
+ <DataColumn name="sfyx">
+ <Property name="property">sfyx</Property>
+ </DataColumn>
+ </DataGrid>
+ </Container>
+ <Container layoutConstraint="bottom">
+ <Property name="exClassName">bg-color</Property>
+ <DataPilot layoutConstraint="right">
+ <Property name="dataSet">dsMain</Property>
+ <Property name="itemCodes">pageSize,pages</Property>
+ </DataPilot>
+ </Container>
+ <Dialog id="dialogMain">
+ <Property name="width">60%</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">left</Property>
+ <Property name="labelSeparator">:</Property>
+ <Property name="labelWidth">120</Property>
+ <Property name="labelAlign">right</Property>
+ <AutoFormElement>
+ <Property name="name">dadm</Property>
+ <Property name="property">dadm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <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">cfbh</Property>
+ <Property name="property">cfbh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sscfmc</Property>
+ <Property name="property">sscfmc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dalx</Property>
+ <Property name="property">dalx</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">damc</Property>
+ <Property name="property">damc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dawj</Property>
+ <Property name="property">dawj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">czbz</Property>
+ <Property name="property">czbz</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ <Tools/>
+ </Dialog>
+ <UpdateAction id="updateSave">
+ <Property name="dataResolver">whjlApi1110PR#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">whjlApi1110PR#delData</Property>
+ </AjaxAction>
+ <AjaxAction id="ajaxPush">
+ <Property name="service">whjlApi1110PR#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>
+ </View>
+</ViewConfig>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1110.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1110.view.xml
new file mode 100644
index 0000000..a3b09e4
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1110.view.xml
@@ -0,0 +1,437 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ViewConfig>
+ <Arguments/>
+ <Context/>
+ <Model>
+ <DataType name="dtMain">
+ <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1110</Property>
+ <PropertyDef name="whjlhb">
+ <Property></Property>
+ <Property name="label">缁存姢璁板綍缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="jlqybh">
+ <Property></Property>
+ <Property name="label">鍐涚伯浼佷笟缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="jlqymc">
+ <Property></Property>
+ <Property name="label">鍐涚伯浼佷笟鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="jgzdbh">
+ <Property></Property>
+ <Property name="label">鍐涗緵绔欑偣缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="jgzdmc">
+ <Property></Property>
+ <Property name="label">鍐涗緵绔欑偣鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="cfbh">
+ <Property></Property>
+ <Property name="label">浠撴埧缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="sscfmc">
+ <Property></Property>
+ <Property name="label">浠撴埧鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="jcrq">
+ <Property name="dataType">Date</Property>
+ <Property name="label">妫�鏌ユ棩鏈�</Property>
+ </PropertyDef>
+ <PropertyDef name="jclx">
+ <Property></Property>
+ <Property name="label">妫�鏌ョ被鍨�</Property>
+ </PropertyDef>
+ <PropertyDef name="jxlr">
+ <Property></Property>
+ <Property name="label">妫�淇唴瀹�</Property>
+ </PropertyDef>
+ <PropertyDef name="shqk">
+ <Property></Property>
+ <Property name="label">鎹熷鎯呭喌</Property>
+ </PropertyDef>
+ <PropertyDef name="wxff">
+ <Property></Property>
+ <Property name="label">缁翠慨鏂规硶</Property>
+ </PropertyDef>
+ <PropertyDef name="wxqk">
+ <Property></Property>
+ <Property name="label">缁翠慨鎯呭喌</Property>
+ </PropertyDef>
+ <PropertyDef name="jxr">
+ <Property></Property>
+ <Property name="label">妫�淇汉</Property>
+ </PropertyDef>
+ <PropertyDef name="ysr">
+ <Property></Property>
+ <Property name="label">楠屾敹浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="wcrq">
+ <Property name="dataType">Date</Property>
+ <Property name="label">瀹屾垚鏃ユ湡</Property>
+ </PropertyDef>
+ <PropertyDef name="bz">
+ <Property></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>
+ <DataType name="dtParam">
+ <Property name="creationType">com.fzzy.api.data.ApiParam</Property>
+ <PropertyDef name="kqdm">
+ <Property></Property>
+ <Property name="label">鎵�灞炲簱鍖�</Property>
+ </PropertyDef>
+ <PropertyDef name="start">
+ <Property name="dataType">Date</Property>
+ <Property name="label">寮�濮嬫椂闂�</Property>
+ </PropertyDef>
+ <PropertyDef name="end">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鎴鏃堕棿</Property>
+ </PropertyDef>
+ <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>
+ </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">whjlApi1108PR#listData</Property>
+ <Property name="pageSize">20</Property>
+ </DataSet>
+ <DataSet id="dsQuery">
+ <ClientEvent name="onReady">self.insert();</ClientEvent>
+ <Property name="dataType">dtParam</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="whjlhb">
+ <Property name="property">whjlhb</Property>
+ </DataColumn>
+ <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="cfbh">
+ <Property name="property">cfbh</Property>
+ </DataColumn>
+ <DataColumn name="sscfmc">
+ <Property name="property">sscfmc</Property>
+ </DataColumn>
+ <DataColumn name="jcrq">
+ <Property name="property">jcrq</Property>
+ </DataColumn>
+ <DataColumn name="jclx">
+ <Property name="property">jclx</Property>
+ </DataColumn>
+ <DataColumn name="czbz">
+ <Property name="property">czbz</Property>
+ </DataColumn>
+ </DataGrid>
+ </Container>
+ <Container layoutConstraint="bottom">
+ <Property name="exClassName">bg-color</Property>
+ <DataPilot layoutConstraint="right">
+ <Property name="dataSet">dsMain</Property>
+ <Property name="itemCodes">pageSize,pages</Property>
+ </DataPilot>
+ </Container>
+ <Dialog id="dialogMain">
+ <Property name="width">60%</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">left</Property>
+ <Property name="labelSeparator">:</Property>
+ <Property name="labelWidth">120</Property>
+ <Property name="labelAlign">right</Property>
+ <AutoFormElement>
+ <Property name="name">whjlhb</Property>
+ <Property name="property">whjlhb</Property>
+ <Editor/>
+ </AutoFormElement>
+ <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">cfbh</Property>
+ <Property name="property">cfbh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sscfmc</Property>
+ <Property name="property">sscfmc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jcrq</Property>
+ <Property name="property">jcrq</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jclx</Property>
+ <Property name="property">jclx</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jxlr</Property>
+ <Property name="property">jxlr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">shqk</Property>
+ <Property name="property">shqk</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">wxff</Property>
+ <Property name="property">wxff</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">wxqk</Property>
+ <Property name="property">wxqk</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jxr</Property>
+ <Property name="property">jxr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ysr</Property>
+ <Property name="property">ysr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">wcrq</Property>
+ <Property name="property">wcrq</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/>
+ </Dialog>
+ <UpdateAction id="updateSave">
+ <Property name="dataResolver">whjlApi1108PR#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">whjlApi1108PR#delData</Property>
+ </AjaxAction>
+ <AjaxAction id="ajaxPush">
+ <Property name="service">whjlApi1108PR#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>
+ </View>
+</ViewConfig>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1111.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1111.view.xml
new file mode 100644
index 0000000..b72d734
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1111.view.xml
@@ -0,0 +1,410 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ViewConfig>
+ <Arguments/>
+ <Context/>
+ <Model>
+ <DataType name="dtMain">
+ <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1111</Property>
+ <PropertyDef name="ssbfjlbh">
+ <Property/>
+ <Property name="label">璁炬柦鎶ュ簾璁板綍缂栧彿</Property>
+ </PropertyDef>
+ <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="cfbh">
+ <Property/>
+ <Property name="label">浠撴埧缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="sscfmc">
+ <Property/>
+ <Property name="label">浠撴埧鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="sqrq">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鐢宠鏃ユ湡</Property>
+ </PropertyDef>
+ <PropertyDef name="bfyy">
+ <Property/>
+ <Property name="label">鎶ュ簾鍘熷洜</Property>
+ </PropertyDef>
+ <PropertyDef name="sqr">
+ <Property/>
+ <Property name="label">鐢宠浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="spr">
+ <Property/>
+ <Property name="label">瀹℃壒浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="sprq">
+ <Property name="dataType">Date</Property>
+ <Property name="label">瀹℃壒鏃ユ湡</Property>
+ </PropertyDef>
+ <PropertyDef name="spyj">
+ <Property/>
+ <Property name="label">瀹℃壒鎰忚</Property>
+ </PropertyDef>
+ <PropertyDef name="bz">
+ <Property/>
+ <Property name="label">澶囨敞</Property>
+ </PropertyDef>
+ <PropertyDef name="bizId">
+ <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 name="label">鎿嶄綔鏍囧織</Property>
+ </PropertyDef>
+ <PropertyDef name="kqdm">
+ <Property/>
+ <Property name="label">搴撳尯浠ｇ爜</Property>
+ </PropertyDef>
+ </DataType>
+ <DataType name="dtParam">
+ <Property name="creationType">com.fzzy.api.data.ApiParam</Property>
+ <PropertyDef name="kqdm">
+ <Property></Property>
+ <Property name="label">鎵�灞炲簱鍖�</Property>
+ </PropertyDef>
+ <PropertyDef name="start">
+ <Property name="dataType">Date</Property>
+ <Property name="label">寮�濮嬫椂闂�</Property>
+ </PropertyDef>
+ <PropertyDef name="end">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鎴鏃堕棿</Property>
+ </PropertyDef>
+ <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>
+ </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">whjlApi1111PR#listData</Property>
+ <Property name="pageSize">20</Property>
+ </DataSet>
+ <DataSet id="dsQuery">
+ <ClientEvent name="onReady">self.insert();</ClientEvent>
+ <Property name="dataType">dtParam</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="ssbfjlbh">
+ <Property name="property">ssbfjlbh</Property>
+ </DataColumn>
+ <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="cfbh">
+ <Property name="property">cfbh</Property>
+ </DataColumn>
+ <DataColumn name="sscfmc">
+ <Property name="property">sscfmc</Property>
+ </DataColumn>
+ <DataColumn name="sqrq">
+ <Property name="property">sqrq</Property>
+ </DataColumn>
+ <DataColumn name="bfyy">
+ <Property name="property">bfyy</Property>
+ </DataColumn>
+ <DataColumn name="czbz">
+ <Property name="property">czbz</Property>
+ </DataColumn>
+ </DataGrid>
+ </Container>
+ <Container layoutConstraint="bottom">
+ <Property name="exClassName">bg-color</Property>
+ <DataPilot layoutConstraint="right">
+ <Property name="dataSet">dsMain</Property>
+ <Property name="itemCodes">pageSize,pages</Property>
+ </DataPilot>
+ </Container>
+ <Dialog id="dialogMain">
+ <Property name="width">60%</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">left</Property>
+ <Property name="labelSeparator">:</Property>
+ <Property name="labelWidth">120</Property>
+ <Property name="labelAlign">right</Property>
+ <AutoFormElement>
+ <Property name="name">ssbfjlbh</Property>
+ <Property name="property">ssbfjlbh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <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">cfbh</Property>
+ <Property name="property">cfbh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sscfmc</Property>
+ <Property name="property">sscfmc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sqrq</Property>
+ <Property name="property">sqrq</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bfyy</Property>
+ <Property name="property">bfyy</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sqr</Property>
+ <Property name="property">sqr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">spr</Property>
+ <Property name="property">spr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sprq</Property>
+ <Property name="property">sprq</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">spyj</Property>
+ <Property name="property">spyj</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/>
+ </Dialog>
+ <UpdateAction id="updateSave">
+ <Property name="dataResolver">whjlApi1111PR#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">whjlApi1111PR#delData</Property>
+ </AjaxAction>
+ <AjaxAction id="ajaxPush">
+ <Property name="service">whjlApi1111PR#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>
+ </View>
+</ViewConfig>
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 46ade0c..fff8f68 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1112.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1112.view.xml
@@ -185,12 +185,41 @@
<Property name="label">搴撳尯浠ｇ爜</Property>
</PropertyDef>
</DataType>
+ <DataType name="dtParam">
+ <Property name="creationType">com.fzzy.api.data.ApiParam</Property>
+ <PropertyDef name="kqdm">
+ <Property></Property>
+ <Property name="label">鎵�灞炲簱鍖�</Property>
+ </PropertyDef>
+ <PropertyDef name="start">
+ <Property name="dataType">Date</Property>
+ <Property name="label">寮�濮嬫椂闂�</Property>
+ </PropertyDef>
+ <PropertyDef name="end">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鎴鏃堕棿</Property>
+ </PropertyDef>
+ <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>
+ </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">whjlApi1112PR#listData</Property>
+ <Property name="pageSize">20</Property>
+ </DataSet>
+ <DataSet id="dsQuery">
+ <ClientEvent name="onReady">self.insert();</ClientEvent>
+ <Property name="dataType">dtParam</Property>
</DataSet>
<Container layout="regionPadding:10" layoutConstraint="top">
<Property name="exClassName">bg-color</Property>
@@ -277,44 +306,48 @@
<RowSelectorColumn>
<Property name="caption">涓婁紶</Property>
</RowSelectorColumn>
- <DataColumn name="sbmc">
- <Property name="property">sbmc</Property>
- <Property name="align">center</Property>
+ <DataColumn name="sbbh">
+ <Property name="property">sbbh</Property>
+ </DataColumn>
+ <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="cfbh">
<Property name="property">cfbh</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="sscfmc">
- <Property name="property">sscfmc</Property>
- <Property name="align">center</Property>
</DataColumn>
<DataColumn name="sbzt">
<Property name="property">sbzt</Property>
- <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="ggxh">
+ <Property name="property">ggxh</Property>
+ </DataColumn>
+ <DataColumn name="zzdw">
+ <Property name="property">zzdw</Property>
</DataColumn>
<DataColumn name="cgsj">
<Property name="property">cgsj</Property>
- <Property name="align">center</Property>
</DataColumn>
- <DataColumn name="gl">
- <Property name="property">gl</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="wxcc">
- <Property name="property">wxcc</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="zygn">
- <Property name="property">zygn</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="sfyx">
- <Property name="property">sfyx</Property>
- <Property name="align">center</Property>
+ <DataColumn name="czbz">
+ <Property name="property">czbz</Property>
</DataColumn>
</DataGrid>
</Container>
+ <Container layoutConstraint="bottom">
+ <Property name="exClassName">bg-color</Property>
+ <DataPilot layoutConstraint="right">
+ <Property name="dataSet">dsMain</Property>
+ <Property name="itemCodes">pageSize,pages</Property>
+ </DataPilot>
+ </Container>
<Dialog id="dialogMain">
<Property name="width">85%</Property>
<Property name="closeable">false</Property>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1113.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1113.view.xml
new file mode 100644
index 0000000..643380e
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1113.view.xml
@@ -0,0 +1,477 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ViewConfig>
+ <Arguments/>
+ <Context/>
+ <Model>
+ <DataType name="dtMain">
+ <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1113</Property>
+ <PropertyDef name="sbwhjlbh">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="jlqybh">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="jlqymc">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="jgzdbh">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="jgzdmc">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="sbbh">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="sbmc">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="wbrq">
+ <Property name="dataType">Date</Property>
+ </PropertyDef>
+ <PropertyDef name="wbdw">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="wbr">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="lxdh">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="whlr">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="whjl">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="fxwt">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="jjcs">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="xcwbrq">
+ <Property name="dataType">Date</Property>
+ </PropertyDef>
+ <PropertyDef name="ysr">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="whjy">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="whjlzp">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="bz">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="zpid">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="zpmc">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="zplj">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="zpdx">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="bizId">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="updateTime">
+ <Property name="dataType">Date</Property>
+ </PropertyDef>
+ <PropertyDef name="czbz">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="kqdm">
+ <Property/>
+ </PropertyDef>
+ </DataType>
+ <DataType name="dtParam">
+ <Property name="creationType">com.fzzy.api.data.ApiParam</Property>
+ <PropertyDef name="kqdm">
+ <Property></Property>
+ <Property name="label">鎵�灞炲簱鍖�</Property>
+ </PropertyDef>
+ <PropertyDef name="start">
+ <Property name="dataType">Date</Property>
+ <Property name="label">寮�濮嬫椂闂�</Property>
+ </PropertyDef>
+ <PropertyDef name="end">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鎴鏃堕棿</Property>
+ </PropertyDef>
+ <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>
+ </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">whjlApi1108PR#listData</Property>
+ </DataSet>
+ <DataSet id="dsQuery">
+ <ClientEvent name="onReady">self.insert();</ClientEvent>
+ <Property name="dataType">dtParam</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="sbwhjlbh">
+ <Property name="property">sbwhjlbh</Property>
+ </DataColumn>
+ <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="sbbh">
+ <Property name="property">sbbh</Property>
+ </DataColumn>
+ <DataColumn name="sbmc">
+ <Property name="property">sbmc</Property>
+ </DataColumn>
+ <DataColumn name="wbrq">
+ <Property name="property">wbrq</Property>
+ </DataColumn>
+ <DataColumn name="wbdw">
+ <Property name="property">wbdw</Property>
+ </DataColumn>
+ <DataColumn name="whlr">
+ <Property name="property">whlr</Property>
+ </DataColumn>
+ <DataColumn name="whjl">
+ <Property name="property">whjl</Property>
+ </DataColumn>
+ <DataColumn name="czbz">
+ <Property name="property">czbz</Property>
+ </DataColumn>
+ </DataGrid>
+ </Container>
+ <Container layoutConstraint="bottom">
+ <Property name="exClassName">bg-color</Property>
+ <DataPilot layoutConstraint="right">
+ <Property name="dataSet">dsMain</Property>
+ <Property name="itemCodes">pageSize,pages</Property>
+ </DataPilot>
+ </Container>
+ <Dialog id="dialogMain">
+ <Property name="width">60%</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">left</Property>
+ <Property name="labelSeparator">:</Property>
+ <Property name="labelWidth">120</Property>
+ <Property name="labelAlign">right</Property>
+ <AutoFormElement>
+ <Property name="name">sbwhjlbh</Property>
+ <Property name="property">sbwhjlbh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <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">sbbh</Property>
+ <Property name="property">sbbh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sbmc</Property>
+ <Property name="property">sbmc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">wbrq</Property>
+ <Property name="property">wbrq</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">wbdw</Property>
+ <Property name="property">wbdw</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">wbr</Property>
+ <Property name="property">wbr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">lxdh</Property>
+ <Property name="property">lxdh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">whlr</Property>
+ <Property name="property">whlr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">whjl</Property>
+ <Property name="property">whjl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">fxwt</Property>
+ <Property name="property">fxwt</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jjcs</Property>
+ <Property name="property">jjcs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">xcwbrq</Property>
+ <Property name="property">xcwbrq</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ysr</Property>
+ <Property name="property">ysr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">whjy</Property>
+ <Property name="property">whjy</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">whjlzp</Property>
+ <Property name="property">whjlzp</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bz</Property>
+ <Property name="property">bz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zpid</Property>
+ <Property name="property">zpid</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zpmc</Property>
+ <Property name="property">zpmc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zplj</Property>
+ <Property name="property">zplj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zpdx</Property>
+ <Property name="property">zpdx</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">whjlApi1108PR#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">whjlApi1108PR#delData</Property>
+ </AjaxAction>
+ <AjaxAction id="ajaxPush">
+ <Property name="service">whjlApi1108PR#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>
+ </View>
+</ViewConfig>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1114.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1114.view.xml
new file mode 100644
index 0000000..3a0082f
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1114.view.xml
@@ -0,0 +1,538 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ViewConfig>
+ <Arguments/>
+ <Context/>
+ <Model>
+ <DataType name="dtMain">
+ <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1114</Property>
+ <PropertyDef name="sbwxjlbh">
+ <Property/>
+ <Property name="label">璁惧缁翠慨璁板綍缂栧彿</Property>
+ </PropertyDef>
+ <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/>
+ </PropertyDef>
+ <PropertyDef name="sbbh">
+ <Property/>
+ <Property name="label">璁惧缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="sbmc">
+ <Property/>
+ <Property name="label">璁惧鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="wxkssj">
+ <Property/>
+ <Property name="label">寮�濮嬬淮淇椂闂�</Property>
+ </PropertyDef>
+ <PropertyDef name="wxjssj">
+ <Property/>
+ <Property name="label">缁撴潫缁翠慨鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="wxdw">
+ <Property/>
+ <Property name="label">缁翠慨鍗曚綅</Property>
+ </PropertyDef>
+ <PropertyDef name="lxr">
+ <Property/>
+ <Property name="label">鑱旂郴浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="lxdh">
+ <Property/>
+ <Property name="label">鑱旂郴鐢佃瘽</Property>
+ </PropertyDef>
+ <PropertyDef name="gzxx">
+ <Property/>
+ <Property name="label">鏁呴殰鐜拌薄</Property>
+ </PropertyDef>
+ <PropertyDef name="gzyy">
+ <Property/>
+ <Property name="label">鏁呴殰鍘熷洜</Property>
+ </PropertyDef>
+ <PropertyDef name="wxff">
+ <Property/>
+ <Property name="label">缁翠慨鏂规硶</Property>
+ </PropertyDef>
+ <PropertyDef name="gxpjxx">
+ <Property/>
+ <Property name="label">鏇存柊閰嶄欢淇℃伅</Property>
+ </PropertyDef>
+ <PropertyDef name="wxhyxzt">
+ <Property/>
+ <Property name="label">缁翠慨鍚庤繍琛岀姸鎬�</Property>
+ </PropertyDef>
+ <PropertyDef name="sysj">
+ <Property name="dataType">int</Property>
+ <Property name="label">璇曠敤鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="wxfy">
+ <Property/>
+ <Property name="label">缁翠慨璐圭敤</Property>
+ </PropertyDef>
+ <PropertyDef name="ysr">
+ <Property/>
+ <Property name="label">楠屾敹浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="jl">
+ <Property/>
+ <Property name="label">缁撹</Property>
+ </PropertyDef>
+ <PropertyDef name="wxjlzp">
+ <Property/>
+ <Property name="label">缁存姢璁板綍鐓х墖</Property>
+ </PropertyDef>
+ <PropertyDef name="bz">
+ <Property/>
+ <Property name="label">澶囨敞</Property>
+ </PropertyDef>
+ <PropertyDef name="zpid">
+ <Property/>
+ <Property name="label">鐓х墖id</Property>
+ </PropertyDef>
+ <PropertyDef name="zpmc">
+ <Property/>
+ <Property name="label">鐓х墖鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="zplj">
+ <Property/>
+ <Property name="label">鐓х墖璺緞</Property>
+ </PropertyDef>
+ <PropertyDef name="zpdx">
+ <Property name="dataType">int</Property>
+ <Property name="label">鐓х墖澶у皬</Property>
+ </PropertyDef>
+ <PropertyDef name="bizId">
+ <Property/>
+ <Property name="label">涓氬姟ID</Property>
+ </PropertyDef>
+ <PropertyDef name="updateTime">
+ <Property name="dataType">DateTime</Property>
+ <Property name="label">鏈�鍚庢洿鏂版椂闂�</Property>
+ </PropertyDef>
+ <PropertyDef name="czbz">
+ <Property/>
+ <Property name="label">鎿嶄綔鏍囧織</Property>
+ </PropertyDef>
+ <PropertyDef name="kqdm">
+ <Property/>
+ <Property name="label">搴撳尯浠ｇ爜</Property>
+ </PropertyDef>
+ </DataType>
+ <DataType name="dtParam">
+ <Property name="creationType">com.fzzy.api.data.ApiParam</Property>
+ <PropertyDef name="kqdm">
+ <Property></Property>
+ <Property name="label">鎵�灞炲簱鍖�</Property>
+ </PropertyDef>
+ <PropertyDef name="start">
+ <Property name="dataType">Date</Property>
+ <Property name="label">寮�濮嬫椂闂�</Property>
+ </PropertyDef>
+ <PropertyDef name="end">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鎴鏃堕棿</Property>
+ </PropertyDef>
+ <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>
+ </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">whjlApi1114PR#listData</Property>
+ <Property name="parameter">20</Property>
+ </DataSet>
+ <DataSet id="dsQuery">
+ <ClientEvent name="onReady">self.insert();</ClientEvent>
+ <Property name="dataType">dtParam</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="sbwxjlbh">
+ <Property name="property">sbwxjlbh</Property>
+ </DataColumn>
+ <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="sbbh">
+ <Property name="property">sbbh</Property>
+ </DataColumn>
+ <DataColumn name="sbmc">
+ <Property name="property">sbmc</Property>
+ </DataColumn>
+ <DataColumn name="wxkssj">
+ <Property name="property">wxkssj</Property>
+ </DataColumn>
+ <DataColumn name="wxjssj">
+ <Property name="property">wxjssj</Property>
+ </DataColumn>
+ <DataColumn name="wxdw">
+ <Property name="property">wxdw</Property>
+ </DataColumn>
+ <DataColumn name="lxr">
+ <Property name="property">lxr</Property>
+ </DataColumn>
+ <DataColumn name="lxdh">
+ <Property name="property">lxdh</Property>
+ </DataColumn>
+ <DataColumn name="gzxx">
+ <Property name="property">gzxx</Property>
+ </DataColumn>
+ <DataColumn name="czbz">
+ <Property name="property">czbz</Property>
+ </DataColumn>
+ </DataGrid>
+ </Container>
+ <Container layoutConstraint="bottom">
+ <Property name="exClassName">bg-color</Property>
+ <DataPilot layoutConstraint="right">
+ <Property name="dataSet">dsMain</Property>
+ <Property name="itemCodes">pageSize,pages</Property>
+ </DataPilot>
+ </Container>
+ <Dialog id="dialogMain">
+ <Property name="width">60%</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">left</Property>
+ <Property name="labelSeparator">:</Property>
+ <Property name="labelWidth">120</Property>
+ <Property name="labelAlign">right</Property>
+ <AutoFormElement>
+ <Property name="name">sbwxjlbh</Property>
+ <Property name="property">sbwxjlbh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <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">sbbh</Property>
+ <Property name="property">sbbh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sbmc</Property>
+ <Property name="property">sbmc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">wxkssj</Property>
+ <Property name="property">wxkssj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">wxjssj</Property>
+ <Property name="property">wxjssj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">wxdw</Property>
+ <Property name="property">wxdw</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">lxr</Property>
+ <Property name="property">lxr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">lxdh</Property>
+ <Property name="property">lxdh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">gzxx</Property>
+ <Property name="property">gzxx</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">gzyy</Property>
+ <Property name="property">gzyy</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">wxff</Property>
+ <Property name="property">wxff</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">gxpjxx</Property>
+ <Property name="property">gxpjxx</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">wxhyxzt</Property>
+ <Property name="property">wxhyxzt</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sysj</Property>
+ <Property name="property">sysj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">wxfy</Property>
+ <Property name="property">wxfy</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ysr</Property>
+ <Property name="property">ysr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jl</Property>
+ <Property name="property">jl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">wxjlzp</Property>
+ <Property name="property">wxjlzp</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bz</Property>
+ <Property name="property">bz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zpid</Property>
+ <Property name="property">zpid</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zpmc</Property>
+ <Property name="property">zpmc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zplj</Property>
+ <Property name="property">zplj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zpdx</Property>
+ <Property name="property">zpdx</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">whjlApi1114PR#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">whjlApi1114PR#delData</Property>
+ </AjaxAction>
+ <AjaxAction id="ajaxPush">
+ <Property name="service">whjlApi1114PR#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>
+ </View>
+</ViewConfig>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1201.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1201.view.xml
index 27e2f5b..b67f125 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1201.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1201.view.xml
@@ -219,12 +219,41 @@
<Property name="label">澶囨敞璇存槑</Property>
</PropertyDef>
</DataType>
+ <DataType name="dtParam">
+ <Property name="creationType">com.fzzy.api.data.ApiParam</Property>
+ <PropertyDef name="kqdm">
+ <Property></Property>
+ <Property name="label">鎵�灞炲簱鍖�</Property>
+ </PropertyDef>
+ <PropertyDef name="start">
+ <Property name="dataType">Date</Property>
+ <Property name="label">寮�濮嬫椂闂�</Property>
+ </PropertyDef>
+ <PropertyDef name="end">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鎴鏃堕棿</Property>
+ </PropertyDef>
+ <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>
+ </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">whjlApi1201PR#listData</Property>
+ <Property name="pageSize">20</Property>
+ </DataSet>
+ <DataSet id="dsQuery">
+ <ClientEvent name="onReady">self.insert();</ClientEvent>
+ <Property name="dataType">dtParam</Property>
</DataSet>
<Container layout="regionPadding:10" layoutConstraint="top">
<Property name="exClassName">bg-color</Property>
@@ -381,6 +410,13 @@
</DataColumn>
</DataGrid>
</Container>
+ <Container layoutConstraint="bottom">
+ <Property name="exClassName">bg-color</Property>
+ <DataPilot layoutConstraint="right">
+ <Property name="dataSet">dsMain</Property>
+ <Property name="itemCodes">pageSize,pages</Property>
+ </DataPilot>
+ </Container>
<Dialog id="dialogMain">
<Property name="width">85%</Property>
<Property name="closeable">false</Property>
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 4f76fc5..dc1fdd1 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1109.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1109.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;
/**
* 浠撳偍璁炬柦璁惧-浠撳偍璁炬柦鐢靛瓙妗ｆ
@@ -32,6 +34,15 @@
private String sfyx; //鏄惁鏈夋晥
private String bz; //澶囨敞
+ //鍗曠嫭澧炲姞锛屼笉杩涜涓婁紶
+ @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; //搴撳尯浠ｇ爜
}
\ No newline at end of file
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 2268d75..36ba16a 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1110.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1110.java
@@ -41,6 +41,14 @@
private Date wcrq; //瀹屾垚鏃ユ湡
private String bz; //澶囨敞
-
+ //鍗曠嫭澧炲姞锛屼笉杩涜涓婁紶
+ @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; //搴撳尯浠ｇ爜
}
\ No newline at end of file
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 a78fa31..b3f4935 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1111.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1111.java
@@ -38,4 +38,14 @@
private String spyj; //瀹℃壒鎰忚
private String bz; //澶囨敞
+ //鍗曠嫭澧炲姞锛屼笉杩涜涓婁紶
+ @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; //搴撳尯浠ｇ爜
+
}
\ No newline at end of file
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 8b3c8fe..fc08321 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1113.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1113.java
@@ -48,4 +48,14 @@
private String zplj; //鐓х墖璺緞
private String zpdx; //鐓х墖澶у皬
+ //鍗曠嫭澧炲姞锛屼笉杩涜涓婁紶
+ @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; //搴撳尯浠ｇ爜
+
}
\ No newline at end of file
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 9fbc2ac..9412cd1 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1114.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1114.java
@@ -5,6 +5,7 @@
import lombok.EqualsAndHashCode;
import java.io.Serializable;
+import java.util.Date;
/**
* 浠撳偍璁炬柦璁惧-浠撳偍璁惧缁翠慨璁板綍
@@ -49,4 +50,14 @@
private String zpmc; //鐓х墖鍚嶇О
private String zplj; //鐓х墖璺緞
private int zpdx; //鐓х墖澶у皬
+
+ //鍗曠嫭澧炲姞锛屼笉杩涜涓婁紶
+ @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; //搴撳尯浠ｇ爜
}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1109PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1109PR.java
new file mode 100644
index 0000000..faea22a
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1109PR.java
@@ -0,0 +1,199 @@
+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.bstek.dorado.data.provider.Page;
+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.utils.ContextUtil;
+import com.fzzy.api.view.repository.ApiInfoDataRep;
+import com.fzzy.otherview.whhpjl.WhjlConstant;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1109;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Component;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author: YYC
+ * @Description:浠撳偍璁炬柦鐢靛瓙妗ｆ
+ * @DateTime: 2023-10-25 14:13
+ **/
+@Component
+public class WhjlApi1109PR {
+
+ @Autowired
+ private ApiCommonService apiCommonService;
+ @Autowired
+ private ApiPushManager apiPushManager;
+ @Autowired
+ private ApiInfoDataRep apiInfoDataRep;
+
+ /**
+ * 鑾峰彇鍒楄〃淇℃伅
+ * WhjlApi1109PR#listData
+ *
+ * @return
+ */
+ @DataProvider
+ public void listData(Page<WhjlApi1109> page, ApiParam param) {
+
+ Pageable pageable = PageRequest.of(page.getPageNo() - 1, page.getPageSize(), Sort.Direction.DESC, "updateTime");
+
+ Specification specification = new Specification<ApiInfoData>() {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Predicate toPredicate(Root<ApiInfoData> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
+ List<Predicate> predicates = new ArrayList<>(); //鎵�鏈夌殑鏂█
+ Predicate predicate = criteriaBuilder.equal(root.get("inteId"), WhjlConstant.API_CODE_1109);
+ predicates.add(predicate);
+ if (null != param) {
+ if (StringUtils.isNotBlank(param.getKqdm())) {
+ Predicate predicate1 = criteriaBuilder.equal(root.get("kqdm"), param.getKqdm());
+ predicates.add(predicate1);
+ }
+
+ if (StringUtils.isNotBlank(param.getCzbz())) {
+ Predicate predicate2 = criteriaBuilder.equal(root.get("czbz"), param.getCzbz());
+ predicates.add(predicate2);
+ }
+ if (null != param.getStart()) {
+ Predicate predicate3 = criteriaBuilder.greaterThan(root.get("updateTime"), ContextUtil.getCurZero(param.getStart()));
+ predicates.add(predicate3);
+ }
+
+ if (null != param.getEnd()) {
+ Predicate predicate4 = criteriaBuilder.lessThan(root.get("updateTime"), ContextUtil.getNextZero(param.getEnd()));
+ predicates.add(predicate4);
+ }
+ }
+ return criteriaBuilder.and(predicates.toArray(new Predicate[0]));
+ }
+ };
+ org.springframework.data.domain.Page<ApiInfoData> japPage = apiInfoDataRep.findAll(specification, pageable);
+ page.setEntityCount((int) japPage.getTotalElements());
+ List<WhjlApi1109> list = new ArrayList<>();
+ WhjlApi1109 whjlApi1109;
+ for (ApiInfoData infoData : japPage.getContent()) {
+ whjlApi1109 = JSONObject.parseObject(infoData.getData(), WhjlApi1109.class);
+ whjlApi1109.setKqdm(infoData.getKqdm());
+ whjlApi1109.setCzbz(infoData.getCzbz());
+ whjlApi1109.setUpdateTime(infoData.getUpdateTime());
+ whjlApi1109.setBizId(infoData.getDataId());
+ list.add(whjlApi1109);
+ }
+ page.setEntities(list);
+
+ }
+
+ /**
+ * 鏇存柊鎴栦慨鏀�
+ * WhjlApi1109PR#saveData
+ *
+ * @param data
+ * @return
+ */
+ @DataResolver
+ public void saveData(WhjlApi1109 data) {
+ ApiInfoData infoData = new ApiInfoData();
+ infoData.setId(data.getBizId());
+ infoData.setKqdm(data.getKqdm());
+ infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteId(WhjlConstant.API_CODE_1109);
+ infoData.setUpdateTime(new Date());
+ infoData.setDataId(data.getBizId());
+ infoData.setData(JSON.toJSONString(data));
+ infoData.setCzbz(data.getCzbz());
+ infoData.setRemarks("澶囨敞淇℃伅");
+
+ apiInfoDataRep.save(infoData);
+ }
+
+ /**
+ * 鍒犻櫎
+ * WhjlApi1109PR#delData
+ *
+ * @param data
+ * @return
+ */
+ @Expose
+ public String delData(WhjlApi1109 data) {
+ apiInfoDataRep.deleteById(data.getBizId());
+ return null;
+ }
+
+ /**
+ * 涓婁紶
+ * WhjlApi1109PR#pushData
+ *
+ * @param items
+ * @return
+ */
+ @Expose
+ public String pushData(List<WhjlApi1109> 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_12, WhjlConstant.API_CODE_1109);
+
+ //鑾峰彇瀹炵幇鎺ュ彛
+ ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ if (null == apiService) {
+ return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ }
+
+ ResponseDto responseDto;
+ ApiInfoData infoData;
+ for (WhjlApi1109 data : items) {
+ responseDto = apiService.pushData(param, apiConf, items);
+ 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.setInteId(WhjlConstant.API_CODE_1109);
+ 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/WhjlApi1110PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1110PR.java
new file mode 100644
index 0000000..0338e8e
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1110PR.java
@@ -0,0 +1,201 @@
+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.bstek.dorado.data.provider.Page;
+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.utils.ContextUtil;
+import com.fzzy.api.view.repository.ApiInfoDataRep;
+import com.fzzy.otherview.whhpjl.WhjlConstant;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1109;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1110;
+import com.fzzy.push.gd2022.ApiCodeConstant;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Component;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author: YYC
+ * @Description:浠撳偍璁炬柦缁存姢璁板綍
+ * @DateTime: 2023-10-25 14:13
+ **/
+@Component
+public class WhjlApi1110PR {
+
+ @Autowired
+ private ApiCommonService apiCommonService;
+ @Autowired
+ private ApiPushManager apiPushManager;
+ @Autowired
+ private ApiInfoDataRep apiInfoDataRep;
+
+ /**
+ * 鑾峰彇鍒楄〃淇℃伅
+ * WhjlApi1110PR#listData
+ *
+ * @return
+ */
+ @DataProvider
+ public void listData(Page<WhjlApi1110> page, ApiParam param) {
+
+ Pageable pageable = PageRequest.of(page.getPageNo() - 1, page.getPageSize(), Sort.Direction.DESC, "updateTime");
+
+ Specification specification = new Specification<ApiInfoData>() {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Predicate toPredicate(Root<ApiInfoData> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
+ List<Predicate> predicates = new ArrayList<>(); //鎵�鏈夌殑鏂█
+ Predicate predicate = criteriaBuilder.equal(root.get("inteId"), WhjlConstant.API_CODE_1110);
+ predicates.add(predicate);
+ if (null != param) {
+ if (StringUtils.isNotBlank(param.getKqdm())) {
+ Predicate predicate1 = criteriaBuilder.equal(root.get("kqdm"), param.getKqdm());
+ predicates.add(predicate1);
+ }
+
+ if (StringUtils.isNotBlank(param.getCzbz())) {
+ Predicate predicate2 = criteriaBuilder.equal(root.get("czbz"), param.getCzbz());
+ predicates.add(predicate2);
+ }
+ if (null != param.getStart()) {
+ Predicate predicate3 = criteriaBuilder.greaterThan(root.get("updateTime"), ContextUtil.getCurZero(param.getStart()));
+ predicates.add(predicate3);
+ }
+
+ if (null != param.getEnd()) {
+ Predicate predicate4 = criteriaBuilder.lessThan(root.get("updateTime"), ContextUtil.getNextZero(param.getEnd()));
+ predicates.add(predicate4);
+ }
+ }
+ return criteriaBuilder.and(predicates.toArray(new Predicate[0]));
+ }
+ };
+ org.springframework.data.domain.Page<ApiInfoData> japPage = apiInfoDataRep.findAll(specification, pageable);
+ page.setEntityCount((int) japPage.getTotalElements());
+ List<WhjlApi1110> list = new ArrayList<>();
+ WhjlApi1110 whjlApi1110;
+ for (ApiInfoData infoData : japPage.getContent()) {
+ whjlApi1110 = JSONObject.parseObject(infoData.getData(), WhjlApi1110.class);
+ whjlApi1110.setKqdm(infoData.getKqdm());
+ whjlApi1110.setCzbz(infoData.getCzbz());
+ whjlApi1110.setUpdateTime(infoData.getUpdateTime());
+ whjlApi1110.setBizId(infoData.getDataId());
+ list.add(whjlApi1110);
+ }
+ page.setEntities(list);
+
+ }
+
+ /**
+ * 鏇存柊鎴栦慨鏀�
+ * WhjlApi1110PR#saveData
+ *
+ * @param data
+ * @return
+ */
+ @DataResolver
+ public void saveData(WhjlApi1110 data) {
+ ApiInfoData infoData = new ApiInfoData();
+ infoData.setId(data.getBizId());
+ infoData.setKqdm(data.getKqdm());
+ infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteId(WhjlConstant.API_CODE_1110);
+ infoData.setUpdateTime(new Date());
+ infoData.setDataId(data.getBizId());
+ infoData.setData(JSON.toJSONString(data));
+ infoData.setCzbz(data.getCzbz());
+ infoData.setRemarks("澶囨敞淇℃伅");
+
+ apiInfoDataRep.save(infoData);
+ }
+
+ /**
+ * 鍒犻櫎
+ * WhjlApi1110PR#delData
+ *
+ * @param data
+ * @return
+ */
+ @Expose
+ public String delData(WhjlApi1110 data) {
+ apiInfoDataRep.deleteById(data.getBizId());
+ return null;
+ }
+
+ /**
+ * 涓婁紶
+ * WhjlApi1110PR#pushData
+ *
+ * @param items
+ * @return
+ */
+ @Expose
+ public String pushData(List<WhjlApi1110> 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_12, WhjlConstant.API_CODE_1110);
+
+ //鑾峰彇瀹炵幇鎺ュ彛
+ ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ if (null == apiService) {
+ return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ }
+
+ ResponseDto responseDto;
+ ApiInfoData infoData;
+ for (WhjlApi1110 data : items) {
+ responseDto = apiService.pushData(param, apiConf, items);
+ 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.setInteId(WhjlConstant.API_CODE_1110);
+ 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/WhjlApi1111PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1111PR.java
new file mode 100644
index 0000000..5ed3b18
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1111PR.java
@@ -0,0 +1,200 @@
+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.bstek.dorado.data.provider.Page;
+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.utils.ContextUtil;
+import com.fzzy.api.view.repository.ApiInfoDataRep;
+import com.fzzy.otherview.whhpjl.WhjlConstant;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1111;
+import com.fzzy.push.gd2022.ApiCodeConstant;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Component;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author: YYC
+ * @Description:浠撳偍璁惧鎶ュ簾璁板綍
+ * @DateTime: 2023-10-25 14:13
+ **/
+@Component
+public class WhjlApi1111PR {
+
+ @Autowired
+ private ApiCommonService apiCommonService;
+ @Autowired
+ private ApiPushManager apiPushManager;
+ @Autowired
+ private ApiInfoDataRep apiInfoDataRep;
+
+ /**
+ * 鑾峰彇鍒楄〃淇℃伅
+ * WhjlApi1111PR#listData
+ *
+ * @return
+ */
+ @DataProvider
+ public void listData(Page<WhjlApi1111> page, ApiParam param) {
+
+ Pageable pageable = PageRequest.of(page.getPageNo() - 1, page.getPageSize(), Sort.Direction.DESC, "updateTime");
+
+ Specification specification = new Specification<ApiInfoData>() {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Predicate toPredicate(Root<ApiInfoData> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
+ List<Predicate> predicates = new ArrayList<>(); //鎵�鏈夌殑鏂█
+ Predicate predicate = criteriaBuilder.equal(root.get("inteId"), WhjlConstant.API_CODE_1111);
+ predicates.add(predicate);
+ if (null != param) {
+ if (StringUtils.isNotBlank(param.getKqdm())) {
+ Predicate predicate1 = criteriaBuilder.equal(root.get("kqdm"), param.getKqdm());
+ predicates.add(predicate1);
+ }
+
+ if (StringUtils.isNotBlank(param.getCzbz())) {
+ Predicate predicate2 = criteriaBuilder.equal(root.get("czbz"), param.getCzbz());
+ predicates.add(predicate2);
+ }
+ if (null != param.getStart()) {
+ Predicate predicate3 = criteriaBuilder.greaterThan(root.get("updateTime"), ContextUtil.getCurZero(param.getStart()));
+ predicates.add(predicate3);
+ }
+
+ if (null != param.getEnd()) {
+ Predicate predicate4 = criteriaBuilder.lessThan(root.get("updateTime"), ContextUtil.getNextZero(param.getEnd()));
+ predicates.add(predicate4);
+ }
+ }
+ return criteriaBuilder.and(predicates.toArray(new Predicate[0]));
+ }
+ };
+ org.springframework.data.domain.Page<ApiInfoData> japPage = apiInfoDataRep.findAll(specification, pageable);
+ page.setEntityCount((int) japPage.getTotalElements());
+ List<WhjlApi1111> list = new ArrayList<>();
+ WhjlApi1111 whjlApi1111;
+ for (ApiInfoData infoData : japPage.getContent()) {
+ whjlApi1111 = JSONObject.parseObject(infoData.getData(), WhjlApi1111.class);
+ whjlApi1111.setKqdm(infoData.getKqdm());
+ whjlApi1111.setCzbz(infoData.getCzbz());
+ whjlApi1111.setUpdateTime(infoData.getUpdateTime());
+ whjlApi1111.setBizId(infoData.getDataId());
+ list.add(whjlApi1111);
+ }
+ page.setEntities(list);
+
+ }
+
+ /**
+ * 鏇存柊鎴栦慨鏀�
+ * WhjlApi1111PR#saveData
+ *
+ * @param data
+ * @return
+ */
+ @DataResolver
+ public void saveData(WhjlApi1111 data) {
+ ApiInfoData infoData = new ApiInfoData();
+ infoData.setId(data.getBizId());
+ infoData.setKqdm(data.getKqdm());
+ infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteId(WhjlConstant.API_CODE_1111);
+ infoData.setUpdateTime(new Date());
+ infoData.setDataId(data.getBizId());
+ infoData.setData(JSON.toJSONString(data));
+ infoData.setCzbz(data.getCzbz());
+ infoData.setRemarks("澶囨敞淇℃伅");
+
+ apiInfoDataRep.save(infoData);
+ }
+
+ /**
+ * 鍒犻櫎
+ * WhjlApi1111PR#delData
+ *
+ * @param data
+ * @return
+ */
+ @Expose
+ public String delData(WhjlApi1111 data) {
+ apiInfoDataRep.deleteById(data.getBizId());
+ return null;
+ }
+
+ /**
+ * 涓婁紶
+ * WhjlApi1111PR#pushData
+ *
+ * @param items
+ * @return
+ */
+ @Expose
+ public String pushData(List<WhjlApi1111> 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_12, WhjlConstant.API_CODE_1111);
+
+ //鑾峰彇瀹炵幇鎺ュ彛
+ ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ if (null == apiService) {
+ return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ }
+
+ ResponseDto responseDto;
+ ApiInfoData infoData;
+ for (WhjlApi1111 data : items) {
+ responseDto = apiService.pushData(param, apiConf, items);
+ 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.setInteId(WhjlConstant.API_CODE_1111);
+ 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/WhjlApi1112PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1112PR.java
index 52d5571..ff00ca4 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1112PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1112PR.java
@@ -5,6 +5,7 @@
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
+import com.bstek.dorado.data.provider.Page;
import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.dto.ResponseDto;
@@ -13,12 +14,23 @@
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiPushManager;
import com.fzzy.api.service.ApiRemoteService;
+import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.otherview.whhpjl.WhjlConstant;
import com.fzzy.otherview.whhpjl.dto.WhjlApi1112;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1112;
+import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Component;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -46,22 +58,55 @@
* @return
*/
@DataProvider
- public List<WhjlApi1112> listData() {
- List<ApiInfoData> result = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1111);
- if (null == result || result.isEmpty()) {
- return null;
- }
+ public void listData(Page<WhjlApi1112> page, ApiParam param) {
+
+ Pageable pageable = PageRequest.of(page.getPageNo() - 1, page.getPageSize(), Sort.Direction.DESC, "updateTime");
+
+ Specification specification = new Specification<ApiInfoData>() {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Predicate toPredicate(Root<ApiInfoData> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
+ List<Predicate> predicates = new ArrayList<>(); //鎵�鏈夌殑鏂█
+ Predicate predicate = criteriaBuilder.equal(root.get("inteId"), WhjlConstant.API_CODE_1112);
+ predicates.add(predicate);
+ if (null != param) {
+ if (StringUtils.isNotBlank(param.getKqdm())) {
+ Predicate predicate1 = criteriaBuilder.equal(root.get("kqdm"), param.getKqdm());
+ predicates.add(predicate1);
+ }
+
+ if (StringUtils.isNotBlank(param.getCzbz())) {
+ Predicate predicate2 = criteriaBuilder.equal(root.get("czbz"), param.getCzbz());
+ predicates.add(predicate2);
+ }
+ if (null != param.getStart()) {
+ Predicate predicate3 = criteriaBuilder.greaterThan(root.get("updateTime"), ContextUtil.getCurZero(param.getStart()));
+ predicates.add(predicate3);
+ }
+
+ if (null != param.getEnd()) {
+ Predicate predicate4 = criteriaBuilder.lessThan(root.get("updateTime"), ContextUtil.getNextZero(param.getEnd()));
+ predicates.add(predicate4);
+ }
+ }
+ return criteriaBuilder.and(predicates.toArray(new Predicate[0]));
+ }
+ };
+ org.springframework.data.domain.Page<ApiInfoData> japPage = apiInfoDataRep.findAll(specification, pageable);
+ page.setEntityCount((int) japPage.getTotalElements());
List<WhjlApi1112> list = new ArrayList<>();
- WhjlApi1112 whjlApi1111;
- for (ApiInfoData infoData : result) {
- whjlApi1111 = JSONObject.parseObject(infoData.getData(), WhjlApi1112.class);
- whjlApi1111.setKqdm(infoData.getKqdm());
- whjlApi1111.setCzbz(infoData.getCzbz());
- whjlApi1111.setUpdateTime(infoData.getUpdateTime());
- whjlApi1111.setBizId(infoData.getDataId());
- list.add(whjlApi1111);
+ WhjlApi1112 whjlApi1112;
+ for (ApiInfoData infoData : japPage.getContent()) {
+ whjlApi1112 = JSONObject.parseObject(infoData.getData(), WhjlApi1112.class);
+ whjlApi1112.setKqdm(infoData.getKqdm());
+ whjlApi1112.setCzbz(infoData.getCzbz());
+ whjlApi1112.setUpdateTime(infoData.getUpdateTime());
+ whjlApi1112.setBizId(infoData.getDataId());
+ list.add(whjlApi1112);
}
- return list;
+ page.setEntities(list);
+
}
/**
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1113PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1113PR.java
new file mode 100644
index 0000000..7c86272
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1113PR.java
@@ -0,0 +1,200 @@
+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.bstek.dorado.data.provider.Page;
+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.utils.ContextUtil;
+import com.fzzy.api.view.repository.ApiInfoDataRep;
+import com.fzzy.otherview.whhpjl.WhjlConstant;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1113;
+import com.fzzy.push.gd2022.ApiCodeConstant;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Component;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author: YYC
+ * @Description:浠撳偍璁惧缁存姢璁板綍
+ * @DateTime: 2023-10-25 14:13
+ **/
+@Component
+public class WhjlApi1113PR {
+
+ @Autowired
+ private ApiCommonService apiCommonService;
+ @Autowired
+ private ApiPushManager apiPushManager;
+ @Autowired
+ private ApiInfoDataRep apiInfoDataRep;
+
+ /**
+ * 鑾峰彇鍒楄〃淇℃伅
+ * WhjlApi1113PR#listData
+ *
+ * @return
+ */
+ @DataProvider
+ public void listData(Page<WhjlApi1113> page, ApiParam param) {
+
+ Pageable pageable = PageRequest.of(page.getPageNo() - 1, page.getPageSize(), Sort.Direction.DESC, "updateTime");
+
+ Specification specification = new Specification<ApiInfoData>() {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Predicate toPredicate(Root<ApiInfoData> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
+ List<Predicate> predicates = new ArrayList<>(); //鎵�鏈夌殑鏂█
+ Predicate predicate = criteriaBuilder.equal(root.get("inteId"), WhjlConstant.API_CODE_1113);
+ predicates.add(predicate);
+ if (null != param) {
+ if (StringUtils.isNotBlank(param.getKqdm())) {
+ Predicate predicate1 = criteriaBuilder.equal(root.get("kqdm"), param.getKqdm());
+ predicates.add(predicate1);
+ }
+
+ if (StringUtils.isNotBlank(param.getCzbz())) {
+ Predicate predicate2 = criteriaBuilder.equal(root.get("czbz"), param.getCzbz());
+ predicates.add(predicate2);
+ }
+ if (null != param.getStart()) {
+ Predicate predicate3 = criteriaBuilder.greaterThan(root.get("updateTime"), ContextUtil.getCurZero(param.getStart()));
+ predicates.add(predicate3);
+ }
+
+ if (null != param.getEnd()) {
+ Predicate predicate4 = criteriaBuilder.lessThan(root.get("updateTime"), ContextUtil.getNextZero(param.getEnd()));
+ predicates.add(predicate4);
+ }
+ }
+ return criteriaBuilder.and(predicates.toArray(new Predicate[0]));
+ }
+ };
+ org.springframework.data.domain.Page<ApiInfoData> japPage = apiInfoDataRep.findAll(specification, pageable);
+ page.setEntityCount((int) japPage.getTotalElements());
+ List<WhjlApi1113> list = new ArrayList<>();
+ WhjlApi1113 whjlApi1113;
+ for (ApiInfoData infoData : japPage.getContent()) {
+ whjlApi1113 = JSONObject.parseObject(infoData.getData(), WhjlApi1113.class);
+ whjlApi1113.setKqdm(infoData.getKqdm());
+ whjlApi1113.setCzbz(infoData.getCzbz());
+ whjlApi1113.setUpdateTime(infoData.getUpdateTime());
+ whjlApi1113.setBizId(infoData.getDataId());
+ list.add(whjlApi1113);
+ }
+ page.setEntities(list);
+
+ }
+
+ /**
+ * 鏇存柊鎴栦慨鏀�
+ * WhjlApi1113PR#saveData
+ *
+ * @param data
+ * @return
+ */
+ @DataResolver
+ public void saveData(WhjlApi1113 data) {
+ ApiInfoData infoData = new ApiInfoData();
+ infoData.setId(data.getBizId());
+ infoData.setKqdm(data.getKqdm());
+ infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteId(WhjlConstant.API_CODE_1113);
+ infoData.setUpdateTime(new Date());
+ infoData.setDataId(data.getBizId());
+ infoData.setData(JSON.toJSONString(data));
+ infoData.setCzbz(data.getCzbz());
+ infoData.setRemarks("澶囨敞淇℃伅");
+
+ apiInfoDataRep.save(infoData);
+ }
+
+ /**
+ * 鍒犻櫎
+ * WhjlApi1113PR#delData
+ *
+ * @param data
+ * @return
+ */
+ @Expose
+ public String delData(WhjlApi1113 data) {
+ apiInfoDataRep.deleteById(data.getBizId());
+ return null;
+ }
+
+ /**
+ * 涓婁紶
+ * WhjlApi1113PR#pushData
+ *
+ * @param items
+ * @return
+ */
+ @Expose
+ public String pushData(List<WhjlApi1113> 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_12, WhjlConstant.API_CODE_1113);
+
+ //鑾峰彇瀹炵幇鎺ュ彛
+ ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ if (null == apiService) {
+ return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ }
+
+ ResponseDto responseDto;
+ ApiInfoData infoData;
+ for (WhjlApi1113 data : items) {
+ responseDto = apiService.pushData(param, apiConf, items);
+ 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.setInteId(WhjlConstant.API_CODE_1113);
+ 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/WhjlApi1114PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1114PR.java
new file mode 100644
index 0000000..9da0338
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1114PR.java
@@ -0,0 +1,199 @@
+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.bstek.dorado.data.provider.Page;
+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.utils.ContextUtil;
+import com.fzzy.api.view.repository.ApiInfoDataRep;
+import com.fzzy.otherview.whhpjl.WhjlConstant;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1114;
+import com.fzzy.push.gd2022.ApiCodeConstant;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Component;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author: YYC
+ * @Description:浠撳偍璁惧缁翠慨璁板綍
+ * @DateTime: 2023-10-25 14:13
+ **/
+@Component
+public class WhjlApi1114PR {
+
+ @Autowired
+ private ApiCommonService apiCommonService;
+ @Autowired
+ private ApiPushManager apiPushManager;
+ @Autowired
+ private ApiInfoDataRep apiInfoDataRep;
+
+ /**
+ * 鑾峰彇鍒楄〃淇℃伅
+ * WhjlApi1114PR#listData
+ *
+ * @return
+ */
+ @DataProvider
+ public void listData(Page<WhjlApi1114> page, ApiParam param) {
+
+ Pageable pageable = PageRequest.of(page.getPageNo() - 1, page.getPageSize(), Sort.Direction.DESC, "updateTime");
+
+ Specification specification = new Specification<ApiInfoData>() {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Predicate toPredicate(Root<ApiInfoData> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
+ List<Predicate> predicates = new ArrayList<>(); //鎵�鏈夌殑鏂█
+ Predicate predicate = criteriaBuilder.equal(root.get("inteId"), WhjlConstant.API_CODE_1114);
+ predicates.add(predicate);
+ if (null != param) {
+ if (StringUtils.isNotBlank(param.getKqdm())) {
+ Predicate predicate1 = criteriaBuilder.equal(root.get("kqdm"), param.getKqdm());
+ predicates.add(predicate1);
+ }
+
+ if (StringUtils.isNotBlank(param.getCzbz())) {
+ Predicate predicate2 = criteriaBuilder.equal(root.get("czbz"), param.getCzbz());
+ predicates.add(predicate2);
+ }
+ if (null != param.getStart()) {
+ Predicate predicate3 = criteriaBuilder.greaterThan(root.get("updateTime"), ContextUtil.getCurZero(param.getStart()));
+ predicates.add(predicate3);
+ }
+
+ if (null != param.getEnd()) {
+ Predicate predicate4 = criteriaBuilder.lessThan(root.get("updateTime"), ContextUtil.getNextZero(param.getEnd()));
+ predicates.add(predicate4);
+ }
+ }
+ return criteriaBuilder.and(predicates.toArray(new Predicate[0]));
+ }
+ };
+ org.springframework.data.domain.Page<ApiInfoData> japPage = apiInfoDataRep.findAll(specification, pageable);
+ page.setEntityCount((int) japPage.getTotalElements());
+ List<WhjlApi1114> list = new ArrayList<>();
+ WhjlApi1114 whjlApi1114;
+ for (ApiInfoData infoData : japPage.getContent()) {
+ whjlApi1114 = JSONObject.parseObject(infoData.getData(), WhjlApi1114.class);
+ whjlApi1114.setKqdm(infoData.getKqdm());
+ whjlApi1114.setCzbz(infoData.getCzbz());
+ whjlApi1114.setUpdateTime(infoData.getUpdateTime());
+ whjlApi1114.setBizId(infoData.getDataId());
+ list.add(whjlApi1114);
+ }
+ page.setEntities(list);
+
+ }
+
+ /**
+ * 鏇存柊鎴栦慨鏀�
+ * WhjlApi1114PR#saveData
+ *
+ * @param data
+ * @return
+ */
+ @DataResolver
+ public void saveData(WhjlApi1114 data) {
+ ApiInfoData infoData = new ApiInfoData();
+ infoData.setId(data.getBizId());
+ infoData.setKqdm(data.getKqdm());
+ infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteId(WhjlConstant.API_CODE_1114);
+ infoData.setUpdateTime(new Date());
+ infoData.setDataId(data.getBizId());
+ infoData.setData(JSON.toJSONString(data));
+ infoData.setCzbz(data.getCzbz());
+ infoData.setRemarks("澶囨敞淇℃伅");
+
+ apiInfoDataRep.save(infoData);
+ }
+
+ /**
+ * 鍒犻櫎
+ * WhjlApi1114PR#delData
+ *
+ * @param data
+ * @return
+ */
+ @Expose
+ public String delData(WhjlApi1114 data) {
+ apiInfoDataRep.deleteById(data.getBizId());
+ return null;
+ }
+
+ /**
+ * 涓婁紶
+ * WhjlApi1114PR#pushData
+ *
+ * @param items
+ * @return
+ */
+ @Expose
+ public String pushData(List<WhjlApi1114> 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_12, WhjlConstant.API_CODE_1114);
+
+ //鑾峰彇瀹炵幇鎺ュ彛
+ ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ if (null == apiService) {
+ return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ }
+
+ ResponseDto responseDto;
+ ApiInfoData infoData;
+ for (WhjlApi1114 data : items) {
+ responseDto = apiService.pushData(param, apiConf, items);
+ 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.setInteId(WhjlConstant.API_CODE_1114);
+ 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/WhjlApi1201PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1201PR.java
index ea4ef2d..cc8f9ca 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1201PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1201PR.java
@@ -5,6 +5,7 @@
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
+import com.bstek.dorado.data.provider.Page;
import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.dto.ResponseDto;
@@ -13,15 +14,27 @@
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiPushManager;
import com.fzzy.api.service.ApiRemoteService;
+import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.otherview.whhpjl.WhjlConstant;
import com.fzzy.otherview.whhpjl.dto.WhjlApi1201;
+import com.fzzy.push.gd2022.ApiCodeConstant;
+import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Component;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Map;
/**
* @Author: YYC
@@ -45,14 +58,46 @@
* @return
*/
@DataProvider
- public List<WhjlApi1201> listData() {
- List<ApiInfoData> result = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1201);
- if (null == result || result.isEmpty()) {
- return null;
- }
+ public void listData(Page<WhjlApi1201> page, ApiParam param) {
+
+ Pageable pageable = PageRequest.of(page.getPageNo() - 1, page.getPageSize(), Sort.Direction.DESC, "updateTime");
+
+ Specification specification = new Specification<ApiInfoData>() {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Predicate toPredicate(Root<ApiInfoData> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
+ List<Predicate> predicates = new ArrayList<>(); //鎵�鏈夌殑鏂█
+ Predicate predicate = criteriaBuilder.equal(root.get("inteId"), WhjlConstant.API_CODE_1201);
+ predicates.add(predicate);
+ if (null != param) {
+ if (StringUtils.isNotBlank(param.getKqdm())) {
+ Predicate predicate1 = criteriaBuilder.equal(root.get("kqdm"), param.getKqdm());
+ predicates.add(predicate1);
+ }
+
+ if (StringUtils.isNotBlank(param.getCzbz())) {
+ Predicate predicate2 = criteriaBuilder.equal(root.get("czbz"), param.getCzbz());
+ predicates.add(predicate2);
+ }
+ if (null != param.getStart()) {
+ Predicate predicate3 = criteriaBuilder.greaterThan(root.get("updateTime"), ContextUtil.getCurZero(param.getStart()));
+ predicates.add(predicate3);
+ }
+
+ if (null != param.getEnd()) {
+ Predicate predicate4 = criteriaBuilder.lessThan(root.get("updateTime"), ContextUtil.getNextZero(param.getEnd()));
+ predicates.add(predicate4);
+ }
+ }
+ return criteriaBuilder.and(predicates.toArray(new Predicate[0]));
+ }
+ };
+ org.springframework.data.domain.Page<ApiInfoData> japPage = apiInfoDataRep.findAll(specification, pageable);
+ page.setEntityCount((int) japPage.getTotalElements());
List<WhjlApi1201> list = new ArrayList<>();
WhjlApi1201 whjlApi1201;
- for (ApiInfoData infoData : result) {
+ for (ApiInfoData infoData : japPage.getContent()) {
whjlApi1201 = JSONObject.parseObject(infoData.getData(), WhjlApi1201.class);
whjlApi1201.setKqdm(infoData.getKqdm());
whjlApi1201.setCzbz(infoData.getCzbz());
@@ -60,7 +105,8 @@
whjlApi1201.setBizId(infoData.getDataId());
list.add(whjlApi1201);
}
- return list;
+ page.setEntities(list);
+
}
/**
--
Gitblit v1.9.3