From 561bbb85896810c8a2595d3d58fa32325dcdfdf9 Mon Sep 17 00:00:00 2001
From: WS <1143478319@qq.com>
Date: 星期三, 10 五月 2023 18:25:30 +0800
Subject: [PATCH] 粮食购销模块数据上传
---
src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwApi1209.java | 85 ++++++
src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwApi1202.java | 286 ++++++++++++++++++++
src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwApi1208.java | 84 ++++++
src/main/java/com/fzzy/push/gb2022/GBPushService12.java | 4
src/main/java/com/fzzy/push/impl/ComPushService13.java | 10
src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwApi1205.java | 119 ++++++++
src/main/java/com/fzzy/push/shjdjw2023/Shjdjw2023PushService12.java | 21 +
src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java | 125 ++++++++
src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwApi1203.java | 80 +++++
9 files changed, 791 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/fzzy/push/gb2022/GBPushService12.java b/src/main/java/com/fzzy/push/gb2022/GBPushService12.java
index 47ebc04..6a0db63 100644
--- a/src/main/java/com/fzzy/push/gb2022/GBPushService12.java
+++ b/src/main/java/com/fzzy/push/gb2022/GBPushService12.java
@@ -105,7 +105,7 @@
// * 鎺ュ彛缂栫爜-1202 绮鍏ュ簱淇℃伅鏁版嵁鎺ュ彛
// */
// private void pushData1202(ApiParam param) {
-// List<Api1202> items = api1202Rep.findPushData(param.getKqdm());
+// List<ShjdjwApi1202> items = api1202Rep.findPushData(param.getKqdm());
// if (null == items || items.isEmpty()) {
// return;
// }
@@ -113,7 +113,7 @@
// param.setInteId(Constant.API_CODE_1202);
//
// ResponseDto responseDto;
-// for (Api1202 data : items) {
+// for (ShjdjwApi1202 data : items) {
// responseDto = apiRemoteService.pushData(param, data);
// if (responseDto.getSuccess() == 0) {
// if (Constant.CZBZ_I.equals(data.getCzbz())) {
diff --git a/src/main/java/com/fzzy/push/impl/ComPushService13.java b/src/main/java/com/fzzy/push/impl/ComPushService13.java
index 5bc5692..5180e54 100644
--- a/src/main/java/com/fzzy/push/impl/ComPushService13.java
+++ b/src/main/java/com/fzzy/push/impl/ComPushService13.java
@@ -3,15 +3,13 @@
import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.dto.ResponseDto;
-import com.fzzy.api.entity.Api1302;
-import com.fzzy.api.entity.Api1303;
-import com.fzzy.api.entity.Api1304;
-import com.fzzy.api.entity.Api1310;
+import com.fzzy.api.entity.*;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.view.repository.Api1302Rep;
import com.fzzy.api.view.repository.Api1303Rep;
import com.fzzy.api.view.repository.Api1304Rep;
import com.fzzy.api.view.repository.Api1310Rep;
+import com.fzzy.push.shjdjw2023.ShjdjwApiRemoteService2023;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -128,7 +126,7 @@
}
param.setInteCategory(Constant.API_CATEGORY_13);
- param.setInteId(Constant.API_CODE_1302);
+ param.setInteId(Constant.API_CODE_1310);
ResponseDto responseDto;
@@ -142,4 +140,6 @@
}
}
}
+
+
}
diff --git a/src/main/java/com/fzzy/push/shjdjw2023/Shjdjw2023PushService12.java b/src/main/java/com/fzzy/push/shjdjw2023/Shjdjw2023PushService12.java
index f9022c6..4e3d1f1 100644
--- a/src/main/java/com/fzzy/push/shjdjw2023/Shjdjw2023PushService12.java
+++ b/src/main/java/com/fzzy/push/shjdjw2023/Shjdjw2023PushService12.java
@@ -1,15 +1,22 @@
package com.fzzy.push.shjdjw2023;
+import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.PushProtocol;
+import com.fzzy.api.dto.ResponseDto;
+import com.fzzy.api.entity.Api1202;
import com.fzzy.api.service.PushService12;
+import com.fzzy.api.view.repository.Api1202Rep;
import com.fzzy.push.impl.ComPushService12;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import java.util.List;
+
/**
* 涓婃捣鍢夊畾绾鐩戠骞冲彴-绮璐攢鏁版嵁涓婁紶
+ *
* @author czt
* @date 2023/5/9 16:23
*/
@@ -23,6 +30,9 @@
@Autowired
private ComPushService12 pushService;
+ @Autowired
+ private Api1202Rep api1202Rep;
+
@Override
public String getProtocol() {
return PushProtocol.SB_GD_2022.getCode();
@@ -34,15 +44,18 @@
//TODO 绮鍏ュ簱淇℃伅
-
+ pushService.pushData1202(apiRemoteService, param);
//TODO 绮鍏ュ簱璐ㄦ淇℃伅
-
+ pushService.pushData1203(apiRemoteService, param);
//TODO 绮鍑哄簱淇℃伅
-
+ pushService.pushData1205(apiRemoteService, param);
//TODO 绮搴撳瓨淇℃伅
-
+ pushService.pushData1208(apiRemoteService, param);
//TODO 鎹熺泭鍗曚俊鎭�
+ pushService.pushData1209(apiRemoteService, param);
+
log.info("------->>>>绮璐攢 鎺ュ彛妯″潡涓婃姤缁撴潫");
}
+
}
diff --git a/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java b/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
index e3e82d7..29c578d 100644
--- a/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
+++ b/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
@@ -5,20 +5,13 @@
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.dto.ResponseDto;
-import com.fzzy.api.entity.Api1101;
-import com.fzzy.api.entity.Api1103;
-import com.fzzy.api.entity.ApiConfs;
-import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.entity.*;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.utils.RedisUtil;
-import com.fzzy.api.view.repository.Api1101Rep;
-import com.fzzy.api.view.repository.Api1103Rep;
-import com.fzzy.api.view.repository.ApiLogRep;
-import com.fzzy.push.shjdjw2023.dto.ShjdjwApi1101;
-import com.fzzy.push.shjdjw2023.dto.ShjdjwReqDto;
-import com.fzzy.push.shjdjw2023.dto.ShjdjwRespDto;
+import com.fzzy.api.view.repository.*;
+import com.fzzy.push.shjdjw2023.dto.*;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
@@ -48,8 +41,11 @@
@Autowired
private Api1101Rep api1101Rep;
@Autowired
+ private Api1102Rep api1102Rep;
+ @Autowired
private Api1103Rep api1103Rep;
-
+ @Autowired
+ private Api1202Rep api1202Rep;
@Override
public String getProtocol() {
@@ -158,8 +154,76 @@
//鍗曚綅淇℃伅灏佽
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 = new ShjdjwApi1203();
+ Api1203 api1203 = (Api1203) data;
+ BeanUtils.copyProperties(api1203, shjdjwApi1203);
- list.add(data);
+ shjdjwApi1203.setQydbh(api1203.getRkjydh());
+ shjdjwApi1203.setHwbm(api1203.getHwdm());
+ shjdjwApi1203.setYpbm(api1203.getRkywdh());
+ shjdjwApi1203.setJyjg(api1203.getJyz());
+ shjdjwApi1203.setJyjl(api1203.getJyjg());
+ shjdjwApi1203.setPzbm(api1203.getLspzdm());
+ //TODO 鏍囪浣�
+ shjdjwApi1203.setPch("0");
+
+ list.add(shjdjwApi1203);
+ } else if (Constant.API_CODE_1205.equals(inteId)) {
+ //绮鍑哄簱鏁版嵁灏佽
+ ShjdjwApi1205 shjdjwApi1205 = new ShjdjwApi1205();
+ Api1205 api1205 = (Api1205) data;
+
+ 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("0");
+ //TODO 鍗曚綅鍚嶇О 浠撴埧鍚嶇О 鍗曟嵁绫诲瀷 鍝佺鍚嶇О 鍦板潃 鍒板簱鏃堕棿 绂诲簱鏃堕棿 杞崲骞村害
+ shjdjwApi1205.setPch("0");
+
+ list.add(shjdjwApi1205);
+ } else if (Constant.API_CODE_1208.equals(inteId)) {
+ //绮搴撳瓨鏁版嵁灏佽
+ ShjdjwApi1208 shjdjwApi1208 = new ShjdjwApi1208();
+ Api1208 api1208 = (Api1208) data;
+
+ BeanUtils.copyProperties(api1208, shjdjwApi1208);
+
+ shjdjwApi1208.setLspzbm(api1208.getLspzdm());
+ shjdjwApi1208.setLsxzbm(api1208.getLsxzdm());
+ shjdjwApi1208.setDjbm(api1208.getLsdjdm());
+ shjdjwApi1208.setLqgsdwbm(api1208.getLqgsdwdm());
+ shjdjwApi1208.setPch("0");
+ //TODO 鍗曚綅鍚嶇О 浠撴埧鍚嶇О 寤掗棿鍚嶇О 搴撳瓨鐩戞祴鏃堕棿
+
+ list.add(shjdjwApi1208);
+ } else if (Constant.API_CODE_1209.equals(inteId)) {
+ //鎹熺泭鍗曟暟鎹皝瑁�
+ ShjdjwApi1209 shjdjwApi1209 = new ShjdjwApi1209();
+ Api1209 api1209 = (Api1209) data;
+
+ BeanUtils.copyProperties(api1209, shjdjwApi1209);
+
+ shjdjwApi1209.setSydbh(api1209.getSydh());
+ shjdjwApi1209.setHwbm(api1209.getHwdm());
+ shjdjwApi1209.setRksl(api1209.getRkjz());
+ shjdjwApi1209.setCksl(api1209.getCkjz());
+ shjdjwApi1209.setSysl(api1209.getJzsysl());
+ //TODO 鍗曚綅鍚嶇О 搴撶偣鍚嶇О 骞撮檺 杈呮崯婧㈡暟閲� 鎹熺泭绫诲瀷
+
+ list.add(shjdjwApi1209);
} else {
list.add(data);
@@ -167,6 +231,8 @@
dto.setData(list);
return JSON.toJSONString(dto);
}
+
+
/**
* 鑾峰彇鎺ュ彛缂栫爜
@@ -180,10 +246,45 @@
//鍗曚綅鎺ュ彛缂栫爜
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;
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());
+ shjdjwApi1202.setPzbm(api1202.getLspzdm());
+ shjdjwApi1202.setLqxzbm(api1202.getLsxzdm());
+ shjdjwApi1202.setZjkl(api1202.getZjklxj());
+ //杞崲璁″垝鍗曞彿
+ shjdjwApi1202.setJhbh(null);
+ //椤哄簭鍙�
+ shjdjwApi1202.setSxh(ywdh.substring(ywdh.length() - 4));
+ shjdjwApi1202.setDjzt("2");
+ //涓氬姟鍗曞彿
+ shjdjwApi1202.setJydbh(null);
+ //杞崲骞村害
+ shjdjwApi1202.setLhnd(null);
+ //鎵规鍙�
+ shjdjwApi1202.setPch("0");
+ }
}
diff --git a/src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwApi1202.java b/src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwApi1202.java
new file mode 100644
index 0000000..d9dd3db
--- /dev/null
+++ b/src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwApi1202.java
@@ -0,0 +1,286 @@
+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 = "杞崲骞村害")
+ @JSONField(format = "yyyy")
+ private Date 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
new file mode 100644
index 0000000..13b2501
--- /dev/null
+++ b/src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwApi1203.java
@@ -0,0 +1,80 @@
+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 {
+
+ @Id
+ @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
new file mode 100644
index 0000000..85cdaec
--- /dev/null
+++ b/src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwApi1205.java
@@ -0,0 +1,119 @@
+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 String 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
new file mode 100644
index 0000000..dc78fbc
--- /dev/null
+++ b/src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwApi1208.java
@@ -0,0 +1,84 @@
+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
new file mode 100644
index 0000000..d2e35d3
--- /dev/null
+++ b/src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwApi1209.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 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 = "骞撮檺")
+ private String nx;
+
+ @PropertyDef(label = "杈呮崯婧㈡暟閲�")
+ private Double fsysl;
+
+ @PropertyDef(label = "鎹熻�楃巼")
+ private Double shl;
+
+ @PropertyDef(label = "鎹熺泭绫诲瀷")
+ private String sylx;
+
+ @PropertyDef(label = "鍗曟嵁绫诲瀷")
+ private String djlx;
+
+
+}
--
Gitblit v1.9.3