From 15c542eb3964bc33b5bfd00998f1bcd095bf1dfe Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期六, 19 八月 2023 17:59:21 +0800
Subject: [PATCH] 上海数据上报
---
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1202.java | 227 +++++++++
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1105.java | 56 ++
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1205.java | 174 +++++++
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1204.java | 92 +++
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1203.java | 94 +++
src/main/java/com/fzzy/push/sh2023/dto/ShAreaBjw.java | 146 +++---
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1104.java | 76 +++
src/main/java/com/fzzy/push/sh2023/SH2023PushService12.java | 188 +++++++
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1106.java | 88 +++
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1201.java | 176 +++++++
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 120 +++++
11 files changed, 1,355 insertions(+), 82 deletions(-)
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index 4ec8b8c..6c56254 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -11,6 +11,7 @@
import com.fzzy.api.utils.*;
import com.fzzy.api.view.repository.Api1102Rep;
import com.fzzy.api.view.repository.Api1104Rep;
+import com.fzzy.api.view.repository.Api1202Rep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.push.sh2023.dto.*;
import lombok.Data;
@@ -49,6 +50,8 @@
private Api1102Rep api1102Rep;
@Autowired
private Api1104Rep api1104Rep;
+ @Autowired
+ private Api1202Rep api1202Rep;
@Override
public String getProtocol() {
@@ -200,6 +203,123 @@
list.add(api1103);
}
return JSON.toJSONString(list);
+ } else if (SH2023Constant.SH_2023_API_CODE_1104.equals(inteId)) {
+ SH2023Api1104 api1104;
+ //鏈�鍚庤浆鎹负json
+ List<SH2023Api1104> list = new ArrayList<>();
+ //鎶奷ata杞寲鎴恖ist闆嗗悎
+ List<Api1104> api1104List = castList(data, Api1104.class);
+ for (Api1104 apiData : api1104List) {
+ api1104 = new SH2023Api1104();
+ BeanUtils.copyProperties(apiData, api1104);
+ api1104.setAjdm(apiData.getAjdh());
+ api1104.setCfdm(apiData.getCfbh());
+ api1104.setSykqdm(apiData.getKqdm());
+ api1104.setBjw(ShAreaBjw.getBjw(code));
+ list.add(api1104);
+ }
+ return JSON.toJSONString(list);
+ } else if (SH2023Constant.SH_2023_API_CODE_1105.equals(inteId)) {
+ SH2023Api1105 api1105;
+ //鏈�鍚庤浆鎹负json
+ List<SH2023Api1105> list = new ArrayList<>();
+ //鎶奷ata杞寲鎴恖ist闆嗗悎
+ List<Api1105> api1105List = castList(data, Api1105.class);
+ for (Api1105 apiData : api1105List) {
+ api1105 = new SH2023Api1105();
+ BeanUtils.copyProperties(apiData, api1105);
+ api1105.setBjw(ShAreaBjw.getBjw(code));
+ list.add(api1105);
+ }
+ return JSON.toJSONString(list);
+ } else if (SH2023Constant.SH_2023_API_CODE_1106.equals(inteId)) {
+ SH2023Api1106 api1106;
+ //鏈�鍚庤浆鎹负json
+ List<SH2023Api1106> list = new ArrayList<>();
+ //鎶奷ata杞寲鎴恖ist闆嗗悎
+ List<Api1106> api1106List = castList(data, Api1106.class);
+ for (Api1106 apiData : api1106List) {
+ api1106 = new SH2023Api1106();
+ BeanUtils.copyProperties(apiData, api1106);
+ api1106.setBjw(ShAreaBjw.getBjw(code));
+ list.add(api1106);
+ }
+ return JSON.toJSONString(list);
+ } else if (SH2023Constant.SH_2023_API_CODE_1201.equals(inteId)) {
+ SH2023Api1201 api1201;
+ //鏈�鍚庤浆鎹负json
+ List<SH2023Api1201> list = new ArrayList<>();
+ //鎶奷ata杞寲鎴恖ist闆嗗悎
+ List<Api1201> api1201List = castList(data, Api1201.class);
+ for (Api1201 apiData : api1201List) {
+ api1201 = new SH2023Api1201();
+ BeanUtils.copyProperties(apiData, api1201);
+ api1201.setBjw(ShAreaBjw.getBjw(code));
+ api1201.setHtsfzz("0");
+ list.add(api1201);
+ }
+ return JSON.toJSONString(list);
+ } else if (SH2023Constant.SH_2023_API_CODE_1202.equals(inteId)) {
+ SH2023Api1202 api1202;
+ //鏈�鍚庤浆鎹负json
+ List<SH2023Api1202> list = new ArrayList<>();
+ //鎶奷ata杞寲鎴恖ist闆嗗悎
+ List<Api1202> api1202List = castList(data, Api1202.class);
+ for (Api1202 apiData : api1202List) {
+ api1202 = new SH2023Api1202();
+ BeanUtils.copyProperties(apiData, api1202);
+ api1202.setBjw(ShAreaBjw.getBjw(code));
+ api1202.setPch(apiData.getHwdm() + apiData.getShnd());
+ //todo 椹宠繍鍗曞彿(2104) 妫�鏂ゅ崟鍙�(2101) 鍧囦负闈炲繀濉�
+ api1202.setJzrq(apiData.getCmsj());
+ list.add(api1202);
+ }
+ return JSON.toJSONString(list);
+ } else if (SH2023Constant.SH_2023_API_CODE_1203.equals(inteId)) {
+ SH2023Api1203 api1203;
+ //鏈�鍚庤浆鎹负json
+ List<SH2023Api1203> list = new ArrayList<>();
+ //鎶奷ata杞寲鎴恖ist闆嗗悎
+ List<Api1203> api1203List = castList(data, Api1203.class);
+ for (Api1203 apiData : api1203List) {
+ api1203 = new SH2023Api1203();
+ BeanUtils.copyProperties(apiData, api1203);
+ api1203.setBjw(ShAreaBjw.getBjw(code));
+ //鏌ヨ鏀惰幏骞翠唤
+ List<Api1202> api1202List = api1202Rep.getDataById(apiData.getRkywdh());
+ api1203.setPch(apiData.getHwdm() + api1202List.get(0).getShnd());
+ list.add(api1203);
+ }
+ return JSON.toJSONString(list);
+ } else if (SH2023Constant.SH_2023_API_CODE_1204.equals(inteId)) {
+ SH2023Api1204 api1204;
+ //鏈�鍚庤浆鎹负json
+ List<SH2023Api1204> list = new ArrayList<>();
+ //鎶奷ata杞寲鎴恖ist闆嗗悎
+ List<Api1204> api1204List = castList(data, Api1204.class);
+ for (Api1204 apiData : api1204List) {
+ api1204 = new SH2023Api1204();
+ BeanUtils.copyProperties(apiData, api1204);
+ api1204.setBjw(ShAreaBjw.getBjw(code));
+ api1204.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getJssj(), "yyyy"));
+ list.add(api1204);
+ }
+ return JSON.toJSONString(list);
+ } else if (SH2023Constant.SH_2023_API_CODE_1205.equals(inteId)) {
+ SH2023Api1205 api1205;
+ //鏈�鍚庤浆鎹负json
+ List<SH2023Api1205> list = new ArrayList<>();
+ //鎶奷ata杞寲鎴恖ist闆嗗悎
+ List<Api1205> api1205List = castList(data, Api1205.class);
+ for (Api1205 apiData : api1205List) {
+ api1205 = new SH2023Api1205();
+ BeanUtils.copyProperties(apiData, api1205);
+ api1205.setBjw(ShAreaBjw.getBjw(code));
+ api1205.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getCmsj(), "yyyy"));
+ api1205.setJzrq(apiData.getCmsj());
+ list.add(api1205);
+ }
+ return JSON.toJSONString(list);
} else {
return JSON.toJSONString(data);
}
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023PushService12.java b/src/main/java/com/fzzy/push/sh2023/SH2023PushService12.java
index af4414e..6360e29 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023PushService12.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023PushService12.java
@@ -1,13 +1,19 @@
package com.fzzy.push.sh2023;
+import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.PushProtocol;
+import com.fzzy.api.dto.ResponseDto;
+import com.fzzy.api.entity.*;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.service.PushService11;
+import com.fzzy.api.view.repository.*;
import com.fzzy.push.impl.ComPushService11;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+
+import java.util.List;
/**
* 涓婃捣甯傚钩鍙�2023鐗�-鍩虹鏁版嵁涓婁紶
@@ -22,6 +28,30 @@
@Autowired
private SH2023ApiRemoteService apiRemoteService;
+ @Autowired
+ private Api1201Rep api1201Rep;
+ @Autowired
+ private Api1202Rep api1202Rep;
+ @Autowired
+ private Api1203Rep api1203Rep;
+ @Autowired
+ private Api1204Rep api1204Rep;
+ @Autowired
+ private Api1205Rep api1205Rep;
+ @Autowired
+ private Api1206Rep api1206Rep;
+ @Autowired
+ private Api1207Rep api1207Rep;
+ @Autowired
+ private Api1208Rep api1208Rep;
+ @Autowired
+ private Api1209Rep api1209Rep;
+ @Autowired
+ private Api1210Rep api1210Rep;
+ @Autowired
+ private Api1211Rep api1211Rep;
+ @Autowired
+ private Api1212Rep api1212Rep;
@Override
public String getProtocol() {
@@ -30,35 +60,116 @@
@Override
public void pushData(ApiParam param) {
- log.info("------->>>>鍩虹淇℃伅 鎺ュ彛妯″潡涓婃姤寮�濮�");
+ log.info("------->>>>绮璐攢 鎺ュ彛妯″潡涓婃姤寮�濮�");
- //鎺ㄩ�佸崟浣嶄俊鎭�
+ //鎺ㄩ�佸悎鍚屼俊鎭�
+ this.pushData1201(apiRemoteService, param);
+ //绮鍏ュ簱淇℃伅
+ this.pushData1202(apiRemoteService, param);
+ //绮鍏ュ簱妫�楠屼俊鎭�
+ this.pushData1203(apiRemoteService, param);
+ //绮鍏ュ簱缁撶畻淇℃伅
+ this.pushData1204(apiRemoteService, param);
+ //绮鍑哄簱淇℃伅
+ this.pushData1205(apiRemoteService, param);
+ //绮鍑哄簱缁撶畻淇℃伅
+ this.pushData1206(apiRemoteService, param);
+ //鍊掍粨鍊掑嚭
+ this.pushData1207(apiRemoteService, param);
+ //绮搴撳瓨
+ this.pushData1208(apiRemoteService, param);
+ //鎹熸孩鍗�
+ this.pushData1209(apiRemoteService, param);
+ //绮鎬ц川杞彉鍗�
+ this.pushData1210(apiRemoteService, param);
+ //璐﹂潰搴撳瓨
+ this.pushData1211(apiRemoteService, param);
+ //瀹㈡埛淇℃伅
+ this.pushData1212(apiRemoteService, param);
- log.info("------->>>>鍩虹淇℃伅 鎺ュ彛妯″潡涓婃姤缁撴潫");
+ log.info("------->>>>绮璐攢 鎺ュ彛妯″潡涓婃姤缁撴潫");
}
/**
* 1201 鍚堝悓淇℃伅
*/
public void pushData1201(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //鑾峰彇鍚堝悓淇℃伅
+ List<Api1201> list = api1201Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌鍚堝悓淇℃伅锛屼笉鎺ㄩ��-----");
+ return;
+ }
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1201 data : list) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1201Rep.save(data);
+ }
+ }
+ }
}
/**
* 1202 绮鍏ュ簱淇℃伅
*/
public void pushData1202(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //鑾峰彇绮鍏ュ簱淇℃伅
+ List<Api1202> list = api1202Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌绮鍏ュ簱淇℃伅锛屼笉鎺ㄩ��-----");
+ return;
+ }
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1202 data : list) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1202Rep.save(data);
+ }
+ }
+ }
}
/**
* 1203 绮鍏ュ簱妫�楠屼俊鎭�
*/
public void pushData1203(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //鑾峰彇绮鍏ュ簱妫�楠屼俊鎭�
+ List<Api1203> list = api1203Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
+
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌绮鍏ュ簱妫�楠屼俊鎭紝涓嶆帹閫�-----");
+ return;
+ }
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1203 data : list) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1203Rep.save(data);
+ }
+ }
+ }
}
@@ -66,7 +177,27 @@
* 1204 绮鍏ュ簱缁撶畻淇℃伅
*/
public void pushData1204(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //鑾峰彇绮鍏ュ簱缁撶畻淇℃伅
+ List<Api1204> list = api1204Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
+
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌绮鍏ュ簱缁撶畻淇℃伅锛屼笉鎺ㄩ��-----");
+ return;
+ }
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1204 data : list) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1204Rep.save(data);
+ }
+ }
+ }
}
@@ -74,15 +205,54 @@
* 1205 绮鍑哄簱淇℃伅
*/
public void pushData1205(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //鑾峰彇绮鍑哄簱淇℃伅
+ List<Api1205> list = api1205Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌绮鍑哄簱淇℃伅锛屼笉鎺ㄩ��-----");
+ return;
+ }
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1205 data : list) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1205Rep.save(data);
+ }
+ }
+ }
}
/**
* 1206 绮鍑哄簱缁撶畻淇℃伅
*/
public void pushData1206(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //鑾峰彇绮鍑哄簱缁撶畻淇℃伅
+ List<Api1206> list = api1206Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
+
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌绮鍑哄簱缁撶畻淇℃伅锛屼笉鎺ㄩ��-----");
+ return;
+ }
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1206 data : list) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1206Rep.save(data);
+ }
+ }
+ }
}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1104.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1104.java
new file mode 100644
index 0000000..ecd26f4
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1104.java
@@ -0,0 +1,76 @@
+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 javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鎺ュ彛琛�-寤掗棿淇℃伅
+ *
+ * @author chen
+ * @date 2022-09-02 14:18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SH2023Api1104 implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 9157617424050247565L;
+
+ @PropertyDef(label = "寤掗棿浠ｇ爜")
+ private String ajdm;
+
+ @PropertyDef(label = "寤掗棿鍚嶇О")
+ private String ajmc;
+
+ @PropertyDef(label = "浠撴埧(鎴栨补缃�)缂栫爜")
+ private String cfdm;
+
+ @PropertyDef(label = "寤掗棿闀垮害")
+ private double ajcd;
+
+ @PropertyDef(label = "寤掗棿瀹藉害")
+ private double ajkd;
+
+ @PropertyDef(label = "寤掗棿楂樺害")
+ private double ajgd;
+
+ @PropertyDef(label = "寤掗棿璁捐浠撳")
+ private double ajsjcr;
+
+ @PropertyDef(label = "寤掗棿鑱旂郴鐢佃瘽")
+ private String ajlxdh;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "寤掗棿鍚敤鏃ユ湡")
+ private Date ajqyrq;
+
+ @PropertyDef(label = "寤掗棿鐘舵��")
+ private String ajzt;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ private Date zhgxsj;
+
+ @PropertyDef(label = "浣跨敤搴撳尯浠ｇ爜")
+ private String sykqdm;
+
+ @PropertyDef(label = "鏍囪浣�")
+ private String bjw;
+
+
+}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1105.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1105.java
new file mode 100644
index 0000000..f788b6c
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1105.java
@@ -0,0 +1,56 @@
+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;
+
+/**
+ * 鎺ュ彛琛�-璐т綅淇℃伅
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SH2023Api1105 implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -6967028172020353365L;
+
+ @PropertyDef(label = "璐т綅浠ｇ爜")
+ private String hwdm;
+
+ @PropertyDef(label = "璐т綅鍚嶇О")
+ private String hwmc;
+
+ @PropertyDef(label = "寤掗棿浠ｇ爜")
+ private String ajdm;
+
+ @PropertyDef(label = "璐т綅鍚敤鏃ユ湡")
+ @JSONField(format = "yyyy-MM-dd")
+ private Date hwqyrq;
+
+ @PropertyDef(label = "璐т綅瀹归噺")
+ private double hwrl;
+
+ @PropertyDef(label = "淇濈鍗曚綅")
+ private String bgdw;
+
+ @PropertyDef(label = "淇濈鍛�")
+ private String bgy;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private Date zhgxsj;
+
+ @PropertyDef(label = "鏍囪浣�")
+ private String bjw;
+
+}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1106.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1106.java
new file mode 100644
index 0000000..0eefb92
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1106.java
@@ -0,0 +1,88 @@
+package com.fzzy.push.sh2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鎺ュ彛琛�-娌圭綈淇℃伅
+ */
+@Data
+public class SH2023Api1106 implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -9096483549679877168L;
+
+ @JSONField(serialize = false)
+ @PropertyDef(label = "涓氬姟id")
+ private String bizId;
+
+ @PropertyDef(label = "娌圭綈浠ｇ爜")
+ private String ygdm;
+
+ @PropertyDef(label = "娌圭綈鍚嶇О")
+ private String ygmc;
+
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ private String kqdm;
+
+ @PropertyDef(label = "缃愬")
+ private double gr;
+
+ @PropertyDef(label = "寤洪�犳椂闂�")
+ @JSONField(format = "yyyy-MM-dd")
+ private Date jzsj;
+
+ @PropertyDef(label = "娌圭綈鍙婇檮灞炶鏂芥槸鍚﹀畬濂�")
+ private String ygjfssssfwh;
+
+ @PropertyDef(label = "鏈夋棤鍔犵儹瑁呯疆")
+ private String ywjrzz;
+
+ @PropertyDef(label = "娌圭綈绫诲瀷")
+ private String yglx;
+
+ @PropertyDef(label = "缃愬唴鐩村緞")
+ private double gnzj;
+
+ @PropertyDef(label = "缃愬唴楂樺害")
+ private double gngd;
+
+ @PropertyDef(label = "妫�瀹氭柟寮�")
+ private String jdfs;
+
+ @PropertyDef(label = "鐒婃帴鏂瑰紡")
+ private String hjfs;
+
+ @PropertyDef(label = "娌圭綈鐘舵��")
+ private String ygzt;
+
+ @PropertyDef(label = "璁捐鍗曚綅")
+ private String sjdw;
+
+ @PropertyDef(label = "寤鸿鍗曚綅")
+ private String jsdw;
+
+ @PropertyDef(label = "鐩戠悊鍗曚綅")
+ private String jldw;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private Date zhgxsj;
+
+ @PropertyDef(label = "鏍囪浣�")
+ private String bjw;
+
+}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1201.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1201.java
new file mode 100644
index 0000000..a99e9e6
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1201.java
@@ -0,0 +1,176 @@
+package com.fzzy.push.sh2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import com.fzzy.conf.NumberSerializer;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 鎺ュ彛琛�-鍚堝悓淇℃伅
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SH2023Api1201 implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -3432123567533107674L;
+
+ @PropertyDef(label = "鍚堝悓鍙�")
+ private String hth;
+
+ @PropertyDef(label = "鍚堝悓鍚嶇О")
+ @Column(name = "htmc", length = 128)
+ private String htmc;
+
+ @PropertyDef(label = "鍗曚綅浠ｇ爜")
+ private String dwdm;
+
+ @PropertyDef(label = "涓氬姟绫诲埆")
+ private String ywlx;
+
+ @PropertyDef(label = "瀹㈡埛绫诲瀷")
+ private String khlx;
+
+ @PropertyDef(label = "瀹㈡埛缁熶竴绀句細淇＄敤浠ｇ爜")
+ private String khtyshxydm;
+
+ @PropertyDef(label = "瀹㈡埛鍚嶇О")
+ private String khmc;
+
+ @PropertyDef(label = "娉曞畾浠ｈ〃浜�")
+ private String fddbr;
+
+ @PropertyDef(label = "閫氳鍦板潃")
+ private String txdz;
+
+ @PropertyDef(label = "閭斂缂栫爜")
+ private String yzbm;
+
+ @PropertyDef(label = "鑱旂郴浜哄鍚�")
+ private String lxrxm;
+
+ @PropertyDef(label = "鑱旂郴鐢佃瘽")
+ private String lxrdh;
+
+ @PropertyDef(label = "韬唤璇佸彿")
+ private String sfzh;
+
+ @PropertyDef(label = "鐢靛瓙淇＄")
+ private String dzyx;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "绛捐鏃ユ湡")
+ private Date qdrq;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "绾﹀畾瀹屾垚鏃堕棿")
+ private Date ydwcsj;
+
+ @PropertyDef(label = "绛捐鍦扮偣")
+ private String qddd;
+
+ @PropertyDef(label = "绮鍝佺浠ｇ爜")
+ private String lspzdm;
+
+ @PropertyDef(label = "绮鎬ц川浠ｇ爜")
+ private String lsxzdm;
+
+ @PropertyDef(label = "鍚堝悓鍗曚环")
+ private double htdj;
+
+ @PropertyDef(label = "绾﹀畾璐攢绮鏁伴噺")
+ private double ydgxlssl;
+
+ @JSONField(serializeUsing = NumberSerializer.class)
+ @PropertyDef(label = "鍚堝悓鎬婚噾棰�")
+ private BigDecimal htzje;
+
+ @PropertyDef(label = "灞ョ害淇濊瘉閲�")
+ private double lybzj;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "瀹為檯瀹屾垚鏃堕棿")
+ private Date sswcsj;
+
+ @JSONField(name = "Lysl")
+ @PropertyDef(label = "灞ョ害鏁伴噺")
+ private double lysl;
+
+ @JSONField(name = "Lyl")
+ @PropertyDef(label = "灞ョ害鐜�")
+ private double lyl;
+
+ @JSONField(name = "Jsjg")
+ @PropertyDef(label = "缁撶畻浠锋牸")
+ private double jsjg;
+
+ @JSONField(name = "Jszje", serializeUsing = NumberSerializer.class)
+ @PropertyDef(label = "缁撶畻鎬婚噾棰�")
+ private BigDecimal jszje;
+
+ @PropertyDef(label = "缁撶畻涓庡悎鍚屼竴鑷存��")
+ private String jsyhtyzx;
+
+ @PropertyDef(label = "缁撶畻涓庡悎鍚屼笉涓�鑷村師鍥�")
+ private String jsyhtbyzyy;
+
+ @PropertyDef(label = "瀹㈡埛鏂瑰紑鎴疯")
+ private String khfkhh;
+
+ @PropertyDef(label = "瀹㈡埛鏂硅处鍙�")
+ private String khfzh;
+
+ @PropertyDef(label = "瀹㈡埛绛剧害浜�")
+ private String khqyr;
+
+ @PropertyDef(label = "鏈柟寮�鎴疯")
+ private String bfkhh;
+
+ @PropertyDef(label = "鏈柟璐﹀彿")
+ private String bfzh;
+
+ @PropertyDef(label = "鏈柟绛剧害浜�")
+ private String bfqyr;
+
+ @PropertyDef(label = "瀹℃壒浜�")
+ private String shr;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "瀹℃壒鏃堕棿")
+ private Date shsj;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏇存柊鏃堕棿")
+ private Date zhgxsj;
+
+ @JSONField(serialize = false)
+ @PropertyDef(label = "涓氬姟id")
+ private String bizId;
+
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ private String kqdm;
+
+ @JSONField(serialize = false)
+ @PropertyDef(label = "鍚屾鏃堕棿", description = "浠庣伯搴撶郴缁熷悓姝ュ埌鎺ュ彛绠＄悊涓績鐨勬椂闂�")
+ private Date syncTime;
+
+ @PropertyDef(label = "鍚堝悓鏄惁涓")
+ private String htsfzz;
+
+ @PropertyDef(label = "鏍囪浣�")
+ private String bjw;
+}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1202.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1202.java
new file mode 100644
index 0000000..12677c3
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1202.java
@@ -0,0 +1,227 @@
+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 javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鎺ュ彛琛�-绮鍏ュ簱淇℃伅
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SH2023Api1202 implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 760284619085936798L;
+
+
+ //12 浣嶆暟瀛楃粍鎴愶紝绗� 1-2 浣嶄负涓氬姟浠ｇ爜锛�14浠ｈ〃绮鍏ュ簱锛夛紝绗� 3-8 浣嶄緷娆′负骞翠唤鐨勫悗涓や綅銆�2 浣嶆湀浠姐��2 浣嶆棩鏈燂紝鍚庡洓浣嶄负椤哄簭鐮併�備緥濡傦細141605041234
+
+ @PropertyDef(label = "鍏ュ簱涓氬姟鍗曞彿")
+ private String rkywdh;
+
+ @PropertyDef(label = "璐т綅浠ｇ爜")
+ private String hwdm;
+
+ @PropertyDef(label = "涓氬姟绫诲瀷", description = "2锛氬叆搴擄紙榛樿锛�")
+ private String ywlx = "2";
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "涓氬姟鏃ユ湡")
+ private Date ywrq;
+
+ @PropertyDef(label = "璁″垝鏄庣粏鍙�")
+ private String jhmxh;
+
+ @PropertyDef(label = "鍚堝悓鍙�")
+ private String hth;
+
+ @PropertyDef(label = "绮潈褰掑睘鍗曚綅浠ｇ爜")
+ private String lqgsdwdm;
+
+ @PropertyDef(label = "鎵胯繍浜�")
+ private String cyr;
+
+ @PropertyDef(label = "鑱旂郴鐢佃瘽")
+ private String lxdh;
+
+ @PropertyDef(label = "韬唤璇佸彿")
+ private String sfzh;
+
+ @PropertyDef(label = "璇︾粏鍦板潃")
+ private String xxdz;
+
+ @PropertyDef(label = "杩愯緭宸ュ叿")
+ private String ysgj;
+
+ @PropertyDef(label = "杞﹁埞鍙�")
+ private String cch;
+
+ @PropertyDef(label = "杞﹁埞鍙风被鍨�")
+ private String cchlx;
+
+ @PropertyDef(label = "鎸傝溅鍙�")
+ private String gch;
+
+ @PropertyDef(label = "瑁呯伯鍦扮偣")
+ private String ldd;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鐧昏鏃堕棿")
+ private Date djsj;
+
+ @PropertyDef(label = "鐧昏闂ㄥ矖浜哄憳濮撳悕")
+ private String djmgryxm;
+
+ @PropertyDef(label = "绮鍝佺浠ｇ爜")
+ private String lspzdm;
+
+ @PropertyDef(label = "绮鎬ц川浠ｇ爜")
+ private String lsxzdm;
+
+ @PropertyDef(label = "鏀惰幏骞村害")
+ private String shnd;
+
+ @PropertyDef(label = "浜у湴浠ｇ爜")
+ private String cddm;
+
+ @PropertyDef(label = "妫�鏂ょ被鍨�")
+ private String jjlx;
+
+ @PropertyDef(label = "姣涢噸(鍏枻)")
+ private double mz;
+
+ @PropertyDef(label = "姣涢噸鐩戠鍛�")
+ private String mzjby;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "姣涢噸璁￠噺鏃堕棿")
+ private Date mzjlsj;
+
+ @PropertyDef(label = "姣涢噸璁￠噺鍛�")
+ private String mzjly;
+
+ @PropertyDef(label = "鍊间粨鍛�")
+ private String zcy;
+
+ @PropertyDef(label = "鐨噸(鍏枻)")
+ private double pz;
+
+ @PropertyDef(label = "鐨噸鐩戠鍛�")
+ private String pzjby;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鐨噸璁￠噺鏃堕棿")
+ private Date pzjlsj;
+
+ @PropertyDef(label = "鐨噸璁￠噺鍛�")
+ private String pzjly;
+
+ @PropertyDef(label = "鍖呰鐗�")
+ private String bzw;
+
+ @PropertyDef(label = "鏍囧噯鍖呭崟鍖呴噸(鍏枻)")
+ private double bzbdbz = 25;
+
+ @PropertyDef(label = "鏍囧噯鍖呬欢鏁�(浠�)")
+ private Integer bzbjs;
+
+ @PropertyDef(label = "璐ㄦ鎵ｉ噺(灏忚:鍏枻)")
+ private double zjklxj;
+
+ @PropertyDef(label = "鍏朵腑锛氭按鍒嗗鎵ｉ噺(鍏枻)")
+ private double qzsfzkl;
+
+ @PropertyDef(label = "鍏朵腑锛氭潅璐ㄥ鎵ｉ噺(鍏枻)")
+ private double qzzzzkl;
+
+ @PropertyDef(label = "鍏朵腑锛氫笉瀹屽杽绮掓墸閲�(鍏枻)")
+ private double qzbwslkl;
+
+ @PropertyDef(label = "鍏朵腑锛氫簰娣锋墸閲�(鍏枻)")
+ private double qzhhkl;
+
+ @PropertyDef(label = "鍏朵腑锛氱敓闇夌矑鎵ｉ噺(鍏枻)")
+ private double qzsmlkl;
+
+ @PropertyDef(label = "鍏朵腑锛氭暣绮剧背绮掓墸閲�(鍏枻)")
+ private double qzzjmlkl;
+
+ @PropertyDef(label = "鍏朵腑锛氳胺澶栫硻绫虫墸閲�(鍏枻)")
+ private double qzgwcmkl;
+
+ @PropertyDef(label = "鍏朵腑榛勭矑绫虫墸閲�(鍏枻)")
+ private double qzhlmkl;
+
+ @PropertyDef(label = "鍏朵腑锛氬叾浠栨墸閲�(鍏枻)")
+ private double qzqtkl;
+
+ @PropertyDef(label = "鏁寸悊璐圭敤鎶樻墸閲�(鍏枻)")
+ private double zlfyzkl;
+
+ @PropertyDef(label = "鍖呰鐗╂墸閲�(鍏枻)")
+ private double bzwkl;
+
+ @PropertyDef(label = "鍏朵粬鎵ｉ噺(鍏枻)")
+ private double qtkl;
+
+ @PropertyDef(label = "鎵ｉ噺鍘熷洜")
+ private String klyy;
+
+ @PropertyDef(label = "鐜板満鎵ｉ噺(鍏枻)")
+ @Column(name = "xckl")
+ private double xckl;
+
+ @PropertyDef(label = "澧炴墸浠�(鍏枻)")
+ private double zkj;
+
+ @PropertyDef(label = "澧炴墸浠峰師鍥�")
+ private String zkhyy;
+
+ @PropertyDef(label = "鍑�閲�(鍏枻)")
+ private double jz;
+
+ @PropertyDef(label = "瑁呭嵏浣滀笟鍗曚綅")
+ private String zxzydw;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鍑洪棬鏃堕棿")
+ private Date cmsj;
+
+ @PropertyDef(label = "鍑洪棬纭闂ㄥ矖浜哄憳濮撳悕")
+ private String cmqrmgryxm;
+
+ @PropertyDef(label = "鍏ュ簱缁撶畻鍗曞彿")
+ private String rkjsdh;
+
+ @PropertyDef(label = "澶囨敞")
+ private String bz;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏇存柊鏃堕棿")
+ private Date zhgxsj;
+
+ private String pch;
+ private String bjw;
+ private String bydh;
+ private String jjdh;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "璁拌处鏃ユ湡")
+ private Date jzrq;
+
+}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1203.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1203.java
new file mode 100644
index 0000000..7d77d0c
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1203.java
@@ -0,0 +1,94 @@
+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 javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鎺ュ彛琛�-绮鍏ュ簱妫�楠屼俊鎭�
+ */
+@Data
+
+@EqualsAndHashCode(callSuper = false)
+public class SH2023Api1203 implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -5707489334519718974L;
+
+
+ //鍏ュ簱涓氬姟鍗曞彿鐢� 12 浣嶆暟瀛楃粍鎴愶紝绗� 1-2 浣嶄负涓氬姟浠ｇ爜锛�14浠ｈ〃绮鍏ュ簱锛夛紝绗� 3-8 浣嶄緷娆′负骞翠唤鐨勫悗涓や綅銆�2 浣嶆湀浠姐��2 浣嶆棩鏈燂紝鍚庡洓浣嶄负椤哄簭鐮併�備緥濡傦細141605041234
+ @Id
+ @PropertyDef(label = "鍏ュ簱妫�楠屽崟鍙�")
+ private String rkjydh;
+
+ @PropertyDef(label = "璐т綅浠ｇ爜")
+ private String hwdm;
+
+ @PropertyDef(label = "鍏ュ簱涓氬姟鍗曞彿")
+ private String rkywdh;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鎵︽牱鏃堕棿")
+ private Date qysj;
+
+ @PropertyDef(label = "鎵︽牱浜哄鍚�")
+ private String qyrxm;
+
+ @PropertyDef(label = "鎵︽牱鏂瑰紡")
+ private String qyfs;
+
+ @PropertyDef(label = "妫�楠岄」鐩�,闅斿紑")
+ private String jyxm;
+
+ @PropertyDef(label = "妫�楠屽��,闅斿紑")
+ private String jyz;
+
+ @PropertyDef(label = "澧炴墸浠�(鍏�,闅斿紑)")
+ private String zkj;
+
+ @PropertyDef(label = "澧炴墸閲�(鍏枻,闅斿紑)")
+ private String zkl;
+
+ @PropertyDef(label = "妫�楠屼汉濮撳悕")
+ private String jyrxm;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "妫�楠屾椂闂�")
+ private Date jysj;
+
+ @PropertyDef(label = "妫�楠岀粨鏋�")
+ private String jyjg;
+
+ @PropertyDef(label = "绮鍝佺浠ｇ爜")
+ private String lspzdm;
+
+ @PropertyDef(label = "绮瀹氱瓑")
+ private String lsdd;
+
+ @PropertyDef(label = "淇濈鍛樺鏍�")
+ private String bgyfh;
+
+ @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;
+}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1204.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1204.java
new file mode 100644
index 0000000..2c4da07
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1204.java
@@ -0,0 +1,92 @@
+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 javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鎺ュ彛琛�-绮鍏ュ簱缁撶畻淇℃伅
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SH2023Api1204 implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -8378354337037404298L;
+
+ @PropertyDef(label = "鍏ュ簱缁撶畻鍗曞彿", description = "鐢卞簱鐐逛唬鐮�+缁撶畻鏃ユ湡锛坹yyyMMdd锛�+4 浣嶉『搴忓彿缁勬垚")
+ private String rkjsdh;
+
+ @PropertyDef(label = "璐т綅浠ｇ爜")
+ private String hwdm;
+
+ @PropertyDef(label = "鍚堝悓鍙�")
+ private String hth;
+
+ @PropertyDef(label = "缁撶畻鏁伴噺(鍏枻)")
+ private double jssl;
+
+ @PropertyDef(label = "缁撶畻鍗曚环(鍏�/鍏枻)")
+ private double jsdj;
+
+ @PropertyDef(label = "缁撶畻閲戦(鍏�)")
+ private double jsje;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "缁撶畻鏃堕棿")
+ private Date jssj;
+
+ @PropertyDef(label = "缁撶畻鏂瑰紡")
+ private String jsfs;
+
+ @PropertyDef(label = "鏀舵浜�")
+ private String skr;
+
+ @PropertyDef(label = "閾惰琛屽埆浠ｇ爜")
+ private String yhhbdm;
+
+ @PropertyDef(label = "鏀舵浜鸿韩浠借瘉鍙�")
+ private String skrsfzh;
+
+ @PropertyDef(label = "寮�鎴疯鍙�")
+ private String khhh;
+
+ @PropertyDef(label = "寮�鎴疯鍚嶇О")
+ private String khhmc;
+
+ @PropertyDef(label = "閾惰璐﹀彿")
+ private String yhzh;
+
+ @PropertyDef(label = "鍙戠エ鍙风爜")
+ private String fphm;
+
+ @PropertyDef(label = "鍙戠エ鐘舵��")
+ private String fpzt;
+
+ @PropertyDef(label = "浠樻鍗曚綅")
+ private String fkdw;
+
+ @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;
+}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1205.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1205.java
new file mode 100644
index 0000000..8cac8cf
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1205.java
@@ -0,0 +1,174 @@
+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 javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鎺ュ彛琛�-绮鍑哄簱淇℃伅
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SH2023Api1205 extends ApiParent implements Serializable {
+
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -6381473449862569451L;
+
+
+ //涓氬姟鍗曞彿鐢� 12 浣嶆暟瀛楃粍鎴愶紝绗� 1-2 浣嶄负涓氬姟缂栫爜锛�15 浠ｈ〃绮鍑哄簱锛夛紝绗� 3-8 浣嶄緷娆′负骞翠唤鐨勫悗涓や綅銆�2 浣嶆湀浠姐��2浣嶆棩鏈燂紝鍚庡洓浣嶄负椤哄簭鐮併�備緥濡傦細141605041234
+ @Id
+ @PropertyDef(label = "鍑哄簱涓氬姟鍗曞彿")
+ private String ckywdh;
+
+ @PropertyDef(label = "璐т綅浠ｇ爜")
+ private String hwdm;
+
+ @PropertyDef(label = "璁″垝鏄庣粏鍙�")
+ private String jhmxh;
+
+ @PropertyDef(label = "鍑哄簱閫氱煡鍗曞彿")
+ private String cktzdh;
+
+ @PropertyDef(label = "涓氬姟绫诲瀷", description = "1锛氬嚭搴擄紙榛樿锛�")
+ private String ywlx = "1";
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "涓氬姟鏃ユ湡")
+ private Date ywrq;
+
+ @PropertyDef(label = "鍚堝悓鍙�")
+ private String hth;
+
+ @PropertyDef(label = "鎵胯繍浜�")
+ private String cyr;
+
+ @PropertyDef(label = "鑱旂郴鐢佃瘽")
+ private String lxdh;
+
+ @PropertyDef(label = "韬唤璇佸彿")
+ private String sfzh;
+
+ @PropertyDef(label = "杩愯緭宸ュ叿")
+ private String ysgj;
+
+ @PropertyDef(label = "鍗哥伯鍦扮偣")
+ private String xldd;
+
+ @PropertyDef(label = "杞﹁埞鍙�")
+ private String cch;
+
+ @PropertyDef(label = "杞﹁埞鍙风被鍨�")
+ private String cchlx;
+
+ @PropertyDef(label = "鎸傝溅鍙�")
+ private String gch;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鐧昏鏃堕棿")
+ private Date djsj;
+
+ @PropertyDef(label = "鐧昏闂ㄥ矖浜哄憳濮撳悕")
+ private String djmgryxm;
+
+ @PropertyDef(label = "绮鍝佺浠ｇ爜")
+ private String lspzdm;
+
+ @PropertyDef(label = "绮绛夌骇浠ｇ爜")
+ private String lsdjdm;
+
+ @PropertyDef(label = "绮鎬ц川浠ｇ爜")
+ private String lsxzdm;
+
+ @PropertyDef(label = "鏀惰幏骞村害")
+ private String shnd;
+
+ @PropertyDef(label = "浜у湴浠ｇ爜")
+ private String cddm;
+
+ @PropertyDef(label = "鐨噸(鍏枻)")
+ private double pz;
+
+ @PropertyDef(label = "鐨噸鐩戠鍛�")
+ private String pzjby;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鐨噸璁￠噺鏃堕棿")
+ private Date pzjlsj;
+
+ @PropertyDef(label = "鐨噸璁￠噺鍛�")
+ private String pzjly;
+
+ @PropertyDef(label = "姣涢噸(鍏枻)")
+ private double mz;
+
+ @PropertyDef(label = "姣涢噸鐩戠鍛�")
+ private String mzjby;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "姣涢噸璁￠噺鏃堕棿")
+ private Date mzjlsj;
+
+ @PropertyDef(label = "姣涢噸璁￠噺鍛�")
+ private String mzjly;
+
+ @PropertyDef(label = "鍖呰鐗�")
+ private String bzw;
+
+ @PropertyDef(label = "鏍囧噯鍖呭崟鍖呴噸(鍏枻)")
+ private double bzbdbz;
+
+ @PropertyDef(label = "鏍囧噯鍖呬欢鏁�(浠�)")
+ private Integer bzbjs;
+
+ @PropertyDef(label = "鍑�閲�(鍏枻)")
+ private double jz;
+
+ @PropertyDef(label = "鎵�/澧為噺(鍏枻)")
+ private double kzl;
+
+ @PropertyDef(label = "鍊间粨淇濈鍛樺鍚�")
+ private String zcbgyxm;
+
+ @PropertyDef(label = "瑁呭嵏浣滀笟鍗曚綅")
+ private String zxzydw;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鍑洪棬鏃堕棿")
+ private Date cmsj;
+
+ @PropertyDef(label = "鍑洪棬纭闂ㄥ矖浜哄憳濮撳悕")
+ private String cmqrmgryxm;
+
+ @PropertyDef(label = "鍑哄簱缁撶畻鍗曞彿")
+ private String ckjsdh;
+
+ @PropertyDef(label = "澶囨敞")
+ private String bz;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ private Date zhgxsj;
+
+ private String pch;
+ private String bjw;
+ private String jjdh;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "璁拌处鏃ユ湡")
+ private Date jzrq;
+}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/ShAreaBjw.java b/src/main/java/com/fzzy/push/sh2023/dto/ShAreaBjw.java
index efe84df..d1e2e02 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/ShAreaBjw.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/ShAreaBjw.java
@@ -5,89 +5,89 @@
*/
public enum ShAreaBjw {
- BJW_310101("310101", "榛勬郸鍖�", "huangpu"),
- BJW_310104("310104", "寰愭眹鍖�", "xuhui"),
- BJW_310105("310105", "闀垮畞鍖�", "changning"),
- BJW_310106("310106", "闈欏畨鍖�", "jingan"),
- BJW_310107("310107", "鏅檧鍖�", "pituo"),
- BJW_310109("310109", "铏瑰彛鍖�", "honhkou"),
- BJW_310110("310110", "鏉ㄦ郸鍖�", "yangpu"),
- BJW_310112("310112", "闂佃鍖�", "minhang"),
- BJW_310113("310113", "瀹濆北鍖�", "baoshan"),
- BJW_310114("310114", "鍢夊畾鍖�", "jiading"),
- BJW_310115("310115", "娴︿笢鏂板尯", "pudong"),
- BJW_310116("310116", "閲戝北鍖�", "jinshan"),
- BJW_310117("310117", "鏉炬睙鍖�", "songjiang"),
- BJW_310118("310118", "闈掓郸鍖�", "qingpu"),
- BJW_310120("310120", "濂夎搐鍖�", "fengxian"),
- BJW_310151("310151", "宕囨槑鍖�", "chongming");
+ BJW_310101("310101", "榛勬郸鍖�", "huangpu"),
+ BJW_310104("310104", "寰愭眹鍖�", "xuhui"),
+ BJW_310105("310105", "闀垮畞鍖�", "changning"),
+ BJW_310106("310106", "闈欏畨鍖�", "jingan"),
+ BJW_310107("310107", "鏅檧鍖�", "putuo"),
+ BJW_310109("310109", "铏瑰彛鍖�", "hongkou"),
+ BJW_310110("310110", "鏉ㄦ郸鍖�", "yangpu"),
+ BJW_310112("310112", "闂佃鍖�", "minhang"),
+ BJW_310113("310113", "瀹濆北鍖�", "baoshan"),
+ BJW_310114("310114", "鍢夊畾鍖�", "jiading"),
+ BJW_310115("310115", "娴︿笢鏂板尯", "pudong"),
+ BJW_310116("310116", "閲戝北鍖�", "jinshan"),
+ BJW_310117("310117", "鏉炬睙鍖�", "songjiang"),
+ BJW_310118("310118", "闈掓郸鍖�", "qingpu"),
+ BJW_310120("310120", "濂夎搐鍖�", "fengxian"),
+ BJW_310151("310151", "宕囨槑鍖�", "chongming");
- private String code;
- private String name;
- private String bjw;
+ private String code;
+ private String name;
+ private String bjw;
- ShAreaBjw(String code, String name, String bjw) {
- this.code = code;
- this.name = name;
- this.bjw = bjw;
- }
+ ShAreaBjw(String code, String name, String bjw) {
+ this.code = code;
+ this.name = name;
+ this.bjw = bjw;
+ }
- public String getCode() {
- return code;
- }
+ public String getCode() {
+ return code;
+ }
- public String getName() {
- return name;
- }
+ public String getName() {
+ return name;
+ }
- public String getBjw() {
- return bjw;
- }
+ public String getBjw() {
+ return bjw;
+ }
- public static String getName(String code) {
- if(null == code) return null;
+ public static String getName(String code) {
+ if (null == code) return null;
- if(ShAreaBjw.BJW_310101.getCode().equals(code)) return ShAreaBjw.BJW_310101.getName();
- if(ShAreaBjw.BJW_310104.getCode().equals(code)) return ShAreaBjw.BJW_310104.getName();
- if(ShAreaBjw.BJW_310105.getCode().equals(code)) return ShAreaBjw.BJW_310105.getName();
- if(ShAreaBjw.BJW_310106.getCode().equals(code)) return ShAreaBjw.BJW_310106.getName();
- if(ShAreaBjw.BJW_310107.getCode().equals(code)) return ShAreaBjw.BJW_310107.getName();
- if(ShAreaBjw.BJW_310109.getCode().equals(code)) return ShAreaBjw.BJW_310109.getName();
- if(ShAreaBjw.BJW_310110.getCode().equals(code)) return ShAreaBjw.BJW_310110.getName();
- if(ShAreaBjw.BJW_310112.getCode().equals(code)) return ShAreaBjw.BJW_310112.getName();
- if(ShAreaBjw.BJW_310113.getCode().equals(code)) return ShAreaBjw.BJW_310113.getName();
- if(ShAreaBjw.BJW_310114.getCode().equals(code)) return ShAreaBjw.BJW_310114.getName();
- if(ShAreaBjw.BJW_310115.getCode().equals(code)) return ShAreaBjw.BJW_310115.getName();
- if(ShAreaBjw.BJW_310116.getCode().equals(code)) return ShAreaBjw.BJW_310116.getName();
- if(ShAreaBjw.BJW_310117.getCode().equals(code)) return ShAreaBjw.BJW_310117.getName();
- if(ShAreaBjw.BJW_310118.getCode().equals(code)) return ShAreaBjw.BJW_310118.getName();
- if(ShAreaBjw.BJW_310120.getCode().equals(code)) return ShAreaBjw.BJW_310120.getName();
- if(ShAreaBjw.BJW_310151.getCode().equals(code)) return ShAreaBjw.BJW_310151.getName();
+ if (ShAreaBjw.BJW_310101.getCode().equals(code)) return ShAreaBjw.BJW_310101.getName();
+ if (ShAreaBjw.BJW_310104.getCode().equals(code)) return ShAreaBjw.BJW_310104.getName();
+ if (ShAreaBjw.BJW_310105.getCode().equals(code)) return ShAreaBjw.BJW_310105.getName();
+ if (ShAreaBjw.BJW_310106.getCode().equals(code)) return ShAreaBjw.BJW_310106.getName();
+ if (ShAreaBjw.BJW_310107.getCode().equals(code)) return ShAreaBjw.BJW_310107.getName();
+ if (ShAreaBjw.BJW_310109.getCode().equals(code)) return ShAreaBjw.BJW_310109.getName();
+ if (ShAreaBjw.BJW_310110.getCode().equals(code)) return ShAreaBjw.BJW_310110.getName();
+ if (ShAreaBjw.BJW_310112.getCode().equals(code)) return ShAreaBjw.BJW_310112.getName();
+ if (ShAreaBjw.BJW_310113.getCode().equals(code)) return ShAreaBjw.BJW_310113.getName();
+ if (ShAreaBjw.BJW_310114.getCode().equals(code)) return ShAreaBjw.BJW_310114.getName();
+ if (ShAreaBjw.BJW_310115.getCode().equals(code)) return ShAreaBjw.BJW_310115.getName();
+ if (ShAreaBjw.BJW_310116.getCode().equals(code)) return ShAreaBjw.BJW_310116.getName();
+ if (ShAreaBjw.BJW_310117.getCode().equals(code)) return ShAreaBjw.BJW_310117.getName();
+ if (ShAreaBjw.BJW_310118.getCode().equals(code)) return ShAreaBjw.BJW_310118.getName();
+ if (ShAreaBjw.BJW_310120.getCode().equals(code)) return ShAreaBjw.BJW_310120.getName();
+ if (ShAreaBjw.BJW_310151.getCode().equals(code)) return ShAreaBjw.BJW_310151.getName();
- return code;
- }
+ return code;
+ }
- public static String getBjw(String code) {
- if(null == code) return null;
+ public static String getBjw(String code) {
+ if (null == code) return null;
- if(ShAreaBjw.BJW_310101.getCode().equals(code)) return ShAreaBjw.BJW_310101.getBjw();
- if(ShAreaBjw.BJW_310104.getCode().equals(code)) return ShAreaBjw.BJW_310104.getBjw();
- if(ShAreaBjw.BJW_310105.getCode().equals(code)) return ShAreaBjw.BJW_310105.getBjw();
- if(ShAreaBjw.BJW_310106.getCode().equals(code)) return ShAreaBjw.BJW_310106.getBjw();
- if(ShAreaBjw.BJW_310107.getCode().equals(code)) return ShAreaBjw.BJW_310107.getBjw();
- if(ShAreaBjw.BJW_310109.getCode().equals(code)) return ShAreaBjw.BJW_310109.getBjw();
- if(ShAreaBjw.BJW_310110.getCode().equals(code)) return ShAreaBjw.BJW_310110.getBjw();
- if(ShAreaBjw.BJW_310112.getCode().equals(code)) return ShAreaBjw.BJW_310112.getBjw();
- if(ShAreaBjw.BJW_310113.getCode().equals(code)) return ShAreaBjw.BJW_310113.getBjw();
- if(ShAreaBjw.BJW_310114.getCode().equals(code)) return ShAreaBjw.BJW_310114.getBjw();
- if(ShAreaBjw.BJW_310115.getCode().equals(code)) return ShAreaBjw.BJW_310115.getBjw();
- if(ShAreaBjw.BJW_310116.getCode().equals(code)) return ShAreaBjw.BJW_310116.getBjw();
- if(ShAreaBjw.BJW_310117.getCode().equals(code)) return ShAreaBjw.BJW_310117.getBjw();
- if(ShAreaBjw.BJW_310118.getCode().equals(code)) return ShAreaBjw.BJW_310118.getBjw();
- if(ShAreaBjw.BJW_310120.getCode().equals(code)) return ShAreaBjw.BJW_310120.getBjw();
- if(ShAreaBjw.BJW_310151.getCode().equals(code)) return ShAreaBjw.BJW_310151.getBjw();
+ if (ShAreaBjw.BJW_310101.getCode().equals(code)) return ShAreaBjw.BJW_310101.getBjw();
+ if (ShAreaBjw.BJW_310104.getCode().equals(code)) return ShAreaBjw.BJW_310104.getBjw();
+ if (ShAreaBjw.BJW_310105.getCode().equals(code)) return ShAreaBjw.BJW_310105.getBjw();
+ if (ShAreaBjw.BJW_310106.getCode().equals(code)) return ShAreaBjw.BJW_310106.getBjw();
+ if (ShAreaBjw.BJW_310107.getCode().equals(code)) return ShAreaBjw.BJW_310107.getBjw();
+ if (ShAreaBjw.BJW_310109.getCode().equals(code)) return ShAreaBjw.BJW_310109.getBjw();
+ if (ShAreaBjw.BJW_310110.getCode().equals(code)) return ShAreaBjw.BJW_310110.getBjw();
+ if (ShAreaBjw.BJW_310112.getCode().equals(code)) return ShAreaBjw.BJW_310112.getBjw();
+ if (ShAreaBjw.BJW_310113.getCode().equals(code)) return ShAreaBjw.BJW_310113.getBjw();
+ if (ShAreaBjw.BJW_310114.getCode().equals(code)) return ShAreaBjw.BJW_310114.getBjw();
+ if (ShAreaBjw.BJW_310115.getCode().equals(code)) return ShAreaBjw.BJW_310115.getBjw();
+ if (ShAreaBjw.BJW_310116.getCode().equals(code)) return ShAreaBjw.BJW_310116.getBjw();
+ if (ShAreaBjw.BJW_310117.getCode().equals(code)) return ShAreaBjw.BJW_310117.getBjw();
+ if (ShAreaBjw.BJW_310118.getCode().equals(code)) return ShAreaBjw.BJW_310118.getBjw();
+ if (ShAreaBjw.BJW_310120.getCode().equals(code)) return ShAreaBjw.BJW_310120.getBjw();
+ if (ShAreaBjw.BJW_310151.getCode().equals(code)) return ShAreaBjw.BJW_310151.getBjw();
- return code;
- }
+ return code;
+ }
}
--
Gitblit v1.9.3