From 5f588423dc2300a7eeafdaf00ad7459f1c625a54 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期二, 22 八月 2023 11:09:11 +0800
Subject: [PATCH] 上海数据上报3
---
src/main/java/com/fzzy/push/sh2023/SH2023PushService11.java | 14 -
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1311.java | 130 ++++++++++++++++++
src/main/java/com/fzzy/push/sh2023/SH2023PushService14.java | 2
src/main/java/com/fzzy/push/sh2023/SH2023PushService12.java | 43 +++++-
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2101.java | 114 ++++++++++++++++
src/main/java/com/fzzy/push/sh2023/SH2023PushService13.java | 97 +++++++++++--
6 files changed, 366 insertions(+), 34 deletions(-)
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023PushService11.java b/src/main/java/com/fzzy/push/sh2023/SH2023PushService11.java
index a263dc7..ff43b9b 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023PushService11.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023PushService11.java
@@ -108,7 +108,7 @@
log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌鍗曚綅淇℃伅锛屼笉鎺ㄩ��-----");
return;
}
-
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1101);
//鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
ResponseDto responseDto = apiRemoteService.pushData(param, list);
if (responseDto.getSuccess() == 0) {
@@ -135,7 +135,7 @@
log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌搴撳尯淇℃伅锛屼笉鎺ㄩ��-----");
return;
}
-
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1102);
//鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
ResponseDto responseDto = apiRemoteService.pushData(param, list);
if (responseDto.getSuccess() == 0) {
@@ -163,7 +163,7 @@
log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌浠撴埧淇℃伅锛屼笉鎺ㄩ��-----");
return;
}
-
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1103);
//鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
ResponseDto responseDto = apiRemoteService.pushData(param, list);
if (responseDto.getSuccess() == 0) {
@@ -191,7 +191,7 @@
log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌寤掗棿淇℃伅锛屼笉鎺ㄩ��-----");
return;
}
-
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1104);
//鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
ResponseDto responseDto = apiRemoteService.pushData(param, list);
if (responseDto.getSuccess() == 0) {
@@ -205,8 +205,6 @@
}
}
}
-
-
}
/**
@@ -220,7 +218,7 @@
log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌璐т綅淇℃伅锛屼笉鎺ㄩ��-----");
return;
}
-
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1105);
//鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
ResponseDto responseDto = apiRemoteService.pushData(param, list);
if (responseDto.getSuccess() == 0) {
@@ -248,7 +246,7 @@
log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌娌圭綈淇℃伅锛屼笉鎺ㄩ��-----");
return;
}
-
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1106);
//鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
ResponseDto responseDto = apiRemoteService.pushData(param, list);
if (responseDto.getSuccess() == 0) {
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023PushService12.java b/src/main/java/com/fzzy/push/sh2023/SH2023PushService12.java
index 454c99e..db90a98 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023PushService12.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023PushService12.java
@@ -1,5 +1,6 @@
package com.fzzy.push.sh2023;
+import com.alibaba.fastjson.JSONObject;
import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.PushProtocol;
@@ -9,10 +10,12 @@
import com.fzzy.api.service.PushService11;
import com.fzzy.api.view.repository.*;
import com.fzzy.otherview.sh2023.dto.ShApi2101;
+import com.fzzy.push.sh2023.dto.SH2023Api2101;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -52,6 +55,8 @@
private Api1211Rep api1211Rep;
@Autowired
private Api1212Rep api1212Rep;
+ @Autowired
+ private ApiInfoDataRep apiInfoDataRep;
@Override
public String getProtocol() {
@@ -102,7 +107,7 @@
log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌鍚堝悓淇℃伅锛屼笉鎺ㄩ��-----");
return;
}
-
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1201);
//鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
ResponseDto responseDto = apiRemoteService.pushData(param, list);
if (responseDto.getSuccess() == 0) {
@@ -129,7 +134,7 @@
log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌绮鍏ュ簱淇℃伅锛屼笉鎺ㄩ��-----");
return;
}
-
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1202);
//鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
ResponseDto responseDto = apiRemoteService.pushData(param, list);
if (responseDto.getSuccess() == 0) {
@@ -156,7 +161,7 @@
log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌绮鍏ュ簱妫�楠屼俊鎭紝涓嶆帹閫�-----");
return;
}
-
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1203);
//鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
ResponseDto responseDto = apiRemoteService.pushData(param, list);
if (responseDto.getSuccess() == 0) {
@@ -184,7 +189,7 @@
log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌绮鍏ュ簱缁撶畻淇℃伅锛屼笉鎺ㄩ��-----");
return;
}
-
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1204);
//鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
ResponseDto responseDto = apiRemoteService.pushData(param, list);
if (responseDto.getSuccess() == 0) {
@@ -212,7 +217,7 @@
log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌绮鍑哄簱淇℃伅锛屼笉鎺ㄩ��-----");
return;
}
-
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1205);
//鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
ResponseDto responseDto = apiRemoteService.pushData(param, list);
if (responseDto.getSuccess() == 0) {
@@ -239,7 +244,7 @@
log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌绮鍑哄簱缁撶畻淇℃伅锛屼笉鎺ㄩ��-----");
return;
}
-
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1206);
//鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
ResponseDto responseDto = apiRemoteService.pushData(param, list);
if (responseDto.getSuccess() == 0) {
@@ -308,7 +313,31 @@
* 2101 妫�鏂ゅ崟
*/
public void pushData2101(ApiRemoteService apiRemoteService, ApiParam param) {
- // todo
+
+ //鑾峰彇 妫�鏂ゅ崟淇℃伅
+ List<ApiInfoData> items = apiInfoDataRep.getDataByInteId(SH2023Constant.SH_2023_API_CODE_2101);
+
+ SH2023Api2101 shApi2101;
+ List<SH2023Api2101> list = new ArrayList<>();
+
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_2101);
+ for (ApiInfoData infoData : items) {
+ shApi2101 = JSONObject.parseObject(infoData.getData(), SH2023Api2101.class);
+ shApi2101.setCzbz(infoData.getCzbz());
+ shApi2101.setZhgxsj(infoData.getUpdateTime());
+ list.add(shApi2101);
+ }
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (ApiInfoData data : items) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ apiInfoDataRep.save(data);
+ }
+ }
+ }
}
/**
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023PushService13.java b/src/main/java/com/fzzy/push/sh2023/SH2023PushService13.java
index 26dd3f6..39c62dd 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023PushService13.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023PushService13.java
@@ -1,5 +1,6 @@
package com.fzzy.push.sh2023;
+import com.alibaba.fastjson.JSONObject;
import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.PushProtocol;
@@ -9,12 +10,17 @@
import com.fzzy.api.service.PushService11;
import com.fzzy.api.view.repository.*;
import com.fzzy.otherview.sh2023.dto.ShApi1311;
+import com.fzzy.otherview.sh2023.dto.ShApi2103;
import com.fzzy.otherview.sh2023.repository.ShApi1311Rep;
import com.fzzy.push.impl.ComPushService11;
+import com.fzzy.push.sh2023.dto.SH2023Api1311;
+import com.fzzy.push.sh2023.dto.SH2023Api2103;
import lombok.extern.slf4j.Slf4j;
+import org.codehaus.jackson.JsonParser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -50,6 +56,8 @@
private Api1309Rep api1309Rep;
@Autowired
private Api1310Rep api1310Rep;
+ @Autowired
+ private ApiInfoDataRep apiInfoDataRep;
@Override
public String getProtocol() {
@@ -86,7 +94,7 @@
log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌瀹夊叏绠＄悊锛屼笉鎺ㄩ��-----");
return;
}
-
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1301);
//鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
ResponseDto responseDto = apiRemoteService.pushData(param, list);
if (responseDto.getSuccess() == 0) {
@@ -114,7 +122,7 @@
log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌娓╂箍搴︽娴嬶紝涓嶆帹閫�-----");
return;
}
-
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1302);
//鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
ResponseDto responseDto = apiRemoteService.pushData(param, list);
if (responseDto.getSuccess() == 0) {
@@ -141,7 +149,7 @@
log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌瀹宠櫕妫�娴嬶紝涓嶆帹閫�-----");
return;
}
-
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1303);
//鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
ResponseDto responseDto = apiRemoteService.pushData(param, list);
if (responseDto.getSuccess() == 0) {
@@ -169,7 +177,7 @@
log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌姘斾綋妫�娴嬶紝涓嶆帹閫�-----");
return;
}
-
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1304);
//鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
ResponseDto responseDto = apiRemoteService.pushData(param, list);
if (responseDto.getSuccess() == 0) {
@@ -197,7 +205,7 @@
log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌閫氶浣滀笟锛屼笉鎺ㄩ��-----");
return;
}
-
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1305);
//鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
ResponseDto responseDto = apiRemoteService.pushData(param, list);
if (responseDto.getSuccess() == 0) {
@@ -225,7 +233,7 @@
log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌鐔忚捀浣滀笟锛屼笉鎺ㄩ��-----");
return;
}
-
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1306);
//鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
ResponseDto responseDto = apiRemoteService.pushData(param, list);
if (responseDto.getSuccess() == 0) {
@@ -252,7 +260,7 @@
log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌浠撳唴瑙嗛鍥惧儚锛屼笉鎺ㄩ��-----");
return;
}
-
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1307);
//鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
ResponseDto responseDto = apiRemoteService.pushData(param, list);
if (responseDto.getSuccess() == 0) {
@@ -296,17 +304,51 @@
log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌璐ㄦ鏁版嵁锛屼笉鎺ㄩ��-----");
return;
}
-
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1310);
//鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
ResponseDto responseDto = apiRemoteService.pushData(param, list);
if (responseDto.getSuccess() == 0) {
//鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
for (Api1310 data : list) {
if (Constant.CZBZ_I.equals(data.getCzbz())) {
-
data.setCzbz(Constant.CZBZ_U);
//鏇存柊鐘舵��
api1310Rep.save(data);
+ }
+ }
+ }
+ }
+
+ /**
+ * 1311 瑙嗛鐩戞帶鎺ュ彛
+ */
+ public void pushData1311(ApiRemoteService apiRemoteService, ApiParam param) {
+ // 鑾峰彇 瑙嗛鐩戞帶鎺ュ彛鏁版嵁
+ List<ApiInfoData> items = apiInfoDataRep.getDataByInteId(SH2023Constant.SH_2023_API_CODE_1311);
+
+ if (null == items || items.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌瑙嗛鐩戞帶锛屼笉鎺ㄩ��-----");
+ return;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1311);
+
+ SH2023Api1311 shApi1311;
+ List<SH2023Api1311> list = new ArrayList<>();
+ for (ApiInfoData infoData : items) {
+ shApi1311 = JSONObject.parseObject(infoData.getData(), SH2023Api1311.class);
+ shApi1311.setCzbz(infoData.getCzbz());
+ shApi1311.setZhgxsj(infoData.getUpdateTime());
+ list.add(shApi1311);
+ }
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (ApiInfoData data : items) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ apiInfoDataRep.save(data);
}
}
}
@@ -314,18 +356,37 @@
}
/**
- * 1311 瑙嗛鐩戞帶鎺ュ彛
- */
- public void pushData1311(ApiRemoteService apiRemoteService, ApiParam param) {
- // todo
-
- }
-
- /**
* 2103 绮儏璁惧閰嶇疆
*/
public void pushData2103(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+
+ // 鑾峰彇绮儏璁惧閰嶇疆鏁版嵁
+ List<ApiInfoData> items = apiInfoDataRep.getDataByInteId(SH2023Constant.SH_2023_API_CODE_2103);
+
+ if (null == items || items.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌绮儏璁惧閰嶇疆锛屼笉鎺ㄩ��-----");
+ return;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_2103);
+ SH2023Api2103 shApi2103;
+ List<SH2023Api2103> list = new ArrayList<>();
+ for (ApiInfoData infoData : items) {
+ shApi2103 = JSONObject.parseObject(infoData.getData(), SH2023Api2103.class);
+ shApi2103.setZhgxsj(infoData.getUpdateTime());
+ list.add(shApi2103);
+ }
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (ApiInfoData data : items) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ apiInfoDataRep.save(data);
+ }
+ }
+ }
}
}
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023PushService14.java b/src/main/java/com/fzzy/push/sh2023/SH2023PushService14.java
index 17a5a23..c77ce45 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023PushService14.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023PushService14.java
@@ -58,7 +58,7 @@
log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌鍌ㄥ瑙勬ā锛屼笉鎺ㄩ��-----");
return;
}
-
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1401);
//鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
ResponseDto responseDto = apiRemoteService.pushData(param, list);
if (responseDto.getSuccess() == 0) {
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1311.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1311.java
new file mode 100644
index 0000000..55a4912
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1311.java
@@ -0,0 +1,130 @@
+package com.fzzy.push.sh2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import com.fzzy.api.entity.ApiParent;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 瑙嗛鐩戞帶
+ *
+ * @Author:YAN
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SH2023Api1311 extends ApiParent implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ @PropertyDef(label = "鐩戞帶缂栧彿")
+ private String sxtbh;
+
+ @PropertyDef(label = "閫氶亾缂栧彿")
+ private int tdbh;
+
+ @PropertyDef(label = "閫氶亾鍚嶇О")
+ private String tdmc;
+
+ @PropertyDef(label = "鐩戞帶璁惧缂栫爜")
+ private String jksbbm;
+
+ @PropertyDef(label = "鐩戞帶璁惧鍚嶇О")
+ private String jksbmc;
+
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ private String kqdm;
+
+ /**
+ * 1 娴峰悍, 2 澶у崕, 3 瀹囪
+ * 4 澶╁湴浼熶笟,5 鍗庝负,9 鍏朵粬
+ */
+ @PropertyDef(label = "鐩戞帶鍘傚晢")
+ private String jkcs;
+
+ @PropertyDef(label = "鐩戞帶鍨嬪彿")
+ private String jkxh;
+
+ @PropertyDef(label = "鐩戞帶搴忓垪鍙�")
+ private String jkxlh;
+
+ /**
+ * 1:浠撳唴锛�2:涓氬姟锛�
+ * 3:瀹夐槻
+ */
+ @PropertyDef(label = "瑙嗛鐩戞帶绫诲瀷")
+ private String spjklx;
+
+ /**
+ * 1:DVR 2:NVR
+ */
+ @PropertyDef(label = "璁惧绫诲瀷")
+ private String sblxbm;
+
+ @PropertyDef(label = "瀹夎浣嶇疆")
+ private String azwz;
+
+ /**
+ * 绮簱澶ч棬锛�01锛夛紝鎵︽牱鏈猴紙02锛夛紝鍖栭獙瀹わ紙03锛夛紝缁撶畻瀹わ紙04锛夛紝
+ * 鍦扮鎴匡紙05锛夛紝搴撳尯涓诲共閬擄紙06锛夛紝浠撻棿鐩戞帶锛�07锛夛紝浠撳唴锛�08锛夛紝
+ * 鑽搧搴擄紙09锛夛紝鍣ㄦ潗搴擄紙10锛夛紝鍒堕珮鐐癸紙11锛夛紝鍛ㄧ晫锛�12锛夛紝鍏朵粬锛�99锛�
+ */
+ @PropertyDef(label = "瀹夎浣嶇疆绫诲瀷")
+ private String azwzlx;
+
+ @PropertyDef(label = "鐓у皠鍖哄煙")
+ private String zsqy;
+
+ /**
+ * Y/N
+ */
+ @PropertyDef(label = "鏄惁瀹夎琛ュ厜鐏�")
+ private String sfazbgd;
+
+ @PropertyDef(label = "寤掗棿浠ｇ爜")
+ private String ajdm;
+
+ @PropertyDef(label = "璐т綅浠ｇ爜")
+ private String hwdm;
+
+ /**
+ * 1 :鏋満 2 :鐞冩満
+ */
+ @PropertyDef(label = "鐩戞帶绫诲瀷缂栫爜")
+ private String jkjlxbm;
+
+ @PropertyDef(label = "鐩戞帶棰勭疆浣嶆暟閲�")
+ private int jktyzw;
+
+ @PropertyDef(label = "璁惧IP鍦板潃")
+ private String sbipdz;
+
+ @PropertyDef(label = "璁惧绔彛鍙�")
+ private int sbdkh;
+
+ @PropertyDef(label = "璁惧鐧诲綍鍚嶇О")
+ private String sbdlmc;
+
+ @PropertyDef(label = "璁惧鐧诲綍瀵嗙爜")
+ private String sbdlmm;
+
+ @PropertyDef(label = "澶囨敞")
+ private String bz;
+
+ @PropertyDef(label = "鏍囪浣�")
+ private String bjw;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ private Date zhgxsj;
+
+}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2101.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2101.java
new file mode 100644
index 0000000..56b0a0e
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2101.java
@@ -0,0 +1,114 @@
+package com.fzzy.push.sh2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import com.fzzy.api.entity.ApiParent;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 涓婃捣甯傛帴鍙�-2101 妫�鏂ゅ崟
+ *
+ * @author czt
+ * @date 2023/8/17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SH2023Api2101 extends ApiParent implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ @PropertyDef(label = "妫�鏂ゅ崟鍙�")
+ private String jjdh;
+
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ private String kqdm;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "妫�鏂ゆ棩鏈�")
+ private Date jjrq;
+
+ @PropertyDef(label = "椹宠繍鍗曞彿/搴撻檯璋冩嫧鍗曞彿")
+ private String inbillno;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "璁拌处鏃ユ湡")
+ private Date jzrq;
+
+ @PropertyDef(label = "浣滀笟鍗曞彿")
+ private String zydh;
+
+ /**
+ * 1锛氬叆搴撲綔涓� 2锛氫腑杞皟鍑� 3锛氫腑杞繘浠�
+ * 4锛氬嚭搴撲綔涓� 5锛氬簱瀛樿皟鍑� 6锛氬簱瀛樿皟鍏� 7锛氱Щ浠撴々
+ */
+ @PropertyDef(label = "浣滀笟绫诲瀷")
+ private String zylx;
+
+ @PropertyDef(label = "瀹㈡埛缂栧彿")
+ private String khmc;
+
+ @PropertyDef(label = "鏉ョ伯棰勬姤鍙�/鎻愯揣鍗曞彿")
+ private String psplan;
+
+ @PropertyDef(label = "鍚堝悓鍙�")
+ private String hth;
+
+ @PropertyDef(label = "杞﹁埞鍙�")
+ private String cch;
+
+ @PropertyDef(label = "涓浆杞﹁埞鍙�")
+ private String zzchh;
+
+ @PropertyDef(label = "鍝佺澶х被")
+ private String lspzdmdl;
+
+ @PropertyDef(label = "绮鎬ц川浠ｇ爜")
+ private String lsxzdm;
+
+ @PropertyDef(label = "鏉ョ伯浠ｇ爜")
+ private String lldm;
+
+ @PropertyDef(label = "寤掗棿浠ｇ爜")
+ private String ajdm;
+
+ @PropertyDef(label = "璐т綅浠ｇ爜")
+ private String hwdm;
+
+ @PropertyDef(label = "绉诲叆寤掗棿浠ｇ爜")
+ private String yrajdh;
+
+ @PropertyDef(label = "绉诲叆璐т綅浠ｇ爜")
+ private String yrhwdm;
+
+ @PropertyDef(label = "瑁呭嵏鐝�")
+ private String zxb;
+
+ @PropertyDef(label = "鍖呰鐗╁鎵ｉ噺(鍏枻)")
+ private double bzwzkl;
+
+ @PropertyDef(label = "姣涢噸(鍏枻)")
+ private double mz;
+
+ @PropertyDef(label = "鍑�閲�(鍏枻)")
+ private double jz;
+
+ @PropertyDef(label = "鏁版嵁鐘舵��")
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ private Date zhgxsj;
+
+ @PropertyDef(label = "鎵规鍙�")
+ private String pch;
+
+ @PropertyDef(label = "鏍囪浣�")
+ private String bjw;
+
+}
--
Gitblit v1.9.3