From 7d1ac90c6b158534d63ee204ca8b3c1132b9d2c4 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期二, 12 九月 2023 11:32:59 +0800
Subject: [PATCH] 广东专属页面--熏蒸备案
---
src/main/java/com/fzzy/otherview/gd2022/pr/GDApi1023PR.java | 219 ++++++++---
src/main/java/com/fzzy/otherview/gd2022/GdApi1023.view.xml | 813 +++++++++++++++++++++++++++++++++++++--------
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java | 19
src/main/java/com/fzzy/otherview/gd2022/dto/GdApi1023Way.java | 4
src/main/java/com/fzzy/otherview/gd2022/dto/GdApi1023.java | 7
5 files changed, 844 insertions(+), 218 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java
index 187a941..aaedf5b 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java
@@ -64,7 +64,7 @@
apiLog.setType(ApiLog.TYPE_SYNC);
apiLog.setKqdm(deptId);
apiLog.setUploadTime(new Date());
- apiLog.setInteId(Constant.API_CODE_1107);
+ apiLog.setInteId(ApiCodeConstant.API_1023);
apiLog.setStatus(99);
apiLog.setId(ContextUtil.getUUID());
try {
@@ -74,17 +74,20 @@
log.info("-------------娌℃湁鑾峰彇鍒扮啅钂稿妗堜俊鎭�------------------");
return;
}
-
List<GdApi1023Dtl> dtlList = new ArrayList<>();
List<GdApi1023Way> wayList = new ArrayList<>();
List<GdApi1023People> peopleList = new ArrayList<>();
for (Fz4DrugLogApply data : list) {
+ List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, kqdm + DateFormatUtils.format(data.getTbrq(), "yyyyMMdd") + data.getXzbm());
+ if (apiInfoList.size() != 0) {
+ continue;
+ }
//鍌ㄧ伯绮儏鏄庣粏琛�
String tbrq = "";
if (null != data.getTbrq()) {
tbrq = DateFormatUtils.format(data.getTbrq(), "yyyyMMdd");
}
- List<Fz40DrugLogDtl> dtls = drugLogDtlRep.listDrugLogDtl(data.getXzbm() + data.getDeptId() + tbrq);
+ List<Fz40DrugLogDtl> dtls = drugLogDtlRep.listDrugLogDtl(kqdm + tbrq + data.getXzbm());
for (Fz40DrugLogDtl dtl : dtls) {
GdApi1023Dtl gdApi1023Dtl = new GdApi1023Dtl();
BeanUtils.copyProperties(dtl, gdApi1023Dtl);
@@ -97,13 +100,13 @@
gdApi1023Dtl.setZz(dtl.getPerImpurity());
dtlList.add(gdApi1023Dtl);
}
- List<Fz40DrugLogWay> ways = drugLogWayRep.listDrugLogWay(data.getXzbm() + data.getDeptId() + tbrq);
+ List<Fz40DrugLogWay> ways = drugLogWayRep.listDrugLogWay(kqdm + tbrq + data.getXzbm());
for (Fz40DrugLogWay way : ways) {
GdApi1023Way gdApi1023Way = new GdApi1023Way();
BeanUtils.copyProperties(way, gdApi1023Way);
wayList.add(gdApi1023Way);
}
- List<Fz40DrugLogPeople> peoples = drugLogPeopleRep.listDrugLogPeople(data.getXzbm() + kqdm + tbrq);
+ List<Fz40DrugLogPeople> peoples = drugLogPeopleRep.listDrugLogPeople(kqdm + tbrq + data.getXzbm());
for (Fz40DrugLogPeople people : peoples) {
GdApi1023People gdApi1023People = new GdApi1023People();
BeanUtils.copyProperties(people, gdApi1023People);
@@ -115,6 +118,7 @@
BeanUtils.copyProperties(data, gdApi1023);
gdApi1023.setXzbm(data.getXzbm());
gdApi1023.setKqdm(kqdm);
+ gdApi1023.setDwdm(kqdm.substring(0, 18));
gdApi1023.setYjmc(data.getDrugName());
gdApi1023.setYjlx(data.getDrugType());
gdApi1023.setZhgxsj(data.getUpdateTime());
@@ -130,10 +134,9 @@
infoData.setInteType(Constant.API_CATEGORY_13);
infoData.setInteId(ApiCodeConstant.API_1023);
infoData.setBizType(PushProtocol.SB_GD_2022.getCode());
- infoData.setUpdateTime(data.getUpdateTime());
- infoData.setDataId(kqdm + DateFormatUtils.format(data.getTbrq(), "yyMMdd") + data.getXzbm());
+ infoData.setUpdateTime(new Date());
+ infoData.setDataId(kqdm + DateFormatUtils.format(data.getTbrq(), "yyyyMMdd") + data.getXzbm());
- List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByDataId(DateFormatUtils.format(data.getTbrq(), "yyMMdd") + kqdm + data.getXzbm());
if (null == apiInfoList || apiInfoList.isEmpty()) {
gdApi1023.setCzbz(Constant.CZBZ_I);
infoData.setCzbz(Constant.CZBZ_I);
diff --git a/src/main/java/com/fzzy/otherview/gd2022/GdApi1023.view.xml b/src/main/java/com/fzzy/otherview/gd2022/GdApi1023.view.xml
index 2691245..12341b5 100644
--- a/src/main/java/com/fzzy/otherview/gd2022/GdApi1023.view.xml
+++ b/src/main/java/com/fzzy/otherview/gd2022/GdApi1023.view.xml
@@ -124,134 +124,213 @@
<PropertyDef name="czbz">
<Property></Property>
<Property name="label">鎿嶄綔鏍囧織</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("CZBZ")}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
</PropertyDef>
<PropertyDef name="zhgxsj">
<Property></Property>
<Property name="label">鏈�鍚庢洿鏂版椂闂�</Property>
+ <Property name="dataType">DateTime</Property>
</PropertyDef>
- <Reference name="dtPeople">
+ <Reference name="peoples">
<Property name="dataType">[dtPeople]</Property>
- <Property name="parameter">
- <Entity>
- <Property name="xzbm">$${this.xzbm}</Property>
- <Property name="kqdm">$${this.kqdm}</Property>
- <Property name="tbrq">$${this.tbrq}</Property>
- </Entity>
- </Property>
<Property name="dataProvider">gDApi1023PR#peopleList</Property>
+ <Property name="parameter">$${this.peopleList}</Property>
</Reference>
- <Reference name="dtWay">
+ <Reference name="ways">
<Property name="dataProvider">gDApi1023PR#wayList</Property>
<Property name="dataType">[dtWay]</Property>
+ <Property name="parameter">$${this.wayList}</Property>
</Reference>
- <Reference name="dtDtl">
+ <Reference name="dtls">
<Property name="dataProvider">gDApi1023PR#dtlList</Property>
<Property name="dataType">[dtDtl]</Property>
+ <Property name="parameter">$${this.dtlList}</Property>
</Reference>
+ <PropertyDef name="dtlList"/>
+ <PropertyDef name="peopleList">
+ <Property></Property>
+ </PropertyDef>
+ <PropertyDef name="wayList">
+ <Property></Property>
+ </PropertyDef>
</DataType>
<DataType name="dtPeople">
<Property name="creationType">com.fzzy.otherview.gd2022.dto.GdApi1023People</Property>
<PropertyDef name="xm">
- <Property/>
+ <Property></Property>
+ <Property name="label">濮撳悕</Property>
</PropertyDef>
<PropertyDef name="zw">
- <Property/>
+ <Property></Property>
+ <Property name="label">鑱屽姟</Property>
</PropertyDef>
<PropertyDef name="zyzg">
- <Property/>
+ <Property></Property>
+ <Property name="label">鑱屼笟璧勬牸</Property>
</PropertyDef>
<PropertyDef name="stzk">
- <Property/>
+ <Property></Property>
+ <Property name="label">韬綋鐘跺喌</Property>
</PropertyDef>
<PropertyDef name="xzrwfg">
- <Property/>
+ <Property></Property>
+ <Property name="label">鐔忚捀浠诲姟鍒嗗伐</Property>
</PropertyDef>
<PropertyDef name="sfwb">
- <Property/>
+ <Property></Property>
+ <Property name="label">鏄惁澶栧寘</Property>
</PropertyDef>
</DataType>
<DataType name="dtWay">
<Property name="creationType">com.fzzy.otherview.gd2022.dto.GdApi1023Way</Property>
<PropertyDef name="xznd">
- <Property/>
+ <Property></Property>
+ <Property name="label">璁惧畾鐔忚捀娴撳害(ml/m3)</Property>
+ <Property name="dataType">Double</Property>
+ <Property name="displayFormat">#0.000</Property>
</PropertyDef>
<PropertyDef name="mbsj">
- <Property/>
+ <Property></Property>
+ <Property name="label">瀵嗛棴鏃堕棿(澶�)</Property>
+ <Property name="dataType">Integer</Property>
</PropertyDef>
<PropertyDef name="xzfs">
- <Property/>
+ <Property></Property>
+ <Property name="label">鐔忚捀鏂瑰紡</Property>
</PropertyDef>
<PropertyDef name="sqfs">
- <Property/>
+ <Property></Property>
+ <Property name="label">鏁ｆ皵鏂瑰紡</Property>
</PropertyDef>
</DataType>
<DataType name="dtDtl">
<Property name="creationType">com.fzzy.otherview.gd2022.dto.GdApi1023Dtl</Property>
<PropertyDef name="cfdm">
- <Property/>
+ <Property></Property>
+ <Property name="label">浠撴埧/娌圭綈浠ｇ爜</Property>
</PropertyDef>
<PropertyDef name="lspzdm">
- <Property/>
+ <Property></Property>
+ <Property name="label">绮鍝佺浠ｇ爜</Property>
</PropertyDef>
<PropertyDef name="lsxzdm">
- <Property/>
+ <Property></Property>
+ <Property name="label">绮鎬ц川浠ｇ爜</Property>
</PropertyDef>
<PropertyDef name="lsdjdm">
- <Property/>
+ <Property></Property>
+ <Property name="label">绮绛夌骇浠ｇ爜</Property>
</PropertyDef>
<PropertyDef name="lssl">
<Property name="dataType">Double</Property>
+ <Property name="label">绮鏁伴噺(鍚�)</Property>
+ <Property name="displayFormat">#0.000</Property>
</PropertyDef>
<PropertyDef name="sf">
<Property name="dataType">Double</Property>
+ <Property name="label">姘翠唤</Property>
+ <Property name="displayFormat">#0.000</Property>
</PropertyDef>
<PropertyDef name="zz">
<Property name="dataType">Double</Property>
+ <Property name="label">鏉傚織</Property>
+ <Property name="displayFormat">#0.000</Property>
</PropertyDef>
<PropertyDef name="lw">
<Property name="dataType">Double</Property>
+ <Property name="label">绮俯</Property>
+ <Property name="displayFormat">#0.000</Property>
</PropertyDef>
<PropertyDef name="cw">
<Property name="dataType">Double</Property>
+ <Property name="label">浠撴俯</Property>
+ <Property name="displayFormat">#0.000</Property>
</PropertyDef>
<PropertyDef name="cnsd">
<Property name="dataType">Double</Property>
+ <Property name="label">浠撳唴婀垮害</Property>
+ <Property name="displayFormat">#0.000</Property>
</PropertyDef>
<PropertyDef name="clfs">
- <Property/>
+ <Property></Property>
+ <Property name="label">鍌ㄧ伯鏂瑰紡</Property>
</PropertyDef>
<PropertyDef name="rkrq">
<Property name="dataType">Date</Property>
+ <Property name="label">鍏ュ簱鏃ユ湡</Property>
</PropertyDef>
<PropertyDef name="hc">
- <Property/>
+ <Property></Property>
+ <Property name="label">瀹宠櫕</Property>
</PropertyDef>
<PropertyDef name="cldjpd">
- <Property/>
+ <Property></Property>
+ <Property name="label">铏伯绛夌骇鍒ゅ畾</Property>
</PropertyDef>
<PropertyDef name="ldtj">
<Property name="dataType">Double</Property>
+ <Property name="label">绮爢浣撶Н(m3)</Property>
+ <Property name="displayFormat">#0.000</Property>
</PropertyDef>
<PropertyDef name="kjtj">
<Property name="dataType">Double</Property>
+ <Property name="label">绌洪棿浣撶Н(m3)</Property>
+ <Property name="displayFormat">#0.000</Property>
</PropertyDef>
<PropertyDef name="lddwyyl">
<Property name="dataType">Double</Property>
+ <Property name="label">绮爢鍗曚綅鐢ㄨ嵂閲�</Property>
+ <Property name="displayFormat">#0.000</Property>
</PropertyDef>
<PropertyDef name="kjdwyyl">
<Property name="dataType">Double</Property>
+ <Property name="label">绌洪棿鍗曚綅鐢ㄨ嵂閲�</Property>
+ <Property name="displayFormat">#0.000</Property>
</PropertyDef>
<PropertyDef name="zyyl">
<Property name="dataType">Double</Property>
+ <Property name="label">鎬荤敤鑽噺</Property>
+ <Property name="displayFormat">#0.000</Property>
</PropertyDef>
<PropertyDef name="qmx">
- <Property/>
+ <Property></Property>
+ <Property name="label">姘斿瘑鎬�</Property>
</PropertyDef>
<PropertyDef name="jhxzksrq">
<Property name="dataType">Date</Property>
+ <Property name="label">璁″垝鐔忚捀寮�濮嬫棩鏈�</Property>
</PropertyDef>
<PropertyDef name="jhxzjsrq">
<Property name="dataType">Date</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>
@@ -260,6 +339,11 @@
<DataSet id="dsMain">
<Property name="dataType">[dtMain]</Property>
<Property name="dataProvider">gDApi1023PR#listData</Property>
+ <Property name="pageSize">15</Property>
+ </DataSet>
+ <DataSet id="dsQuery">
+ <ClientEvent name="onReady">self.insert();</ClientEvent>
+ <Property name="dataType">dtParam</Property>
</DataSet>
<ToolBar>
<ToolBarLabel>
@@ -351,6 +435,18 @@
<Property name="exClassName">toolbar-button-push</Property>
<Property name="width">100</Property>
</ToolBarButton>
+ <ToolBarButton>
+ <ClientEvent name="onClick">var cur = view.get("#dgMain").getCurrentItem();
+if(cur){
+ view.get("#dialogDtl").show();
+}else{
+ $alert("璇峰嬀閫夐渶瑕佷慨鏀圭殑鏁版嵁锛�");
+}</ClientEvent>
+ <Property name="exClassName">toolbar-button-warm</Property>
+ <Property name="iconClass">fa fa-search</Property>
+ <Property name="width">100</Property>
+ <Property name="caption">鏌ョ湅璇︽儏</Property>
+ </ToolBarButton>
<Fill/>
<ToolBarButton>
<Property name="caption">涓婁紶璁板綍</Property>
@@ -358,6 +454,34 @@
<Property name="exClassName">toolbar-button</Property>
</ToolBarButton>
</ToolBar>
+ <AutoForm>
+ <Property name="dataSet">dsQuery</Property>
+ <Property name="cols">*,*,*,*</Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="labelSeparator">锛�</Property>
+ <Property name="labelWidth">90</Property>
+ <AutoFormElement>
+ <Property name="name">kqdm</Property>
+ <Property name="property">kqdm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">start</Property>
+ <Property name="property">start</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">end</Property>
+ <Property name="property">end</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">czbz</Property>
+ <Property name="property">czbz</Property>
+ <Property name="trigger">autoMappingDropDown2</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
<DataGrid id="dgMain">
<ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsMain.data:#");
if(data){
@@ -373,60 +497,501 @@
<DataColumn name="xzbm">
<Property name="property">xzbm</Property>
<Property name="align">center</Property>
- <Property name="width">280</Property>
</DataColumn>
<DataColumn name="kqdm">
<Property name="property">kqdm</Property>
- <Property name="width">280</Property>
<Property name="align">center</Property>
</DataColumn>
<DataColumn name="tbrq">
<Property name="property">tbrq</Property>
- <Property name="width">280</Property>
<Property name="align">center</Property>
</DataColumn>
<DataColumn name="dwdm">
<Property name="property">dwdm</Property>
- <Property name="width">280</Property>
<Property name="align">center</Property>
</DataColumn>
<DataColumn name="sqxzrq">
<Property name="property">sqxzrq</Property>
- <Property name="width">280</Property>
<Property name="align">center</Property>
</DataColumn>
<DataColumn name="fzr">
<Property name="property">fzr</Property>
- <Property name="width">280</Property>
<Property name="align">center</Property>
</DataColumn>
<DataColumn name="fzrdh">
<Property name="property">fzrdh</Property>
- <Property name="width">280</Property>
<Property name="align">center</Property>
</DataColumn>
<DataColumn name="czbz">
<Property name="property">czbz</Property>
- <Property name="width">280</Property>
<Property name="align">center</Property>
</DataColumn>
<DataColumn name="zhgxsj">
<Property name="property">zhgxsj</Property>
- <Property name="width">280</Property>
<Property name="align">center</Property>
</DataColumn>
</DataGrid>
- <Dialog id="dialogMain">
+ <Dialog id="dialogMain" layout="regionPadding:5">
<Property name="width">85%</Property>
<Property name="closeable">false</Property>
<Property name="iconClass">fa fa-sliders</Property>
<Property name="caption">鐔忚捀澶囨淇℃伅</Property>
+ <Property name="height">85%</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>
+ <FieldSet layout="regionPadding:5">
+ <Property name="caption">鍩虹淇℃伅</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="cols">*,*,*,*</Property>
+ <Property name="labelPosition">top</Property>
+ <Property name="labelSeparator">:</Property>
+ <AutoFormElement>
+ <Property name="name">xzbm</Property>
+ <Property name="property">xzbm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">kqdm</Property>
+ <Property name="property">kqdm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">tbrq</Property>
+ <Property name="property">tbrq</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dwdm</Property>
+ <Property name="property">dwdm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sqxzrq</Property>
+ <Property name="property">sqxzrq</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">fzr</Property>
+ <Property name="property">fzr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">fzrdh</Property>
+ <Property name="property">fzrdh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">xcfzr</Property>
+ <Property name="property">xcfzr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">xcfzrzw</Property>
+ <Property name="property">xcfzrzw</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">xcfzrdh</Property>
+ <Property name="property">xcfzrdh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">tbr</Property>
+ <Property name="property">tbr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">tbrdh</Property>
+ <Property name="property">tbrdh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sfszjjxd</Property>
+ <Property name="property">sfszjjxd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sfszjjxx</Property>
+ <Property name="property">sfszjjxx</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sfszjjxn</Property>
+ <Property name="property">sfszjjxn</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sfszjjxb</Property>
+ <Property name="property">sfszjjxb</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ssxzzystqybqk</Property>
+ <Property name="property">ssxzzystqybqk</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">xzssgcap</Property>
+ <Property name="property">xzssgcap</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">aqfhjyjcccs</Property>
+ <Property name="property">aqfhjyjcccs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">xzzysx</Property>
+ <Property name="property">xzzysx</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">fileStorageId</Property>
+ <Property name="property">fileStorageId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">yjmc</Property>
+ <Property name="property">yjmc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">yjlx</Property>
+ <Property name="property">yjlx</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">yjyxqz</Property>
+ <Property name="property">yjyxqz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">lqsl</Property>
+ <Property name="property">lqsl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sysbjfs</Property>
+ <Property name="property">sysbjfs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zcdd</Property>
+ <Property name="property">zcdd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">lqr</Property>
+ <Property name="property">lqr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">lqrq</Property>
+ <Property name="property">lqrq</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">czbz</Property>
+ <Property name="property">czbz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zhgxsj</Property>
+ <Property name="property">zhgxsj</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </FieldSet>
+ <FieldSet layout="regionPadding:5">
+ <Property name="caption">鐔忚捀浣滀笟浜哄憳淇℃伅</Property>
+ <Buttons/>
+ <Children>
+ <Panel layout="regionPadding:5">
+ <Property name="caption">浜哄憳淇℃伅</Property>
+ <Property name="height">400</Property>
+ <Buttons/>
+ <Children>
+ <Container layout="regionPadding:10">
+ <Property name="exClassName">bg-color</Property>
+ <Property name="contentOverflow">hidden</Property>
+ <Property name="height">55</Property>
+ <Label layoutConstraint="left">
+ <Property name="text">鑿滃崟鏍忥細</Property>
+ </Label>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var list = view.get("#dsMain.data:#").get("peoples");
+list.insert({});</ClientEvent>
+ <Property name="caption">鏂板</Property>
+ <Property name="exClassName">btn-default</Property>
+ <Property name="iconClass">fa fa-plus</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var data = view.get("#dataPeoples.currentEntity");
+if(!data){
+ return;
+}
+data.remove();</ClientEvent>
+ <Property name="caption">鍒犻櫎</Property>
+ <Property name="iconClass">fa fa-minus</Property>
+ <Property name="exClassName">btn-warn</Property>
+ </Button>
+ </Container>
+ <DataGrid id="dataPeoples">
+ <Property name="dataPath">#.peoples</Property>
+ <Property name="dataSet">dsMain</Property>
+ <DataColumn name="xm">
+ <Property name="property">xm</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="zw">
+ <Property name="property">zw</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="zyzg">
+ <Property name="property">zyzg</Property>
+ <Property name="trigger">listDropZG</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="stzk">
+ <Property name="property">stzk</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="xzrwfg">
+ <Property name="property">xzrwfg</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="sfwb">
+ <Property name="property">sfwb</Property>
+ <Property name="trigger">listDropYN</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ </DataGrid>
+ </Children>
+ <Tools/>
+ </Panel>
+ </Children>
+ </FieldSet>
+ <FieldSet layout="regionPadding:5">
+ <Property name="caption">鐔忚捀澶囨鏂瑰紡淇℃伅</Property>
+ <Buttons/>
+ <Children>
+ <Panel layout="regionPadding:5">
+ <Property name="caption">鐔忚捀澶囨鏂瑰紡</Property>
+ <Property name="height">400</Property>
+ <Buttons/>
+ <Children>
+ <Container layout="regionPadding:10">
+ <Property name="exClassName">bg-color</Property>
+ <Property name="contentOverflow">hidden</Property>
+ <Property name="height">55</Property>
+ <Label layoutConstraint="left">
+ <Property name="text">鑿滃崟鏍忥細</Property>
+ </Label>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var list = view.get("#dsMain.data:#").get("ways");
+list.insert({});</ClientEvent>
+ <Property name="caption">鏂板</Property>
+ <Property name="exClassName">btn-default</Property>
+ <Property name="iconClass">fa fa-plus</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var data = view.get("#dataWays.currentEntity");
+if(!data){
+ return;
+}
+data.remove();</ClientEvent>
+ <Property name="caption">鍒犻櫎</Property>
+ <Property name="iconClass">fa fa-minus</Property>
+ <Property name="exClassName">btn-warn</Property>
+ </Button>
+ </Container>
+ <DataGrid id="dataWays">
+ <Property name="dataPath">#.ways</Property>
+ <Property name="dataSet">dsMain</Property>
+ <DataColumn name="xznd">
+ <Property name="property">xznd</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="mbsj">
+ <Property name="property">mbsj</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="xzfs">
+ <Property name="property">xzfs</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="sqfs">
+ <Property name="property">sqfs</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ </DataGrid>
+ </Children>
+ <Tools/>
+ </Panel>
+ </Children>
+ </FieldSet>
+ </Children>
+ <Tools/>
+ </Dialog>
+ <Dialog id="dialogDtl" layout="regionPadding:5">
+ <Property name="caption">鐔忚捀浣滀笟鐨勫偍绮伯鎯�</Property>
+ <Property name="width">90%</Property>
+ <Property name="iconClass">fa fa-sliders</Property>
+ <Property name="height">90%</Property>
+ <Buttons>
+ <Button>
+ <ClientEvent name="onClick">self.get("parent").hide();</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>
+ <FieldSet layout="regionPadding:5">
+ <Property name="caption">鐔忚捀浣滀笟鐨勫偍绮伯鎯呮槑缁�</Property>
+ <Buttons/>
+ <Children>
+ <Panel layout="regionPadding:5">
+ <Property name="caption">鍌ㄧ伯绮儏鏄庣粏</Property>
+ <Buttons/>
+ <Children>
+ <Container layout="regionPadding:10">
+ <Property name="exClassName">bg-color</Property>
+ <Property name="contentOverflow">hidden</Property>
+ <Property name="height">55</Property>
+ <Label layoutConstraint="left">
+ <Property name="text">鑿滃崟鏍忥細</Property>
+ </Label>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var list = view.get("#dsMain.data:#").get("dtls");
+list.insert({});
+view.get("#addDtl").show();</ClientEvent>
+ <Property name="caption">鏂板</Property>
+ <Property name="exClassName">btn-default</Property>
+ <Property name="iconClass">fa fa-plus</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var cur = view.get("#dgDtl").getCurrentItem();
+if(cur){
+ view.get("#addDtl").show();
+}else{
+ $alert("璇峰嬀閫夐渶瑕佷慨鏀圭殑鏁版嵁锛�");
+}</ClientEvent>
+ <Property name="caption">淇敼</Property>
+ <Property name="exClassName">btn-warm</Property>
+ <Property name="iconClass">fa fa-pencil</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var list = view.get("#dsMain.data:#").get("dtls");
+list.remove();
+view.get("#updateDelDtl").execute(function(){
+});</ClientEvent>
+ <Property name="caption">鍒犻櫎</Property>
+ <Property name="iconClass">fa fa-minus</Property>
+ <Property name="exClassName">btn-warn</Property>
+ </Button>
+ </Container>
+ <DataGrid id="dgDtl">
+ <Property name="dataPath">#.dtls</Property>
+ <Property name="dataSet">dsMain</Property>
+ <DataColumn name="cfdm">
+ <Property name="property">cfdm</Property>
+ <Property name="readOnly">true</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="lspzdm">
+ <Property name="property">lspzdm</Property>
+ <Property name="readOnly">true</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="lsxzdm">
+ <Property name="property">lsxzdm</Property>
+ <Property name="readOnly">true</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="lssl">
+ <Property name="property">lssl</Property>
+ <Property name="readOnly">true</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="cldjpd">
+ <Property name="property">cldjpd</Property>
+ <Property name="readOnly">true</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="lddwyyl">
+ <Property name="property">lddwyyl</Property>
+ <Property name="readOnly">true</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="kjdwyyl">
+ <Property name="property">kjdwyyl</Property>
+ <Property name="readOnly">true</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="zyyl">
+ <Property name="property">zyyl</Property>
+ <Property name="readOnly">true</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="qmx">
+ <Property name="property">qmx</Property>
+ <Property name="readOnly">true</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="jhxzksrq">
+ <Property name="property">jhxzksrq</Property>
+ <Property name="readOnly">true</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="jhxzjsrq">
+ <Property name="property">jhxzjsrq</Property>
+ <Property name="readOnly">true</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ </DataGrid>
+ </Children>
+ <Tools/>
+ </Panel>
+ </Children>
+ </FieldSet>
+ </Children>
+ <Tools/>
+ </Dialog>
+ <Dialog id="addDtl">
+ <Property name="caption">鐔忚捀浣滀笟鐨勫偍绮伯鎯呮槑缁�</Property>
+ <Property name="width">80%</Property>
+ <Buttons>
+ <Button>
+ <ClientEvent name="onClick">var cur = view.get("#dgDtl").getCurrentItem();
+view.get("#updateSave").execute(function(){
+ self.get("parent").hide();
});</ClientEvent>
<Property name="caption">纭畾</Property>
<Property name="iconClass">fa fa-check</Property>
@@ -445,182 +1010,131 @@
<Property name="cols">*,*,*,*</Property>
<Property name="labelPosition">top</Property>
<Property name="labelSeparator">:</Property>
+ <Property name="dataPath">#.dtls</Property>
<AutoFormElement>
- <Property name="name">xzbm</Property>
- <Property name="property">xzbm</Property>
+ <Property name="name">cfdm</Property>
+ <Property name="property">cfdm</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">kqdm</Property>
- <Property name="property">kqdm</Property>
+ <Property name="name">lspzdm</Property>
+ <Property name="property">lspzdm</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">tbrq</Property>
- <Property name="property">tbrq</Property>
+ <Property name="name">lsxzdm</Property>
+ <Property name="property">lsxzdm</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">dwdm</Property>
- <Property name="property">dwdm</Property>
+ <Property name="name">lsdjdm</Property>
+ <Property name="property">lsdjdm</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">sqxzrq</Property>
- <Property name="property">sqxzrq</Property>
+ <Property name="name">lssl</Property>
+ <Property name="property">lssl</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">fzr</Property>
- <Property name="property">fzr</Property>
+ <Property name="name">sf</Property>
+ <Property name="property">sf</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">fzrdh</Property>
- <Property name="property">fzrdh</Property>
+ <Property name="name">zz</Property>
+ <Property name="property">zz</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">xcfzr</Property>
- <Property name="property">xcfzr</Property>
+ <Property name="name">lw</Property>
+ <Property name="property">lw</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">xcfzrzw</Property>
- <Property name="property">xcfzrzw</Property>
+ <Property name="name">cw</Property>
+ <Property name="property">cw</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">xcfzrdh</Property>
- <Property name="property">xcfzrdh</Property>
+ <Property name="name">cnsd</Property>
+ <Property name="property">cnsd</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">tbr</Property>
- <Property name="property">tbr</Property>
+ <Property name="name">clfs</Property>
+ <Property name="property">clfs</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">tbrdh</Property>
- <Property name="property">tbrdh</Property>
+ <Property name="name">rkrq</Property>
+ <Property name="property">rkrq</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">sfszjjxd</Property>
- <Property name="property">sfszjjxd</Property>
+ <Property name="name">hc</Property>
+ <Property name="property">hc</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">sfszjjxx</Property>
- <Property name="property">sfszjjxx</Property>
+ <Property name="name">cldjpd</Property>
+ <Property name="property">cldjpd</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">sfszjjxn</Property>
- <Property name="property">sfszjjxn</Property>
+ <Property name="name">ldtj</Property>
+ <Property name="property">ldtj</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">sfszjjxb</Property>
- <Property name="property">sfszjjxb</Property>
+ <Property name="name">kjtj</Property>
+ <Property name="property">kjtj</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">ssxzzystqybqk</Property>
- <Property name="property">ssxzzystqybqk</Property>
+ <Property name="name">lddwyyl</Property>
+ <Property name="property">lddwyyl</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">xzssgcap</Property>
- <Property name="property">xzssgcap</Property>
+ <Property name="name">kjdwyyl</Property>
+ <Property name="property">kjdwyyl</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">aqfhjyjcccs</Property>
- <Property name="property">aqfhjyjcccs</Property>
+ <Property name="name">zyyl</Property>
+ <Property name="property">zyyl</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">xzzysx</Property>
- <Property name="property">xzzysx</Property>
+ <Property name="name">qmx</Property>
+ <Property name="property">qmx</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">fileStorageId</Property>
- <Property name="property">fileStorageId</Property>
+ <Property name="name">jhxzksrq</Property>
+ <Property name="property">jhxzksrq</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">yjmc</Property>
- <Property name="property">yjmc</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">yjlx</Property>
- <Property name="property">yjlx</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">yjyxqz</Property>
- <Property name="property">yjyxqz</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">lqsl</Property>
- <Property name="property">lqsl</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">sysbjfs</Property>
- <Property name="property">sysbjfs</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">zcdd</Property>
- <Property name="property">zcdd</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">lqr</Property>
- <Property name="property">lqr</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">lqrq</Property>
- <Property name="property">lqrq</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">czbz</Property>
- <Property name="property">czbz</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">zhgxsj</Property>
- <Property name="property">zhgxsj</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">dtPeople</Property>
- <Property name="property">dtPeople</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">dtWay</Property>
- <Property name="property">dtWay</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">dtDtl</Property>
- <Property name="property">dtDtl</Property>
+ <Property name="name">jhxzjsrq</Property>
+ <Property name="property">jhxzjsrq</Property>
<Editor/>
</AutoFormElement>
</AutoForm>
</Children>
<Tools/>
</Dialog>
+ <UpdateAction id="updateDelDtl">
+ <Property name="dataResolver">gDApi1023PR#saveData</Property>
+ <Property name="confirmMessage">褰撳墠鏁版嵁鍒犻櫎鍚庢棤娉曟仮澶嶏紝璇风‘璁よ鍒犻櫎涔堬紵</Property>
+ <UpdateItem>
+ <Property name="dataPath">[#current]</Property>
+ <Property name="dataSet">dsMain</Property>
+ </UpdateItem>
+ </UpdateAction>
<UpdateAction id="updateSave">
- <Property name="dataResolver">whjlApi1101PR#saveData</Property>
+ <Property name="dataResolver">gDApi1023PR#saveData</Property>
<UpdateItem>
<Property name="dataPath">[#current]</Property>
<Property name="dataSet">dsMain</Property>
@@ -628,13 +1142,20 @@
</UpdateAction>
<AjaxAction id="ajaxDel">
<Property name="confirmMessage">褰撳墠鏁版嵁鍒犻櫎鍚庢棤娉曟仮澶嶏紝璇风‘璁よ鍒犻櫎涔堬紵</Property>
- <Property name="service">whjlApi1101PR#delData</Property>
+ <Property name="service">gDApi1023PR#delData</Property>
+ </AjaxAction>
+ <AjaxAction id="ajaxDelUpdate">
+ <Property name="confirmMessage">褰撳墠鏁版嵁鍒犻櫎鍚庢棤娉曟仮澶嶏紝璇风‘璁よ鍒犻櫎涔堬紵</Property>
+ <Property name="service">gDApi1023PR#delUpdate</Property>
</AjaxAction>
<AjaxAction id="ajaxPush">
- <Property name="service">whjlApi1101PR#pushData</Property>
+ <Property name="service">gDApi1023PR#pushData</Property>
</AjaxAction>
<ListDropDown id="listDropYN">
<Property name="items">鏄�,鍚�</Property>
</ListDropDown>
+ <ListDropDown id="listDropZG">
+ <Property name="items">鍒濅腑,涓骇,楂樼骇</Property>
+ </ListDropDown>
</View>
</ViewConfig>
diff --git a/src/main/java/com/fzzy/otherview/gd2022/dto/GdApi1023.java b/src/main/java/com/fzzy/otherview/gd2022/dto/GdApi1023.java
index cef79ec..354906d 100644
--- a/src/main/java/com/fzzy/otherview/gd2022/dto/GdApi1023.java
+++ b/src/main/java/com/fzzy/otherview/gd2022/dto/GdApi1023.java
@@ -68,14 +68,13 @@
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
private Date zhgxsj; //鏈�鍚庢洿鏂版椂闂�
+ private String dtlList;
+ private String peopleList;
+ private String wayList;
private List<GdApi1023Dtl> dtls; //瀹炴柦鐔忚捀浣滀笟鐨勫偍绮伯鎯呮槑缁�
private List<GdApi1023People> peoples; //鐔忚捀浣滀笟浜哄憳淇℃伅
private List<GdApi1023Way> ways; //鐔忚捀澶囨鏂瑰紡
-
-
-
-
}
diff --git a/src/main/java/com/fzzy/otherview/gd2022/dto/GdApi1023Way.java b/src/main/java/com/fzzy/otherview/gd2022/dto/GdApi1023Way.java
index 6cac77f..775206f 100644
--- a/src/main/java/com/fzzy/otherview/gd2022/dto/GdApi1023Way.java
+++ b/src/main/java/com/fzzy/otherview/gd2022/dto/GdApi1023Way.java
@@ -12,8 +12,8 @@
private static final long serialVersionUID = 1L;
- private String xznd; //璁惧畾鐔忚捀娴撳害(ml/m3)
- private String mbsj; //瀵嗛棴鏃堕棿(澶�)
+ private Double xznd; //璁惧畾鐔忚捀娴撳害(ml/m3)
+ private Integer mbsj; //瀵嗛棴鏃堕棿(澶�)
private String xzfs; //鐔忚捀鏂瑰紡
private String sqfs; //鏁ｆ皵鏂瑰紡
diff --git a/src/main/java/com/fzzy/otherview/gd2022/pr/GDApi1023PR.java b/src/main/java/com/fzzy/otherview/gd2022/pr/GDApi1023PR.java
index 9f9f736..c35d10a 100644
--- a/src/main/java/com/fzzy/otherview/gd2022/pr/GDApi1023PR.java
+++ b/src/main/java/com/fzzy/otherview/gd2022/pr/GDApi1023PR.java
@@ -1,22 +1,41 @@
package com.fzzy.otherview.gd2022.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.gd2022.dto.GdApi1023;
import com.fzzy.otherview.gd2022.dto.GdApi1023Dtl;
import com.fzzy.otherview.gd2022.dto.GdApi1023People;
import com.fzzy.otherview.gd2022.dto.GdApi1023Way;
-import com.fzzy.otherview.whhpjl.WhjlConstant;
-import com.fzzy.otherview.whhpjl.dto.WhjlApi1101;
import com.fzzy.push.gd2022.ApiCodeConstant;
+import com.fzzy.push.sh2023.SH2023Constant;
+import com.fzzy.push.sh2023.dto.SH2023Api2103;
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateFormatUtils;
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.*;
/**
@@ -42,91 +61,175 @@
* @return
*/
@DataProvider
- public List<GdApi1023> listData(Map<String, Object> param) {
+ public void listData(Page<GdApi1023> page, ApiParam param) {
- List<ApiInfoData> result = apiInfoDataRep.getDataByInteId(ApiCodeConstant.API_1023);
- if(null == result ||result.isEmpty()){
- return null;
- }
+ 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"), ApiCodeConstant.API_1023);
+ 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<GdApi1023> list = new ArrayList<>();
- GdApi1023 gbApi1023;
- for (ApiInfoData infoData : result) {
- GdApi1023 gdApi1023= JSONObject.parseObject(infoData.getData(), GdApi1023.class);
+ GdApi1023 gdApi1023;
+ for (ApiInfoData infoData : japPage.getContent()) {
+ gdApi1023 = JSONObject.parseObject(infoData.getData(), GdApi1023.class);
list.add(gdApi1023);
}
- return list;
+ page.setEntities(list);
+
}
/**
* 鑾峰彇鐔忚捀浣滀笟浜哄憳淇℃伅琛�
* gDApi1023PR#peopleList
- *
*/
@DataProvider
- public List<GdApi1023People> peopleList(Map<String, Object> param) throws Exception {
- String xzbm = (String) param.get("xzbm");
- String deptId = (String) param.get("deptId");
- String tbrq = DateFormatUtils.format((Date) param.get("tbrq"), "yyyyMMdd");
- String id = xzbm + deptId + tbrq;
-
- List<ApiInfoData> infoData = apiInfoDataRep.getDataByDataId(id);
- if(null == infoData || infoData.isEmpty()){
- return null;
- }
- GdApi1023 gdApi1023= JSONObject.parseObject(infoData.get(0).getData(), GdApi1023.class);
- if(null == gdApi1023){
- return null;
- }
-
- return gdApi1023.getPeoples();
+ public List<GdApi1023People> peopleList(String code) {
+ return JSON.parseArray(code, GdApi1023People.class);
}
/**
* 鑾峰彇鐔忚捀澶囨鏂瑰紡琛ㄨ〃淇℃伅
* gDApi1023PR#wayList
- *
*/
@DataProvider
- public List<GdApi1023Way> wayList(Map<String, Object> param) throws Exception {
- String xzbm = (String) param.get("xzbm");
- String deptId = (String) param.get("deptId");
- String tbrq = DateFormatUtils.format((Date) param.get("tbrq"), "yyyyMMdd");
- String id = xzbm + deptId + tbrq;
-
- List<ApiInfoData> infoData = apiInfoDataRep.getDataByDataId(id);
- if(null == infoData || infoData.isEmpty()){
- return null;
- }
- GdApi1023 gdApi1023= JSONObject.parseObject(infoData.get(0).getData(), GdApi1023.class);
- if(null == gdApi1023){
- return null;
- }
-
- return gdApi1023.getWays();
+ public List<GdApi1023Way> wayList(String code) {
+ return JSON.parseArray(code, GdApi1023Way.class);
}
/**
* 瀹炴柦鐔忚捀浣滀笟鐨勫偍绮伯鎯呮槑缁嗚〃
* gDApi1023PR#dtlList
- *
*/
@DataProvider
- public List<GdApi1023Dtl> dtlList(Map<String, Object> param) throws Exception {
- String xzbm = (String) param.get("xzbm");
- String deptId = (String) param.get("deptId");
- String tbrq = DateFormatUtils.format((Date) param.get("tbrq"), "yyyyMMdd");
- String id = xzbm + deptId + tbrq;
+ public List<GdApi1023Dtl> dtlList(String code) {
+ return JSON.parseArray(code, GdApi1023Dtl.class);
+ }
- List<ApiInfoData> infoData = apiInfoDataRep.getDataByDataId(id);
- if(null == infoData || infoData.isEmpty()){
- return null;
+ /**
+ * gDApi1023PR#saveData
+ */
+ @DataResolver
+ public void saveData(GdApi1023 data) {
+ data.setDtlList(JSON.toJSONString(data.getDtls()));
+ data.setWayList(JSON.toJSONString(data.getWays()));
+ data.setPeopleList(JSON.toJSONString(data.getPeoples()));
+ ApiInfoData infoData;
+ List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, data.getKqdm() + DateFormatUtils.format(data.getTbrq(), "yyyyMMdd") + data.getXzbm());
+ if (apiInfoList.size() != 0) {
+ infoData = apiInfoList.get(0);
+ infoData.setData(JSON.toJSONString(data));
+ } else {
+ infoData = new ApiInfoData();
+ infoData.setId(ContextUtil.getUUID());
+ infoData.setKqdm(data.getKqdm());
+ infoData.setInteId(ApiCodeConstant.API_1023);
+ infoData.setUpdateTime(new Date());
+ infoData.setDataId(data.getKqdm() + DateFormatUtils.format(data.getTbrq(), "yyyyMMdd") + data.getXzbm());
+ infoData.setData(JSON.toJSONString(data));
+ infoData.setCzbz(Constant.CZBZ_I);
+ infoData.setRemarks("澶囨敞淇℃伅");
}
- GdApi1023 gdApi1023= JSONObject.parseObject(infoData.get(0).getData(), GdApi1023.class);
- if(null == gdApi1023){
- return null;
+ apiInfoDataRep.save(infoData);
+ }
+
+ /**
+ * gDApi1023PR#delData
+ */
+ @Expose
+ public void delData(GdApi1023 data) {
+ List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, data.getKqdm() + DateFormatUtils.format(data.getTbrq(), "yyyyMMdd") + data.getXzbm());
+ apiInfoDataRep.deleteById(apiInfoList.get(0).getId());
+ }
+
+ /**
+ * gDApi1023PR#delUpdate
+ */
+ @Expose
+ public String delUpdate(GdApi1023 data) {
+ if (null == data) {
+ return "鏃犳暟鎹墽琛�";
+ }
+ List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, data.getKqdm() + DateFormatUtils.format(data.getTbrq(), "yyyyMMdd") + data.getXzbm());
+ data.setCzbz(Constant.CZBZ_D);
+ apiInfoDataRep.updateStatus(apiInfoList.get(0).getId(), JSON.toJSONString(data), Constant.CZBZ_D);
+ return null;
+ }
+
+ /**
+ * gDApi1023PR#pushData
+ *
+ * @param items
+ * @return
+ */
+ @Expose
+ public String pushData(List<GdApi1023> items) {
+ ResponseDto responseDto;
+ String result = "";
+
+ String kqdm = items.get(0).getKqdm();
+ ApiConfs apiConf = apiCommonService.getConf(kqdm);
+
+ if (null == apiConf) {
+ return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
}
- return gdApi1023.getDtls();
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, "21", ApiCodeConstant.API_1023);
+
+ //鑾峰彇瀹炵幇鎺ュ彛
+ ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ if (null == apiService) {
+ return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ }
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ responseDto = apiService.pushData(param, apiConf, items);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+
+ ApiInfoData infoData;
+ for (GdApi1023 data : items) {
+ List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, data.getKqdm() + DateFormatUtils.format(data.getTbrq(), "yyyyMMdd") + data.getXzbm());
+ data.setCzbz(Constant.CZBZ_U);
+ infoData = apiInfoList.get(0);
+ infoData.setUpdateTime(new Date());
+ infoData.setCzbz(Constant.CZBZ_U);
+ infoData.setData(JSON.toJSONString(data));
+ apiInfoDataRep.save(infoData);
+ }
+ result += responseDto.toString();
+ }
+ return result;
}
}
--
Gitblit v1.9.3