From 7f5e2fe559a2c7c7f255cb8b9aa4488f988330c6 Mon Sep 17 00:00:00 2001
From: ws <ws@123.com>
Date: 星期一, 13 十一月 2023 09:27:57 +0800
Subject: [PATCH] 修改武汉接口
---
src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java | 2
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java | 2
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1213.view.xml | 5
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1101PR.java | 2
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1109.java | 2
src/main/java/com/fzzy/otherview/whhpjl/WhjlConstant.java | 6
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1221.java | 66 ++++
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1206.view.xml | 2
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1405.view.xml | 6
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1106PR.java | 2
src/main/java/com/fzzy/api/view/repository/GbCheckItemRep.java | 10
src/main/resources/templates/home/home-whjl.html | 3
src/main/java/com/fzzy/api/utils/FileUtils.java | 2
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1221.view.xml | 607 +++++++++++++++++++++++++++++++++++++
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1109PR.java | 9
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1221PR.java | 157 +++++++++
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java | 2
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1405.java | 14
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1109.view.xml | 5
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1114.view.xml | 9
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1114.java | 1
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1206.java | 2
22 files changed, 890 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/fzzy/api/utils/FileUtils.java b/src/main/java/com/fzzy/api/utils/FileUtils.java
index 0ff5bdb..df2a8e2 100644
--- a/src/main/java/com/fzzy/api/utils/FileUtils.java
+++ b/src/main/java/com/fzzy/api/utils/FileUtils.java
@@ -40,7 +40,7 @@
* @param filePath:鏂囦欢璺緞
* @return
*/
- private static byte[] file2byte(String filePath) {
+ public static byte[] file2byte(String filePath) {
byte[] buffer = null;
try {
File file = new File(filePath);
diff --git a/src/main/java/com/fzzy/api/view/repository/GbCheckItemRep.java b/src/main/java/com/fzzy/api/view/repository/GbCheckItemRep.java
index 602d5df..0e88760 100644
--- a/src/main/java/com/fzzy/api/view/repository/GbCheckItemRep.java
+++ b/src/main/java/com/fzzy/api/view/repository/GbCheckItemRep.java
@@ -20,4 +20,14 @@
*/
@Query("from GbCheckItem where bizCode like:bizCode order by code ")
List<GbCheckItem> findByBizCode(@Param("bizCode") String bizCode);
+
+ /**
+ *
+ * @param code
+ * @return
+ */
+ @Query("from GbCheckItem where code =:code order by code ")
+ List<GbCheckItem> findByCode(@Param("code") String code);
+
+
}
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java
index cb55480..824d303 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java
@@ -135,7 +135,7 @@
zkj = "";
zkl = "";
for (Fz35CheckItem fz35CheckItem : fz35CheckItems) {
- gbCheckList = gbCheckItemRep.findByBizCode(fz35CheckItem.getStandardId());
+ gbCheckList = gbCheckItemRep.findByCode(fz35CheckItem.getStandardId());
if (gbCheckList == null || gbCheckList.isEmpty()) {
continue;
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java
index 7977a27..6b292e0 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java
@@ -128,7 +128,7 @@
}
//鍑轰粨瀹屾垚鏃堕棿
if("1".equals(apiData.getHwzt())){
- apiData.setCcwcsj(DateUtils.addDays(fz35DepotStore.getStoreDate(), 5));
+ apiData.setCcwcsj(fz35DepotStore.getFullDate());
}
//鍥藉埆
apiData.setGb("156");
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1109.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1109.view.xml
index 4451c78..e503cba 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1109.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1109.view.xml
@@ -38,11 +38,12 @@
<Property name="label">妗ｆ绫诲瀷</Property>
</PropertyDef>
<PropertyDef name="damc">
- <Property></Property>
+ <Property></Property>
<Property name="label">妗ｆ鍚嶇О</Property>
</PropertyDef>
<PropertyDef name="dawj">
- <Property></Property>
+ <Property name="dataType">byte</Property>
+ <Property></Property>
<Property name="label">妗ｆ鏂囦欢</Property>
</PropertyDef>
<PropertyDef name="sfyx">
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1114.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1114.view.xml
index 86f20f7..74816bf 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1114.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1114.view.xml
@@ -71,6 +71,10 @@
<Property></Property>
<Property name="label">鏇存柊閰嶄欢淇℃伅</Property>
</PropertyDef>
+ <PropertyDef name="ysynx">
+ <Property></Property>
+ <Property name="label">宸蹭娇鐢ㄥ勾闄�</Property>
+ </PropertyDef>
<PropertyDef name="wxhyxzt">
<Property></Property>
<Property name="label">缁翠慨鍚庤繍琛岀姸鎬�</Property>
@@ -395,6 +399,11 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">ysynx</Property>
+ <Property name="property">ysynx</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">wxdw</Property>
<Property name="property">wxdw</Property>
<Editor/>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1206.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1206.view.xml
index 3334491..3c3569b 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1206.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1206.view.xml
@@ -54,7 +54,7 @@
<Property name="label">鍚堝悓瀹㈡埛鍚嶇О</Property>
</PropertyDef>
<PropertyDef name="htspdj">
- <Property></Property>
+ <Property name="dataType">Double</Property>
<Property name="label">鍚堝悓鍟嗗搧鍗曚环</Property>
</PropertyDef>
<PropertyDef name="htspsl">
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1213.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1213.view.xml
index 8d6323d..e15b8d0 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1213.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1213.view.xml
@@ -88,10 +88,8 @@
<PropertyDef name="sfyx">
<Property></Property>
<Property name="label">鏄惁鏈夋晥</Property>
- <Property name="dataType">Integer</Property>
</PropertyDef>
<PropertyDef name="bz">
- <Property></Property>
<Property name="label">澶囨敞</Property>
</PropertyDef>
<PropertyDef name="bizId">
@@ -587,8 +585,5 @@
</Children>
<Tools/>
</Dialog>
- <ListDropDown id="listDropYN">
- <Property name="items">鏄�,鍚�</Property>
- </ListDropDown>
</View>
</ViewConfig>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1221.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1221.view.xml
new file mode 100644
index 0000000..468864e
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1221.view.xml
@@ -0,0 +1,607 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ViewConfig>
+ <Arguments/>
+ <Context/>
+ <Model>
+ <DataType name="dtMain">
+ <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1221</Property>
+ <PropertyDef name="jhid">
+ <Property/>
+ <Property name="label">璁″垝ID</Property>
+ </PropertyDef>
+ <PropertyDef name="jhbh">
+ <Property/>
+ <Property name="label">璁″垝缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="jhmc">
+ <Property/>
+ <Property name="label">璁″垝鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="jlqybh">
+ <Property/>
+ <Property name="label">鍐涚伯浼佷笟缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="ssqymc">
+ <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="bzrq">
+ <Property name="dataType">Date</Property>
+ <Property name="label">缂栧埗鏃ユ湡</Property>
+ </PropertyDef>
+ <PropertyDef name="jhnd">
+ <Property/>
+ <Property name="label">璁″垝骞村害</Property>
+ </PropertyDef>
+ <PropertyDef name="jhjd">
+ <Property/>
+ <Property name="label">璁″垝瀛ｅ害</Property>
+ </PropertyDef>
+ <PropertyDef name="lspzbm">
+ <Property/>
+ <Property name="label">鍝佺缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="ppbh">
+ <Property/>
+ <Property name="label">鍝佺墝缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="cpbh">
+ <Property/>
+ <Property name="label">浜у搧缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="jhsl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">璁″垝鏁伴噺</Property>
+ </PropertyDef>
+ <PropertyDef name="sxsl1">
+ <Property name="dataType">Double</Property>
+ <Property name="label">涓婃棳闇�姹傛暟閲�1</Property>
+ </PropertyDef>
+ <PropertyDef name="xxsl1">
+ <Property name="dataType">Double</Property>
+ <Property name="label">涓嬫棳闇�姹傛暟閲�1</Property>
+ </PropertyDef>
+ <PropertyDef name="sxsl2">
+ <Property name="dataType">Double</Property>
+ <Property name="label">涓婃棳闇�姹傛暟閲�2</Property>
+ </PropertyDef>
+ <PropertyDef name="xxsl2">
+ <Property name="dataType">Double</Property>
+ <Property name="label">涓嬫棳闇�姹傛暟閲�2</Property>
+ </PropertyDef>
+ <PropertyDef name="sxsl3">
+ <Property name="dataType">Double</Property>
+ <Property name="label">涓婃棳闇�姹傛暟閲�3</Property>
+ </PropertyDef>
+ <PropertyDef name="xxsl3">
+ <Property name="dataType">Double</Property>
+ <Property name="label">涓嬫棳闇�姹傛暟閲�3</Property>
+ </PropertyDef>
+ <PropertyDef name="jldwbm">
+ <Property/>
+ <Property name="label">璁￠噺鍗曚綅缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="jldwmc">
+ <Property/>
+ <Property name="label">璁￠噺鍗曚綅鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="lxr">
+ <Property/>
+ <Property name="label">鑱旂郴浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="lxfs">
+ <Property/>
+ <Property name="label">鑱旂郴鏂瑰紡</Property>
+ </PropertyDef>
+ <PropertyDef name="fgld">
+ <Property/>
+ <Property name="label">鍒嗙棰嗗</Property>
+ </PropertyDef>
+ <PropertyDef name="fhr">
+ <Property/>
+ <Property name="label">澶嶆牳浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="tbdw">
+ <Property/>
+ <Property name="label">濉姤鍗曚綅</Property>
+ </PropertyDef>
+ <PropertyDef name="tbr">
+ <Property/>
+ <Property name="label">濉姤浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="tbsj">
+ <Property name="dataType">DateTime</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>
+ </Model>
+ <View layout="regionPadding:10">
+ <Property name="packages">font-awesome,css-common</Property>
+ <DataSet id="dsMain">
+ <Property name="dataType">[dtMain]</Property>
+ <Property name="dataProvider">whjlApi1221PR#listData</Property>
+ </DataSet>
+ <Container layout="regionPadding:10" layoutConstraint="top">
+ <Property name="exClassName">bg-color</Property>
+ <Property name="height">55</Property>
+ <Property name="contentOverflow">hidden</Property>
+ <Label layoutConstraint="left">
+ <Property name="text">鑿滃崟鏍忥細</Property>
+ </Label>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">view.get("#dsMain").insert();
+view.get("#dialogMain").show();</ClientEvent>
+ <Property name="iconClass">fa fa-plus</Property>
+ <Property name="caption">鏂板</Property>
+ <Property name="exClassName">btn-default</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var cur = view.get("#dgMain").getCurrentItem();
+if(cur){
+ view.get("#dialogMain").show();
+}else{
+ $alert("璇峰嬀閫夐渶瑕佷慨鏀圭殑鏁版嵁锛�");
+}</ClientEvent>
+ <Property name="caption">缂栬緫</Property>
+ <Property name="iconClass">fa fa-pencil</Property>
+ <Property name="exClassName">btn-warm</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var cur = view.get("#dgMain").getCurrentItem();
+if(cur){
+ view.get("#ajaxDel").set("parameter",cur).execute(function(result){
+ if(result){
+ $alert(result);
+ } else{
+ cur.remove();
+ }
+ });
+}else{
+ $alert("璇峰嬀閫夐渶瑕佸垹闄ょ殑鏁版嵁锛�");
+}</ClientEvent>
+ <Property name="caption">鍒犻櫎</Property>
+ <Property name="iconClass">fa fa-minus</Property>
+ <Property name="exClassName">btn-warn</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">view.get("#dsMain").flushAsync();</ClientEvent>
+ <Property name="caption">鍒锋柊</Property>
+ <Property name="iconClass">fa fa-search</Property>
+ <Property name="exClassName">btn-flush</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var select = view.get("#dgMain").get("selection");
+if(select && select.length > 0){
+ view.get("#ajaxPush").set("parameter",select).execute(function(result){
+ view.get("#dsMain").flushAsync();
+ $notify(result);
+ });
+}else{
+ $alert("璇峰嬀閫夐渶瑕佷笂鎶ョ殑鏁版嵁锛�");
+}</ClientEvent>
+ <Property name="caption">鎵嬪姩涓婁紶</Property>
+ <Property name="iconClass">fa fa-hand-o-up</Property>
+ <Property name="exClassName">btn-default</Property>
+ </Button>
+ <Button layoutConstraint="right">
+ <ClientEvent name="onClick">//鏄剧ず璁板綍
+view.get("#iFrame").reload();
+view.get("#dialogLog").show();</ClientEvent>
+ <Property name="caption">涓婁紶璁板綍</Property>
+ <Property name="iconClass">fa fa-bars</Property>
+ <Property name="exClassName">btn-flush</Property>
+ </Button>
+ </Container>
+ <Container layoutConstraint="center">
+ <Property name="exClassName">bg-color</Property>
+ <DataGrid id="dgMain">
+ <ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsMain.data:#");
+if(data){
+ view.get("#dialogMain").show();
+}</ClientEvent>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="selectionMode">multiRows</Property>
+ <Property name="readOnly">true</Property>
+ <RowNumColumn/>
+ <RowSelectorColumn>
+ <Property name="caption">涓婁紶</Property>
+ </RowSelectorColumn>
+ <DataColumn name="jhid">
+ <Property name="property">jhid</Property>
+ </DataColumn>
+ <DataColumn name="jhbh">
+ <Property name="property">jhbh</Property>
+ </DataColumn>
+ <DataColumn name="jhmc">
+ <Property name="property">jhmc</Property>
+ </DataColumn>
+ <DataColumn name="jlqybh">
+ <Property name="property">jlqybh</Property>
+ </DataColumn>
+ <DataColumn name="ssqymc">
+ <Property name="property">ssqymc</Property>
+ </DataColumn>
+ <DataColumn name="jgzdbh">
+ <Property name="property">jgzdbh</Property>
+ </DataColumn>
+ <DataColumn name="jgzdmc">
+ <Property name="property">jgzdmc</Property>
+ </DataColumn>
+ <DataColumn name="bzrq">
+ <Property name="property">bzrq</Property>
+ </DataColumn>
+ <DataColumn name="jhnd">
+ <Property name="property">jhnd</Property>
+ </DataColumn>
+ <DataColumn name="jhjd">
+ <Property name="property">jhjd</Property>
+ </DataColumn>
+ <DataColumn name="lspzbm">
+ <Property name="property">lspzbm</Property>
+ </DataColumn>
+ <DataColumn name="ppbh">
+ <Property name="property">ppbh</Property>
+ </DataColumn>
+ <DataColumn name="cpbh">
+ <Property name="property">cpbh</Property>
+ </DataColumn>
+ <DataColumn name="jhsl">
+ <Property name="property">jhsl</Property>
+ </DataColumn>
+ <DataColumn name="sxsl1">
+ <Property name="property">sxsl1</Property>
+ </DataColumn>
+ <DataColumn name="xxsl1">
+ <Property name="property">xxsl1</Property>
+ </DataColumn>
+ <DataColumn name="sxsl2">
+ <Property name="property">sxsl2</Property>
+ </DataColumn>
+ <DataColumn name="xxsl2">
+ <Property name="property">xxsl2</Property>
+ </DataColumn>
+ <DataColumn name="sxsl3">
+ <Property name="property">sxsl3</Property>
+ </DataColumn>
+ <DataColumn name="xxsl3">
+ <Property name="property">xxsl3</Property>
+ </DataColumn>
+ <DataColumn name="jldwbm">
+ <Property name="property">jldwbm</Property>
+ </DataColumn>
+ <DataColumn name="jldwmc">
+ <Property name="property">jldwmc</Property>
+ </DataColumn>
+ <DataColumn name="lxr">
+ <Property name="property">lxr</Property>
+ </DataColumn>
+ <DataColumn name="lxfs">
+ <Property name="property">lxfs</Property>
+ </DataColumn>
+ <DataColumn name="fgld">
+ <Property name="property">fgld</Property>
+ </DataColumn>
+ <DataColumn name="fhr">
+ <Property name="property">fhr</Property>
+ </DataColumn>
+ <DataColumn name="tbdw">
+ <Property name="property">tbdw</Property>
+ </DataColumn>
+ <DataColumn name="tbr">
+ <Property name="property">tbr</Property>
+ </DataColumn>
+ <DataColumn name="tbsj">
+ <Property name="property">tbsj</Property>
+ </DataColumn>
+ <DataColumn name="sfyx">
+ <Property name="property">sfyx</Property>
+ </DataColumn>
+ <DataColumn name="bz">
+ <Property name="property">bz</Property>
+ </DataColumn>
+ <DataColumn name="bizId">
+ <Property name="property">bizId</Property>
+ </DataColumn>
+ <DataColumn name="updateTime">
+ <Property name="property">updateTime</Property>
+ </DataColumn>
+ <DataColumn name="czbz">
+ <Property name="property">czbz</Property>
+ </DataColumn>
+ <DataColumn name="kqdm">
+ <Property name="property">kqdm</Property>
+ </DataColumn>
+ </DataGrid>
+ </Container>
+ <Dialog id="dialogMain">
+ <Property name="width">85%</Property>
+ <Property name="closeable">false</Property>
+ <Property name="iconClass">fa fa-sliders</Property>
+ <Property name="caption">鐗╄祫搴撳瓨棰勮璁板綍</Property>
+ <Buttons>
+ <Button>
+ <ClientEvent name="onClick">var cur = view.get("#dgMain").getCurrentItem();
+view.get("#updateSave").execute(function(){
+ self.get("parent").hide();
+ view.get("#dsMain").flushAsync();
+});</ClientEvent>
+ <Property name="caption">纭畾</Property>
+ <Property name="iconClass">fa fa-check</Property>
+ </Button>
+ <Button>
+ <ClientEvent name="onClick">var cur = view.get("#dgMain").getCurrentItem();
+self.get("parent").hide();
+if(cur) cur.cancel();</ClientEvent>
+ <Property name="caption">鍙栨秷</Property>
+ <Property name="iconClass">fa fa-times</Property>
+ </Button>
+ </Buttons>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="cols">*,*,*,*</Property>
+ <Property name="labelPosition">top</Property>
+ <Property name="labelSeparator">:</Property>
+ <Property name="labelAlign">left</Property>
+ <AutoFormElement>
+ <Property name="name">jhid</Property>
+ <Property name="property">jhid</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jhbh</Property>
+ <Property name="property">jhbh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jhmc</Property>
+ <Property name="property">jhmc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jlqybh</Property>
+ <Property name="property">jlqybh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ssqymc</Property>
+ <Property name="property">ssqymc</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">bzrq</Property>
+ <Property name="property">bzrq</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jhnd</Property>
+ <Property name="property">jhnd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jhjd</Property>
+ <Property name="property">jhjd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">lspzbm</Property>
+ <Property name="property">lspzbm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ppbh</Property>
+ <Property name="property">ppbh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cpbh</Property>
+ <Property name="property">cpbh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jhsl</Property>
+ <Property name="property">jhsl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sxsl1</Property>
+ <Property name="property">sxsl1</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">xxsl1</Property>
+ <Property name="property">xxsl1</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sxsl2</Property>
+ <Property name="property">sxsl2</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">xxsl2</Property>
+ <Property name="property">xxsl2</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sxsl3</Property>
+ <Property name="property">sxsl3</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">xxsl3</Property>
+ <Property name="property">xxsl3</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jldwbm</Property>
+ <Property name="property">jldwbm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jldwmc</Property>
+ <Property name="property">jldwmc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">lxr</Property>
+ <Property name="property">lxr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">lxfs</Property>
+ <Property name="property">lxfs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">fgld</Property>
+ <Property name="property">fgld</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">fhr</Property>
+ <Property name="property">fhr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">tbdw</Property>
+ <Property name="property">tbdw</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">tbr</Property>
+ <Property name="property">tbr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">tbsj</Property>
+ <Property name="property">tbsj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sfyx</Property>
+ <Property name="property">sfyx</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">whjlApi1221PR#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">whjlApi1221PR#delData</Property>
+ </AjaxAction>
+ <AjaxAction id="ajaxPush">
+ <Property name="service">whjlApi1221PR#pushData</Property>
+ </AjaxAction>
+ <Dialog id="dialogLog">
+ <Property name="width">90%</Property>
+ <Property name="height">90%</Property>
+ <Property name="caption">涓婁紶璁板綍</Property>
+ <Property name="iconClass">fa fa-sliders</Property>
+ <Buttons>
+ <Button>
+ <ClientEvent name="onClick">self.get("parent").hide();</ClientEvent>
+ <Property name="caption">鍏抽棴</Property>
+ <Property name="iconClass">fa fa-times</Property>
+ </Button>
+ </Buttons>
+ <Children>
+ <Container>
+ <IFrame id="iFrame">
+ <Property name="path">com.fzzy.api.view.ApiLog.d</Property>
+ <Property name="userData">
+ <Entity>
+ <Property name="deptId">deptId</Property>
+ </Entity>
+ </Property>
+ </IFrame>
+ </Container>
+ </Children>
+ <Tools/>
+ </Dialog>
+ <ListDropDown id="listDropYN">
+ <Property name="items">鏄�,鍚�</Property>
+ </ListDropDown>
+ <ListDropDown id="listDropType">
+ <Property name="items">鏃ュ父鍑哄簱,鏃ュ父鍏ュ簱,搴旀�ュ嚭搴�,搴旀�ュ叆搴�</Property>
+ </ListDropDown>
+ <ListDropDown id="listDropInOut">
+ <Property name="items">鍏ュ簱,鍑哄簱</Property>
+ </ListDropDown>
+ </View>
+</ViewConfig>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1405.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1405.view.xml
index 1c5ed9a..3a9f8a3 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1405.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1405.view.xml
@@ -58,19 +58,22 @@
</PropertyDef>
<PropertyDef name="htqdr">
<Property></Property>
- <Property name="label">鍚堝悓绛捐鏃堕棿</Property>
+ <Property name="label">鍚堝悓绛捐浜�</Property>
</PropertyDef>
<PropertyDef name="htqdsj">
<Property></Property>
<Property name="label">鍚堝悓绛捐鏃堕棿</Property>
+ <Property name="dataType">DateTime</Property>
</PropertyDef>
<PropertyDef name="htsxsj">
<Property></Property>
<Property name="label">鍚堝悓鐢熸晥鏃ユ湡</Property>
+ <Property name="dataType">Date</Property>
</PropertyDef>
<PropertyDef name="htjzsj">
<Property></Property>
<Property name="label">鍚堝悓鎴鏃ユ湡</Property>
+ <Property name="dataType">Date</Property>
</PropertyDef>
<PropertyDef name="htcjr">
<Property></Property>
@@ -79,6 +82,7 @@
<PropertyDef name="htcjsj">
<Property></Property>
<Property name="label">鍚堝悓鍒涘缓鏃堕棿</Property>
+ <Property name="dataType">DateTime</Property>
</PropertyDef>
<PropertyDef name="htdbgjlbz">
<Property></Property>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlConstant.java b/src/main/java/com/fzzy/otherview/whhpjl/WhjlConstant.java
index 81f43a3..4e7e212 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlConstant.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlConstant.java
@@ -168,6 +168,10 @@
*/
public static String API_CODE_1220 = "1220";
/**
+ * 鎺ュ彛缂栫爜-1220 绛规帾璁″垝
+ */
+ public static String API_CODE_1221 = "1221";
+ /**
* 鎺ュ彛缂栫爜-1301 娓╂箍搴︽娴嬭褰曟暟鎹帴鍙�
*/
public static String API_CODE_1301 = "1301";
@@ -330,6 +334,8 @@
public static String API_CODE_WZKCYJGZ = "WZKCYJGZ";
//鎺ュ彛缂栫爜-1220 鐗╄祫搴撳瓨棰勮瑙勫垯--璺緞(WZKCYJJL)
public static String API_CODE_WZKCYJJL = "WZKCYJJL";
+ //鎺ュ彛缂栫爜-1221 绛规帾璁″垝--璺緞(CCJH)
+ public static String API_CODE_CCJH = "CCJH";
//鎺ュ彛缂栫爜-1301 娓╂箍搴︽娴嬭褰� --璺緞(WSDJCJL)
public static String API_CODE_WSDJCJL = "WSDJCJL";
//鎺ュ彛缂栫爜-1302 杩愯緭鐜妫�娴嬭褰� --璺緞(YSHJJCJL)
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 2f623ab..83acc0a 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1109.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1109.java
@@ -30,7 +30,7 @@
private String sscfmc; //浠撴埧鍚嶇О
private String dalx; //妗ｆ绫诲瀷
private String damc; //妗ｆ鍚嶇О
- private byte[] dawj; //妗ｆ鏂囦欢
+ private byte dawj; //妗ｆ鏂囦欢
private String sfyx; //鏄惁鏈夋晥
private String bz; //澶囨敞
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 3842e6e..b0ad85d 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1114.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1114.java
@@ -41,6 +41,7 @@
private String wxff; //缁翠慨鏂规硶
private String gxpjxx; //鏇存柊閰嶄欢淇℃伅
private String wxhyxzt; //缁翠慨鍚庤繍琛岀姸鎬�
+ private String ysynx; //宸蹭娇鐢ㄥ勾闄�
private int sysj; //璇曠敤鏃堕棿
private String wxfy; //缁翠慨璐圭敤
private String ysr; //楠屾敹浜�
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1206.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1206.java
index 562b3a9..d7c7161 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1206.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1206.java
@@ -35,7 +35,7 @@
private String jljgqymc; //鍔犲伐浼佷笟鍚嶇О
private String htkhbh; //鍚堝悓瀹㈡埛缂栧彿
private String htkhmc; //鍚堝悓瀹㈡埛鍚嶇О
- private String htspdj; //鍚堝悓鍟嗗搧鍗曚环
+ private Double htspdj; //鍚堝悓鍟嗗搧鍗曚环
private Double htspsl; //鍚堝悓鍟嗗搧鏁伴噺
private String spbm; //鍟嗗搧缂栫爜
private Double zje; //鎬婚噾棰�
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1221.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1221.java
new file mode 100644
index 0000000..25d021c
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1221.java
@@ -0,0 +1,66 @@
+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;
+
+/**
+ * 绛规帾璁″垝
+ *
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class WhjlApi1221 implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ private String jhid; //璁″垝ID
+ private String jhbh; //璁″垝缂栧彿
+ private String jhmc; //璁″垝鍚嶇О
+ private String jlqybh; //鍐涚伯浼佷笟缂栧彿
+ private String ssqymc; //鍐涚伯浼佷笟鍚嶇О
+ private String jgzdbh; //鍐涗緵绔欑偣缂栧彿
+ private String jgzdmc; //鍐涗緵绔欑偣鍚嶇О
+ @JSONField(format = "yyyy-MM-dd")
+ private Date bzrq; //缂栧埗鏃ユ湡
+ private String jhnd; //璁″垝骞村害
+ private String jhjd; //璁″垝瀛ｅ害
+ private String lspzbm; //鍝佺缂栧彿
+ private String ppbh; //鍝佺墝缂栧彿
+ private String cpbh; //浜у搧缂栧彿
+ private Double jhsl; //璁″垝鏁伴噺
+ private Double sxsl1; //涓婃棳闇�姹傛暟閲�1
+ private Double xxsl1; //涓嬫棳闇�姹傛暟閲�1
+ private Double sxsl2; //涓婃棳闇�姹傛暟閲�2
+ private Double xxsl2; //涓嬫棳闇�姹傛暟閲�2
+ private Double sxsl3; //涓婃棳闇�姹傛暟閲�3
+ private Double xxsl3; //涓嬫棳闇�姹傛暟閲�3
+ private String jldwbm; //璁￠噺鍗曚綅缂栧彿
+ private String jldwmc; //璁￠噺鍗曚綅鍚嶇О
+ private String lxr; //鑱旂郴浜�
+ private String lxfs; //鑱旂郴鏂瑰紡
+ private String fgld; //鍒嗙棰嗗
+ private String fhr; //澶嶆牳浜�
+ private String tbdw; //濉姤鍗曚綅
+ private String tbr; //濉姤浜�
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private Date tbsj; //濉姤鏃堕棿
+ private String sfyx; //鏄惁鏈夋晥
+ private String bz; //澶囨敞
+
+
+
+ //鍗曠嫭澧炲姞锛屼笉杩涜涓婁紶
+ @JSONField(serialize = false)
+ private String bizId; //涓氬姟ID
+ @JSONField(serialize = false)
+ private Date updateTime; //鏈�鍚庢洿鏂版椂闂�
+ private String czbz; //鎿嶄綔鏍囧織
+ @JSONField(serialize = false)
+ private String kqdm; //搴撳尯浠ｇ爜
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1405.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1405.java
index 23e7a1d..993365f 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1405.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1405.java
@@ -33,15 +33,15 @@
private Double htspdj; //鍚堝悓鍟嗗搧鍗曚环
private Double zje; //鎬婚噾棰�
private String htqdr; //鍚堝悓绛捐浜�
- @JSONField(format = "YYYY-MM-dd HH:mm:ss")
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
private Date htqdsj; //鍚堝悓绛捐鏃堕棿
- @JSONField(format = "YYYYMMDD")
- private String htsxsj; //鍚堝悓鐢熸晥鏃ユ湡
- @JSONField(format = "YYYYMMDD")
- private String htjzsj; //鍚堝悓鎴鏃ユ湡
+ @JSONField(format = "yyyyMMdd")
+ private Date htsxsj; //鍚堝悓鐢熸晥鏃ユ湡
+ @JSONField(format = "yyyyMMdd")
+ private Date htjzsj; //鍚堝悓鎴鏃ユ湡
private String htcjr; //鍚堝悓鍒涘缓浜�
- @JSONField(format = "YYYY-MM-dd HH:mm:ss")
- private String htcjsj; //鍚堝悓鍒涘缓鏃堕棿
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private Date htcjsj; //鍚堝悓鍒涘缓鏃堕棿
private String htdbgjlbz; //鍚堝悓鐨勫彉鏇磋褰曟爣蹇�
private String htbgyy; //鍚堝悓鍙樻洿鍘熷洜
private String htlx; //鍚堝悓绫诲瀷
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1101PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1101PR.java
index 84dcc8b..1a5960e 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1101PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1101PR.java
@@ -130,7 +130,7 @@
ResponseDto responseDto;
ApiInfoData infoData;
for (WhjlApi1101 data : items) {
- responseDto = apiService.pushData(param, apiConf, items);
+ responseDto = apiService.pushData(param, apiConf, data);
if (responseDto.getSuccess() == 0) {
if (Constant.CZBZ_I.equals(data.getCzbz())) {
infoData = new ApiInfoData();
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1106PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1106PR.java
index d6e6e58..af27ebf 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1106PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1106PR.java
@@ -130,7 +130,7 @@
ResponseDto responseDto;
ApiInfoData infoData;
for (WhjlApi1106 data : items) {
- responseDto = apiService.pushData(param, apiConf, items);
+ responseDto = apiService.pushData(param, apiConf, data);
if (responseDto.getSuccess() == 0) {
if (Constant.CZBZ_I.equals(data.getCzbz())) {
infoData = new ApiInfoData();
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1109PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1109PR.java
index edd2105..3503d01 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1109PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1109PR.java
@@ -15,6 +15,7 @@
import com.fzzy.api.service.ApiPushManager;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.utils.FileUtils;
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.otherview.whhpjl.WhjlConstant;
import com.fzzy.otherview.whhpjl.dto.WhjlApi1109;
@@ -120,7 +121,7 @@
ApiInfoData infoData = new ApiInfoData();
infoData.setId(data.getBizId());
infoData.setKqdm(data.getKqdm());
- infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteType(WhjlConstant.API_CATEGORY_11);
infoData.setInteId(WhjlConstant.API_CODE_1109);
infoData.setUpdateTime(new Date());
infoData.setDataId(data.getBizId());
@@ -164,7 +165,7 @@
}
//灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_12, WhjlConstant.API_CODE_1109);
+ ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_11, WhjlConstant.API_CODE_1109);
//鑾峰彇瀹炵幇鎺ュ彛
ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
@@ -175,13 +176,15 @@
ResponseDto responseDto;
ApiInfoData infoData;
for (WhjlApi1109 data : items) {
+// byte[] bytes = FileUtils.file2byte(data.getBz());
+// data.setDawj(bytes);
responseDto = apiService.pushData(param, apiConf, data);
if (responseDto.getSuccess() == 0) {
if (Constant.CZBZ_I.equals(data.getCzbz())) {
infoData = new ApiInfoData();
infoData.setId(data.getBizId());
infoData.setKqdm(data.getKqdm());
- infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteType(WhjlConstant.API_CATEGORY_11);
infoData.setInteId(WhjlConstant.API_CODE_1109);
infoData.setUpdateTime(new Date());
infoData.setDataId(data.getBizId());
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1221PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1221PR.java
new file mode 100644
index 0000000..6532944
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1221PR.java
@@ -0,0 +1,157 @@
+package com.fzzy.otherview.whhpjl.pr;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.bstek.dorado.annotation.DataProvider;
+import com.bstek.dorado.annotation.DataResolver;
+import com.bstek.dorado.annotation.Expose;
+import com.fzzy.api.Constant;
+import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.dto.ResponseDto;
+import com.fzzy.api.entity.ApiConfs;
+import com.fzzy.api.entity.ApiInfoData;
+import com.fzzy.api.service.ApiCommonService;
+import com.fzzy.api.service.ApiPushManager;
+import com.fzzy.api.service.ApiRemoteService;
+import com.fzzy.api.view.repository.ApiInfoDataRep;
+import com.fzzy.otherview.whhpjl.WhjlConstant;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1221;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鐗╄祫搴撳瓨棰勮璁板綍
+ *
+ * @Author:YAN
+ */
+@Component
+public class WhjlApi1221PR {
+ @Autowired
+ private ApiCommonService apiCommonService;
+ @Autowired
+ private ApiPushManager apiPushManager;
+ @Autowired
+ private ApiInfoDataRep apiInfoDataRep;
+
+ /**
+ * 鑾峰彇鍒楄〃淇℃伅
+ * whjlApi1221PR#listData
+ *
+ * @return
+ */
+ @DataProvider
+ public List<WhjlApi1221> listData() {
+ List<ApiInfoData> result = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1221);
+ if (null == result || result.isEmpty()) {
+ return null;
+ }
+ List<WhjlApi1221> list = new ArrayList<>();
+ WhjlApi1221 whjlApi1221;
+ for (ApiInfoData infoData : result) {
+ whjlApi1221 = JSONObject.parseObject(infoData.getData(), WhjlApi1221.class);
+ whjlApi1221.setKqdm(infoData.getKqdm());
+ whjlApi1221.setCzbz(infoData.getCzbz());
+ whjlApi1221.setUpdateTime(infoData.getUpdateTime());
+ whjlApi1221.setBizId(infoData.getDataId());
+ list.add(whjlApi1221);
+ }
+ return list;
+ }
+
+
+ /**
+ * 鏇存柊鎴栦慨鏀�
+ * whjlApi1221PR#saveData
+ *
+ * @param data
+ * @return
+ */
+ @DataResolver
+ public void saveData(WhjlApi1221 data) {
+ ApiInfoData infoData = new ApiInfoData();
+ infoData.setId(data.getBizId());
+ infoData.setKqdm(data.getKqdm());
+ infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteId(WhjlConstant.API_CODE_1221);
+ infoData.setUpdateTime(new Date());
+ infoData.setDataId(data.getBizId());
+ infoData.setData(JSON.toJSONString(data));
+ infoData.setCzbz(data.getCzbz());
+ infoData.setRemarks("澶囨敞淇℃伅");
+
+ apiInfoDataRep.save(infoData);
+ }
+
+
+ /**
+ * 鍒犻櫎
+ * whjlApi1221PR#delData
+ *
+ * @param data
+ * @return
+ */
+ @Expose
+ public String delData(WhjlApi1221 data) {
+ apiInfoDataRep.deleteById(data.getBizId());
+ return null;
+ }
+
+ /**
+ * 涓婁紶
+ * whjlApi1221PR#pushData
+ *
+ * @param items
+ * @return
+ */
+ @Expose
+ public String pushData(List<WhjlApi1221> 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_1221);
+
+ //鑾峰彇瀹炵幇鎺ュ彛
+ ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ if (null == apiService) {
+ return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ }
+
+ ApiInfoData infoData;
+ ResponseDto responseDto;
+ for (WhjlApi1221 data : items) {
+ responseDto = apiService.pushData(param, apiConf, data);
+ if (responseDto.getSuccess() == 0) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ infoData = new ApiInfoData();
+ infoData.setId(data.getBizId());
+ infoData.setKqdm(data.getKqdm());
+ infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteId(WhjlConstant.API_CODE_1221);
+ infoData.setUpdateTime(new Date());
+ infoData.setDataId(data.getBizId());
+
+ data.setCzbz(Constant.CZBZ_U);
+ infoData.setCzbz(Constant.CZBZ_U);
+ infoData.setData(JSON.toJSONString(data));
+
+ apiInfoDataRep.save(infoData);
+ }
+ }
+ result += responseDto.toString();
+ }
+ return result;
+ }
+}
diff --git a/src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java b/src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java
index eef3e64..53b42ac 100644
--- a/src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java
@@ -231,6 +231,8 @@
return WhjlConstant.API_CODE_WZKCYJGZ;
case "1220":
return WhjlConstant.API_CODE_WZKCYJJL;
+ case "1221":
+ return WhjlConstant.API_CODE_CCJH;
case "1301":
return WhjlConstant.API_CODE_WSDJCJL;
case "1302":
diff --git a/src/main/resources/templates/home/home-whjl.html b/src/main/resources/templates/home/home-whjl.html
index 2dc16c6..4793524 100644
--- a/src/main/resources/templates/home/home-whjl.html
+++ b/src/main/resources/templates/home/home-whjl.html
@@ -225,6 +225,9 @@
<dd>
<a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1220.d">鐗╄祫搴撳瓨棰勮璁板綍</a>
</dd>
+ <dd>
+ <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1221.d">绛规帾璁″垝</a>
+ </dd>
</dl>
</li>
--
Gitblit v1.9.3