From 604c6337b8806a5686d3931f5577bf371c7dec14 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期二, 26 十二月 2023 21:47:31 +0800
Subject: [PATCH] 上海嘉定纪委接口-提交1
---
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1205.java | 2
src/main/java/com/fzzy/push/shjdjw2023/dto/Shjdjw2023Api1102.java | 78 +
src/main/java/com/fzzy/push/shjdjw2023/dto/Shjdjw2023Api1202.java | 225 +++++
src/main/java/com/fzzy/push/shjdjw2023/dto/Shjdjw2023Api1310.java | 124 ++
src/main/java/com/fzzy/push/shjdjw2023/Shjdjw2023HttpClientUtil.java | 10
src/main/resources/application-pro5303-jw.yml | 61 +
src/main/java/com/fzzy/push/shjdjw2023/Shjdjw2023PushService11.java | 2
src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiCodeConstant.java | 115 +
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java | 1
src/main/java/com/fzzy/push/shjdjw2023/dto/Shjdjw2023Api1105.java | 53 +
src/main/java/com/fzzy/push/shjdjw2023/dto/Shjdjw2023Api1205.java | 174 +++
src/main/java/com/fzzy/push/shjdjw2023/dto/Shjdjw2023Api1103.java | 197 ++++
src/main/java/com/fzzy/push/shjdjw2023/dto/Shjdjw2023Api1203.java | 85 +
src/main/java/com/fzzy/push/shjdjw2023/dto/Shjdjw2023Api1209.java | 118 ++
src/main/java/com/fzzy/push/shjdjw2023/dto/Shjdjw2023Api1403.java | 72 +
src/main/resources/logback-spring.xml | 35
src/main/java/com/fzzy/push/shjdjw2023/Shjdjw2023PushService12.java | 2
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1307.java | 13
/dev/null | 73 -
src/main/java/com/fzzy/push/shjdjw2023/dto/Shjdjw2023Api1404.java | 61 +
src/main/resources/application-pro2.yml | 61 +
src/main/java/com/fzzy/push/shjdjw2023/dto/Shjdjw2023Api1104.java | 200 ++++
src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java | 777 +++++++---------
src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwReqDto.java | 6
src/main/java/com/fzzy/push/shjdjw2023/dto/Shjdjw2023Api1101.java | 113 ++
25 files changed, 2,097 insertions(+), 561 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java
index 7d3b87e..d65df04 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java
@@ -161,6 +161,7 @@
api1310.setCzbz(Constant.CZBZ_I);
} else {
api1310.setCzbz(api1310List.get(0).getCzbz());
+ api1310.setBglx(api1310List.get(0).getBglx());
}
api1310Rep.save(api1310);
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1205.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1205.java
index cd7b4c7..34dd6ff 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1205.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1205.java
@@ -26,9 +26,7 @@
*/
private static final long serialVersionUID = -6381473449862569451L;
-
//涓氬姟鍗曞彿鐢� 12 浣嶆暟瀛楃粍鎴愶紝绗� 1-2 浣嶄负涓氬姟缂栫爜锛�15 浠ｈ〃绮鍑哄簱锛夛紝绗� 3-8 浣嶄緷娆′负骞翠唤鐨勫悗涓や綅銆�2 浣嶆湀浠姐��2浣嶆棩鏈燂紝鍚庡洓浣嶄负椤哄簭鐮併�備緥濡傦細141605041234
- @Id
@PropertyDef(label = "鍑哄簱涓氬姟鍗曞彿")
private String ckywdh;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1307.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1307.java
index 6fc9366..3bdeb3b 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1307.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1307.java
@@ -4,19 +4,14 @@
import com.bstek.dorado.annotation.PropertyDef;
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 15:57
+ * @author czt
+ * @date 2023-09-02 15:57
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -46,9 +41,6 @@
@PropertyDef(label = "鍥惧儚缂栧彿")
private String txbh;
- @PropertyDef(label = "鏂囦欢id")
- private String fileStorageId;
-
@JSONField(name = "yzwbh")
@PropertyDef(label = "棰勭疆浣嶇紪鍙�")
private String yzwbh;
@@ -61,5 +53,4 @@
@PropertyDef(label = "鏍囪浣�")
private String bjw;
-
}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/push/shjdjw2023/Shjdjw2023HttpClientUtil.java b/src/main/java/com/fzzy/push/shjdjw2023/Shjdjw2023HttpClientUtil.java
index 0f062fa..b713bb0 100644
--- a/src/main/java/com/fzzy/push/shjdjw2023/Shjdjw2023HttpClientUtil.java
+++ b/src/main/java/com/fzzy/push/shjdjw2023/Shjdjw2023HttpClientUtil.java
@@ -70,14 +70,8 @@
rs = null;
return new ShjdjwRespDto(99,e.getMessage());
}
- if(StringUtils.isNotEmpty(rs)){
- rs = rs.replaceAll("\"", "");
- log.info("---------鎺ュ彛杩斿洖锛岀鏂囷細" + rs +"---------");
- rs = AESUtils.decrypt(rs, apiConfs.getPublicKey());
- log.info("---------鎺ュ彛杩斿洖锛岃В鏋愬悗锛�" + rs +"---------");
- responseDto = JSON.parseObject(rs, ShjdjwRespDto.class);
- }
-
+ log.info("---------鎺ュ彛杩斿洖锛�" + rs +"---------");
+ responseDto = JSON.parseObject(rs,ShjdjwRespDto.class);
if(responseDto == null ) return new ShjdjwRespDto(99,"鎺ュ彛璇锋眰鍙戠敓鏈煡閿欒");
return responseDto;
} finally {
diff --git a/src/main/java/com/fzzy/push/shjdjw2023/Shjdjw2023PushService11.java b/src/main/java/com/fzzy/push/shjdjw2023/Shjdjw2023PushService11.java
index f3a74f8..906acd5 100644
--- a/src/main/java/com/fzzy/push/shjdjw2023/Shjdjw2023PushService11.java
+++ b/src/main/java/com/fzzy/push/shjdjw2023/Shjdjw2023PushService11.java
@@ -32,7 +32,7 @@
public void pushData(ApiParam param) {
log.info("------->>>>鍩虹淇℃伅 鎺ュ彛妯″潡涓婃姤寮�濮�");
- //鑾峰彇搴撳尯淇℃伅锛屾帹閫佷负鍗曚綅淇℃伅
+ pushService.pushData1101(apiRemoteService, param);
pushService.pushData1102(apiRemoteService, param);
log.info("------->>>>鍩虹淇℃伅 鎺ュ彛妯″潡涓婃姤缁撴潫");
diff --git a/src/main/java/com/fzzy/push/shjdjw2023/Shjdjw2023PushService12.java b/src/main/java/com/fzzy/push/shjdjw2023/Shjdjw2023PushService12.java
index ae5b446..5430ff4 100644
--- a/src/main/java/com/fzzy/push/shjdjw2023/Shjdjw2023PushService12.java
+++ b/src/main/java/com/fzzy/push/shjdjw2023/Shjdjw2023PushService12.java
@@ -44,8 +44,6 @@
pushService.pushData1203(apiRemoteService, param);
//绮鍑哄簱淇℃伅
pushService.pushData1205(apiRemoteService, param);
- //绮搴撳瓨淇℃伅
- pushService.pushData1208(apiRemoteService, param);
//鎹熺泭鍗曚俊鎭�
pushService.pushData1209(apiRemoteService, param);
diff --git a/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiCodeConstant.java b/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiCodeConstant.java
index 945c3e5..73a4ced 100644
--- a/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiCodeConstant.java
+++ b/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiCodeConstant.java
@@ -3,45 +3,108 @@
/**
* 涓婃捣鍢夊畾绾鐩戠骞冲彴-鎺ュ彛缂栫爜
* @author czt
- * @date 2023/5/9 14:25
+ * @date 2023/12/26 17:50
*/
public class ShjdjwApiCodeConstant {
/**
* 鎺ュ彛缂栫爜-1101 鍗曚綅淇℃伅
*/
- public static String API_CODE_LS1101 = "ls1101";
+ public static String API_CODE_1101 = "1101";
/**
- * 鎺ュ彛缂栫爜-1201 璐ㄦ
+ * 鎺ュ彛缂栫爜-1102 搴撳尯淇℃伅
*/
- public static String API_CODE_LS1201 = "ls1201";
+ public static String API_CODE_1102 = "1102";
/**
- * 鎺ュ彛缂栫爜-1302 绮鍏ュ簱
+ * 鎺ュ彛缂栫爜-1103 浠撴埧淇℃伅
*/
- public static String API_CODE_LS1302 = "ls1302";
+ public static String API_CODE_1103 = "1103";
/**
- * 鎺ュ彛缂栫爜-1303 鍏ュ簱璐ㄦ
+ * 鎺ュ彛缂栫爜-1104 寤掗棿淇℃伅
*/
- public static String API_CODE_LS1303 = "ls1303";
+ public static String API_CODE_1104 = "1104";
/**
- * 鎺ュ彛缂栫爜-1306 绮鍑哄簱
+ * 鎺ュ彛缂栫爜-1105 璐т綅淇℃伅
*/
- public static String API_CODE_LS1306 = "ls1306";
- /**
- * 鎺ュ彛缂栫爜-1310 绮搴撳瓨
- */
- public static String API_CODE_LS1310 = "ls1310";
- /**
- * 鎺ュ彛缂栫爜-1311 鎹熺泭鍗�
- */
- public static String API_CODE_LS1311 = "ls1311";
- /**
- * 鎺ュ彛缂栫爜-101 杞崲璁″垝
- */
- public static String API_CODE_LS1501 = "ls1501";
- /**
- * 鎺ュ彛缂栫爜-1502 杞崲璁″垝瀹屾垚鎯呭喌
- */
- public static String API_CODE_LS1502 = "ls1502";
+ public static String API_CODE_1105 = "1105";
+ /**
+ * 鎺ュ彛缂栫爜-1202 绮鍏ュ簱
+ */
+ public static String API_CODE_1202 = "1202";
+ /**
+ * 鎺ュ彛缂栫爜-1203 鍏ュ簱璐ㄦ
+ */
+ public static String API_CODE_1203 = "1203";
+ /**
+ * 鎺ュ彛缂栫爜-1205 绮鍑哄簱
+ */
+ public static String API_CODE_1205 = "1205";
+ /**
+ * 鎺ュ彛缂栫爜-1209 鎹熺泭鍗�
+ */
+ public static String API_CODE_1209 = "1209";
+ /**
+ * 鎺ュ彛缂栫爜-1310 璐ㄦ
+ */
+ public static String API_CODE_1310 = "1310";
+ /**
+ * 鎺ュ彛缂栫爜-1403 杞崲璁″垝
+ */
+ public static String API_CODE_1403 = "1403";
+ /**
+ * 鎺ュ彛缂栫爜-1404 杞崲璁″垝鏄庣粏
+ */
+ public static String API_CODE_1404 = "1404";
+
+ /*==========鎺ュ彛ID==========*/
+ /**
+ * 鎺ュ彛缂栫爜-1101 鍗曚綅淇℃伅
+ */
+ public static String API_CODE_1101_ID = "to_ls_1101_dwxx";
+ /**
+ * 鎺ュ彛缂栫爜-1102 搴撳尯淇℃伅
+ */
+ public static String API_CODE_1102_ID = "to_ls_1102_kqxx";
+ /**
+ * 鎺ュ彛缂栫爜-1103 浠撴埧淇℃伅
+ */
+ public static String API_CODE_1103_ID = "to_ls_1103_cfxx";
+ /**
+ * 鎺ュ彛缂栫爜-1104 寤掗棿淇℃伅
+ */
+ public static String API_CODE_1104_ID = "to_ls_1104_ajxx";
+ /**
+ * 鎺ュ彛缂栫爜-1105 璐т綅淇℃伅
+ */
+ public static String API_CODE_1105_ID = "to_ls_1105_hwxx";
+
+ /**
+ * 鎺ュ彛缂栫爜-1202 绮鍏ュ簱
+ */
+ public static String API_CODE_1202_ID = "to_ls_1202_lsrk";
+ /**
+ * 鎺ュ彛缂栫爜-1203 鍏ュ簱璐ㄦ
+ */
+ public static String API_CODE_1203_ID = "to_ls_1203_lljy";
+ /**
+ * 鎺ュ彛缂栫爜-1205 绮鍑哄簱
+ */
+ public static String API_CODE_1205_ID = "to_ls_1205_lsck";
+ /**
+ * 鎺ュ彛缂栫爜-1209 鎹熺泭鍗�
+ */
+ public static String API_CODE_1209_ID = "to_ls_1209_syd";
+ /**
+ * 鎺ュ彛缂栫爜-1310 璐ㄦ
+ */
+ public static String API_CODE_1310_ID = "to_ls_1310_zjsj";
+ /**
+ * 鎺ュ彛缂栫爜-1403 杞崲璁″垝
+ */
+ public static String API_CODE_1403_ID = "to_ls_1403_lhjh";
+ /**
+ * 鎺ュ彛缂栫爜-1404 杞崲璁″垝鏄庣粏
+ */
+ public static String API_CODE_1404_ID = "to_ls_1404_lhjhmx";
}
diff --git a/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java b/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
index 7ec8b14..aa07138 100644
--- a/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
+++ b/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
@@ -1,8 +1,6 @@
package com.fzzy.push.shjdjw2023;
import com.alibaba.fastjson.JSON;
-import com.bstek.dorado.util.DateUtils;
-import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.dto.ResponseDto;
@@ -10,27 +8,25 @@
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.service.ApiTriggerService;
+import com.fzzy.api.utils.AESUtils;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.utils.RedisUtil;
import com.fzzy.api.view.repository.*;
+import com.fzzy.push.sh2023.dto.ShAreaBjw;
import com.fzzy.push.shjdjw2023.dto.*;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.time.DateFormatUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-
-import java.text.DateFormat;
-import java.text.DecimalFormat;
import java.util.*;
/**
* 涓婃捣鍢夊畾绾鐩戠骞冲彴-涓婁紶鏁版嵁鏈嶅姟绫�
*
* @author czt
- * @date 2023/5/9 14:09
+ * @date 2023/12/26
*/
@Slf4j
@Data
@@ -52,16 +48,21 @@
@Autowired
private Api1103Rep api1103Rep;
@Autowired
+ private Api1104Rep api1104Rep;
+ @Autowired
private Api1105Rep api1105Rep;
@Autowired
private Api1202Rep api1202Rep;
@Autowired
- private Api1104Rep api1104Rep;
+ private Api1205Rep api1205Rep;
@Autowired
private Api1208Rep api1208Rep;
@Autowired
+ private Api1210Rep api1210Rep;
+ @Autowired
+ private Api1403Rep api1403Rep;
+ @Autowired
private Api1404Rep api1404Rep;
-
@Override
public String getProtocol() {
@@ -71,6 +72,12 @@
@Override
public ResponseDto pushData(ApiParam param, Object data) {
return pushData(param, null, data);
+ }
+
+ @Override
+ public ResponseDto pullData(ApiParam param, ApiConfs conf) {
+ //璇ュ崗璁棤姝ゅ疄鐜�
+ return null;
}
@Override
@@ -86,25 +93,24 @@
//娣诲姞鏃ュ織
ApiLog apiLog = new ApiLog();
apiLog.setId(ContextUtil.getUUID());
- apiLog.setInteId(param.getInteId());
+ apiLog.setInteId(inteId);
- //鑾峰彇鎺ュ彛缂栫爜
- String interfaceId = getDataId(inteId);
-
- //鑾峰彇json鏁版嵁
- String jsonData = getJsonData(inteId, data, interfaceId);
-
- if (StringUtils.isEmpty(interfaceId)) {
+ if (StringUtils.isEmpty(inteId)) {
ResponseDto responseDto = new ResponseDto(99, "娌℃湁鑾峰彇鍒版帴鍙�", bizId);
apiLog.setStatus(99);
apiLog.setResult("娌℃湁鑾峰彇鍒版帴鍙�");
apiLogRep.save(apiLog);
return responseDto;
}
+
+ //鏌ヨ搴撳尯淇℃伅琛屾斂鍖哄垝鐮�
+ List<Api1102> api1102List = api1102Rep.findPushData(kqdm);
+ //鑾峰彇json鏁版嵁
+ String jsonData = getJsonData(inteId, data, api1102List.get(0).getXzqhdm());
+
apiLog.setData(jsonData);
apiLog.setKqdm(kqdm);
apiLog.setUploadTime(new Date());
-
if (conf == null) {
ResponseDto responseDto = new ResponseDto(99, "娌℃湁鑾峰彇鍒颁笂浼犻厤缃�", bizId);
apiLog.setStatus(99);
@@ -113,7 +119,14 @@
return responseDto;
}
- ShjdjwRespDto responseDto = Shjdjw2023HttpClientUtil.postPushData(conf.getApiUrl(), jsonData, conf);
+ ShjdjwReqDto reqData = new ShjdjwReqDto();
+ //鎺ュ彛ID
+ reqData.setId(getInteId(inteId));
+ //涓婁紶鏁版嵁锛屽姞瀵�
+ reqData.setData(AESUtils.encryptByEcb(jsonData, conf.getPublicKey()));
+
+ ShjdjwRespDto responseDto = Shjdjw2023HttpClientUtil.postPushData(conf.getApiUrl(), JSON.toJSONString(reqData), conf);
+
responseDto.setBizId(bizId);
apiLog.setStatus(responseDto.getCode() == 1 ? 0 : responseDto.getCode());
apiLog.setResult(responseDto.getDescription());
@@ -121,35 +134,64 @@
ResponseDto resd = new ResponseDto();
resd.setSuccess(responseDto.getCode() == 1 ? 0 : responseDto.getCode());
resd.setMsg(responseDto.getDescription());
-
- if (Constant.API_CODE_1403.equals(inteId)) {
- //杞崲璁″垝瀹屾垚鎯呭喌鏁版嵁灏佽
- Shjdjw1502 shjdjw1502 = copy1502((Api1403) data);
- ShjdjwReqDto<Object> dto = new ShjdjwReqDto<>();
- dto.setId(getDataId(ShjdjwApiCodeConstant.API_CODE_LS1502));
- List<Object> list = new ArrayList<>();
- list.add(shjdjw1502);
- dto.setData(list);
- String json = JSON.toJSONString(dto);
-
- //杞崲璁″垝瀹屾垚鎯呭喌鏁版嵁涓婁紶
- apiLog.setData(json);
- apiLog.setKqdm(kqdm);
- apiLog.setUploadTime(new Date());
- ShjdjwRespDto shjdjwresponseDto = Shjdjw2023HttpClientUtil.postPushData(conf.getApiUrl(), json, conf);
- responseDto.setBizId(bizId);
- apiLog.setStatus(shjdjwresponseDto.getCode() == 1 ? 0 : shjdjwresponseDto.getCode());
- apiLog.setResult(shjdjwresponseDto.getDescription());
- apiLogRep.save(apiLog);
- ResponseDto response = new ResponseDto();
- response.setSuccess(shjdjwresponseDto.getCode() == 1 ? 0 : shjdjwresponseDto.getCode());
- response.setMsg(shjdjwresponseDto.getDescription());
- }
return resd;
} catch (Exception e) {
log.error(e.getMessage(), e);
return new ResponseDto(99, e.getMessage());
}
+ }
+
+ /**
+ * 鑾峰彇鎺ュ彛id
+ *
+ * @param inteId
+ * @return
+ */
+ private String getInteId(String inteId) {
+ switch (inteId) {
+ case "1101":
+ return ShjdjwApiCodeConstant.API_CODE_1101_ID;
+ case "1102":
+ return ShjdjwApiCodeConstant.API_CODE_1102_ID;
+ case "1103":
+ return ShjdjwApiCodeConstant.API_CODE_1103_ID;
+ case "1104":
+ return ShjdjwApiCodeConstant.API_CODE_1104_ID;
+ case "1105":
+ return ShjdjwApiCodeConstant.API_CODE_1105_ID;
+ case "1202":
+ return ShjdjwApiCodeConstant.API_CODE_1202_ID;
+ case "1203":
+ return ShjdjwApiCodeConstant.API_CODE_1203_ID;
+ case "1205":
+ return ShjdjwApiCodeConstant.API_CODE_1205_ID;
+ case "1209":
+ return ShjdjwApiCodeConstant.API_CODE_1209_ID;
+ case "1310":
+ return ShjdjwApiCodeConstant.API_CODE_1310_ID;
+ case "1403":
+ return ShjdjwApiCodeConstant.API_CODE_1403_ID;
+ case "1404":
+ return ShjdjwApiCodeConstant.API_CODE_1404_ID;
+ default:
+ return inteId;
+ }
+ }
+
+ /**
+ * 杞负JSON
+ *
+ * @param inteId
+ * @param data
+ * @param code
+ * @return
+ */
+ private String getJsonData(String inteId, Object data, String code) {
+
+ List<Object> list = new ArrayList<>();
+ Object object = getJsonApiData(inteId, data, code);
+ list.add(object);
+ return JSON.toJSONString(list);
}
/**
@@ -160,404 +202,269 @@
* @return
* @throws Exception
*/
- private String getJsonData(String inteId, Object data, String interfaceId) {
- ShjdjwReqDto<Object> dto = new ShjdjwReqDto<>();
- dto.setId(getDataId(interfaceId));
- List<Object> list = new ArrayList<>();
- //杞崲灏佽
- if (Constant.API_CODE_1102.equals(inteId)) {
- //鍗曚綅鎺ュ彛鏁版嵁灏佽
- ShjdjwApi1101 shjdjwApi1101 = new ShjdjwApi1101();
- BeanUtils.copyProperties(data, shjdjwApi1101);
- //鏌ヨ鍗曚綅淇℃伅
- List<Api1101> listApi1101 = api1101Rep.findPushData(shjdjwApi1101.getKqdm());
- Api1101 api1101 = null;
- if (null != listApi1101 && listApi1101.size() > 0) {
- api1101 = listApi1101.get(0);
- }
- if (null != api1101) {
- shjdjwApi1101.setDwmc(api1101.getDwmc());
- shjdjwApi1101.setKqs(api1101.getKqs());
- }
+
+ private Object getJsonApiData(String inteId, Object data, String code) {
+ //鍏蜂綋鏍规嵁鎺ュ彛杩涜灏佽
+ if (ShjdjwApiCodeConstant.API_CODE_1101.equals(inteId)) {
+ Shjdjw2023Api1101 api1101 = new Shjdjw2023Api1101();
+ BeanUtils.copyProperties(data, api1101);
+
+ return api1101;
+ }
+ if (ShjdjwApiCodeConstant.API_CODE_1102.equals(inteId)) {
+ Shjdjw2023Api1102 api1102 = new Shjdjw2023Api1102();
+ BeanUtils.copyProperties(data, api1102);
+
+ return api1102;
+ }
+ if (ShjdjwApiCodeConstant.API_CODE_1103.equals(inteId)) {
+ Shjdjw2023Api1103 api1103 = new Shjdjw2023Api1103();
+ BeanUtils.copyProperties(data, api1103);
+
+ return api1103;
+ }
+ if (ShjdjwApiCodeConstant.API_CODE_1104.equals(inteId)) {
+ Shjdjw2023Api1104 api1104 = new Shjdjw2023Api1104();
+ Api1104 apiData = (Api1104) data;
+
//鏌ヨ浠撴埧淇℃伅
- List<Api1103> listApi1103 = api1103Rep.findPushData(shjdjwApi1101.getKqdm());
- if (null != listApi1103 && listApi1103.size() > 0) {
- for (int i = 0; i < listApi1103.size(); i++) {
- if (i == 0) {
- shjdjwApi1101.setCfmc(listApi1103.get(i).getCfmc());
- } else {
- shjdjwApi1101.setCfmc(shjdjwApi1101.getCfmc() + "#" + listApi1103.get(i).getCfmc());
+ List<Api1103> api1103List = api1103Rep.findPushDataByCfdm(apiData.getCfbh());
+ List<Api1104> api1104List = api1104Rep.findDataByCfbh(apiData.getCfbh());
+ int num = 2;
+ if (null != api1104List && api1104List.size() > 0) {
+ num = api1104List.size();
+ }
+ if (null != api1103List && api1103List.size() > 0) {
+ Api1103 api1103 = api1103List.get(0);
+ BeanUtils.copyProperties(api1103, api1104);
+ api1104.setCwc(api1103.getCwc() / num);
+ api1104.setCnc(api1103.getCnc() / num);
+ api1104.setSjcr(api1103.getSjcr() / num);
+ }
+ BeanUtils.copyProperties(apiData, api1104);
+ api1104.setAjdm(apiData.getAjdh());
+ api1104.setCfdm(apiData.getCfbh());
+
+ //璁剧疆绮鎬ц川浠ｇ爜(鏌ョ湅寤掗棿瀵瑰簲鐨勬渶鏂板簱瀛樿繘琛岃祴鍊�)
+ List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1104.getAjdm() + "01");
+ if (null != api1208List && api1208List.size() > 0) {
+ api1104.setLsxzdm(api1208List.get(0).getLsxzdm());
+ }
+
+ return api1104;
+ }
+ if (ShjdjwApiCodeConstant.API_CODE_1105.equals(inteId)) {
+ Shjdjw2023Api1105 api1105 = new Shjdjw2023Api1105();
+ BeanUtils.copyProperties(data, api1105);
+
+ return api1105;
+ }
+ if (ShjdjwApiCodeConstant.API_CODE_1202.equals(inteId)) {
+ Shjdjw2023Api1202 api1202 = new Shjdjw2023Api1202();
+ Api1202 apiData = (Api1202) data;
+ BeanUtils.copyProperties(apiData, api1202);
+ api1202.setBjw(ShAreaBjw.getBjw(code));
+ api1202.setJzrq(apiData.getCmsj());
+ if (StringUtils.isEmpty(api1202.getCddm())) {
+ api1202.setCddm(api1202.getHwdm().substring(2, 8));
+ }
+ if (StringUtils.isEmpty(api1202.getRkjsdh())) {
+ api1202.setRkjsdh("0");
+ }
+ //璁剧疆绮杞崲骞村害,鏍规嵁璁″垝鏄庣粏鍙锋煡璇㈣鍒掓槑缁嗭紝鍐嶆牴鎹鍒掓槑缁嗘煡璇㈣疆鎹㈣鍒�
+ List<Api1404> api1404List = api1404Rep.getDataByJhmxdh(apiData.getJhmxh());
+ if (null != api1404List && api1404List.size() > 0) {
+ List<Api1403> api1403List = api1403Rep.getDataByLhjhdh(api1404List.get(0).getLhjhdh());
+ if (null != api1403List && api1403List.size() > 0) {
+ if (StringUtils.isNotEmpty(api1403List.get(0).getJhnd())) {
+ api1202.setLhnd(api1403List.get(0).getJhnd());
}
}
}
- //鍗曚綅淇℃伅灏佽
- list.add(shjdjwApi1101);
- } else if (Constant.API_CODE_1202.equals(inteId)) {
- //绮鍏ュ簱鏁版嵁灏佽
- ShjdjwApi1202 shjdjwApi1202 = new ShjdjwApi1202();
- Api1202 api1202 = (Api1202) data;
- copyApi1202(api1202, shjdjwApi1202);
- list.add(shjdjwApi1202);
- } else if (Constant.API_CODE_1203.equals(inteId)) {
- //绮鍏ュ簱妫�楠屾暟鎹皝瑁�
- ShjdjwApi1203 shjdjwApi1203 = copyApi1203((Api1203) data);
+ //鏌ヨ绮鎬ц川杞彉鍗曞彿(鏍规嵁鍏ュ簱鏃堕棿鍜岃揣浣嶄唬鐮佹煡璇㈢伯椋熸�ц川杞彉鍗�)
+ List<Api1210> api1210List = api1210Rep.findDataByHwdmAndTime(api1202.getHwdm(), api1202.getCmsj());
+ if (null != api1210List && api1210List.size() > 0) {
+ api1202.setLsxzzbdh(api1210List.get(0).getLsxzzbdh());
+ }
+ //璁剧疆鎵规鍙�
+ List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1202.getHwdm());
+ if (null != api1208List && api1208List.size() > 0) {
+ api1202.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
+ }
+ //绮鎬ц川
+ api1202.setLsxzdm("200");
- list.add(shjdjwApi1203);
- } else if (Constant.API_CODE_1205.equals(inteId)) {
- //绮鍑哄簱鏁版嵁灏佽
- ShjdjwApi1205 shjdjwApi1205 = copyApi1205((Api1205) data);
-
- list.add(shjdjwApi1205);
- } else if (Constant.API_CODE_1208.equals(inteId)) {
- //绮搴撳瓨鏁版嵁灏佽
- ShjdjwApi1208 shjdjwApi1208 = copyApi1208((Api1208) data);
-
- list.add(shjdjwApi1208);
- } else if (Constant.API_CODE_1209.equals(inteId)) {
- //鎹熺泭鍗曟暟鎹皝瑁�
- ShjdjwApi1209 shjdjwApi1209 = copyApi1209((Api1209) data);
-
- list.add(shjdjwApi1209);
- } else if (Constant.API_CODE_1310.equals(inteId)) {
- //璐ㄦ鏁版嵁灏佽
- ShjdjwApi1310 shjdjwApi1310 = copyApi1310((Api1310) data);
-
- list.add(shjdjwApi1310);
- } else if (Constant.API_CODE_1403.equals(inteId)) {
- //杞崲璁″垝鏁版嵁灏佽
- ShjdjwApi1403 shjdjwApi1403 = copyApi1403((Api1403) data);
-
- list.add(shjdjwApi1403);
- } else {
-
- list.add(data);
+ return api1202;
}
- dto.setData(list);
- return JSON.toJSONString(dto);
+ if (ShjdjwApiCodeConstant.API_CODE_1203.equals(inteId)) {
+ Shjdjw2023Api1203 api1203 = new Shjdjw2023Api1203();
+ Api1203 apiData = (Api1203) data;
+ BeanUtils.copyProperties(apiData, api1203);
+ api1203.setBjw(ShAreaBjw.getBjw(code));
+ if (StringUtils.isEmpty(api1203.getJyxm())) {
+ api1203.setJyxm("0");
+ }
+ if (StringUtils.isEmpty(api1203.getJyz())) {
+ api1203.setJyz("0");
+ }
+ if (StringUtils.isEmpty(api1203.getZkj())) {
+ api1203.setZkj("0");
+ }
+ if (StringUtils.isEmpty(api1203.getZkl())) {
+ api1203.setZkl("0");
+ }
+ //璁剧疆鎵规鍙�
+ List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1203.getHwdm());
+ if (null != api1208List && api1208List.size() > 0) {
+ api1203.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
+ }
+ //璁剧疆璐ㄦ缂栫爜(榛樿绛夊悓浜庡叆搴撹川妫�鍗曞彿),鑻ヤ负鑸硅繍锛屽垯璁剧疆涓虹郴缁熷唴鑸硅繍鐨勫崟鍙�
+ api1203.setZjbh(api1203.getRkjydh());
+ List<Api1202> api1202List = api1202Rep.getDataById(api1203.getRkywdh());
+ if (null != api1202List && api1202List.size() > 0) {
+ if (api1202List.get(0).getYsgj().equals("3")) {
+ api1203.setZjbh(api1202List.get(0).getBizId().substring(2));
+ }
+ }
+ return api1203;
+ }
+ if (ShjdjwApiCodeConstant.API_CODE_1205.equals(inteId)) {
+
+ Shjdjw2023Api1205 api1205 = new Shjdjw2023Api1205();
+ Api1205 apiData = (Api1205) data;
+ BeanUtils.copyProperties(apiData, api1205);
+ api1205.setBjw(ShAreaBjw.getBjw(code));
+
+ api1205.setJzrq(apiData.getCmsj());
+ if (StringUtils.isEmpty(api1205.getCddm())) {
+ api1205.setCddm(api1205.getHwdm().substring(2, 8));
+ }
+ if (StringUtils.isEmpty(api1205.getCkjsdh())) {
+ api1205.setCkjsdh("0");
+ }
+
+ //璁剧疆绮杞崲骞村害
+ List<Api1404> api1404List = api1404Rep.getDataByJhmxdh(apiData.getJhmxh());
+ if (null != api1404List && api1404List.size() > 0) {
+ List<Api1403> api1403List = api1403Rep.getDataByLhjhdh(api1404List.get(0).getLhjhdh());
+ if (null != api1403List && api1403List.size() > 0) {
+ if (StringUtils.isNotEmpty(api1403List.get(0).getJhnd())) {
+ api1205.setLhnd(api1403List.get(0).getJhnd());
+ }
+ }
+ }
+
+ //璁剧疆鎵规鍙�
+ List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1205.getHwdm());
+ if (null != api1208List && api1208List.size() > 0) {
+ api1205.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
+ }
+
+ //绮鎬ц川
+ api1205.setLsxzdm("200");
+
+ return api1205;
+ }
+ if (ShjdjwApiCodeConstant.API_CODE_1209.equals(inteId)) {
+
+ Shjdjw2023Api1209 api1209 = new Shjdjw2023Api1209();
+ Api1209 apiData = (Api1209) data;
+
+ BeanUtils.copyProperties(apiData, api1209);
+ api1209.setDjlx("2");
+ api1209.setSzjl(apiData.getQzszkl());
+ api1209.setZrshde(apiData.getQzzrshde());
+ api1209.setBjw(ShAreaBjw.getBjw(code));
+ api1209.setJzrq(apiData.getYwrq());
+ List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1209.getHwdm());
+ if (null != api1208List && api1208List.size() > 0) {
+ api1209.setPch(api1209.getHwdm() + api1208List.get(0).getShnd());
+ }
+
+ //绮鎬ц川,鏆傛椂榛樿鍖虹骇鍌ㄥ
+ api1209.setLsxzdm("122");
+
+ return api1209;
+ }
+ if (ShjdjwApiCodeConstant.API_CODE_1310.equals(inteId)) {
+ Shjdjw2023Api1310 api1310 = new Shjdjw2023Api1310();
+ Api1310 apiData = (Api1310) data;
+ BeanUtils.copyProperties(apiData, api1310);
+ api1310.setBjw(ShAreaBjw.getBjw(code));
+ api1310.setJyrq(apiData.getJysj());
+
+ if (StringUtils.isEmpty(api1310.getJyxm())) {
+ api1310.setJyxm("0");
+ }
+ if (StringUtils.isEmpty(api1310.getJyxmz())) {
+ api1310.setJyxmz("0");
+ }
+ String lsxzdm = "122";
+ String pch = "";
+ List<Api1208> api1208List = api1208Rep.getDataByHwdm(api1310.getHwdm());
+ if (null != api1208List && api1208List.size() > 0) {
+ if (StringUtils.isNotEmpty(api1208List.get(0).getLsxzdm())) {
+ lsxzdm = api1208List.get(0).getLsxzdm();
+ pch = apiData.getHwdm() + api1208List.get(0).getShnd();
+ }
+ }
+ //璁剧疆鎵规鍙�
+ api1310.setPch(pch);
+ api1310.setLsxzdm(lsxzdm);
+ if (api1310.getYpsl() == 0.0) {
+ api1310.setYpsl(5.0);
+ }
+ if (StringUtils.isEmpty(api1310.getQyrxm())) {
+ api1310.setQyrxm("鎵︽牱浜�");
+ }
+ if (StringUtils.isEmpty(api1310.getJdrxm())) {
+ api1310.setJdrxm("鐩戠潱浜�");
+ }
+ if (StringUtils.isEmpty(api1310.getShrxm())) {
+ api1310.setShrxm("瀹℃牳浜�");
+ }
+ //璁剧疆绌哄睘鎬т负榛樿鍊�
+ return api1310;
+ }
+ if (ShjdjwApiCodeConstant.API_CODE_1403.equals(inteId)) {
+ Shjdjw2023Api1403 api1403 = new Shjdjw2023Api1403();
+ Api1403 apiData = (Api1403) data;
+ BeanUtils.copyProperties(apiData, api1403);
+ List<Api1101> api1101List = api1101Rep.findDataByDwdm(apiData.getLhjhdh().substring(0, 18));
+
+ api1403.setJhzxdw(api1101List.get(0).getDwdm());
+ api1403.setJhzxdwmc(api1101List.get(0).getDwmc());
+ api1403.setBjw(ShAreaBjw.getBjw(code));
+
+ //鏌ヨ杞崲璁″垝鐨勮疆鍏ユ暟閲忓拰杞嚭鏁伴噺
+ List<Api1404> list = api1404Rep.getDataByLhjhdh(api1403.getLhjhdh());
+ Double lrsl = 0.0, lcsl = 0.0; //鐢ㄤ簬缁熻杞叆鏁伴噺鍜岃疆鍑烘暟閲�
+ if (null != list && list.size() > 0) {
+ for (Api1404 api1404 : list) {
+ if (null != api1404.getLhlx() && "2".equals(api1404.getLhlx())) {
+ lrsl += api1404.getLhsl();
+ }
+ if (null != api1404.getLhlx() && "1".equals(api1404.getLhlx())) {
+ lcsl += api1404.getLhsl();
+ }
+ }
+ }
+ api1403.setLrsl(lrsl / 1000 + "");
+ api1403.setLcsl(lcsl / 1000 + "");
+
+ //璁剧疆绌哄睘鎬т负榛樿鍊�
+ return api1403;
+ }
+ if (ShjdjwApiCodeConstant.API_CODE_1404.equals(inteId)) {
+ Shjdjw2023Api1404 api1404 = new Shjdjw2023Api1404();
+ BeanUtils.copyProperties(data, api1404);
+ api1404.setMxzt("1");
+ api1404.setBjw(ShAreaBjw.getBjw(code));
+
+ //璁剧疆绌哄睘鎬т负榛樿鍊�
+ return api1404;
+ }
+ return data;
}
- private ShjdjwApi1403 copyApi1403(Api1403 api1403) {
- ShjdjwApi1403 shjdjwApi1403 = new ShjdjwApi1403();
- BeanUtils.copyProperties(api1403, shjdjwApi1403);
-
- List<Double> lhsl = getLhsl(api1403);
- if (null != lhsl && lhsl.size() > 0) {
- shjdjwApi1403.setLrsl(lhsl.get(1));
- shjdjwApi1403.setLrsl(lhsl.get(0));
- }
-
- shjdjwApi1403.setJhbm(api1403.getLhjhdh());
- shjdjwApi1403.setPch("0");
- return shjdjwApi1403;
- }
-
- /**
- * 鑾峰彇杞叆鍜岃疆鍑洪噸閲�
- *
- * @param api1403
- * @return
- */
- private List<Double> getLhsl(Api1403 api1403) {
- List<Api1404> api1404List = api1404Rep.getDataByLhjhdh(api1403.getLhjhdh());
- List<Double> lhsl = new ArrayList<>();
- if (null != api1404List && api1404List.size() > 0) {
-// double sum = api1404List.stream().mapToDouble(Api1404::getLhsl).summaryStatistics().getSum();
- double lcSum = api1404List.stream()
- .filter(x -> x.getLhlx().equals("1"))
- .mapToDouble(Api1404::getLhsl)
- .summaryStatistics().getSum();
- double lrSum = api1404List.stream()
- .filter(x -> x.getLhlx().equals("2"))
- .mapToDouble(Api1404::getLhsl)
- .summaryStatistics().getSum();
- lhsl.add(lcSum);
- lhsl.add(lrSum);
- }
- return lhsl;
- }
-
- private Shjdjw1502 copy1502(Api1403 api1403) {
- Shjdjw1502 shjdjw1502 = new Shjdjw1502();
- shjdjw1502.setDwmc(api1403.getLhjhdh());
- shjdjw1502.setJhnd(api1403.getJhnd());
-
- // 璁″垝鏁伴噺
- List<Double> lhsl = getLhsl(api1403);
- Double sum = 0.0;
- if (null != lhsl && lhsl.size() > 0) {
- sum = lhsl.stream().reduce(0d, Double::sum);
- }
- // 宸叉墽琛屾暟閲�
- List<Api1202> api1202List = api1202Rep.getDataByTime(api1403.getKszxrq(), api1403.getJzzxrq());
-
- Double yzxsl = api1202List.stream()
- .mapToDouble(Api1202::getJz)
- .summaryStatistics().getSum();
- shjdjw1502.setJhsl(new DecimalFormat("0.00").format(sum));
- shjdjw1502.setYzxsl(new DecimalFormat("0.00").format(yzxsl));
- //鎵ц姣斾緥
- shjdjw1502.setZxbl(String.valueOf((yzxsl / sum * 100)));
-
- // 鎷涙爣/绔炰环姣斾緥
- shjdjw1502.setZbjjbl("100");
- shjdjw1502.setCzbz(api1403.getCzbz());
-
- return shjdjw1502;
- }
-
- private ShjdjwApi1203 copyApi1203(Api1203 api1203) {
- ShjdjwApi1203 shjdjwApi1203 = new ShjdjwApi1203();
-
- BeanUtils.copyProperties(api1203, shjdjwApi1203);
-
- shjdjwApi1203.setQydbh(api1203.getRkjydh());
- shjdjwApi1203.setHwbm(api1203.getHwdm());
- List<Api1105> list = api1105Rep.findPushDataByHwdm(api1203.getHwdm());
- if(null != list && list.size() > 0){
- shjdjwApi1203.setHwbm(list.get(0).getHwmc());
- }
- shjdjwApi1203.setYpbm(api1203.getRkywdh());
- shjdjwApi1203.setJyjg(api1203.getJyz());
- shjdjwApi1203.setJyjl(api1203.getJyjg());
- shjdjwApi1203.setPzbm(api1203.getLspzdm());
- shjdjwApi1203.setBjw("jiading");
- shjdjwApi1203.setPch("0");
- return shjdjwApi1203;
- }
-
- private ShjdjwApi1310 copyApi1310(Api1310 api1310) {
- ShjdjwApi1310 shjdjwApi1310 = new ShjdjwApi1310();
-
- BeanUtils.copyProperties(api1310, shjdjwApi1310);
-
- shjdjwApi1310.setZjbgdbh(api1310.getZjbgdh());
- shjdjwApi1310.setPznm(api1310.getLspzdm());
- shjdjwApi1310.setSkdjbm(api1310.getLsdjdm());
- shjdjwApi1310.setJylbbm(api1310.getJylb());
-// if (StringUtils.isNotEmpty(shjdjwApi1310.getJyxm())) {
-// String[] split = shjdjwApi1310.getJyxm().split(",");
-// StringBuilder jyjl = new StringBuilder();
-// for (String s : split) {
-// jyjl.append(",鍚堟牸");
-// }
-// shjdjwApi1310.setJyjl(jyjl.toString().substring(1));
-// }
- //璋冩暣涓轰紶閫掓楠屽��
- shjdjwApi1310.setJyjl(api1310.getJyxmz());
- shjdjwApi1310.setZlzbjgpd(api1310.getZbjgpd());
- //鏌ヨ鍗曚綅淇℃伅
- List<Api1101> listApi1101 = api1101Rep.findPushData(api1310.getKqdm());
- if (null != listApi1101 && listApi1101.size() > 0) {
- shjdjwApi1310.setDwmc(listApi1101.get(0).getDwmc());
- }
-
- //鏌ヨ浠撴埧淇℃伅
- List<Api1103> listApi1103 = api1103Rep.findPushDataByCfdm(api1310.getHwdm().substring(0, 25));
- if (null != listApi1103 && listApi1103.size() > 0) {
- shjdjwApi1310.setCfmc(listApi1103.get(0).getCfmc());
- }
-
- //鏌ヨ寤掗棿淇℃伅
- List<Api1104> listApi1104 = api1104Rep.findDataByAjdh(api1310.getHwdm().substring(0, 28));
- if (null != listApi1104 && listApi1104.size() > 0) {
- shjdjwApi1310.setAjmc(listApi1104.get(0).getAjmc());
- }
-
- //鏌ヨ搴撳尯淇℃伅
- List<Api1102> listApi1102 = api1102Rep.findPushData(api1310.getKqdm());
- if (null != listApi1102 && listApi1102.size() > 0) {
- shjdjwApi1310.setKdmc(listApi1102.get(0).getKqmc());
- }
- //鏌ヨ绮搴撳瓨
- List<Api1208> listApi1208 = api1208Rep.getDataByHwdm(api1310.getHwdm());
- if (null != listApi1208 && listApi1208.size() > 0) {
- shjdjwApi1310.setKdmc(listApi1208.get(0).getLsxzdm());
- }
- shjdjwApi1310.setPch("0");
- return shjdjwApi1310;
- }
-
- private ShjdjwApi1209 copyApi1209(Api1209 api1209) {
- ShjdjwApi1209 shjdjwApi1209 = new ShjdjwApi1209();
-
- BeanUtils.copyProperties(api1209, shjdjwApi1209);
-
- shjdjwApi1209.setSydbh(api1209.getSydh());
-
- shjdjwApi1209.setRksl(api1209.getRkjz());
- shjdjwApi1209.setCksl(api1209.getCkjz());
- shjdjwApi1209.setSysl(api1209.getJzsysl());
- //鏌ヨ鍗曚綅淇℃伅
- List<Api1101> listApi1101 = api1101Rep.findPushData(api1209.getKqdm());
- if (null != listApi1101 && listApi1101.size() > 0) {
- shjdjwApi1209.setDwmc(listApi1101.get(0).getDwmc());
- }
- //鏌ヨ搴撳尯淇℃伅
- List<Api1102> listApi1102 = api1102Rep.findPushData(api1209.getKqdm());
- if (null != listApi1102 && listApi1102.size() > 0) {
- shjdjwApi1209.setKdmc(listApi1102.get(0).getKqmc());
- }
- //璐т綅淇℃伅
- shjdjwApi1209.setHwbm(api1209.getHwdm());
- List<Api1105> list = api1105Rep.findPushDataByHwdm(api1209.getHwdm());
- if(null != list && list.size() > 0){
- shjdjwApi1209.setHwbm(list.get(0).getHwmc());
- }
-
- shjdjwApi1209.setNx(api1209.getYwrq());
- //杈呮崯鐩婃暟閲�
- shjdjwApi1209.setFsysl(0.0);
- //鎹熺泭绫诲瀷
- shjdjwApi1209.setSylx(api1209.getJzsysl() > 0 ? "0" : "1");
- return shjdjwApi1209;
- }
-
- private ShjdjwApi1208 copyApi1208(Api1208 api1208) {
- ShjdjwApi1208 shjdjwApi1208 = new ShjdjwApi1208();
-
- BeanUtils.copyProperties(api1208, shjdjwApi1208);
-
- shjdjwApi1208.setLspzbm(api1208.getLspzdm());
- shjdjwApi1208.setLsxzbm(api1208.getLsxzdm());
- shjdjwApi1208.setDjbm(api1208.getLsdjdm());
- shjdjwApi1208.setLqgsdwbm(api1208.getLqgsdwdm());
-
- //鏌ヨ鍗曚綅淇℃伅
- List<Api1101> listApi1101 = api1101Rep.findPushData(api1208.getKqdm());
- if (null != listApi1101 && listApi1101.size() > 0) {
- shjdjwApi1208.setDwmc(listApi1101.get(0).getDwmc());
- }
-
- //鏌ヨ浠撴埧淇℃伅
- List<Api1103> listApi1103 = api1103Rep.findPushDataByCfdm(api1208.getHwdm().substring(0, 25));
- if (null != listApi1103 && listApi1103.size() > 0) {
- shjdjwApi1208.setCfmc(listApi1103.get(0).getCfmc());
- }
-
- //鏌ヨ寤掗棿淇℃伅
- List<Api1104> listApi1104 = api1104Rep.findDataByAjdh(api1208.getHwdm().substring(0, 28));
- if (null != listApi1104 && listApi1104.size() > 0) {
- shjdjwApi1208.setAjmc(listApi1104.get(0).getAjmc());
- }
-
- shjdjwApi1208.setKcjcsj(api1208.getZhgxsj());
-
- shjdjwApi1208.setPch("0");
- return shjdjwApi1208;
- }
-
- private ShjdjwApi1205 copyApi1205(Api1205 api1205) {
- ShjdjwApi1205 shjdjwApi1205 = new ShjdjwApi1205();
-
- BeanUtils.copyProperties(api1205, shjdjwApi1205);
-
- shjdjwApi1205.setYwdh(api1205.getCkywdh());
- shjdjwApi1205.setHtbm(api1205.getHth());
- shjdjwApi1205.setPzbm(api1205.getLspzdm());
- shjdjwApi1205.setDjbm(api1205.getLsdjdm());
- shjdjwApi1205.setLqxzbm(api1205.getLsxzdm());
- shjdjwApi1205.setCzbz(api1205.getCzbz());
- shjdjwApi1205.setLrfs("0");
- shjdjwApi1205.setPzbm(api1205.getLspzdm());
-
- //鏌ヨ鍗曚綅淇℃伅
- List<Api1101> listApi1101 = api1101Rep.findPushData(api1205.getKqdm());
- if (null != listApi1101 && listApi1101.size() > 0) {
- shjdjwApi1205.setDwmc(listApi1101.get(0).getDwmc());
- }
-
- //鏌ヨ璐т綅淇℃伅
- List<Api1105> listApi1105 = api1105Rep.findPushDataByHwdm(api1205.getHwdm());
- if (null != listApi1105 && listApi1105.size() > 0) {
- shjdjwApi1205.setCfmc(listApi1105.get(0).getHwmc());
- }
-
- shjdjwApi1205.setDjlx("0");
-
- //鏌ヨ瀛楀吀鏁版嵁
- ApiTrigger apiTrigger = apiTriggerService.findNameByCode(api1205.getLspzdm(), Constant.TRIGGER_P_LSPZ);
- shjdjwApi1205.setWlmc(null == apiTrigger ? api1205.getLspzdm() : apiTrigger.getName());
- shjdjwApi1205.setDz(StringUtils.isNotEmpty(api1205.getXldd()) ? api1205.getXldd() : "搴撳唴");
-
- shjdjwApi1205.setDksj(api1205.getDjsj());
- shjdjwApi1205.setLksj(api1205.getCmsj());
- shjdjwApi1205.setLhnd(DateFormatUtils.format(api1205.getCmsj(), "yyyy"));
- shjdjwApi1205.setPch("0");
- return shjdjwApi1205;
- }
-
-
- /**
- * 鑾峰彇鎺ュ彛缂栫爜
- *
- * @param inteId
- * @return
- */
- private String getDataId(String inteId) {
- switch (inteId) {
- case "1102":
- //鍗曚綅鎺ュ彛缂栫爜
- return ShjdjwApiCodeConstant.API_CODE_LS1101;
- case "1202":
- //绮鍏ュ簱鎺ュ彛缂栫爜
- return ShjdjwApiCodeConstant.API_CODE_LS1302;
- case "1203":
- //绮鍏ュ簱妫�楠屾帴鍙ｇ紪鐮�
- return ShjdjwApiCodeConstant.API_CODE_LS1303;
- case "1205":
- //绮鍑哄簱鎺ュ彛缂栫爜
- return ShjdjwApiCodeConstant.API_CODE_LS1306;
- case "1208":
- //绮搴撳瓨鎺ュ彛缂栫爜
- return ShjdjwApiCodeConstant.API_CODE_LS1310;
- case "1209":
- //鎹熺泭鍗曟帴鍙ｇ紪鐮�
- return ShjdjwApiCodeConstant.API_CODE_LS1311;
- case "1310":
- //璐ㄦ鎺ュ彛缂栫爜
- return ShjdjwApiCodeConstant.API_CODE_LS1201;
- case "1403":
- //杞崲璁″垝鎺ュ彛缂栫爜
- return ShjdjwApiCodeConstant.API_CODE_LS1501;
- default:
- return inteId;
- }
-
- }
-
- //瑁呮崲灏佽
- private void copyApi1202(Api1202 api1202, ShjdjwApi1202 shjdjwApi1202) {
- BeanUtils.copyProperties(api1202, shjdjwApi1202);
- String ywdh = api1202.getRkywdh();
- shjdjwApi1202.setYwdh(ywdh);
- shjdjwApi1202.setHwbm(api1202.getHwdm());
- List<Api1105> list = api1105Rep.findPushDataByHwdm(api1202.getHwdm());
- if(null != list && list.size() > 0){
- shjdjwApi1202.setHwbm(list.get(0).getHwmc());
- }
- shjdjwApi1202.setPzbm(api1202.getLspzdm());
- shjdjwApi1202.setLqxzbm(api1202.getLsxzdm());
- shjdjwApi1202.setZjkl(api1202.getZjklxj());
- //杞崲璁″垝鍗曞彿
- shjdjwApi1202.setJhbh(api1202.getJhmxh());
- //椤哄簭鍙�
- shjdjwApi1202.setSxh(ywdh.substring(ywdh.length() - 4));
- shjdjwApi1202.setDjzt("2");
- //涓氬姟鍗曞彿
- shjdjwApi1202.setJydbh(api1202.getRkywdh());
- //杞崲骞村害
- shjdjwApi1202.setLhnd(api1202.getShnd());
- //鍒板簱鏃堕棿銆佺搴撴椂闂�
- shjdjwApi1202.setDksj(api1202.getDjsj());
- shjdjwApi1202.setLksj(api1202.getCmsj());
- //鎵规鍙�
- shjdjwApi1202.setPch("0");
- }
-
-
- @Override
- public ResponseDto pullData(ApiParam param, ApiConfs conf) {
- //璇ュ崗璁棤姝ゅ疄鐜�
- return null;
- }
}
diff --git a/src/main/java/com/fzzy/push/shjdjw2023/dto/Shjdjw1502.java b/src/main/java/com/fzzy/push/shjdjw2023/dto/Shjdjw1502.java
deleted file mode 100644
index ac00f8e..0000000
--- a/src/main/java/com/fzzy/push/shjdjw2023/dto/Shjdjw1502.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.fzzy.push.shjdjw2023.dto;
-
-import com.bstek.dorado.annotation.PropertyDef;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class Shjdjw1502 implements Serializable {
-
- @PropertyDef(label = "鍗曚綅鍚嶇О")
- private String dwmc;
-
- @PropertyDef(label = "璁″垝骞村害")
- private String jhnd;
-
- @PropertyDef(label = "璁″垝鏁伴噺")
- private String jhsl;
-
- @PropertyDef(label = "宸叉墽琛屾暟閲�")
- private String yzxsl;
-
- @PropertyDef(label = "鎵ц姣斾緥")
- private String zxbl;
-
- @PropertyDef(label = "鎷涙爣/绔炰环姣斾緥")
- private String zbjjbl;
-
- @PropertyDef(label = "鎿嶄綔鏍囧織")
- private String czbz;
-
-
-}
diff --git a/src/main/java/com/fzzy/push/shjdjw2023/dto/Shjdjw2023Api1101.java b/src/main/java/com/fzzy/push/shjdjw2023/dto/Shjdjw2023Api1101.java
new file mode 100644
index 0000000..0248c89
--- /dev/null
+++ b/src/main/java/com/fzzy/push/shjdjw2023/dto/Shjdjw2023Api1101.java
@@ -0,0 +1,113 @@
+package com.fzzy.push.shjdjw2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+import com.bstek.dorado.annotation.PropertyDef;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鍗曚綅淇℃伅
+ * @author czt
+ * @date 2023/12/26 18:27
+ */
+@Data
+public class Shjdjw2023Api1101 implements Serializable {
+
+ private static final long serialVersionUID = 9157617424050247565L;
+
+ @PropertyDef(label = "鍗曚綅浠ｇ爜")
+ private String dwdm;
+
+ @PropertyDef(label = "鍗曚綅鍚嶇О")
+ private String dwmc;
+
+ @PropertyDef(label = "鍗曚綅绫诲瀷")
+ private String dwlx;
+
+ @PropertyDef(label = "娉ㄥ唽鏃ユ湡")
+ @JSONField(format = "yyyy-MM-dd")
+ private Date zcrq;
+
+ @PropertyDef(label = "娉ㄥ唽璧勬湰")
+ private Double zczb;
+
+ @PropertyDef(label = "璧勪骇鎬婚")
+ private Double zcze;
+
+ @PropertyDef(label = "娉曞畾浠ｈ〃浜�")
+ private String fddbr;
+
+ @PropertyDef(label = "娉曚汉韬唤璇佸彿")
+ private String frsfzh;
+
+ @PropertyDef(label = "娉曚汉鑱旂郴鏂瑰紡")
+ private String frlxfs;
+
+ @PropertyDef(label = "浼佷笟鑱旂郴浜�")
+ private String qylxr;
+
+ @PropertyDef(label = "鍔炲叕鐢佃瘽")
+ private String bgdh;
+
+ @PropertyDef(label = "娉ㄥ唽鍦板潃")
+ private String zcdz;
+
+ @PropertyDef(label = "鐢靛瓙閭")
+ @JSONField(serialize = true)
+ private String dzyx = "鏃�";
+
+ @PropertyDef(label = "浼佷笟瀹樻柟缃戠珯鍦板潃")
+ @JSONField(serialize = true)
+ private String qygfwzdz = "鏃�";
+
+ @PropertyDef(label = "浼犵湡鍙风爜")
+ @JSONField(serialize = true)
+ private String czhm = "鏃�";
+
+ @PropertyDef(label = "閭斂缂栫爜")
+ private String yzbm;
+
+ @PropertyDef(label = "琛屾斂鍖哄垝浠ｇ爜")
+ private String xzqhdm;
+
+ @PropertyDef(label = "涓婄骇鍗曚綅鍚嶇О")
+ @JSONField(serialize = true)
+ private String sjdwmc = "鏃�";
+
+ @PropertyDef(label = "涓婄骇鍗曚綅浠ｇ爜")
+ @JSONField(serialize = true)
+ private String sjdwdm = "鏃�";
+
+ @PropertyDef(label = "搴撳尯鏁�")
+ private Integer kqs;
+
+ @PropertyDef(label = "浠撴埧鏁�")
+ private Integer cfs;
+
+ @PropertyDef(label = "寤掗棿鏁�")
+ private Integer ajs;
+
+ @PropertyDef(label = "鍗曚綅鐘舵��")
+ private String dwzt;
+
+ @PropertyDef(label = "娌圭綈鏁�")
+ private Integer ygs;
+
+ @PropertyDef(label = "缁忓害")
+ private Double jd;
+
+ @PropertyDef(label = "绾害")
+ private Double wd;
+
+ @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/shjdjw2023/dto/Shjdjw2023Api1102.java b/src/main/java/com/fzzy/push/shjdjw2023/dto/Shjdjw2023Api1102.java
new file mode 100644
index 0000000..c852436
--- /dev/null
+++ b/src/main/java/com/fzzy/push/shjdjw2023/dto/Shjdjw2023Api1102.java
@@ -0,0 +1,78 @@
+package com.fzzy.push.shjdjw2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鎺ュ彛琛�-搴撳尯淇℃伅
+ */
+@Data
+public class Shjdjw2023Api1102 implements Serializable {
+
+ private static final long serialVersionUID = 6597930270077627879L;
+
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ private String kqdm;
+
+ @PropertyDef(label = "鍗曚綅浠ｇ爜")
+ private String dwdm;
+
+ @PropertyDef(label = "搴撳尯鍚嶇О")
+ private String kqmc;
+
+ @PropertyDef(label = "搴撳尯鍦板潃")
+ private String kqdz;
+
+ @PropertyDef(label = "琛屾斂鍖哄垝浠ｇ爜")
+ private String xzqhdm;
+
+ @PropertyDef(label = "搴撳尯浜ф潈", description = "1锛� 鑷湁 2锛氱璧� 3锛氬叡鏈� 4锛氭贩鍚� 9锛氬叾浠�")
+ private String kqcq;
+
+ @PropertyDef(label = "鏈夋晥浠撳")
+ private Double yxcr;
+
+ @PropertyDef(label = "鏈夋晥缃愬")
+ private Double yxgr;
+
+ @PropertyDef(label = "鍗犲湴闈㈢Н")
+ private Double zdmj;
+
+ @PropertyDef(label = "浠撴埧鏁�")
+ private Integer cfs;
+
+ @PropertyDef(label = "娌圭綈鏁�")
+ private Integer ygs;
+
+ @PropertyDef(label = "搴撳尯缁忓害")
+ private Double jd;
+
+ @PropertyDef(label = "搴撳尯绾害")
+ private Double wd;
+
+ @PropertyDef(label = "搴撳尯鐘舵��", description = "1:姝ｅ父锛堥粯璁わ級 2:閫�鍑哄偍澶囩伯鎵垮偍")
+ private String kqzt;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private Date zhgxsj;
+
+ @PropertyDef(label = "搴撳尯灞炴��", description = "1:甯傜骇鐩村睘锛�2:甯傜骇浠ｅ偍锛�3:鍖虹骇鐩村偍锛�4:鍖虹骇浠ｅ偍锛�9锛氬叾浠�")
+ private String kqsx;
+
+ @PropertyDef(label = "寤掗棿鏁�")
+ private Integer ajs;
+
+ @PropertyDef(label = "鏍囪浣�", description = "1:姝ｅ父(榛樿), 2:閫�鍑哄偍澶囩伯鎵垮偍")
+ private String bjw;
+
+ @PropertyDef(label = "鍌ㄥ浠撳")
+ private Double cbcr;
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/push/shjdjw2023/dto/Shjdjw2023Api1103.java b/src/main/java/com/fzzy/push/shjdjw2023/dto/Shjdjw2023Api1103.java
new file mode 100644
index 0000000..ada2f72
--- /dev/null
+++ b/src/main/java/com/fzzy/push/shjdjw2023/dto/Shjdjw2023Api1103.java
@@ -0,0 +1,197 @@
+package com.fzzy.push.shjdjw2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鎺ュ彛琛�-浠撴埧淇℃伅
+ */
+@Data
+public class Shjdjw2023Api1103 implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 8095346227076335949L;
+
+ @PropertyDef(label = "浠撴埧浠ｇ爜")
+ private String cfdm;
+
+ @PropertyDef(label = "浠撴埧鍚嶇О")
+ private String cfmc;
+
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ private String kqdm;
+
+ @PropertyDef(label = "浠撴埧绫诲瀷浠ｇ爜")
+ private String cflxdm;
+
+ @PropertyDef(label = "浜や粯浣跨敤鏃ユ湡")
+ @JSONField(format = "yyyy-MM-dd")
+ private Date jfsyrq;
+
+ @PropertyDef(label = "寤鸿鍗曚綅")
+ private String jsdw;
+
+ @PropertyDef(label = "璁捐浣跨敤骞撮檺")
+ private String sjsynx;
+
+ @PropertyDef(label = "璁捐鍗曚綅")
+ private String sjdw;
+
+ @PropertyDef(label = "鐩戠悊鍗曚綅")
+ private String jldw;
+
+ @PropertyDef(label = "澧欎綋缁撴瀯")
+ private String qtjg;
+
+ @PropertyDef(label = "鎴块《缁撴瀯")
+ private String fdjg;
+
+ @PropertyDef(label = "鎴挎灦缁撴瀯")
+ private String fjjg;
+
+ @PropertyDef(label = "鍦伴潰缁撴瀯")
+ private String dmjg;
+
+ @PropertyDef(label = "璁捐浠撳")
+ private Double sjcr;
+
+ @PropertyDef(label = "浠撳闀�")
+ private Double cwc;
+
+ @PropertyDef(label = "浠撳瀹�")
+ private Double cwk;
+
+ @PropertyDef(label = "浠撳妾愰珮")
+ private Double cwyg;
+
+ @PropertyDef(label = "浠撳椤堕珮")
+ private Double cwdg;
+
+ @PropertyDef(label = "绛掍粨澶栧緞")
+ private Double tcwj;
+
+ @PropertyDef(label = "浠撳唴闀�")
+ private Double cnc;
+
+ @PropertyDef(label = "浠撳唴瀹�")
+ private Double cnk;
+
+ @PropertyDef(label = "浠撳唴妾愰珮")
+ private Double cnyg;
+
+ @PropertyDef(label = "浠撳唴瑁呯伯绾块珮")
+ private Double cnzlxg;
+
+ @PropertyDef(label = "绛掍粨鍐呭緞")
+ private Double tcnj;
+
+ @PropertyDef(label = "浠撳唴浣撶Н")
+ private Double cntj;
+
+ @PropertyDef(label = "浠撻棬鏁伴噺")
+ private Integer cmsl;
+
+ @PropertyDef(label = "浠撻棬浣嶇疆")
+ private String cmwz;
+
+ @PropertyDef(label = "浠撻棬楂樺害")
+ private Double cmgd;
+
+ @PropertyDef(label = "浠撻棬瀹藉害")
+ private Double cmkd;
+
+ @PropertyDef(label = "鎸＄伯闂ㄥ瀷寮�")
+ private String dlmxs;
+
+ @PropertyDef(label = "浠撴埧鏄惁瀹屽ソ")
+ private String cfsfwh;
+
+ @PropertyDef(label = "鍌ㄧ伯鍔熸晥")
+ private String clgx;
+
+ @PropertyDef(label = "鑳藉惁闅旂儹淇濇俯")
+ private String nfgrbw;
+
+ @PropertyDef(label = "闅旂儹淇濇俯鎺柦")
+ private String grbwcs;
+
+ @PropertyDef(label = "闅旂儹鎬ц兘")
+ private String grxn;
+
+ @PropertyDef(label = "缁撴瀯鏉愭枡")
+ private String jgcl;
+
+ @PropertyDef(label = "姘斿瘑鎬�")
+ private String qmx;
+
+ @PropertyDef(label = "鏄惁宸茶繘琛屼俊鎭寲鏀归��")
+ private String sfyjxxxhgz;
+
+ @PropertyDef(label = "绮儏鎶�鏈�")
+ private String lqjs;
+
+ @PropertyDef(label = "鑳藉惁鏁ｈ鍌ㄥ瓨")
+ private String nfszcc;
+
+ @PropertyDef(label = "鏈夋棤闃查紶闃查泙闃茶櫕瑁呯疆鍙婅鏂�")
+ private String ywfsfqfczz;
+
+ @PropertyDef(label = "鏈夋棤闃茬伀闃茬垎闃茬洍璁炬柦")
+ private String ywfhfbfdss;
+
+ @PropertyDef(label = "鏈夋棤鏈烘閫氶璁炬柦")
+ private String ywjxtfss;
+
+ @PropertyDef(label = "閫氶绯荤粺鍨嬪紡")
+ private String tfxtxs;
+
+ @PropertyDef(label = "閫氶鎶�鏈�")
+ private String tfjs;
+
+ @PropertyDef(label = "鑳藉惁鐜祦鐔忚捀鏉�铏�")
+ private String nfhlxzsc;
+
+ @PropertyDef(label = "鏉�铏妧鏈�")
+ private String scjs;
+
+ @PropertyDef(label = "鑳藉惁瀵屾爱浣庢哀姘旇皟鍌ㄧ伯")
+ private String nffddyqtcl;
+
+ @PropertyDef(label = "鎺ф俯鎶�鏈�")
+ private String kwjs;
+
+ @PropertyDef(label = "瀹宠櫕妫�娴嬫柟寮�")
+ private String hcjcfs;
+
+ @PropertyDef(label = "浠撴埧鐘舵��")
+ private String cfzt;
+
+ @PropertyDef(label = "淇濈鍛�")
+ private String bgr;
+
+ @PropertyDef(label = "浠撴埧缁忓害")
+ private Double jd;
+
+ @PropertyDef(label = "浠撴埧绾害")
+ private Double wd;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private Date zhgxsj;
+
+ @PropertyDef(label = "寤掗棿鏁�")
+ private Integer ajs;
+
+ @PropertyDef(label = "鏍囪浣�")
+ private String bjw;
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/push/shjdjw2023/dto/Shjdjw2023Api1104.java b/src/main/java/com/fzzy/push/shjdjw2023/dto/Shjdjw2023Api1104.java
new file mode 100644
index 0000000..87bc82c
--- /dev/null
+++ b/src/main/java/com/fzzy/push/shjdjw2023/dto/Shjdjw2023Api1104.java
@@ -0,0 +1,200 @@
+package com.fzzy.push.shjdjw2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鎺ュ彛琛�-寤掗棿淇℃伅
+ *
+ * @author czt
+ * @date 2022-09-02 14:18
+ */
+@Data
+public class Shjdjw2023Api1104 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 String cflxdm;
+
+ @PropertyDef(label = "浜や粯浣跨敤鏃ユ湡")
+ @JSONField(format = "yyyy-MM-dd")
+ private Date jfsyrq;
+
+ @PropertyDef(label = "寤鸿鍗曚綅")
+ private String jsdw;
+
+ @PropertyDef(label = "璁捐浣跨敤骞撮檺")
+ private String sjsynx;
+
+ @PropertyDef(label = "璁捐鍗曚綅")
+ private String sjdw;
+
+ @PropertyDef(label = "鐩戠悊鍗曚綅")
+ private String jldw;
+
+ @PropertyDef(label = "澧欎綋缁撴瀯")
+ private String qtjg;
+
+ @PropertyDef(label = "鎴块《缁撴瀯")
+ private String fdjg;
+
+ @PropertyDef(label = "鎴挎灦缁撴瀯")
+ private String fjjg;
+
+ @PropertyDef(label = "鍦伴潰缁撴瀯")
+ private String dmjg;
+
+ @PropertyDef(label = "璁捐浠撳")
+ private Double sjcr;
+
+ @PropertyDef(label = "浠撳闀�")
+ private Double cwc;
+
+ @PropertyDef(label = "浠撳瀹�")
+ private Double cwk;
+
+ @PropertyDef(label = "浠撳妾愰珮")
+ private Double cwyg;
+
+ @PropertyDef(label = "浠撳椤堕珮")
+ private Double cwdg;
+
+ @PropertyDef(label = "绛掍粨澶栧緞")
+ private Double tcwj;
+
+ @PropertyDef(label = "浠撳唴闀�")
+ private Double cnc;
+
+ @PropertyDef(label = "浠撳唴瀹�")
+ private Double cnk;
+
+ @PropertyDef(label = "浠撳唴妾愰珮")
+ private Double cnyg;
+
+ @PropertyDef(label = "浠撳唴瑁呯伯绾块珮")
+ private Double cnzlxg;
+
+ @PropertyDef(label = "绛掍粨鍐呭緞")
+ private Double tcnj;
+
+ @PropertyDef(label = "浠撳唴浣撶Н")
+ private Double cntj;
+
+ @PropertyDef(label = "浠撻棬鏁伴噺")
+ private Integer cmsl;
+
+ @PropertyDef(label = "浠撻棬浣嶇疆")
+ private String cmwz;
+
+ @PropertyDef(label = "浠撻棬楂樺害")
+ private Double cmgd;
+
+ @PropertyDef(label = "浠撻棬瀹藉害")
+ private Double cmkd;
+
+ @PropertyDef(label = "鎸＄伯闂ㄥ瀷寮�")
+ private String dlmxs;
+
+ @PropertyDef(label = "浠撴埧鏄惁瀹屽ソ")
+ private String cfsfwh;
+
+ @PropertyDef(label = "鍌ㄧ伯鍔熸晥")
+ private String clgx;
+
+ @PropertyDef(label = "鑳藉惁闅旂儹淇濇俯")
+ private String nfgrbw;
+
+ @PropertyDef(label = "闅旂儹淇濇俯鎺柦")
+ private String grbwcs;
+
+ @PropertyDef(label = "闅旂儹鎬ц兘")
+ private String grxn;
+
+ @PropertyDef(label = "缁撴瀯鏉愭枡")
+ private String jgcl;
+
+ @PropertyDef(label = "姘斿瘑鎬�")
+ private String qmx;
+
+ @PropertyDef(label = "鏄惁宸茶繘琛屼俊鎭寲鏀归��")
+ private String sfyjxxxhgz;
+
+ @PropertyDef(label = "绮儏鎶�鏈�")
+ private String lqjs;
+
+ @PropertyDef(label = "鑳藉惁鏁ｈ鍌ㄥ瓨")
+ private String nfszcc;
+
+ @PropertyDef(label = "鏈夋棤闃查紶闃查泙闃茶櫕瑁呯疆鍙婅鏂�")
+ private String ywfsfqfczz;
+
+ @PropertyDef(label = "鏈夋棤闃茬伀闃茬垎闃茬洍璁炬柦")
+ private String ywfhfbfdss;
+
+ @PropertyDef(label = "鏈夋棤鏈烘閫氶璁炬柦")
+ private String ywjxtfss;
+
+ @PropertyDef(label = "閫氶绯荤粺鍨嬪紡")
+ private String tfxtxs;
+
+ @PropertyDef(label = "閫氶鎶�鏈�")
+ private String tfjs;
+
+ @PropertyDef(label = "鑳藉惁鐜祦鐔忚捀鏉�铏�")
+ private String nfhlxzsc;
+
+ @PropertyDef(label = "鏉�铏妧鏈�")
+ private String scjs;
+
+ @PropertyDef(label = "鑳藉惁瀵屾爱浣庢哀姘旇皟鍌ㄧ伯")
+ private String nffddyqtcl;
+
+ @PropertyDef(label = "鎺ф俯鎶�鏈�")
+ private String kwjs;
+
+ @PropertyDef(label = "瀹宠櫕妫�娴嬫柟寮�")
+ private String hcjcfs;
+
+ @PropertyDef(label = "浠撴埧鐘舵��")
+ private String cfzt;
+
+ @PropertyDef(label = "淇濈鍛�")
+ private String bgr;
+
+ @PropertyDef(label = "浠撴埧缁忓害")
+ private Double jd;
+
+ @PropertyDef(label = "浠撴埧绾害")
+ private Double wd;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ private Date zhgxsj;
+
+ @PropertyDef(label = "鏍囪浣�")
+ private String bjw;
+
+ @PropertyDef(label = "绮鎬ц川浠ｇ爜")
+ private String lsxzdm;
+
+}
diff --git a/src/main/java/com/fzzy/push/shjdjw2023/dto/Shjdjw2023Api1105.java b/src/main/java/com/fzzy/push/shjdjw2023/dto/Shjdjw2023Api1105.java
new file mode 100644
index 0000000..570d37b
--- /dev/null
+++ b/src/main/java/com/fzzy/push/shjdjw2023/dto/Shjdjw2023Api1105.java
@@ -0,0 +1,53 @@
+package com.fzzy.push.shjdjw2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鎺ュ彛琛�-璐т綅淇℃伅
+ */
+@Data
+public class Shjdjw2023Api1105 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/shjdjw2023/dto/Shjdjw2023Api1202.java b/src/main/java/com/fzzy/push/shjdjw2023/dto/Shjdjw2023Api1202.java
new file mode 100644
index 0000000..46fbda2
--- /dev/null
+++ b/src/main/java/com/fzzy/push/shjdjw2023/dto/Shjdjw2023Api1202.java
@@ -0,0 +1,225 @@
+package com.fzzy.push.shjdjw2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+import javax.persistence.Column;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author czt
+ * 绮鍏ュ簱淇℃伅鏁版嵁灏佽
+ */
+@Data
+public class Shjdjw2023Api1202 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 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 cchlx;
+
+ @PropertyDef(label = "杞﹁埞鍙�")
+ private String cch;
+
+ @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;
+
+ @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;
+
+ @PropertyDef(label = "鎵规鍙�")
+ private String pch = "鏃�";
+
+ @PropertyDef(label = "鏍囪浣�")
+ private String bjw;
+
+ @PropertyDef(label = "椹宠繍鍗曞彿")
+ private String bydh = "鏃�";
+
+ @PropertyDef(label = "妫�鏂ゅ崟鍙�")
+ private String jjdh = "鏃�";
+
+ @PropertyDef(label = "杞崲骞村害")
+ private String lhnd;
+
+ @PropertyDef(label = "绮鎬ц川杞彉鍗曞彿")
+ private String lsxzzbdh;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "璁拌处鏃ユ湡")
+ private Date jzrq;
+}
diff --git a/src/main/java/com/fzzy/push/shjdjw2023/dto/Shjdjw2023Api1203.java b/src/main/java/com/fzzy/push/shjdjw2023/dto/Shjdjw2023Api1203.java
new file mode 100644
index 0000000..0168ee8
--- /dev/null
+++ b/src/main/java/com/fzzy/push/shjdjw2023/dto/Shjdjw2023Api1203.java
@@ -0,0 +1,85 @@
+package com.fzzy.push.shjdjw2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author czt
+ * 绮鍏ュ簱妫�楠屼俊鎭暟鎹皝瑁�
+ */
+@Data
+public class Shjdjw2023Api1203 implements Serializable {
+
+ private static final long serialVersionUID = -5707489334519718974L;
+
+ //鍏ュ簱涓氬姟鍗曞彿鐢� 12 浣嶆暟瀛楃粍鎴愶紝绗� 1-2 浣嶄负涓氬姟浠ｇ爜锛�14浠ｈ〃绮鍏ュ簱锛夛紝绗� 3-8 浣嶄緷娆′负骞翠唤鐨勫悗涓や綅銆�2 浣嶆湀浠姐��2 浣嶆棩鏈燂紝鍚庡洓浣嶄负椤哄簭鐮併�備緥濡傦細141605041234
+ @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;
+
+ @PropertyDef(label = "璐ㄦ缂栧彿")
+ private String zjbh;
+
+}
diff --git a/src/main/java/com/fzzy/push/shjdjw2023/dto/Shjdjw2023Api1205.java b/src/main/java/com/fzzy/push/shjdjw2023/dto/Shjdjw2023Api1205.java
new file mode 100644
index 0000000..142bb55
--- /dev/null
+++ b/src/main/java/com/fzzy/push/shjdjw2023/dto/Shjdjw2023Api1205.java
@@ -0,0 +1,174 @@
+package com.fzzy.push.shjdjw2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.persistence.Id;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author czt
+ * 绮鍑哄簱淇℃伅鏁版嵁灏佽
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class Shjdjw2023Api1205 implements Serializable {
+
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -6381473449862569451L;
+
+ //涓氬姟鍗曞彿鐢� 12 浣嶆暟瀛楃粍鎴愶紝绗� 1-2 浣嶄负涓氬姟缂栫爜锛�15 浠ｈ〃绮鍑哄簱锛夛紝绗� 3-8 浣嶄緷娆′负骞翠唤鐨勫悗涓や綅銆�2 浣嶆湀浠姐��2浣嶆棩鏈燂紝鍚庡洓浣嶄负椤哄簭鐮併�備緥濡傦細141605041234
+ @PropertyDef(label = "鍑哄簱涓氬姟鍗曞彿")
+ private String ckywdh;
+
+ @PropertyDef(label = "璐т綅浠ｇ爜")
+ private String hwdm;
+
+ @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 cchlx;
+
+ @PropertyDef(label = "杞﹁埞鍙�")
+ private String cch;
+
+ @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 ="鏃�";
+
+ @PropertyDef(label = "璁″垝鏄庣粏鍙�")
+ private String jhmxh = "鏃�";
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "璁拌处鏃ユ湡")
+ private Date jzrq;
+
+ @PropertyDef(label = "妫�鏂ょ被鍨�")
+ private String jjlx = "鏃�";
+
+ private String lhnd;
+}
diff --git a/src/main/java/com/fzzy/push/shjdjw2023/dto/Shjdjw2023Api1209.java b/src/main/java/com/fzzy/push/shjdjw2023/dto/Shjdjw2023Api1209.java
new file mode 100644
index 0000000..fb7a4f1
--- /dev/null
+++ b/src/main/java/com/fzzy/push/shjdjw2023/dto/Shjdjw2023Api1209.java
@@ -0,0 +1,118 @@
+package com.fzzy.push.shjdjw2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author czt
+ * 鎹熸孩鍗曚俊鎭暟鎹皝瑁�
+ */
+@Data
+public class Shjdjw2023Api1209 implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -8778664614878279565L;
+
+ @PropertyDef(label = "鎹熸孩鍗曞彿")
+ private String sydh;
+
+ @PropertyDef(label = "璐т綅浠ｇ爜")
+ private String hwdm;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "璁拌处鏃ユ湡")
+ private Date jzrq;
+
+ @PropertyDef(label = "鍏ュ簱鍑�閲�")
+ private Double rkjz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鍏ュ簱鏃堕棿")
+ private Date rksj;
+
+ @PropertyDef(label = "鍏ュ簱姘村垎")
+ private Double rksf;
+
+ @PropertyDef(label = "鍏ュ簱鏉傝川")
+ private Double rkzz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鍑哄簱鏃堕棿")
+ private Date cksj;
+
+ @PropertyDef(label = "鍑哄簱鍑�閲�")
+ private Double ckjz;
+
+ @PropertyDef(label = "鍑哄簱姘村垎")
+ private Double cksf;
+
+ @PropertyDef(label = "鍑哄簱鏉傝川")
+ private Double ckzz;
+
+ @PropertyDef(label = "鍑�閲嶆崯婧㈡暟閲�")
+ private Double jzsysl;
+
+ @PropertyDef(label = "姘存潅鍑忛噺")
+ private Double szjl;
+
+ @PropertyDef(label = "鑷劧鎹熻�楀畾棰�")
+ private Double zrshde;
+
+ @PropertyDef(label = "瓒呰�楁暟閲�")
+ private Double chsl;
+
+ @PropertyDef(label = "鎹熺泭鏄惁姝ｅ父")
+ private String sysfzc;
+
+ @PropertyDef(label = "鎹熸孩绫诲瀷",description = "1:鎹熻�楋紝2锛氭崯澶憋紝3.鍏朵粬")
+ private String sylx;
+
+ @PropertyDef(label = "鎹熸孩鍘熷洜")
+ private String syyy;
+
+ @PropertyDef(label = "浠撳偍瀹℃牳浜�")
+ private String ccshr;
+
+ @PropertyDef(label = "璐ㄦ瀹℃牳浜�")
+ private String zjshr;
+
+ @PropertyDef(label = "缁熻瀹℃牳浜�")
+ private String tjshr;
+
+ @PropertyDef(label = "浼氳瀹℃牳浜�")
+ private String kjshr;
+
+ @PropertyDef(label = "棰嗗瀹℃牳浜�")
+ private String ldshr;
+
+ @PropertyDef(label = "澶囨敞")
+ private String bz ="鏃�";
+
+ @PropertyDef(label = "鍗曟嵁绫诲瀷")
+ private String djlx;
+
+ @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;
+
+ @PropertyDef(label = "绮鎬ц川浠ｇ爜")
+ private String lsxzdm;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "涓氬姟鏃ユ湡" )
+ private Date ywrq;
+}
diff --git a/src/main/java/com/fzzy/push/shjdjw2023/dto/Shjdjw2023Api1310.java b/src/main/java/com/fzzy/push/shjdjw2023/dto/Shjdjw2023Api1310.java
new file mode 100644
index 0000000..c993bd8
--- /dev/null
+++ b/src/main/java/com/fzzy/push/shjdjw2023/dto/Shjdjw2023Api1310.java
@@ -0,0 +1,124 @@
+package com.fzzy.push.shjdjw2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author czt
+ * 璐ㄦ鏁版嵁
+ */
+@Data
+public class Shjdjw2023Api1310 implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ @PropertyDef(label = "璐ㄦ鎶ュ憡鍗曞彿")
+ private String zjbgdh;
+
+ @PropertyDef(label = "璐т綅浠ｇ爜")
+ private String hwdm;
+
+ @PropertyDef(label = "绮鍝佺浠ｇ爜")
+ private String lspzdm;
+
+ @PropertyDef(label = "绮绛夌骇浠ｇ爜")
+ private String lsdjdm;
+
+ @PropertyDef(label = "妫�楠岀被鍒�")
+ private String jylb;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "妫�楠屾棩鏈�")
+ private Date jyrq;
+
+ @PropertyDef(label = "妫�楠屽崟浣�")
+ private String jydw;
+
+ @PropertyDef(label = "妫�楠屼汉")
+ private String jyr;
+
+ @PropertyDef(label = "妫�楠屼緷鎹�")
+ private String jyyj;
+
+ @PropertyDef(label = "鎸囨爣绫诲埆")
+ private String zblb;
+
+ @PropertyDef(label = "妫�楠岄」鐩�")
+ private String jyxm;
+
+ @PropertyDef(label = "妫�楠岄」鐩��")
+ private String jyxmz;
+
+ @PropertyDef(label = "鎸囨爣缁撴灉鍒ゅ畾")
+ private String zbjgpd;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "绛惧彂鏃ユ湡")
+ private Date qfrq;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鎶ュ憡鍑哄叿鏃堕棿")
+ private Date bgcjsj;
+
+ @PropertyDef(label = "瀹℃牳浜哄鍚�")
+ private String shrxm;
+
+ @PropertyDef(label = "鎵︽牱鍗曠紪鍙�")
+ private String qydbh;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鎵︽牱鏃堕棿")
+ private Date qysj;
+
+ @PropertyDef(label = "鎵︽牱鍖哄煙")
+ private String qyqy;
+
+ @PropertyDef(label = "鎵︽牱浜哄鍚�")
+ private String qyrxm;
+
+ @PropertyDef(label = "鐩戠潱浜哄鍚�")
+ private String jdrxm;
+
+ @PropertyDef(label = "鏍峰搧缂栧彿")
+ private String ypbh;
+
+ @PropertyDef(label = "鏍峰搧鏁伴噺")
+ private double ypsl;
+
+ @PropertyDef(label = "浠ｈ〃鏁伴噺")
+ private double dbsl;
+
+ @PropertyDef(label = "鏍峰搧绛夌骇")
+ private String ypdj;
+
+ @PropertyDef(label = "鏄惁姝ｅ父瀛樺偍骞撮檺")
+ private String sfzcccnx;
+
+ @PropertyDef(label = "澶囨敞")
+ private String bz;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ private Date zhgxsj;
+
+ @PropertyDef(label = "鏍囪浣�")
+ private String bjw;
+
+ @PropertyDef(label = "鎵规鍙�")
+ private String pch;
+
+ @PropertyDef(label = "绮鎬ц川浠ｇ爜")
+ private String lsxzdm;
+
+ @PropertyDef(label = "鎶ュ憡绫诲瀷", description = "1-鍗曚綅妫�楠岋紱2-鏁翠綋妫�楠岋紱3-鍏朵粬")
+ private String bglx;
+}
diff --git a/src/main/java/com/fzzy/push/shjdjw2023/dto/Shjdjw2023Api1403.java b/src/main/java/com/fzzy/push/shjdjw2023/dto/Shjdjw2023Api1403.java
new file mode 100644
index 0000000..2deb89b
--- /dev/null
+++ b/src/main/java/com/fzzy/push/shjdjw2023/dto/Shjdjw2023Api1403.java
@@ -0,0 +1,72 @@
+package com.fzzy.push.shjdjw2023.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 czt
+ * 杞崲璁″垝淇℃伅
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class Shjdjw2023Api1403 implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+
+ @PropertyDef(label = "杞崲璁″垝鍗曞彿")
+ private String lhjhdh;
+
+ @PropertyDef(label = "璁″垝鏂囧彿")
+ private String jhwh;
+
+ @PropertyDef(label = "璁″垝鍚嶇О")
+ private String jhmc;
+
+ @PropertyDef(label = "璁″垝骞村害")
+ private String jhnd;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "寮�濮嬫墽琛屾棩鏈�")
+ private Date kszxrq;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "鎴鎵ц鏃ユ湡")
+ private Date jzzxrq;
+
+ @PropertyDef(label = "璁″垝鎵ц鍗曚綅")
+ private String jhzxdw;
+
+ @PropertyDef(label = "璁″垝鎵ц鍗曚綅鍚嶇О")
+ private String jhzxdwmc;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "璁″垝涓嬭揪鏃堕棿")
+ private Date jhxdsj;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ private Date zhgxsj;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @PropertyDef(label = "鏍囪浣�")
+ private String bjw;
+
+ @PropertyDef(label = "杞叆鏁伴噺")
+ private String lrsl;
+
+ @PropertyDef(label = "杞嚭鏁伴噺")
+ private String lcsl;
+
+
+}
diff --git a/src/main/java/com/fzzy/push/shjdjw2023/dto/Shjdjw2023Api1404.java b/src/main/java/com/fzzy/push/shjdjw2023/dto/Shjdjw2023Api1404.java
new file mode 100644
index 0000000..735757a
--- /dev/null
+++ b/src/main/java/com/fzzy/push/shjdjw2023/dto/Shjdjw2023Api1404.java
@@ -0,0 +1,61 @@
+package com.fzzy.push.shjdjw2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author czt
+ * 杞崲璁″垝鏄庣粏淇℃伅
+ */
+@Data
+public class Shjdjw2023Api1404 implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ @PropertyDef(label = "璁″垝鏄庣粏鍗曞彿")
+ private String jhmxdh;
+
+ @PropertyDef(label = "杞崲璁″垝鍗曞彿")
+ private String lhjhdh;
+
+ @PropertyDef(label = "绮鍝佺浠ｇ爜")
+ private String lspzdm;
+
+ @PropertyDef(label = "绮绛夌骇浠ｇ爜")
+ private String lsdjdm;
+
+ @PropertyDef(label = "绮鎬ц川浠ｇ爜")
+ private String lsxzdm;
+
+ @PropertyDef(label = "鏀惰幏骞村害")
+ private String shnd;
+
+ @PropertyDef(label = "杞崲璐т綅浠ｇ爜")
+ private String lhhwdm;
+
+ @PropertyDef(label = "杞崲鏁伴噺")
+ private double lhsl;
+
+ @PropertyDef(label = "杞崲绫诲瀷")
+ private String lhlx;
+
+ @PropertyDef(label = "鏄庣粏鐘舵��" , description = "0锛氫綔搴燂紱1锛氭湁鏁�")
+ private String mxzt;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ private Date zhgxsj;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @PropertyDef(label = "鏍囪浣�")
+ private String bjw;
+
+}
diff --git a/src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwApi1101.java b/src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwApi1101.java
deleted file mode 100644
index 650eacf..0000000
--- a/src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwApi1101.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.fzzy.push.shjdjw2023.dto;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import com.bstek.dorado.annotation.PropertyDef;
-import java.io.Serializable;
-
-/**
- * 鍗曚綅淇℃伅鏁版嵁灏佽
- * @author czt
- * @date 2023/5/9 19:27
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class ShjdjwApi1101 implements Serializable {
- /**
- *
- */
- private static final long serialVersionUID = 1L;
-
- @PropertyDef(label = "鍗曚綅鍚嶇О")
- private String dwmc;
-
- @PropertyDef(label = "搴撳尯鏁�")
- private Integer kqs;
-
- @JSONField(serialize = false)
- @PropertyDef(label = "搴撳尯浠ｇ爜" )
- private String kqdm;
-
- @PropertyDef(label = "搴撳尯鍚嶇О" )
- private String kqmc;
-
- @PropertyDef(label = "浠撴埧鏁�" )
- private Integer cfs;
-
- @PropertyDef(label = "浠撴埧鍚嶇О", description = "澶氫釜鐢�#闅斿紑")
- private String cfmc;
-
- @PropertyDef(label = "鎿嶄綔鏍囧織" )
- private String czbz;
-
-}
diff --git a/src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwApi1202.java b/src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwApi1202.java
deleted file mode 100644
index a8bff62..0000000
--- a/src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwApi1202.java
+++ /dev/null
@@ -1,285 +0,0 @@
-package com.fzzy.push.shjdjw2023.dto;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.bstek.dorado.annotation.PropertyDef;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import javax.persistence.Id;
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 绮鍏ュ簱淇℃伅鏁版嵁灏佽
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class ShjdjwApi1202 implements Serializable {
-
-
- @Id
- @PropertyDef(label = "鍏ュ簱涓氬姟鍗曞彿")
- private String ywdh;
-
- @PropertyDef(label = "鍗曚綅鍚嶇О")
- private String hwbm;
-
- @PropertyDef(label = "搴撶偣鍚嶇О")
- private String kdmc;
-
- @PropertyDef(label = "涓氬姟鏃ユ湡")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
- @JSONField(format = "yyyy-MM-dd")
- private String ywrq;
-
- @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 = "鐧昏鏃堕棿")
- @JSONField(format = "yyyy-MM-dd HH:mm:ss")
- private String djsj;
-
- @PropertyDef(label = "绮鍝佺浠ｇ爜")
- private String pzbm;
-
- @PropertyDef(label = "绮鎬ц川浠ｇ爜")
- private String Lqxzbm;
-
- @PropertyDef(label = "鏀惰幏骞村害")
- private String shnd;
-
- @PropertyDef(label = "浜у湴浠ｇ爜")
- private String cddm;
-
- @PropertyDef(label = "妫�鏂ょ被鍨�")
- private String jjlx;
-
- @PropertyDef(label = "姣涢噸")
- private Double mz;
-
- @PropertyDef(label = "姣涢噸璁￠噺鏃堕棿")
- @JSONField(format = "yyyy-MM-dd HH:mm:ss")
- private String mzjlsj;
-
- @PropertyDef(label = "鐨噸")
- private Double pz;
-
- @PropertyDef(label = "鐨噸璁￠噺鏃堕棿")
- @JSONField(format = "yyyy-MM-dd HH:mm:ss")
- private Date pzjlsj;
-
- @PropertyDef(label = "璐ㄦ鎵ｉ噺")
- private Double zjkl;
-
- @PropertyDef(label = "鍑�閲�")
- private Double jz;
-
- @PropertyDef(label = "鍑洪棬鏃堕棿")
- @JSONField(format = "yyyy-MM-dd HH:mm:ss")
- private Date cmsj;
-
- @PropertyDef(label = "鍑洪棬纭闂ㄥ矖浜哄憳濮撳悕")
- private String cmqrmgryxm;
-
- @PropertyDef(label = "杞崲璁″垝鍗曞彿")
- private String jhbh;
-
- @PropertyDef(label = "澶囨敞")
- private String bz;
-
- @PropertyDef(label = "鎿嶄綔鏍囧織")
- private String czbz;
-
- @PropertyDef(label = "鐧昏闂ㄥ矖浜哄憳濮撳悕")
- private String djmgryxm;
-
- @PropertyDef(label = "姣涢噸鐩戠鍛�")
- private String mzjby;
-
- @PropertyDef(label = "姣涢噸璁￠噺鍛�")
- private String mzjly;
-
- @PropertyDef(label = "鐨噸鐩戠鍛�")
- private String pzjby;
-
- @PropertyDef(label = "鐨噸璁￠噺鍛�")
- private String pzjly;
-
- @PropertyDef(label = "鍖呰鐗�")
- private String bzw;
-
- @PropertyDef(label = "鏍囧噯鍖呭崟鍖呴噸")
- private Double bzbdbz;
-
- @PropertyDef(label = "鏍囧噯鍖呬欢鏁�")
- private Integer bzbjs;
-
- @PropertyDef(label = "鍖呰鐗╂墸閲�")
- private Double bzwkl;
-
- @PropertyDef(label = "鍏朵粬鎵ｉ噺")
- private Double qtkl;
-
- @PropertyDef(label = "鎵ｉ噺鍘熷洜")
- private String klyy;
-
- @PropertyDef(label = "鎵ｆ按鏉�")
- private Double ksz;
-
- @PropertyDef(label = "鎵ｆ暣鏅�")
- private Double kzs;
-
- @PropertyDef(label = "鐜板満鎵ｉ噺")
- private Double xckl;
-
- @PropertyDef(label = "椤哄簭鍙�")
- private String sxh;
-
- @PropertyDef(label = "鍗曟嵁鐘舵��")
- private String djzt;
-
- @PropertyDef(label = "缁撶畻鏍囧織")
- private String jsbz;
-
- @PropertyDef(label = "瀹℃牳璁拌处鏃堕棿")
- @JSONField(format = "yyyy-MM-dd HH:mm:ss")
- private Date shjzsj;
-
- @PropertyDef(label = "璁拌处鏈熼棿")
- private String jzqj;
-
- @PropertyDef(label = "鍗曟嵁绫诲瀷")
- private String djlx;
-
- @PropertyDef(label = "褰曞叆鏂瑰紡")
- private String lrfs;
-
- @PropertyDef(label = "鏄惁澶嶆")
- private String sffj;
-
- @PropertyDef(label = "瀹㈡埛")
- private String kh;
-
- @PropertyDef(label = "鍝佺鍚嶇О")
- private String wlmc;
-
- @PropertyDef(label = "鍦板潃")
- private String dz;
-
- @PropertyDef(label = "鍒板簱鏃堕棿")
- @JSONField(format = "yyyy-MM-dd HH:mm:ss")
- private Date dksj;
-
- @PropertyDef(label = "绂诲簱鏃堕棿")
- @JSONField(format = "yyyy-MM-dd HH:mm:ss")
- private Date lksj;
-
- @PropertyDef(label = "鎵︽牱鍗曠紪鍙�")
- private String qydbh;
-
- @PropertyDef(label = "鎵︽牱鍛�")
- private String qyy;
-
- @PropertyDef(label = "绛夌骇鍐呯爜")
- private String wldjnm;
-
- @PropertyDef(label = "妫�楠屽憳")
- private String jyy;
-
- @PropertyDef(label = "妫�楠屾椂闂�")
- @JSONField(format = "yyyy-MM-dd HH:mm:ss")
- private Date jysj;
-
- @PropertyDef(label = "妫�楠屾剰瑙�")
- private String jyyj;
-
- @PropertyDef(label = "鍥藉埆")
- private String gb;
-
- @PropertyDef(label = "浜у湴")
- private String cd;
-
- @PropertyDef(label = "妫�楠屾剰瑙佸娉�")
- private String jyyjbz;
-
- @PropertyDef(label = "姣涢噸淇敼鍘熷洜")
- private String mzxgyy;
-
- @PropertyDef(label = "鐨噸淇敼鍘熷洜")
- private String pzxgyy;
-
- @PropertyDef(label = "瀹夋帓鍏ョ伯浠撴埧")
- private String aprlcf;
-
- @PropertyDef(label = "瀹夋帓鍏ョ伯璐т綅")
- private String aprlhw;
-
- @PropertyDef(label = "瀹為檯鍏ョ伯浠撴埧")
- private String sjrlcf;
-
- @PropertyDef(label = "瀹為檯鍏ョ伯璐т綅")
- private String sjrlhw;
-
- @PropertyDef(label = "淇濈鍛�")
- private String bgy;
-
- @PropertyDef(label = "淇濈鍛樻墸姘�")
- private Double bgyks;
-
- @PropertyDef(label = "淇濈鍛樻墸鏉�")
- private Double bgykz;
-
- @PropertyDef(label = "淇濈鍛樻剰瑙�")
- private String bgyyj;
-
- @PropertyDef(label = "鐑樺共鎵ｉ噺姣斾緥")
- private Double hgklbl;
-
- @PropertyDef(label = "鐑樺共鎵ｉ噺")
- private Double hgkl;
-
- @PropertyDef(label = "鎵ｉ噺鍓嶅噣閲�")
- private Double klqjz;
-
- @PropertyDef(label = "缁撶畻浜�")
- private String jsr;
-
- @PropertyDef(label = "鍏ュ簱鍗曡皟鏁存爣蹇�")
- private String tzbz;
-
- @PropertyDef(label = "璋冩暣鏃堕棿")
- @JSONField(format = "yyyy-MM-dd HH:mm:ss")
- private Date tzsj;
-
- @PropertyDef(label = "璋冩暣浜�")
- private String tzr;
-
- @PropertyDef(label = "涓氬姟鍗曞彿")
- private String jydbh;
-
- @PropertyDef(label = "杞崲骞村害")
- private String lhnd;
-
- @PropertyDef(label = "鎵规鍙�")
- private String Pch;
-
-
-}
diff --git a/src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwApi1203.java b/src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwApi1203.java
deleted file mode 100644
index e7a1e1e..0000000
--- a/src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwApi1203.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.fzzy.push.shjdjw2023.dto;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.bstek.dorado.annotation.PropertyDef;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import javax.persistence.Id;
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 绮鍏ュ簱妫�楠屼俊鎭暟鎹皝瑁�
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class ShjdjwApi1203 implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @PropertyDef(label = "鍏ュ簱妫�楠屽崟鍙�")
- private String qydbh;
-
- @PropertyDef(label = "璐т綅浠ｇ爜")
- private String hwbm;
-
- @PropertyDef(label = "鍏ュ簱涓氬姟鍗曞彿")
- private String ypbm;
-
- @PropertyDef(label = "鎵︽牱鏃堕棿")
- @JSONField(format = "yyyy-MM-dd HH:mm:ss")
- private Date qysj;
-
- @PropertyDef(label = "鎵︽牱浜哄鍚�")
- private String qyrxm;
-
- @PropertyDef(label = "妫�楠岄」鐩�")
- private String jyxm;
-
- @PropertyDef(label = "妫�楠岀粨鏋�")
- private String jyjg;
-
- @PropertyDef(label = "澧炴墸浠�")
- private String zkj;
-
- @PropertyDef(label = "澧炴墸閲�")
- private String zkl;
-
- @PropertyDef(label = "妫�楠屼汉濮撳悕")
- private String jyrxm;
-
- @PropertyDef(label = "妫�楠屾椂闂�")
- @JSONField(format = "yyyy-MM-dd HH:mm:ss")
- private String jysj;
-
- @PropertyDef(label = "妫�楠岀粨璁�")
- private String jyjl;
-
- @PropertyDef(label = "绮鍝佺浠ｇ爜")
- private String pzbm;
-
- @PropertyDef(label = "绮瀹氱瓑")
- private String lsdd;
-
- @PropertyDef(label = "鎿嶄綔鏍囧織")
- private String czbz;
-
- @PropertyDef(label = "鎵︽牱绫诲埆")
- private String qylb;
-
- @PropertyDef(label = "鎵ｉ噺姣斾緥")
- private Double klbl;
-
- @PropertyDef(label = "鏍囪浣�")
- private String bjw;
-
- @PropertyDef(label = "鎵规鍙�")
- private String pch;
-
-
-}
diff --git a/src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwApi1205.java b/src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwApi1205.java
deleted file mode 100644
index ed94fb7..0000000
--- a/src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwApi1205.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package com.fzzy.push.shjdjw2023.dto;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.bstek.dorado.annotation.PropertyDef;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import javax.persistence.Id;
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 绮鍑哄簱淇℃伅鏁版嵁灏佽
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class ShjdjwApi1205 implements Serializable {
-
-
- @Id
- @PropertyDef(label = "鍑哄簱涓氬姟鍗曞彿")
- private String ywdh;
-
- @PropertyDef(label = "鍗曚綅鍚嶇О")
- private String dwmc;
-
- @PropertyDef(label = "浠撴埧鍚嶇О")
- private String cfmc;
-
- @PropertyDef(label = "鍑哄簱閫氱煡鍗曞彿")
- private String cktzdh;
-
- @PropertyDef(label = "涓氬姟绫诲瀷")
- private String ywlx;
-
- @PropertyDef(label = "涓氬姟鏃ユ湡")
- @JSONField(format = "yyyy-MM-dd")
- private Date ywrq;
-
- @PropertyDef(label = "鍚堝悓鍙�")
- private String htbm;
-
- @PropertyDef(label = "杩愯緭宸ュ叿")
- private String ysgj;
-
- @PropertyDef(label = "杞﹁埞鍙�")
- private String cch;
-
- @PropertyDef(label = "鐧昏鏃堕棿")
- @JSONField(format = "yyyy-MM-dd HH:mm:ss")
- private Date djsj;
-
- @PropertyDef(label = "绮鍝佺浠ｇ爜")
- private String pzbm;
-
- @PropertyDef(label = "绮绛夌骇浠ｇ爜")
- private String djbm;
-
- @PropertyDef(label = "绮鎬ц川浠ｇ爜")
- private String lqxzbm;
-
- @PropertyDef(label = "鏀惰幏骞村害")
- private String shnd;
-
- @PropertyDef(label = "浜у湴浠ｇ爜")
- private String cddm;
-
- @PropertyDef(label = "鐨噸")
- private String pz;
-
- @PropertyDef(label = "鐨噸璁￠噺鏃堕棿")
- @JSONField(format = "yyyy-MM-dd HH:mm:ss")
- private Date pzjlsj;
-
- @PropertyDef(label = "姣涢噸")
- private String mz;
-
- @PropertyDef(label = "姣涢噸璁￠噺鏃堕棿")
- @JSONField(format = "yyyy-MM-dd HH:mm:ss")
- private Date mzjlsj;
-
- @PropertyDef(label = "鍑�閲�")
- private Double jz;
-
- @PropertyDef(label = "鍑洪棬鏃堕棿")
- @JSONField(format = "yyyy-MM-dd HH:mm:ss")
- private Date cmsj;
-
- @PropertyDef(label = "鎿嶄綔鏍囧織")
- private String czbz;
-
- @PropertyDef(label = "鍗曟嵁绫诲瀷")
- private String djlx;
-
- @PropertyDef(label = "褰曞叆鏂瑰紡")
- private String lrfs;
-
- @PropertyDef(label = "鍝佺鍚嶇О")
- private String wlmc;
-
- @PropertyDef(label = "鍦板潃")
- private String dz;
-
- @PropertyDef(label = "鍒板簱鏃堕棿")
- @JSONField(format = "yyyy-MM-dd")
- private Date dksj;
-
- @PropertyDef(label = "绂诲簱鏃堕棿")
- @JSONField(format = "yyyy-MM-dd")
- private Date lksj;
-
- @PropertyDef(label = "杞崲骞村害")
- private String lhnd;
-
- @PropertyDef(label = "鎵规鍙�")
- private String pch;
-
-
-}
diff --git a/src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwApi1208.java b/src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwApi1208.java
deleted file mode 100644
index dc78fbc..0000000
--- a/src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwApi1208.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package com.fzzy.push.shjdjw2023.dto;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.bstek.dorado.annotation.PropertyDef;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-/**
- * 绮搴撳瓨鏁版嵁灏佽
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class ShjdjwApi1208 {
-
- @PropertyDef(label = "鍗曚綅鍚嶇О")
- private String dwmc;
-
- @PropertyDef(label = "浠撴埧鍚嶇О")
- private String cfmc;
-
- @PropertyDef(label = "寤掗棿鍚嶇О")
- private String ajmc;
-
- @PropertyDef(label = "绮鍝佺浠ｇ爜")
- private String lspzbm;
-
- @PropertyDef(label = "绮鎬ц川浠ｇ爜")
- private String lsxzbm;
-
- @PropertyDef(label = "绮绛夌骇浠ｇ爜")
- private String djbm;
-
- @PropertyDef(label = "鏀惰幏骞村害")
- private String shnd;
-
- @PropertyDef(label = "鍥藉埆")
- private String gb;
-
- @PropertyDef(label = "浜у湴")
- private String cd;
-
- @PropertyDef(label = "绮潈褰掑睘鍗曚綅浠ｇ爜")
- private String lqgsdwbm;
-
- @PropertyDef(label = "绠＄悊鏂瑰紡")
- private String glfs;
-
- @PropertyDef(label = "搴撳瓨鐩戞祴鏃堕棿")
- @JSONField(format = "yyyy-MM-dd HH:mm:ss")
- private Date kcjcsj;
-
- @PropertyDef(label = "鏈熸湯搴撳瓨")
- private Double qmkc;
-
- @PropertyDef(label = "鎿嶄綔鏍囧織")
- private String czbz;
-
- @PropertyDef(label = "瀹為檯鏁伴噺")
- private Double sjsl;
-
- @PropertyDef(label = "骞村垵搴撳瓨")
- private Double ncye;
-
- @PropertyDef(label = "鏈熷垵搴撳瓨")
- private Double qckc;
-
- @PropertyDef(label = "鏈湡鏀跺叆")
- private Double bqsr;
-
- @PropertyDef(label = "鏈湡鏀嚭")
- private Double bqzc;
-
- @PropertyDef(label = "璐ㄩ噺鎯呭喌")
- private String zlqk;
-
- @PropertyDef(label = "璐ㄦ鎶ュ憡鍗曞唴鐮�")
- private String zjbgdnm;
-
- @PropertyDef(label = "鎵规鍙�")
- private String pch;
-
-}
diff --git a/src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwApi1209.java b/src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwApi1209.java
deleted file mode 100644
index 979e516..0000000
--- a/src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwApi1209.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package com.fzzy.push.shjdjw2023.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;
-
-/**
- * 鎹熸孩鍗曚俊鎭暟鎹皝瑁�
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class ShjdjwApi1209 implements Serializable {
-
- @PropertyDef(label = "鎹熸孩鍗曞彿")
- private String sydbh;
-
- @PropertyDef(label = "鍗曚綅鍚嶇О")
- private String dwmc;
-
- @PropertyDef(label = "搴撶偣鍚嶇О")
- private String kdmc;
-
- @PropertyDef(label = "璐т綅浠ｇ爜")
- private String hwbm;
-
- @PropertyDef(label = "涓氬姟鏃ユ湡")
- @JSONField(format = "yyyy-MM-dd")
- private Date ywrq;
-
- @PropertyDef(label = "鍏ュ簱鏁伴噺")
- private Double rksl;
-
- @PropertyDef(label = "鍏ュ簱鏃堕棿")
- @JSONField(format = "yyyy-MM-dd HH:mm:ss")
- private Date rksj;
-
- @PropertyDef(label = "鍑哄簱鏁伴噺")
- private Double cksl;
-
- @PropertyDef(label = "鍑哄簱鏃堕棿")
- @JSONField(format = "yyyy-MM-dd HH:mm:ss")
- private Date cksj;
-
- @PropertyDef(label = "鎹熸孩鏁伴噺")
- private Double sysl;
-
- @PropertyDef(label = "鎹熸孩鍘熷洜")
- private String syyy;
-
- @PropertyDef(label = "鎿嶄綔鏍囧織")
- private String czbz;
-
- @PropertyDef(label = "鍏ュ簱姘村垎")
- private Double rksf;
-
- @PropertyDef(label = "鍏ュ簱鏉傝川")
- private Double rkzz;
-
- @PropertyDef(label = "鍑哄簱姘村垎")
- private Double cksf;
-
- @PropertyDef(label = "鍑哄簱鏉傝川")
- private Double ckzz;
-
- @PropertyDef(label = "骞撮檺")
- @JSONField(format = "yyyy")
- private Date nx;
-
- @PropertyDef(label = "杈呮崯婧㈡暟閲�")
- private Double fsysl;
-
- @PropertyDef(label = "鎹熻�楃巼")
- private Double shl;
-
- @PropertyDef(label = "鎹熺泭绫诲瀷")
- private String sylx;
-
- @PropertyDef(label = "鍗曟嵁绫诲瀷")
- private String djlx;
-
-
-}
diff --git a/src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwApi1310.java b/src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwApi1310.java
deleted file mode 100644
index defab56..0000000
--- a/src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwApi1310.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package com.fzzy.push.shjdjw2023.dto;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.bstek.dorado.annotation.PropertyDef;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-public class ShjdjwApi1310 implements Serializable {
-
- @PropertyDef(label = "璐ㄦ鎶ュ憡鍗曞彿")
- @JsonProperty("Zjbgdbh")
- private String zjbgdbh;
-
- @PropertyDef(label = "鍗曚綅鍚嶇О")
- private String dwmc;
-
- @PropertyDef(label = "搴撶偣鍚嶇О")
- private String kdmc;
-
- @PropertyDef(label = "浠撴埧鍚嶇О")
- private String cfmc;
-
- @PropertyDef(label = "寤掗棿鍚嶇О")
- private String ajmc;
-
- @PropertyDef(label = "绮鍝佺浠ｇ爜")
- private String pznm;
-
- @PropertyDef(label = "绮绛夌骇浠ｇ爜")
- private String skdjbm;
-
- @PropertyDef(label = "鍏ュ簱鏃ユ湡")
- @JSONField(format = "yyyy-MM-dd")
- private Date rkrq;
-
- @PropertyDef(label = "妫�楠岀被鍒�")
- private String jylbbm;
-
- @PropertyDef(label = "妫�楠屽崟浣�")
- private String jydw;
-
- @PropertyDef(label = "妫�楠屼緷鎹�")
- private String jyyj;
-
- @PropertyDef(label = "鎸囨爣绫诲埆")
- private String zblb;
-
- @PropertyDef(label = "妫�楠岄」鐩�")
- private String jyxm;
-
- @PropertyDef(label = "妫�楠岀粨璁�")
- private String jyjl;
-
- @PropertyDef(label = "鎸囨爣缁撴灉鍒ゅ畾")
- private String zlzbjgpd;
-
- @PropertyDef(label = "鎵︽牱鏃堕棿")
- @JSONField(format = "yyyy-MM-dd HH:mm:ss")
- private Date qysj;
-
- @PropertyDef(label = "鏄惁姝ｅ父瀛樺偍骞撮檺")
- private String sfzcccnx;
-
- @PropertyDef(label = "鎿嶄綔鏍囧織")
- private String czbz;
-
- @PropertyDef(label = "鍏ュ簱骞撮檺")
- private Integer rknx;
-
- @PropertyDef(label = "妫�楠屾椂闂�")
- private Date jysj;
-
- @PropertyDef(label = "鍝佺鍚嶇О")
- private String wlzhmc;
-
- @PropertyDef(label = "绮鎬ц川")
- private String lsxz;
-
- @PropertyDef(label = "椋熷搧瀹夊叏鎸囨爣璐ㄦ缁撴灉")
- private String spaqzjjg;
-
- @PropertyDef(label = "鎵规鍙�")
- private String pch;
-
-}
diff --git a/src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwApi1403.java b/src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwApi1403.java
deleted file mode 100644
index e8e1e13..0000000
--- a/src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwApi1403.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.fzzy.push.shjdjw2023.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;
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class ShjdjwApi1403 implements Serializable {
-
-
- @PropertyDef(label = "杞崲璁″垝鍗曞彿")
- private String jhbm;
-
- @PropertyDef(label = "璁″垝骞村害")
- private String jhnd;
-
- @PropertyDef(label = "寮�濮嬫墽琛屾棩鏈�")
- @JSONField(format = "yyyy-MM-dd")
- private Date kszxrq;
-
- @PropertyDef(label = "鎴鎵ц鏃ユ湡")
- @JSONField(format = "yyyy-MM-dd")
- private Date jzzxrq;
-
- @PropertyDef(label = "璁″垝涓嬭揪鍗曚綅")
- private String jhxddw;
-
- @PropertyDef(label = "璁″垝涓嬭揪鏃堕棿")
- @JSONField(format = "yyyy-MM-dd")
- private Date jhxdsj;
-
- @PropertyDef(label = "鎿嶄綔鏍囧織")
- private String czbz;
-
- @PropertyDef(label = "璁″垝鍚嶇О")
- private String jhmc;
-
- @PropertyDef(label = "鍝佺")
- private String wlzhmc;
-
- @PropertyDef(label = "鏀惰幏骞村害")
- private String shnd;
-
- @PropertyDef(label = "瀹為檯瀹屾垚鏃ユ湡")
- private String sjwcrq;
-
- @PropertyDef(label = "璁″垝鐘舵��")
- private String jhbz;
-
- @PropertyDef(label = "杞叆杞嚭绫诲瀷")
- private String lrlclx;
-
- @PropertyDef(label = "杞叆鏁伴噺")
- private Double lrsl;
-
- @PropertyDef(label = "杞嚭鏁伴噺")
- private Double lcsl;
-
- @PropertyDef(label = "鏀惰喘鏁伴噺")
- private Double sgsl;
-
- @PropertyDef(label = "閿�鍞暟閲�")
- private Double xssl;
-
- @PropertyDef(label = "鎵规鍙�")
- private String pch;
-
-}
diff --git a/src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwReqDto.java b/src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwReqDto.java
index e53fed2..7ff78e2 100644
--- a/src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwReqDto.java
+++ b/src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwReqDto.java
@@ -6,10 +6,10 @@
/**
* 涓婃捣鍢夊畾绾鐩戠骞冲彴-鏁版嵁灏佽
* @author czt
- * @date 2023/5/9 14:35
+ * @date 2023/12/26
*/
@Data
-public class ShjdjwReqDto<T> implements Serializable {
+public class ShjdjwReqDto implements Serializable {
/**
* 鎺ュ彛缂栫爜
@@ -19,5 +19,5 @@
/**
* 涓婁紶鏁版嵁(闆嗗悎褰㈠紡)
*/
- private T data;
+ private String data;
}
diff --git a/src/main/resources/application-pro2.yml b/src/main/resources/application-pro2.yml
new file mode 100644
index 0000000..f2e896b
--- /dev/null
+++ b/src/main/resources/application-pro2.yml
@@ -0,0 +1,61 @@
+########################## 涓婃捣鍢夊畾-绾 ##########################
+server:
+ port: 8091
+ jetty:
+ max-http-post-size: 209715200
+ tomcat:
+ max-http-post-size: 209715200
+spring:
+ datasource:
+ #涓绘暟鎹簮
+ primary:
+ url: jdbc:mysql://127.0.0.1:3306/igds_api_jw?useUnicode=true&characterEncoding=utf-8&useSSL=false
+ driver-class-name: com.mysql.jdbc.Driver
+ username: root
+ password: root
+ #娆℃暟鎹簮
+ secondary:
+ url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8&useSSL=false
+ driver-class-name: com.mysql.jdbc.Driver
+ username: root
+ password: root
+ jpa:
+ #涓籮pa閰嶇疆
+ primary:
+ show-sql: true
+ properties:
+ hibernate:
+ hbm2ddl:
+ auto: update
+ dialect: org.hibernate.dialect.MySQL5InnoDBDialect
+ #娆pa閰嶇疆
+ secondary:
+ show-sql: true
+ properties:
+ hibernate:
+ hbm2ddl:
+ auto: none
+ dialect: org.hibernate.dialect.MySQL5InnoDBDialect
+ # Redis鐩稿叧閰嶇疆
+ redis:
+ database: 1
+ host: 127.0.0.1
+ port: 6379
+ password: Abc123..
+ # 杩炴帴姹犳渶澶ц繛鎺ユ暟锛堜娇鐢ㄨ礋鍊艰〃绀烘病鏈夐檺鍒讹級
+ pool:
+ max-active: 200
+ max-wait: -1
+ max-idle: 10
+ min-idle: 0
+ timeout: 6000
+igds:
+ default:
+ companyId: 5303
+ file-path: D:/IGDS-API-jw/FILE/
+ img-path: D:/IGDS/FILE/
+ # 鐪佸钩鍙癛SA瀵嗛挜瀵逛俊鎭�
+ #鍏挜锛歁IGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCsoiS5Q5CKAT9w5EbZXCxJO/5J2iV3i2HrTW/YcGs2EGeQsQc97EWPdFE1SPXGH5p9TO8nCFRJScj4WeeKUVcuRpzR7czQQ+c6kf6cR9LLQrAiGEMQSk13j/5UsJho23IQDGKWoH18f5aPdX8tJn/o4aR6mMxUY9jdaSKEBck1TQIDAQAB
+ # 鍖虹骇骞冲彴RSA瀵嗛挜瀵逛俊鎭�
+ #鍏挜锛歁IGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCRsamMiP5Op2JJtp3+IIJADFYhL256ZW0KsOkMHruJ3hVwgvoimPHKuUWRI/CS365v4BwUzzfBRdbECMFsLA1e1FHPPA0uSsAIuSVwRzHXG4drX7ZCDa9GFZ+qyIFAU25j2e2PC9olvKbGLBfZ8cL1FLXGxSVyDCX4t/UMZdDULwIDAQAB
+ #绉侀挜锛歁IICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAJGxqYyI/k6nYkm2nf4ggkAMViEvbnplbQqw6Qweu4neFXCC+iKY8cq5RZEj8JLfrm/gHBTPN8FF1sQIwWwsDV7UUc88DS5KwAi5JXBHMdcbh2tftkINr0YVn6rIgUBTbmPZ7Y8L2iW8psYsF9nxwvUUtcbFJXIMJfi39Qxl0NQvAgMBAAECgYBKWLHfoCy9sFbMrN7UxnwQ+PqetpiW5tkNApf58ljbErQ4FO5V51xDieXBGejy2igmuOM7jz6xZtUgdiNV8uji/RtiNRqsBekVBPMeYAnPwA4GQ0HNwyHJ3ebJNQqT9bwrk8QpRUuCnrx/U1l7P1QNR5o52H1HpEKPlS0ga0fuQQJBAMdiSFYKt8/PwsYclvU/GqXrPy4cxMBhtE/ZssH9KourxnJcyfRz7EPgfSZykxlGHn8j/r8C2XxtAIYW6mRckqECQQC7EIZCZ3eV8abSIB33oKmw2jZlPQrHXMt8DWz8FYbNIA/9bvk9e9O42iQwMUtHfOMcNMWbcvKR/J+83bcE08TPAkA1ErdYl+/H1HDvVUrlq0+HnPArcSL6ZsedfcB0nNRHa4kehg6IEJdylf4aTuNTFfQmOcmkxLhpw4YhK1ZnMrEhAkEAuiMLNXA3MmCumk+TAiBAOdYoYjyHSTEw2VOSqpPQ+rN4tbmDEIbyefG2KK4kNhIy+pIYP0H11QYG/KuxvX/rSQJBALs0TqUgcGOp9+IkOq4jCXiVkP5/r7JWinQ4d6bYhJ4wspQYloYFCHljKKXtst1m8I3PC+vJY8R6va/3xtQKT8U=
diff --git a/src/main/resources/application-pro5303-jw.yml b/src/main/resources/application-pro5303-jw.yml
new file mode 100644
index 0000000..f2e896b
--- /dev/null
+++ b/src/main/resources/application-pro5303-jw.yml
@@ -0,0 +1,61 @@
+########################## 涓婃捣鍢夊畾-绾 ##########################
+server:
+ port: 8091
+ jetty:
+ max-http-post-size: 209715200
+ tomcat:
+ max-http-post-size: 209715200
+spring:
+ datasource:
+ #涓绘暟鎹簮
+ primary:
+ url: jdbc:mysql://127.0.0.1:3306/igds_api_jw?useUnicode=true&characterEncoding=utf-8&useSSL=false
+ driver-class-name: com.mysql.jdbc.Driver
+ username: root
+ password: root
+ #娆℃暟鎹簮
+ secondary:
+ url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8&useSSL=false
+ driver-class-name: com.mysql.jdbc.Driver
+ username: root
+ password: root
+ jpa:
+ #涓籮pa閰嶇疆
+ primary:
+ show-sql: true
+ properties:
+ hibernate:
+ hbm2ddl:
+ auto: update
+ dialect: org.hibernate.dialect.MySQL5InnoDBDialect
+ #娆pa閰嶇疆
+ secondary:
+ show-sql: true
+ properties:
+ hibernate:
+ hbm2ddl:
+ auto: none
+ dialect: org.hibernate.dialect.MySQL5InnoDBDialect
+ # Redis鐩稿叧閰嶇疆
+ redis:
+ database: 1
+ host: 127.0.0.1
+ port: 6379
+ password: Abc123..
+ # 杩炴帴姹犳渶澶ц繛鎺ユ暟锛堜娇鐢ㄨ礋鍊艰〃绀烘病鏈夐檺鍒讹級
+ pool:
+ max-active: 200
+ max-wait: -1
+ max-idle: 10
+ min-idle: 0
+ timeout: 6000
+igds:
+ default:
+ companyId: 5303
+ file-path: D:/IGDS-API-jw/FILE/
+ img-path: D:/IGDS/FILE/
+ # 鐪佸钩鍙癛SA瀵嗛挜瀵逛俊鎭�
+ #鍏挜锛歁IGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCsoiS5Q5CKAT9w5EbZXCxJO/5J2iV3i2HrTW/YcGs2EGeQsQc97EWPdFE1SPXGH5p9TO8nCFRJScj4WeeKUVcuRpzR7czQQ+c6kf6cR9LLQrAiGEMQSk13j/5UsJho23IQDGKWoH18f5aPdX8tJn/o4aR6mMxUY9jdaSKEBck1TQIDAQAB
+ # 鍖虹骇骞冲彴RSA瀵嗛挜瀵逛俊鎭�
+ #鍏挜锛歁IGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCRsamMiP5Op2JJtp3+IIJADFYhL256ZW0KsOkMHruJ3hVwgvoimPHKuUWRI/CS365v4BwUzzfBRdbECMFsLA1e1FHPPA0uSsAIuSVwRzHXG4drX7ZCDa9GFZ+qyIFAU25j2e2PC9olvKbGLBfZ8cL1FLXGxSVyDCX4t/UMZdDULwIDAQAB
+ #绉侀挜锛歁IICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAJGxqYyI/k6nYkm2nf4ggkAMViEvbnplbQqw6Qweu4neFXCC+iKY8cq5RZEj8JLfrm/gHBTPN8FF1sQIwWwsDV7UUc88DS5KwAi5JXBHMdcbh2tftkINr0YVn6rIgUBTbmPZ7Y8L2iW8psYsF9nxwvUUtcbFJXIMJfi39Qxl0NQvAgMBAAECgYBKWLHfoCy9sFbMrN7UxnwQ+PqetpiW5tkNApf58ljbErQ4FO5V51xDieXBGejy2igmuOM7jz6xZtUgdiNV8uji/RtiNRqsBekVBPMeYAnPwA4GQ0HNwyHJ3ebJNQqT9bwrk8QpRUuCnrx/U1l7P1QNR5o52H1HpEKPlS0ga0fuQQJBAMdiSFYKt8/PwsYclvU/GqXrPy4cxMBhtE/ZssH9KourxnJcyfRz7EPgfSZykxlGHn8j/r8C2XxtAIYW6mRckqECQQC7EIZCZ3eV8abSIB33oKmw2jZlPQrHXMt8DWz8FYbNIA/9bvk9e9O42iQwMUtHfOMcNMWbcvKR/J+83bcE08TPAkA1ErdYl+/H1HDvVUrlq0+HnPArcSL6ZsedfcB0nNRHa4kehg6IEJdylf4aTuNTFfQmOcmkxLhpw4YhK1ZnMrEhAkEAuiMLNXA3MmCumk+TAiBAOdYoYjyHSTEw2VOSqpPQ+rN4tbmDEIbyefG2KK4kNhIy+pIYP0H11QYG/KuxvX/rSQJBALs0TqUgcGOp9+IkOq4jCXiVkP5/r7JWinQ4d6bYhJ4wspQYloYFCHljKKXtst1m8I3PC+vJY8R6va/3xtQKT8U=
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
index 40f6952..d6c7d8d 100644
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -9,6 +9,7 @@
<property name="DEV_LOG_HOME" value="C:/app/igds-api/log"/>\
<!-- pro鏂囦欢璺緞 -->
<property name="PRO_LOG_HOME" value="C:/app/igds-api/log" />
+ <property name="PRO2_LOG_HOME" value="C:/app/igds-api2/log" />
<!-- linux鏂囦欢璺緞 -->
<property name="PRO_LINUX_HOME" value="/usr/local/igds-api/log" />
@@ -67,6 +68,40 @@
</root>
</springProfile>
+ <!-- 鐢熶骇鐜 -->
+ <springProfile name="pro2">
+ <!-- 姣忓ぉ浜х敓涓�涓枃浠� -->
+ <appender name="PRO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <!-- 鏂囦欢璺緞 -->
+ <file>${PRO2_LOG_HOME}/${APP_MODEL}-info.log</file>
+ <!-- 鏃ュ織璁板綍鍣ㄧ殑婊氬姩绛栫暐锛屾寜鏃ユ湡锛屾寜澶у皬璁板綍 -->
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <!-- 鏂囦欢鍚嶇О -->
+ <fileNamePattern>${PRO2_LOG_HOME}/${APP_MODEL}-info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+ <!--鏃ュ織鏂囦欢淇濈暀澶╂暟 -->
+ <maxHistory>60</maxHistory>
+ <!-- 鏃ュ織澶у皬 -->
+ <timeBasedFileNamingAndTriggeringPolicy
+ class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+ <maxFileSize>100MB</maxFileSize>
+ </timeBasedFileNamingAndTriggeringPolicy>
+ </rollingPolicy>
+ <encoder>
+ <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+ <charset>UTF-8</charset>
+ </encoder>
+ <layout class="ch.qos.logback.classic.PatternLayout">
+ <pattern>${PATTERN}</pattern>
+ </layout>
+ </appender>
+
+ <logger name="org.hibernate.tool" level="WARN"/>
+ <logger name="com.bstek.dorado" level="WARN"/>
+ <root level="info">
+ <appender-ref ref="PRO_FILE"/>
+ </root>
+ </springProfile>
+
<!-- 鐢熶骇鐜-linux -->
<springProfile name="linux">
<!-- 姣忓ぉ浜х敓涓�涓枃浠� -->
--
Gitblit v1.9.3