From 89cb4ea9adbf4578cceb379b58f36d0ac2d05095 Mon Sep 17 00:00:00 2001
From: ws <ws@123.com>
Date: 星期一, 25 九月 2023 20:25:06 +0800
Subject: [PATCH] 优化上海数据上报
---
src/main/java/com/fzzy/api/view/repository/Api1102Rep.java | 2
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1102.java | 5
src/main/java/com/fzzy/otherview/sh2023/ShApi2104.view.xml | 10
src/main/java/com/fzzy/api/view/Api1306.view.xml | 13 +
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1308.java | 68 ++++++++
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1403.java | 6
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2103.java | 2
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 175 ++++++++++++++++-----
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1404.java | 6
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1211.java | 2
src/main/java/com/fzzy/test/ApiTest.view.xml | 27 +++
src/main/resources/templates/home/home.html | 3
src/main/java/com/fzzy/push/sh2023/SH2023PushService12.java | 23 ++
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1309.java | 73 +++++++++
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2104.java | 2
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1401.java | 4
src/main/java/com/fzzy/test/ApiTestPR.java | 41 +++++
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2104.java | 2
18 files changed, 407 insertions(+), 57 deletions(-)
diff --git a/src/main/java/com/fzzy/api/view/Api1306.view.xml b/src/main/java/com/fzzy/api/view/Api1306.view.xml
index 184bf43..4aa3841 100644
--- a/src/main/java/com/fzzy/api/view/Api1306.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1306.view.xml
@@ -183,6 +183,10 @@
<Property></Property>
<Property name="label">琛ヨ嵂鏂规硶</Property>
</PropertyDef>
+ <PropertyDef name="nlhqnddw">
+ <Property></Property>
+ <Property name="label">纾峰寲姘㈡祿搴﹀崟浣�</Property>
+ </PropertyDef>
<PropertyDef name="zyrs">
<Property></Property>
<Property name="label">浣滀笟浜烘暟</Property>
@@ -487,6 +491,10 @@
<Property name="name">xzzydh</Property>
</DataColumn>
<DataColumn>
+ <Property name="property">nlhqnddw</Property>
+ <Property name="name">nlhqnddw</Property>
+ </DataColumn>
+ <DataColumn>
<Property name="property">cfdm</Property>
<Property name="name">cfdm</Property>
</DataColumn>
@@ -718,6 +726,11 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">nlhqnddw</Property>
+ <Property name="property">nlhqnddw</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">byff</Property>
<Property name="property">byff</Property>
<Editor/>
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1102Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1102Rep.java
index ef2a24b..8fa3e85 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1102Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1102Rep.java
@@ -21,7 +21,7 @@
/**
- * 鏌ヨ鎵�鏈夌殑鐩戞帶鐐逛綅淇℃伅
+ * 鏌ヨ搴撳尯
* @param kqdm
* @return
*/
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2104.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2104.java
index 4944aab..4313e4a 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2104.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2104.java
@@ -102,7 +102,7 @@
sh2023Api2104.setLldm(kqdm);
sh2023Api2104.setJz(sysData.getNetWeight());
- sh2023Api2104.setZhgxsh(sysData.getUpdateTime());
+ sh2023Api2104.setZhgxsj(sysData.getUpdateTime());
//鑾峰彇璐т綅淇℃伅
api1105 = commonService.getApi1105Cache(sysData.getDepotId());
diff --git a/src/main/java/com/fzzy/otherview/sh2023/ShApi2104.view.xml b/src/main/java/com/fzzy/otherview/sh2023/ShApi2104.view.xml
index e4e14b4..952d701 100644
--- a/src/main/java/com/fzzy/otherview/sh2023/ShApi2104.view.xml
+++ b/src/main/java/com/fzzy/otherview/sh2023/ShApi2104.view.xml
@@ -68,7 +68,7 @@
<Property name="valueProperty">name</Property>
</Property>
</PropertyDef>
- <PropertyDef name="zhgxsh">
+ <PropertyDef name="zhgxsj">
<Property name="dataType">Date</Property>
<Property name="label">鏈�鍚庢洿鏂版椂闂�</Property>
</PropertyDef>
@@ -317,8 +317,8 @@
<Property name="property">czbz</Property>
<Property name="align">center</Property>
</DataColumn>
- <DataColumn name="zhgxsh">
- <Property name="property">zhgxsh</Property>
+ <DataColumn name="zhgxsj">
+ <Property name="property">zhgxsj</Property>
<Property name="align">center</Property>
</DataColumn>
<DataColumn name="bjw">
@@ -425,8 +425,8 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">zhgxsh</Property>
- <Property name="property">zhgxsh</Property>
+ <Property name="name">zhgxsj</Property>
+ <Property name="property">zhgxsj</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index f17b10e..a9abe77 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -297,6 +297,8 @@
api1102.setBjw(ShAreaBjw.getBjw(code));
api1102.setKqsx("2");
api1102.setCbcr(count);
+ //TODO 搴撳尯鐘舵��
+ api1102.setKqzt("1");
list.add(api1102);
}
return JSON.toJSONString(list);
@@ -444,6 +446,9 @@
api1111 = new SH2023Api1111();
BeanUtils.copyProperties(apiData, api1111);
api1111.setBjw(ShAreaBjw.getBjw(code));
+ if (StringUtils.isEmpty(api1111.getBz())) {
+ api1111.setBz("鏃�");
+ }
list.add(api1111);
}
return JSON.toJSONString(list);
@@ -588,7 +593,8 @@
api1207.setDcrq(apiData.getDcrq());
api1207.setBjw(ShAreaBjw.getBjw(code));
//TODO 搴撹皟鍗曞彿
-
+ api1207.setPch(apiData.getDchwdm() + DateFormatUtils.format(apiData.getDcrq(), "yyyy"));
+ api1207.setKddh(apiData.getDcdh().substring(21,33));
list.add(api1207);
}
return JSON.toJSONString(list);
@@ -660,6 +666,11 @@
BeanUtils.copyProperties(apiData, api1211);
api1211.setZglkdm(api1211.getKqdm());
+ //TODO 璐т綅浠ｇ爜 绮鎬ц川浠ｇ爜 鏉ョ伯浠ｇ爜
+// api1211.setHwdm("91310114703439394M001000100101");
+// api1211.setLsxzdm("001");
+// api1211.setLldm("91310114703439394M001000100101");
+
api1211.setBjw(ShAreaBjw.getBjw(code));
api1211.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getYwrq(), "yyyyMM"));
if(StringUtils.isEmpty(api1211.getLldm())){
@@ -796,6 +807,43 @@
}
return JSON.toJSONString(list);
}
+
+ if (SH2023Constant.SH_2023_API_CODE_1308.equals(inteId)) {
+ SH2023Api1308 api1308;
+ //鏈�鍚庤浆鎹负json
+ List<SH2023Api1308> list = new ArrayList<>();
+ //鎶奷ata杞寲鎴恖ist闆嗗悎
+ List<Api1308> api1308List = castList(data, Api1308.class);
+ for (Api1308 apiData : api1308List) {
+ api1308 = new SH2023Api1308();
+
+ BeanUtils.copyProperties(apiData, api1308);
+ //TODO 璐т綅浠ｇ爜 鍥惧儚缂栧彿 瑙嗛缂栧彿
+ api1308.setHwdm("鏃�");
+ api1308.setBjw(ShAreaBjw.getBjw(code));
+ List<Api1109> api1109List = api1109Rep.getDataByFileId(apiData.getFileStorageId());
+ api1308.setTxbh(api1109List.get(0).getWjmc());
+ api1308.setSpbh(api1109List.get(0).getWjmc());
+ list.add(api1308);
+ }
+ return JSON.toJSONString(list);
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1309.equals(inteId)) {
+ SH2023Api1309 api1309;
+ //鏈�鍚庤浆鎹负json
+ List<SH2023Api1309> list = new ArrayList<>();
+ //鎶奷ata杞寲鎴恖ist闆嗗悎
+ List<Api1309> api1308List = castList(data, Api1309.class);
+ for (Api1309 apiData : api1308List) {
+ api1309 = new SH2023Api1309();
+
+ BeanUtils.copyProperties(apiData, api1309);
+ api1309.setBjw(ShAreaBjw.getBjw(code));
+
+ list.add(api1309);
+ }
+ return JSON.toJSONString(list);
+ }
if (SH2023Constant.SH_2023_API_CODE_1310.equals(inteId)) {
SH2023Api1310 api1310;
//鏈�鍚庤浆鎹负json
@@ -810,6 +858,7 @@
api1310.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getJysj(), "yyyy"));
List<Api1202> api1202List = api1202Rep.getDataByHwdm(apiData.getHwdm());
api1310.setLspzdm(api1202List.get(0).getLspzdm());
+ api1310.setLsxzdm("002");
list.add(api1310);
}
return JSON.toJSONString(list);
@@ -823,6 +872,7 @@
for (Api1401 apiData : api1401List) {
api1401 = new SH2023Api1401();
BeanUtils.copyProperties(apiData, api1401);
+ api1401.setBjw(ShAreaBjw.getBjw(code));
list.add(api1401);
}
return JSON.toJSONString(list);
@@ -852,6 +902,7 @@
BeanUtils.copyProperties(apiData, api1403);
api1403.setJhzxdw(apiData.getJhxddw());
api1403.setJhzxdwmc(apiData.getJhxddwmc());
+ api1403.setBjw(ShAreaBjw.getBjw(code));
list.add(api1403);
}
return JSON.toJSONString(list);
@@ -866,70 +917,102 @@
api1404 = new SH2023Api1404();
BeanUtils.copyProperties(apiData, api1404);
//TODO 鏄庣粏鐘舵��
-
+ api1404.setMxzt("1");
+ api1404.setBjw(ShAreaBjw.getBjw(code));
list.add(api1404);
}
return JSON.toJSONString(list);
}
-
- if (SH2023Constant.SH_2023_API_CODE_2102.equals(inteId)) {
- SH2023Api2102 api2102;
+ if (SH2023Constant.SH_2023_API_CODE_2101.equals(inteId)) {
+ SH2023Api2101 api2101;
//鏈�鍚庤浆鎹负json
- List<SH2023Api2102> list = new ArrayList<>();
//鎶奷ata杞寲鎴恖ist闆嗗悎
- List<Api1207> api1207List = castList(data, Api1207.class);
- for (Api1207 apiData : api1207List) {
- api2102 = new SH2023Api2102();
- BeanUtils.copyProperties(apiData, api2102);
- api2102.setDrdh(apiData.getDcdh());
- api2102.setDcrq(apiData.getDcrq());
- api2102.setPch(api2102.getDrhwdm() + DateFormatUtils.format(apiData.getDcrq(), "yyyy"));
- api2102.setBjw(ShAreaBjw.getBjw(code));
- //TODO 搴撹皟鍗曞彿
+ List<SH2023Api2101> list = castList(data, SH2023Api2101.class);
- list.add(api2102);
- }
return JSON.toJSONString(list);
}
+
+ if (SH2023Constant.SH_2023_API_CODE_2102.equals(inteId)) {
+// SH2023Api2102 api2102;
+// //鏈�鍚庤浆鎹负json
+// List<SH2023Api2102> list = new ArrayList<>();
+// //鎶奷ata杞寲鎴恖ist闆嗗悎
+// List<Api1207> api1207List = castList(data, Api1207.class);
+// for (Api1207 apiData : api1207List) {
+// api2102 = new SH2023Api2102();
+// BeanUtils.copyProperties(apiData, api2102);
+// api2102.setDrdh(apiData.getDcdh());
+// api2102.setDcrq(apiData.getDcrq());
+// api2102.setPch(api2102.getDrhwdm() + DateFormatUtils.format(apiData.getDcrq(), "yyyy"));
+// api2102.setBjw(ShAreaBjw.getBjw(code));
+// //TODO 搴撹皟鍗曞彿
+//
+// list.add(api2102);
+// }
+ List<SH2023Api2102> list = castList(data, SH2023Api2102.class);
+ return JSON.toJSONString(list);
+ }
+ if (SH2023Constant.SH_2023_API_CODE_2103.equals(inteId)) {
+ SH2023Api2103 api2103;
+ //鏈�鍚庤浆鎹负json
+ //鎶奷ata杞寲鎴恖ist闆嗗悎
+
+ List<SH2023Api2103> list = castList(data, SH2023Api2103.class);
+ List<SH2023Api2103Item> listItems = castList(list.get(0).getDlqplxq(), SH2023Api2103Item.class);
+ list.get(0).setCzbz("i");
+ list.get(0).setSh2023Api2103Items(listItems);
+ return JSON.toJSONString(list);
+ }
+ if (SH2023Constant.SH_2023_API_CODE_2104.equals(inteId)) {
+ SH2023Api2104 api2104;
+ //鏈�鍚庤浆鎹负json
+ //鎶奷ata杞寲鎴恖ist闆嗗悎
+ List<SH2023Api2104> list = castList(data, SH2023Api2104.class);
+
+ return JSON.toJSONString(list);
+ }
+
if (SH2023Constant.SH_2023_API_CODE_2203.equals(inteId)) {
SH2023Api2203 api2203;
//鏈�鍚庤浆鎹负json
- List<SH2023Api2203> list = new ArrayList<>();
+// List<SH2023Api2203> list = new ArrayList<>();
//鎶奷ata杞寲鎴恖ist闆嗗悎
- List<Api1201> api1201List = castList(data, Api1201.class);
- for (Api1201 apiData : api1201List) {
- api2203 = new SH2023Api2203();
- BeanUtils.copyProperties(apiData, api2203);
- api2203.setHtbh(apiData.getHth());
-
-// api2203.setBdh();
- api2203.setCjrq(apiData.getQdrq());
-// api2203.setJyzt();
-// api2203.setLsxz();
-// api2203.setLspzmx();
-// api2203.setScnf();
-// api2203.setKd();
- //
- list.add(api2203);
- }
+ List<SH2023Api2203> list = castList(data, SH2023Api2203.class);
+// for (Api1201 apiData : api1201List) {
+// api2203 = new SH2023Api2203();
+// BeanUtils.copyProperties(apiData, api2203);
+// api2203.setHtbh(apiData.getHth());
+//
+//// api2203.setBdh();
+// api2203.setCjrq(apiData.getQdrq());
+//// api2203.setJyzt();
+//// api2203.setLsxz();
+//// api2203.setLspzmx();
+//// api2203.setScnf();
+//// api2203.setKd();
+// //
+// list.add(api2203);
+// }
return JSON.toJSONString(list);
}
+
+
if (SH2023Constant.SH_2023_API_CODE_2204.equals(inteId)) {
SH2023Api2204 api2204;
//鏈�鍚庤浆鎹负json
- List<SH2023Api2204> list = new ArrayList<>();
+// List<SH2023Api2204> list = new ArrayList<>();
//鎶奷ata杞寲鎴恖ist闆嗗悎
- List<Api1310> api1310List = castList(data, Api1310.class);
- for (Api1310 apiData : api1310List) {
- api2204 = new SH2023Api2204();
- BeanUtils.copyProperties(apiData, api2204);
-// api2204.setSf();
-// api2204.setRksf();
-// api2204.setlldm();
- api2204.setBjw(ShAreaBjw.getBjw(code));
- api2204.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getJysj(), "yyyy"));
- list.add(api2204);
- }
+ List<SH2023Api2204> list = castList(data, SH2023Api2204.class);
+// for (Api1310 apiData : api1310List) {
+// api2204 = new SH2023Api2204();
+// BeanUtils.copyProperties(apiData, api2204);
+//// api2204.setSf();
+//// api2204.setRksf();
+//// api2204.setlldm();
+// api2204.setBjw(ShAreaBjw.getBjw(code));
+// api2204.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getJysj(), "yyyy"));
+// list.add(api2204);
+// }
return JSON.toJSONString(list);
}
//璐㈠姟鎶ヨ〃鏁版嵁灏佽
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023PushService12.java b/src/main/java/com/fzzy/push/sh2023/SH2023PushService12.java
index 509e83d..3dc498b 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023PushService12.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023PushService12.java
@@ -378,6 +378,27 @@
*/
public void pushData1211(ApiRemoteService apiRemoteService, ApiParam param) {
//TODO
+ //绮鎬ц川杞彉鍗�
+ List<Api1211> list = api1211Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
+
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌绮搴撳瓨淇℃伅锛屼笉鎺ㄩ��-----");
+ return;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1210);
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1211 data : list) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1211Rep.save(data);
+ }
+ }
+ }
}
@@ -462,7 +483,7 @@
for (ApiInfoData infoData : items) {
shApi2104 = JSONObject.parseObject(infoData.getData(), SH2023Api2104.class);
shApi2104.setCzbz(infoData.getCzbz());
- shApi2104.setZhgxsh(infoData.getUpdateTime());
+ shApi2104.setZhgxsj(infoData.getUpdateTime());
list.add(shApi2104);
}
ResponseDto responseDto = apiRemoteService.pushData(param, list);
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1102.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1102.java
index 3c42fb4..88463bf 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1102.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1102.java
@@ -76,6 +76,9 @@
@PropertyDef(label = "搴撳尯灞炴��", description = "1:甯傜骇鐩村睘锛�2:鍖虹骇鐩村睘锛�3:绀句細浠撳锛�4:鍏朵粬")
private String kqsx;
- @PropertyDef(label = "鏍囪浣�")
+ @PropertyDef(label = "搴撳尯鐘舵��")
+ private String kqzt;
+
+ @PropertyDef(label = "鏍囪浣�", description = "1:姝ｅ父(榛樿), 2:閫�鍑哄偍澶囩伯鎵垮偍")
private String bjw;
}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1211.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1211.java
index 2af339b..3694117 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1211.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1211.java
@@ -52,8 +52,8 @@
@PropertyDef(label = "鏈堢粨鏍囧織")
private Integer yjbz;
- @JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "涓氬姟鏃ユ湡")
+ @JSONField(format = "yyyy-MM-dd")
private Date ywrq;
@PropertyDef(label = "鎿嶄綔鏍囧織")
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1308.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1308.java
new file mode 100644
index 0000000..d16ea80
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1308.java
@@ -0,0 +1,68 @@
+package com.fzzy.push.sh2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鎺ュ彛琛�-瑙嗛鐩戞帶寮傚父浜嬩欢鍛婅鍩烘湰淇℃伅鎺ュ彛
+ *
+ * @author ws
+ * @date 2022-09-22 15:57
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SH2023Api1308 implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private Date gjsj;
+
+ @PropertyDef(label = "搴撳尯鍚嶇О")
+ private String kqmc;
+
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ private String kqdm;
+
+ @PropertyDef(label = "璐т綅浠ｇ爜")
+ private String hwdm;
+
+ @PropertyDef(label = "搴撳尯鍦板潃")
+ private String kqdz;
+
+ @PropertyDef(label = "瑙嗛鐩戞帶璁惧id")
+ private String spjksbid;
+
+ @PropertyDef(label = "瀹夎浣嶇疆绫诲瀷")
+ private String azwzlx;
+
+ @PropertyDef(label = "鐩戣鍖哄煙璇存槑")
+ private String jsqysm;
+
+ @PropertyDef(label = "寮傚父鍛婅璇存槑")
+ private String ycgjsm;
+
+ @PropertyDef(label = "鍥惧儚缂栧彿")
+ private String txbh;
+
+ @PropertyDef(label = "瑙嗛缂栧彿")
+ private String spbh;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private Date zhgxsj;
+
+ @PropertyDef(label = "鏍囪浣�")
+ private String bjw;
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1309.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1309.java
new file mode 100644
index 0000000..579b0e0
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1309.java
@@ -0,0 +1,73 @@
+package com.fzzy.push.sh2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鎺ュ彛琛�-瑙嗛鐩戞帶寮傚父浜嬩欢鍛婅鍩烘湰淇℃伅鎺ュ彛
+ *
+ * @author ws
+ * @date 2022-09-22 15:57
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SH2023Api1309 implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ @PropertyDef(label = "棰勮淇℃伅浠ｇ爜")
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private Date fbsj;
+
+ @PropertyDef(label = "棰勮淇℃伅浠ｇ爜")
+ private String yjxxdm;
+
+ @PropertyDef(label = "杩濊涓讳綋绫诲瀷")
+ private String wgztlx;
+
+ @PropertyDef(label = "杩濊鍗曚綅浠ｇ爜")
+ private String qydm;
+
+ @PropertyDef(label = "杩濊琛屼负浜�")
+ private String wgxwr;
+
+ @PropertyDef(label = "娑夊強搴撶偣")
+ private String sjkd;
+
+ @PropertyDef(label = "杩濊绫诲瀷")
+ private String wglx;
+
+ @PropertyDef(label = "杩濊璇︽儏")
+ private String wgqk;
+
+ @PropertyDef(label = "褰撳墠澶勭疆鐘舵��")
+ private String czzt;
+
+ @PropertyDef(label = "澶勭疆鍐呭")
+ private String hxczqk;
+
+ @PropertyDef(label = "澶勭疆浜�")
+ private String hxczr;
+
+ @PropertyDef(label = "澶勭疆鏃堕棿")
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private Date hxczsj;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private Date zhgxsj;
+
+ @PropertyDef(label = "鏍囪浣�")
+ private String bjw;
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1401.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1401.java
index 17e7ea2..2233ef5 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1401.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1401.java
@@ -56,5 +56,9 @@
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
private Date zhgxsj;
+ @PropertyDef(label = "鏍囪浣�")
+ private String bjw;
+
+
}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1403.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1403.java
index 02eb499..900830e 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1403.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1403.java
@@ -59,5 +59,11 @@
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
private Date zhgxsj;
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @PropertyDef(label = "鏍囪浣�")
+ private String bjw;
+
}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1404.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1404.java
index 6ab6a95..90a9fd9 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1404.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1404.java
@@ -59,4 +59,10 @@
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
private Date zhgxsj;
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @PropertyDef(label = "鏍囪浣�")
+ private String bjw;
+
}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2103.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2103.java
index e183bf4..d5e1f38 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2103.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2103.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fzzy.api.entity.ApiParent;
import lombok.Data;
@@ -74,6 +75,7 @@
private Date zhgxsj;
@Transient
+ @JsonIgnore
private List<SH2023Api2103Item> sh2023Api2103Items;
}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2104.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2104.java
index f25d710..19c7f52 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2104.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2104.java
@@ -56,7 +56,7 @@
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
- private Date zhgxsh;
+ private Date zhgxsj;
@PropertyDef(label = "鎵规鍙�")
private String pch;
diff --git a/src/main/java/com/fzzy/test/ApiTest.view.xml b/src/main/java/com/fzzy/test/ApiTest.view.xml
new file mode 100644
index 0000000..c0e01ee
--- /dev/null
+++ b/src/main/java/com/fzzy/test/ApiTest.view.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ViewConfig>
+ <Arguments/>
+ <Context/>
+ <Model/>
+ <View layout="regionPadding:10">
+ <Property name="packages">font-awesome,css-common</Property>
+ <ToolBar>
+ <ToolBarButton>
+ <ClientEvent name="onClick">
+view.get("#ajaxDel").execute(function(result){
+ if(result){
+ $alert(result);
+ }
+});
+</ClientEvent>
+ <Property name="caption">娴嬭瘯</Property>
+ <Property name="iconClass">fa fa-minus</Property>
+ <Property name="exClassName">toolbar-button-warn</Property>
+ <Property name="width">100</Property>
+ </ToolBarButton>
+ </ToolBar>
+ <AjaxAction id="ajaxDel">
+ <Property name="service">apiTestPR#push1311</Property>
+ </AjaxAction>
+ </View>
+</ViewConfig>
diff --git a/src/main/java/com/fzzy/test/ApiTestPR.java b/src/main/java/com/fzzy/test/ApiTestPR.java
new file mode 100644
index 0000000..3a2a33f
--- /dev/null
+++ b/src/main/java/com/fzzy/test/ApiTestPR.java
@@ -0,0 +1,41 @@
+package com.fzzy.test;
+
+import com.bstek.dorado.annotation.Expose;
+import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.entity.ApiConfs;
+import com.fzzy.api.service.ApiCommonService;
+import com.fzzy.push.sh2023.SH2023ApiRemoteService;
+import com.fzzy.push.sh2023.SH2023PushService13;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+@Slf4j
+public class ApiTestPR {
+
+ @Autowired
+ private SH2023ApiRemoteService apiRemoteService;
+ @Autowired
+ private SH2023PushService13 pushService13;
+ @Autowired
+ private ApiCommonService apiCommonService;
+
+ @Expose
+ public String push1311(){
+ String kqdm = "91310114703439394M001";
+ ApiConfs apiConf = apiCommonService.getConf(kqdm);
+ ApiParam param =new ApiParam();
+ param.setInteId("1311");
+ param.setKqdm(kqdm);
+ param.setInteCategory("13");
+ param.setPushProtocol("SB_SH_2023");
+ param.setDeptId("5303_001");
+
+// String jsonString = "{\"spjksbid\":\"61020201401327020104\",\"sblxbm\":\"1\",\"spjklx\":\"1\",\"jkxlh\":\"123456789\",\"jkxh\":\"132456789\",\"jkcs\":\"1\",\"kqdm\":\"91310114703439394M001\",\"jksbmc\":\"娴嬭瘯鍚嶇О\",\"jksbbm\":\"123456789\",\"tdbh\":\"1\",\"ajdm\":\"91310114703439394M0010001001\",\"sfazbgd\":\"Y\",\"zsqy\":\"娴嬭瘯鏁版嵁\",\"azwzlx\":\"01\",\"azwz\":\"澶ч棬鍙",\"jkjlxbm\":\"1\",\"hwdm\":\"91310114703439394M001000100101\",\"jktyzw\":\"1\",\"sbdlmm\":\"123\",\"sbdlmc\":\"娴嬭瘯\",\"sbdkh\":\"1\",\"sbipdz\":\"132.220.220\",\"zhgxsj\":\"2023-09-20 11:11:11\",\"czbz\":\"i\",\"bjw\":\"91310114703439394M001000100101\",\"bz\":\"澶囨敞\"}";
+// apiRemoteService.pushData(param,apiConf, jsonString);
+ pushService13.pushData1311(apiRemoteService, param);
+
+ return "success";
+ }
+}
diff --git a/src/main/resources/templates/home/home.html b/src/main/resources/templates/home/home.html
index 3ca3b10..07636b2 100644
--- a/src/main/resources/templates/home/home.html
+++ b/src/main/resources/templates/home/home.html
@@ -311,6 +311,9 @@
<dd>
<a lay-href="com.fzzy.otherview.sh2023.ShApi2204.d">涓婃捣-瀹氬寲姘存楠�</a>
</dd>
+ <dd>
+ <a lay-href="com.fzzy.test.ApiTest.d">瑙嗛鎺ュ彛娴嬭瘯</a>
+ </dd>
</dl>
</li>
--
Gitblit v1.9.3