From 2b63170e6ec11246a5029ea74340adb1b7d2f1a9 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期一, 21 八月 2023 20:10:17 +0800
Subject: [PATCH] 上海数据上报2
---
src/main/java/com/fzzy/api/view/repository/Api1202Rep.java | 4
src/main/java/com/fzzy/api/view/repository/Api1301Rep.java | 9
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1302.java | 106 +++
src/main/java/com/fzzy/api/view/repository/Api1109Rep.java | 6
src/main/java/com/fzzy/otherview/sh2023/dto/ShApi2101.java | 92 ++
src/main/java/com/fzzy/api/view/repository/Api1307Rep.java | 10
src/main/java/com/fzzy/push/sh2023/SH2023PushService13.java | 221 ++++++
src/main/java/com/fzzy/otherview/sh2023/repository/ShApi1311Rep.java | 21
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1305.java | 192 ++++++
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1310.java | 132 ++++
src/main/java/com/fzzy/api/view/repository/Api1401Rep.java | 8
src/main/java/com/fzzy/otherview/sh2023/repository/ShApi2101Rep.java | 20
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 155 ++++
src/main/java/com/fzzy/otherview/sh2023/dto/ShApi1311.java | 133 ++++
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1307.java | 68 ++
src/main/java/com/fzzy/push/sh2023/SH2023PushService14.java | 39 +
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1304.java | 75 ++
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1303.java | 72 ++
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1206.java | 82 ++
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1306.java | 240 +++++++
src/main/java/com/fzzy/push/sh2023/SH2023PushService12.java | 5
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1301.java | 101 +++
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1401.java | 67 ++
23 files changed, 1,833 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1109Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1109Rep.java
index 40f145f..1cc30dd 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1109Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1109Rep.java
@@ -7,10 +7,11 @@
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.transaction.annotation.Transactional;
+
import java.util.Date;
import java.util.List;
-public interface Api1109Rep extends JpaRepository<Api1109, String> , JpaSpecificationExecutor<Api1109> {
+public interface Api1109Rep extends JpaRepository<Api1109, String>, JpaSpecificationExecutor<Api1109> {
@Query("from Api1109 where kqdm=:kqdm and czbz= 'i' ")
List<Api1109> findPushData(@Param("kqdm") String kqdm);
@@ -25,4 +26,7 @@
@Query("from Api1109 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
List<Api1109> findPushDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
+
+ @Query("from Api1109 where fileStorageId=:fileStorageId ")
+ List<Api1109> getDataByFileId(@Param("fileStorageId") String fileStorageId);
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1202Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1202Rep.java
index 00dcda7..3b31632 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1202Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1202Rep.java
@@ -7,6 +7,7 @@
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.transaction.annotation.Transactional;
+
import java.util.Date;
import java.util.List;
@@ -21,6 +22,9 @@
@Query("update Api1202 set czbz =:czbz where rkywdh=:rkywdh")
int updateStatus(@Param("rkywdh") String rkywdh, @Param("czbz") String czbz);
+ @Query("from Api1202 where rkywdh=:hwdm ")
+ List<Api1202> getDataByHwdm(@Param("hwdm") String hwdm);
+
@Query("from Api1202 where rkywdh=:rkywdh ")
List<Api1202> getDataById(@Param("rkywdh") String rkywdh);
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1301Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1301Rep.java
index 64f2b95..0f82855 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1301Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1301Rep.java
@@ -1,11 +1,20 @@
package com.fzzy.api.view.repository;
+import com.fzzy.api.entity.Api1212;
import com.fzzy.api.entity.Api1301;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.Date;
+import java.util.List;
public interface Api1301Rep extends JpaRepository<Api1301, String>, JpaSpecificationExecutor<Api1301> {
+ @Query("from Api1301 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Api1301> findPushDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
+
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1307Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1307Rep.java
index 75f2a75..d5ac016 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1307Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1307Rep.java
@@ -1,10 +1,20 @@
package com.fzzy.api.view.repository;
+import com.fzzy.api.entity.Api1301;
import com.fzzy.api.entity.Api1307;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.Date;
+import java.util.List;
public interface Api1307Rep extends JpaRepository<Api1307, String>, JpaSpecificationExecutor<Api1307> {
+
+ @Query("from Api1307 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Api1307> findPushDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
+
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1401Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1401Rep.java
index 199e591..36899a0 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1401Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1401Rep.java
@@ -3,8 +3,16 @@
import com.fzzy.api.entity.Api1401;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.Date;
+import java.util.List;
public interface Api1401Rep extends JpaRepository<Api1401, Integer>, JpaSpecificationExecutor<Api1401> {
+ @Query("from Api1401 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Api1401> findPushDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
+
}
diff --git a/src/main/java/com/fzzy/otherview/sh2023/dto/ShApi1311.java b/src/main/java/com/fzzy/otherview/sh2023/dto/ShApi1311.java
new file mode 100644
index 0000000..5b5003f
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/sh2023/dto/ShApi1311.java
@@ -0,0 +1,133 @@
+package com.fzzy.otherview.sh2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+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:YAN
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class ShApi1311 implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ @PropertyDef(label = "鐩戞帶缂栧彿")
+ private String sxtbh;
+
+ @PropertyDef(label = "閫氶亾缂栧彿")
+ private int tdbh;
+
+ @PropertyDef(label = "閫氶亾鍚嶇О")
+ private String tdmc;
+
+ @PropertyDef(label = "鐩戞帶璁惧缂栫爜")
+ private String jksbbm;
+
+ @PropertyDef(label = "鐩戞帶璁惧鍚嶇О")
+ private String jksbmc;
+
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ private String kqdm;
+
+ /**
+ * 1 娴峰悍, 2 澶у崕, 3 瀹囪
+ * 4 澶╁湴浼熶笟,5 鍗庝负,9 鍏朵粬
+ */
+ @PropertyDef(label = "鐩戞帶鍘傚晢")
+ private String jkcs;
+
+ @PropertyDef(label = "鐩戞帶鍨嬪彿")
+ private String jkxh;
+
+ @PropertyDef(label = "鐩戞帶搴忓垪鍙�")
+ private String jkxlh;
+
+ /**
+ * 1:浠撳唴锛�2:涓氬姟锛�
+ * 3:瀹夐槻
+ */
+ @PropertyDef(label = "瑙嗛鐩戞帶绫诲瀷")
+ private String spjklx;
+
+ /**
+ * 1:DVR 2:NVR
+ */
+ @PropertyDef(label = "璁惧绫诲瀷")
+ private String sblxbm;
+
+ @PropertyDef(label = "瀹夎浣嶇疆")
+ private String azwz;
+
+ /**
+ * 绮簱澶ч棬锛�01锛夛紝鎵︽牱鏈猴紙02锛夛紝鍖栭獙瀹わ紙03锛夛紝缁撶畻瀹わ紙04锛夛紝
+ * 鍦扮鎴匡紙05锛夛紝搴撳尯涓诲共閬擄紙06锛夛紝浠撻棿鐩戞帶锛�07锛夛紝浠撳唴锛�08锛夛紝
+ * 鑽搧搴擄紙09锛夛紝鍣ㄦ潗搴擄紙10锛夛紝鍒堕珮鐐癸紙11锛夛紝鍛ㄧ晫锛�12锛夛紝鍏朵粬锛�99锛�
+ */
+ @PropertyDef(label = "瀹夎浣嶇疆绫诲瀷")
+ private String azwzlx;
+
+ @PropertyDef(label = "鐓у皠鍖哄煙")
+ private String zsqy;
+
+ /**
+ * Y/N
+ */
+ @PropertyDef(label = "鏄惁瀹夎琛ュ厜鐏�")
+ private String sfazbgd;
+
+ @PropertyDef(label = "寤掗棿浠ｇ爜")
+ private String ajdm;
+
+ @PropertyDef(label = "璐т綅浠ｇ爜")
+ private String hwdm;
+
+ /**
+ * 1 :鏋満 2 :鐞冩満
+ */
+ @PropertyDef(label = "鐩戞帶绫诲瀷缂栫爜")
+ private String jkjlxbm;
+
+ @PropertyDef(label = "鐩戞帶棰勭疆浣嶆暟閲�")
+ private int jktyzw;
+
+ @PropertyDef(label = "璁惧IP鍦板潃")
+ private String sbipdz;
+
+ @PropertyDef(label = "璁惧绔彛鍙�")
+ private int sbdkh;
+
+ @PropertyDef(label = "璁惧鐧诲綍鍚嶇О")
+ private String sbdlmc;
+
+ @PropertyDef(label = "璁惧鐧诲綍瀵嗙爜")
+ private String sbdlmm;
+
+ @PropertyDef(label = "澶囨敞")
+ private String bz;
+
+ @PropertyDef(label = "鏍囪浣�")
+ private String bjw;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ private Date zhgxsj;
+
+}
diff --git a/src/main/java/com/fzzy/otherview/sh2023/dto/ShApi2101.java b/src/main/java/com/fzzy/otherview/sh2023/dto/ShApi2101.java
index 9e07d0d..26db2d6 100644
--- a/src/main/java/com/fzzy/otherview/sh2023/dto/ShApi2101.java
+++ b/src/main/java/com/fzzy/otherview/sh2023/dto/ShApi2101.java
@@ -1,8 +1,13 @@
package com.fzzy.otherview.sh2023.dto;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
import lombok.EqualsAndHashCode;
+
+import javax.persistence.*;
import java.io.Serializable;
+import java.util.Date;
/**
* 涓婃捣甯傛帴鍙�-2101 妫�鏂ゅ崟
@@ -18,5 +23,92 @@
*/
private static final long serialVersionUID = 1L;
+ @PropertyDef(label = "妫�鏂ゅ崟鍙�")
+ private String jjdh;
+
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ private String kqdm;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "妫�鏂ゆ棩鏈�")
+ private Date jjrq;
+
+ @PropertyDef(label = "椹宠繍鍗曞彿/搴撻檯璋冩嫧鍗曞彿")
+ private String inbillno;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "璁拌处鏃ユ湡")
+ private Date jzrq;
+
+ @PropertyDef(label = "浣滀笟鍗曞彿")
+ private String zydh;
+
+ /**
+ * 1锛氬叆搴撲綔涓� 2锛氫腑杞皟鍑� 3锛氫腑杞繘浠�
+ * 4锛氬嚭搴撲綔涓� 5锛氬簱瀛樿皟鍑� 6锛氬簱瀛樿皟鍏� 7锛氱Щ浠撴々
+ */
+ @PropertyDef(label = "浣滀笟绫诲瀷")
+ private String zylx;
+
+ @PropertyDef(label = "瀹㈡埛缂栧彿")
+ private String khmc;
+
+ @PropertyDef(label = "鏉ョ伯棰勬姤鍙�/鎻愯揣鍗曞彿")
+ private String psplan;
+
+ @PropertyDef(label = "鍚堝悓鍙�")
+ private String hth;
+
+ @PropertyDef(label = "杞﹁埞鍙�")
+ private String cch;
+
+ @PropertyDef(label = "涓浆杞﹁埞鍙�")
+ private String zzchh;
+
+ @PropertyDef(label = "鍝佺澶х被")
+ private String lspzdmdl;
+
+ @PropertyDef(label = "绮鎬ц川浠ｇ爜")
+ private String lsxzdm;
+
+ @PropertyDef(label = "鏉ョ伯浠ｇ爜")
+ private String lldm;
+
+ @PropertyDef(label = "寤掗棿浠ｇ爜")
+ private String ajdm;
+
+ @PropertyDef(label = "璐т綅浠ｇ爜")
+ private String hwdm;
+
+ @PropertyDef(label = "绉诲叆寤掗棿浠ｇ爜")
+ private String yrajdh;
+
+ @PropertyDef(label = "绉诲叆璐т綅浠ｇ爜")
+ private String yrhwdm;
+
+ @PropertyDef(label = "瑁呭嵏鐝�")
+ private String zxb;
+
+ @PropertyDef(label = "鍖呰鐗╁鎵ｉ噺(鍏枻)")
+ private double bzwzkl;
+
+ @PropertyDef(label = "姣涢噸(鍏枻)")
+ private double mz;
+
+ @PropertyDef(label = "鍑�閲�(鍏枻)")
+ private double jz;
+
+ @PropertyDef(label = "鏁版嵁鐘舵��")
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ private Date zhgxsj;
+
+ @PropertyDef(label = "鎵规鍙�")
+ private String pch;
+
+ @PropertyDef(label = "鏍囪浣�")
+ private String bjw;
}
diff --git a/src/main/java/com/fzzy/otherview/sh2023/repository/ShApi1311Rep.java b/src/main/java/com/fzzy/otherview/sh2023/repository/ShApi1311Rep.java
new file mode 100644
index 0000000..32b6c04
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/sh2023/repository/ShApi1311Rep.java
@@ -0,0 +1,21 @@
+package com.fzzy.otherview.sh2023.repository;
+
+import com.fzzy.otherview.sh2023.dto.ShApi1311;
+import com.fzzy.otherview.sh2023.dto.ShApi2101;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 瑙嗛鐩戞帶
+ *
+ * @Author:YAN
+ */
+public interface ShApi1311Rep {
+
+
+}
diff --git a/src/main/java/com/fzzy/otherview/sh2023/repository/ShApi2101Rep.java b/src/main/java/com/fzzy/otherview/sh2023/repository/ShApi2101Rep.java
new file mode 100644
index 0000000..2875974
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/sh2023/repository/ShApi2101Rep.java
@@ -0,0 +1,20 @@
+package com.fzzy.otherview.sh2023.repository;
+
+import com.fzzy.api.entity.Api1310;
+import com.fzzy.otherview.sh2023.dto.ShApi2101;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 妫�鏂ゅ崟
+ *
+ * @Author:YAN
+ */
+public interface ShApi2101Rep {
+
+}
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index 6c56254..4942ca3 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -9,10 +9,7 @@
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.*;
-import com.fzzy.api.view.repository.Api1102Rep;
-import com.fzzy.api.view.repository.Api1104Rep;
-import com.fzzy.api.view.repository.Api1202Rep;
-import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.api.view.repository.*;
import com.fzzy.push.sh2023.dto.*;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
@@ -51,7 +48,11 @@
@Autowired
private Api1104Rep api1104Rep;
@Autowired
+ private Api1109Rep api1109Rep;
+ @Autowired
private Api1202Rep api1202Rep;
+ @Autowired
+ private Api1205Rep api1205Rep;
@Override
public String getProtocol() {
@@ -320,6 +321,152 @@
list.add(api1205);
}
return JSON.toJSONString(list);
+ } else if (SH2023Constant.SH_2023_API_CODE_1206.equals(inteId)) {
+ SH2023Api1206 api1206;
+ //鏈�鍚庤浆鎹负json
+ List<SH2023Api1206> list = new ArrayList<>();
+ //鎶奷ata杞寲鎴恖ist闆嗗悎
+ List<Api1206> api1206List = castList(data, Api1206.class);
+ for (Api1206 apiData : api1206List) {
+ api1206 = new SH2023Api1206();
+ BeanUtils.copyProperties(apiData, api1206);
+ api1206.setBjw(ShAreaBjw.getBjw(code));
+ List<Api1205> api1205List = api1205Rep.getDataById(apiData.getCkjsdh());
+ api1206.setPch(api1205List.get(0).getHwdm() + DateFormatUtils.format(api1205List.get(0).getCmsj(), "yyyy"));
+ list.add(api1206);
+ }
+ return JSON.toJSONString(list);
+ } else if (SH2023Constant.SH_2023_API_CODE_1301.equals(inteId)) {
+ SH2023Api1301 api1301;
+ //鏈�鍚庤浆鎹负json
+ List<SH2023Api1301> list = new ArrayList<>();
+ //鎶奷ata杞寲鎴恖ist闆嗗悎
+ List<Api1301> api1301List = castList(data, Api1301.class);
+ for (Api1301 apiData : api1301List) {
+ api1301 = new SH2023Api1301();
+ BeanUtils.copyProperties(apiData, api1301);
+ api1301.setBjw(ShAreaBjw.getBjw(code));
+ list.add(api1301);
+ }
+ return JSON.toJSONString(list);
+ } else if (SH2023Constant.SH_2023_API_CODE_1302.equals(inteId)) {
+ SH2023Api1302 api1302;
+ //鏈�鍚庤浆鎹负json
+ List<SH2023Api1302> list = new ArrayList<>();
+ //鎶奷ata杞寲鎴恖ist闆嗗悎
+ List<Api1302> api1302List = castList(data, Api1302.class);
+ for (Api1302 apiData : api1302List) {
+ api1302 = new SH2023Api1302();
+ BeanUtils.copyProperties(apiData, api1302);
+ api1302.setBjw(ShAreaBjw.getBjw(code));
+ api1302.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getJcsj(), "yyyy"));
+ //todo 娓╂箍搴︽娴嬫暟鎹笉鍏�
+ list.add(api1302);
+ }
+ return JSON.toJSONString(list);
+ } else if (SH2023Constant.SH_2023_API_CODE_1303.equals(inteId)) {
+ SH2023Api1303 api1303;
+ //鏈�鍚庤浆鎹负json
+ List<SH2023Api1303> list = new ArrayList<>();
+ //鎶奷ata杞寲鎴恖ist闆嗗悎
+ List<Api1303> api1303List = castList(data, Api1303.class);
+ for (Api1303 apiData : api1303List) {
+ api1303 = new SH2023Api1303();
+ BeanUtils.copyProperties(apiData, api1303);
+ api1303.setBjw(ShAreaBjw.getBjw(code));
+ api1303.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getJcsj(), "yyyy"));
+ list.add(api1303);
+ }
+ return JSON.toJSONString(list);
+ } else if (SH2023Constant.SH_2023_API_CODE_1304.equals(inteId)) {
+ SH2023Api1304 api1304;
+ //鏈�鍚庤浆鎹负json
+ List<SH2023Api1304> list = new ArrayList<>();
+ //鎶奷ata杞寲鎴恖ist闆嗗悎
+ List<Api1304> api1304List = castList(data, Api1304.class);
+ for (Api1304 apiData : api1304List) {
+ api1304 = new SH2023Api1304();
+ BeanUtils.copyProperties(apiData, api1304);
+ api1304.setBjw(ShAreaBjw.getBjw(code));
+ api1304.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getJcsj(), "yyyy"));
+ list.add(api1304);
+ }
+ return JSON.toJSONString(list);
+ } else if (SH2023Constant.SH_2023_API_CODE_1305.equals(inteId)) {
+ SH2023Api1305 api1305;
+ //鏈�鍚庤浆鎹负json
+ List<SH2023Api1305> list = new ArrayList<>();
+ //鎶奷ata杞寲鎴恖ist闆嗗悎
+ List<Api1305> api1305List = castList(data, Api1305.class);
+ for (Api1305 apiData : api1305List) {
+ api1305 = new SH2023Api1305();
+ BeanUtils.copyProperties(apiData, api1305);
+ api1305.setBjw(ShAreaBjw.getBjw(code));
+ api1305.setAjdm(apiData.getTfzydh().substring(0, 28));
+ list.add(api1305);
+ }
+ return JSON.toJSONString(list);
+ } else if (SH2023Constant.SH_2023_API_CODE_1306.equals(inteId)) {
+ SH2023Api1306 api1306;
+ //鏈�鍚庤浆鎹负json
+ List<SH2023Api1306> list = new ArrayList<>();
+ //鎶奷ata杞寲鎴恖ist闆嗗悎
+ List<Api1306> api1306List = castList(data, Api1306.class);
+ for (Api1306 apiData : api1306List) {
+ api1306 = new SH2023Api1306();
+ BeanUtils.copyProperties(apiData, api1306);
+ api1306.setBjw(ShAreaBjw.getBjw(code));
+ api1306.setPch(apiData.getXzzydh().substring(0, 30) + DateFormatUtils.format(apiData.getXzkssj(), "yyyy"));
+ api1306.setAjdm(apiData.getXzzydh().substring(0, 28));
+ list.add(api1306);
+ }
+ return JSON.toJSONString(list);
+ } else if (SH2023Constant.SH_2023_API_CODE_1307.equals(inteId)) {
+ SH2023Api1307 api1307;
+ //鏈�鍚庤浆鎹负json
+ List<SH2023Api1307> list = new ArrayList<>();
+ //鎶奷ata杞寲鎴恖ist闆嗗悎
+ List<Api1307> api1307List = castList(data, Api1307.class);
+ for (Api1307 apiData : api1307List) {
+ api1307 = new SH2023Api1307();
+ BeanUtils.copyProperties(apiData, api1307);
+ api1307.setBjw(ShAreaBjw.getBjw(code));
+ api1307.setAjdm(apiData.getHwdm().substring(0, 28));
+ List<Api1109> api1109List = api1109Rep.getDataByFileId(apiData.getFileStorageId());
+ api1307.setTxbh(api1109List.get(0).getWjmc());
+ list.add(api1307);
+ }
+ return JSON.toJSONString(list);
+ } else if (SH2023Constant.SH_2023_API_CODE_1310.equals(inteId)) {
+ SH2023Api1310 api1310;
+ //鏈�鍚庤浆鎹负json
+ List<SH2023Api1310> list = new ArrayList<>();
+ //鎶奷ata杞寲鎴恖ist闆嗗悎
+ List<Api1310> api1310List = castList(data, Api1310.class);
+ for (Api1310 apiData : api1310List) {
+ api1310 = new SH2023Api1310();
+ BeanUtils.copyProperties(apiData, api1310);
+ api1310.setBjw(ShAreaBjw.getBjw(code));
+ api1310.setJyrq(apiData.getJysj());
+ api1310.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getJysj(), "yyyy"));
+ List<Api1202> api1202List = api1202Rep.getDataByHwdm(apiData.getHwdm());
+ api1310.setLspzdm(api1202List.get(0).getLspzdm());
+ list.add(api1310);
+ }
+ return JSON.toJSONString(list);
+ } else if (SH2023Constant.SH_2023_API_CODE_1401.equals(inteId)) {
+ SH2023Api1401 api1401;
+ //鏈�鍚庤浆鎹负json
+ List<SH2023Api1401> list = new ArrayList<>();
+ //鎶奷ata杞寲鎴恖ist闆嗗悎
+ List<Api1401> api1401List = castList(data, Api1401.class);
+ for (Api1401 apiData : api1401List) {
+ api1401 = new SH2023Api1401();
+ BeanUtils.copyProperties(apiData, api1401);
+ api1401.setBjw(ShAreaBjw.getBjw(code));
+ list.add(api1401);
+ }
+ return JSON.toJSONString(list);
} else {
return JSON.toJSONString(data);
}
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023PushService12.java b/src/main/java/com/fzzy/push/sh2023/SH2023PushService12.java
index 6360e29..454c99e 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023PushService12.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023PushService12.java
@@ -8,7 +8,7 @@
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.service.PushService11;
import com.fzzy.api.view.repository.*;
-import com.fzzy.push.impl.ComPushService11;
+import com.fzzy.otherview.sh2023.dto.ShApi2101;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -308,8 +308,7 @@
* 2101 妫�鏂ゅ崟
*/
public void pushData2101(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
-
+ // todo
}
/**
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023PushService13.java b/src/main/java/com/fzzy/push/sh2023/SH2023PushService13.java
index f116bb8..26dd3f6 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023PushService13.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023PushService13.java
@@ -1,13 +1,21 @@
package com.fzzy.push.sh2023;
+import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.PushProtocol;
+import com.fzzy.api.dto.ResponseDto;
+import com.fzzy.api.entity.*;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.service.PushService11;
+import com.fzzy.api.view.repository.*;
+import com.fzzy.otherview.sh2023.dto.ShApi1311;
+import com.fzzy.otherview.sh2023.repository.ShApi1311Rep;
import com.fzzy.push.impl.ComPushService11;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+
+import java.util.List;
/**
* 涓婃捣甯傚钩鍙�2023鐗�-鍩虹鏁版嵁涓婁紶
@@ -22,6 +30,26 @@
@Autowired
private SH2023ApiRemoteService apiRemoteService;
+ @Autowired
+ private Api1301Rep api1301Rep;
+ @Autowired
+ private Api1302Rep api1302Rep;
+ @Autowired
+ private Api1303Rep api1303Rep;
+ @Autowired
+ private Api1304Rep api1304Rep;
+ @Autowired
+ private Api1305Rep api1305Rep;
+ @Autowired
+ private Api1306Rep api1306Rep;
+ @Autowired
+ private Api1307Rep api1307Rep;
+ @Autowired
+ private Api1308Rep api1308Rep;
+ @Autowired
+ private Api1309Rep api1309Rep;
+ @Autowired
+ private Api1310Rep api1310Rep;
@Override
public String getProtocol() {
@@ -30,19 +58,48 @@
@Override
public void pushData(ApiParam param) {
- log.info("------->>>>鍩虹淇℃伅 鎺ュ彛妯″潡涓婃姤寮�濮�");
+ log.info("------->>>>绮簱绠＄悊 鎺ュ彛妯″潡涓婃姤寮�濮�");
- //鎺ㄩ�佸崟浣嶄俊鎭�
+ this.pushData1301(apiRemoteService, param);
+ this.pushData1302(apiRemoteService, param);
+ this.pushData1303(apiRemoteService, param);
+ this.pushData1304(apiRemoteService, param);
+ this.pushData1305(apiRemoteService, param);
+ this.pushData1306(apiRemoteService, param);
+ this.pushData1307(apiRemoteService, param);
+ this.pushData1308(apiRemoteService, param);
+ this.pushData1309(apiRemoteService, param);
+ this.pushData1310(apiRemoteService, param);
+ this.pushData1311(apiRemoteService, param);
-
- log.info("------->>>>鍩虹淇℃伅 鎺ュ彛妯″潡涓婃姤缁撴潫");
+ log.info("------->>>>绮簱绠＄悊 鎺ュ彛妯″潡涓婃姤缁撴潫");
}
/**
* 1301 瀹夊叏绠＄悊
*/
public void pushData1301(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //鑾峰彇瀹夊叏绠＄悊
+ List<Api1301> list = api1301Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
+
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌瀹夊叏绠＄悊锛屼笉鎺ㄩ��-----");
+ return;
+ }
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1301 data : list) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1301Rep.save(data);
+ }
+ }
+ }
}
@@ -50,15 +107,54 @@
* 1302 娓╂箍搴︽娴�
*/
public void pushData1302(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //鑾峰彇娓╂箍搴︽娴�
+ List<Api1302> list = api1302Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌娓╂箍搴︽娴嬶紝涓嶆帹閫�-----");
+ return;
+ }
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1302 data : list) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1302Rep.save(data);
+ }
+ }
+ }
}
/**
* 1303 瀹宠櫕妫�娴�
*/
public void pushData1303(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //鑾峰彇瀹宠櫕妫�娴�
+ List<Api1303> list = api1303Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
+
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌瀹宠櫕妫�娴嬶紝涓嶆帹閫�-----");
+ return;
+ }
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1303 data : list) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1303Rep.save(data);
+ }
+ }
+ }
}
@@ -66,7 +162,27 @@
* 1304 姘斾綋妫�娴�
*/
public void pushData1304(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //鑾峰彇姘斾綋妫�娴�
+ List<Api1304> list = api1304Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
+
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌姘斾綋妫�娴嬶紝涓嶆帹閫�-----");
+ return;
+ }
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1304 data : list) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1304Rep.save(data);
+ }
+ }
+ }
}
@@ -74,7 +190,27 @@
* 1305 閫氶浣滀笟
*/
public void pushData1305(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //鑾峰彇閫氶浣滀笟
+ List<Api1305> list = api1305Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
+
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌閫氶浣滀笟锛屼笉鎺ㄩ��-----");
+ return;
+ }
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1305 data : list) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1305Rep.save(data);
+ }
+ }
+ }
}
@@ -82,15 +218,54 @@
* 1306 鐔忚捀浣滀笟
*/
public void pushData1306(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //鑾峰彇鐔忚捀浣滀笟
+ List<Api1306> list = api1306Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌鐔忚捀浣滀笟锛屼笉鎺ㄩ��-----");
+ return;
+ }
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1306 data : list) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1306Rep.save(data);
+ }
+ }
+ }
}
/**
* 1307 浠撳唴瑙嗛鍥惧儚
*/
public void pushData1307(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //鑾峰彇浠撳唴瑙嗛鍥惧儚
+ List<Api1307> list = api1307Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
+
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌浠撳唴瑙嗛鍥惧儚锛屼笉鎺ㄩ��-----");
+ return;
+ }
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1307 data : list) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1307Rep.save(data);
+ }
+ }
+ }
}
@@ -114,7 +289,27 @@
* 1310 璐ㄦ鏁版嵁
*/
public void pushData1310(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //鑾峰彇璐ㄦ鏁版嵁
+ List<Api1310> list = api1310Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
+
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌璐ㄦ鏁版嵁锛屼笉鎺ㄩ��-----");
+ return;
+ }
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1310 data : list) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1310Rep.save(data);
+ }
+ }
+ }
}
@@ -122,7 +317,7 @@
* 1311 瑙嗛鐩戞帶鎺ュ彛
*/
public void pushData1311(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ // todo
}
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023PushService14.java b/src/main/java/com/fzzy/push/sh2023/SH2023PushService14.java
index b76813d..17a5a23 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023PushService14.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023PushService14.java
@@ -1,12 +1,19 @@
package com.fzzy.push.sh2023;
+import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.PushProtocol;
+import com.fzzy.api.dto.ResponseDto;
+import com.fzzy.api.entity.Api1310;
+import com.fzzy.api.entity.Api1401;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.service.PushService11;
+import com.fzzy.api.view.repository.Api1401Rep;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+
+import java.util.List;
/**
* 涓婃捣甯傚钩鍙�2023鐗�-鍩虹鏁版嵁涓婁紶
@@ -21,6 +28,8 @@
@Autowired
private SH2023ApiRemoteService apiRemoteService;
+ @Autowired
+ private Api1401Rep api1401Rep;
@Override
public String getProtocol() {
@@ -29,19 +38,40 @@
@Override
public void pushData(ApiParam param) {
- log.info("------->>>>鍩虹淇℃伅 鎺ュ彛妯″潡涓婃姤寮�濮�");
+ log.info("------->>>>琛屾斂绠＄悊 鎺ュ彛妯″潡涓婃姤寮�濮�");
- //鎺ㄩ�佸崟浣嶄俊鎭�
+ //鍌ㄥ瑙勬ā
+ this.pushData1401(apiRemoteService, param);
- log.info("------->>>>鍩虹淇℃伅 鎺ュ彛妯″潡涓婃姤缁撴潫");
+ log.info("------->>>>琛屾斂绠＄悊 鎺ュ彛妯″潡涓婃姤缁撴潫");
}
/**
* 1401 鍌ㄥ瑙勬ā
*/
public void pushData1401(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //鑾峰彇鍌ㄥ瑙勬ā
+ List<Api1401> list = api1401Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
+
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌鍌ㄥ瑙勬ā锛屼笉鎺ㄩ��-----");
+ return;
+ }
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1401 data : list) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1401Rep.save(data);
+ }
+ }
+ }
}
@@ -68,6 +98,7 @@
//TODO
}
+
/**
* 1405 椤圭洰淇℃伅
*/
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1206.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1206.java
new file mode 100644
index 0000000..418857a
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1206.java
@@ -0,0 +1,82 @@
+package com.fzzy.push.sh2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import com.fzzy.api.entity.ApiParent;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鎺ュ彛琛�-绮鍑哄簱缁撶畻淇℃伅
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SH2023Api1206 implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = -8778664614878279565L;
+
+ @PropertyDef(label = "鍑哄簱缁撶畻鍗曞彿")
+ private String ckjsdh;
+
+ @PropertyDef(label = "鍚堝悓鍙�")
+ private String hth;
+
+ @PropertyDef(label = "缁撶畻鏁伴噺(鍏枻)")
+ private double jssl;
+
+ @PropertyDef(label = "缁撶畻鍗曚环(鍏�/鍏枻)")
+ private double jsdj;
+
+ @PropertyDef(label = "缁撶畻閲戦(鍏�)")
+ private double jsje;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "缁撶畻鏃堕棿")
+ private Date jssj;
+
+ @PropertyDef(label = "缁撶畻鏂瑰紡")
+ private String jsfs;
+
+ @PropertyDef(label = "浠樻浜�")
+ private String fkr;
+
+ @PropertyDef(label = "閾惰琛屽埆浠ｇ爜")
+ private String yhhbdm;
+
+ @PropertyDef(label = "寮�鎴疯鍙�")
+ private String khhh;
+
+ @PropertyDef(label = "寮�鎴疯鍚嶇О")
+ private String khhmc;
+
+ @PropertyDef(label = "閾惰璐﹀彿")
+ private String yhzh;
+
+ @PropertyDef(label = "鍙戠エ鍙风爜")
+ private String fphm;
+
+ @PropertyDef(label = "鍙戠エ鐘舵��")
+ private String fpzt;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏇存柊鏃堕棿")
+ private Date zhgxsj;
+
+ @PropertyDef(label = "鎵规鍙�")
+ private String pch;
+
+ @PropertyDef(label = "鏍囪浣�")
+ private String bjw;
+}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1301.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1301.java
new file mode 100644
index 0000000..a14e336
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1301.java
@@ -0,0 +1,101 @@
+package com.fzzy.push.sh2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鎺ュ彛琛�-瀹夊叏绠＄悊鏁版嵁琛�
+ *
+ * @author chen
+ * @date 2022-09-02 16:06
+ */
+@Data
+public class SH2023Api1301 implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ private String kqdm;
+
+ @PropertyDef(label = "鍗曚綅浠ｇ爜")
+ private String dwdm;
+
+ @PropertyDef(label = "搴撳尯鍚嶇О")
+ private String kqmc;
+
+ @PropertyDef(label = "鍦扮偣")
+ private String dd;
+
+ @PropertyDef(label = "椋庨櫓鐐圭紪鐮�")
+ private String fxdbm;
+
+ @PropertyDef(label = "璇嗗埆浜�")
+ private String sbr;
+
+ @PropertyDef(label = "鐜妭/閮ㄤ綅")
+ private String hjbw;
+
+ @PropertyDef(label = "椋庨櫓淇℃伅")
+ private String fxxx;
+
+ @PropertyDef(label = "椋庨櫓绫诲瀷")
+ private String fxlx;
+
+ @PropertyDef(label = "椋庨櫓鍒嗙骇")
+ private String fxfj;
+
+ @PropertyDef(label = "椋庨櫓绠℃帶鎺柦")
+ private String fxglcs;
+
+ @JSONField(name = "Yhxx")
+ @PropertyDef(label = "闅愭偅淇℃伅")
+ private String yhxx;
+
+ @PropertyDef(label = "闅愭偅鎺掓煡淇℃伅")
+ private String yhpcxx;
+
+ @PropertyDef(label = "闅愭偅鏁存敼淇℃伅")
+ private String yhzgxx;
+
+ @PropertyDef(label = "闅愭偅鏁存敼楠屾敹淇℃伅")
+ private String yhysxx;
+
+ @PropertyDef(label = "浜嬫晠鍩烘湰淇℃伅")
+ private String sgjbxx;
+
+ @PropertyDef(label = "鏁存敼鏃堕檺")
+ private String zgsx;
+
+ @PropertyDef(label = "璐ｄ换鍗曚綅")
+ private String zrdw;
+
+ @PropertyDef(label = "璐ｄ换浜�")
+ private String zrr;
+
+ @PropertyDef(label = "鏁存敼楠屾敹淇℃伅")
+ private String zgysxx;
+
+ @PropertyDef(label = "椋庨櫓璺熻釜鐩戠璐ｄ换浜�")
+ private String fxgzjgzrr;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ private Date zhgxsj;
+
+ @PropertyDef(label = "鏍囪浣�")
+ private String bjw;
+}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1302.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1302.java
new file mode 100644
index 0000000..0c7ed9b
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1302.java
@@ -0,0 +1,106 @@
+package com.fzzy.push.sh2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import com.fzzy.api.entity.ApiParent;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鎺ュ彛琛�-娓╂箍搴︽娴嬫暟鎹〃
+ *
+ * @author chen
+ * @date 2022-09-02 16:07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SH2023Api1302 implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -7985638448449311029L;
+
+
+ @PropertyDef(label = "娓╂箍搴︽娴嬪崟鍙�")
+ private String wsdjcdh;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "妫�娴嬫椂闂�")
+ private Date jcsj;
+
+ @PropertyDef(label = "璐т綅浠ｇ爜")
+ private String hwdm;
+
+ @PropertyDef(label = "浠撴埧澶栨俯")
+ private double cfww;
+
+ @PropertyDef(label = "浠撴埧澶栨箍")
+ private double cfws;
+
+ @PropertyDef(label = "浠撴埧鍐呮俯")
+ private double cfnw;
+
+ @PropertyDef(label = "浠撴埧鍐呮箍")
+ private double cfns;
+
+ @PropertyDef(label = "绮鏈�楂樻俯")
+ private double lszgw;
+
+ @PropertyDef(label = "绮鏈�浣庢俯")
+ private double lszdw;
+
+ @PropertyDef(label = "绮骞冲潎娓�")
+ private double lspjw;
+
+ @PropertyDef(label = "绮娓╁害鍊奸泦鍚�")
+ private String lswdzjh;
+
+ @PropertyDef(label = "绮婀垮害鍊奸泦鍚�")
+ private String lssdzjh;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ private Date zhgxsj;
+
+ @PropertyDef(label = "灞傚钩鍧囨俯")
+ private String cpjw;
+
+ @PropertyDef(label = "灞傛渶楂樻俯")
+ private String czgw;
+
+ @PropertyDef(label = "灞傛渶浣庢俯")
+ private String czdw;
+
+ @PropertyDef(label = "鍚勮寖鍥村潎娓�")
+ private String gfwjw;
+
+ @PropertyDef(label = "绮俯鏄庣粏")
+ private String lwmx;
+
+ @PropertyDef(label = "绮俯鐘舵��")
+ private String lwzt;
+
+ @PropertyDef(label = "寮傚父鐐逛釜鏁�")
+ private String ycdgs;
+
+ @PropertyDef(label = "绮儏鎶�鏈�")
+ private String lqjs;
+
+ @PropertyDef(label = "鏍囪浣�")
+ private String bjw;
+
+ @PropertyDef(label = "鎵规鍙�")
+ private String pch;
+
+}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1303.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1303.java
new file mode 100644
index 0000000..508732b
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1303.java
@@ -0,0 +1,72 @@
+package com.fzzy.push.sh2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import com.fzzy.api.entity.ApiParent;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鎺ュ彛琛�-铏妫�娴嬫暟鎹〃
+ *
+ * @author chen
+ * @date 2022-09-02 16:10
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SH2023Api1303 implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 7545059969928419761L;
+
+ @PropertyDef(label = "瀹宠櫕妫�娴嬪崟鍙�", description = "鐢辫揣浣嶄唬鐮�+妫�娴嬫棩鏈燂紙yyyyMMdd锛�+4 浣嶉『搴忓彿缁勬垚")
+ private String hcjcdh;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "妫�娴嬫椂闂�")
+ private Date jcsj;
+
+ @PropertyDef(label = "璐т綅浠ｇ爜")
+ private String hwdm;
+
+ @PropertyDef(label = "妫�鏌ュ铏柟娉�")
+ private String jchcff;
+
+ @PropertyDef(label = "鍙戠敓閮ㄤ綅")
+ private String fsbw;
+
+ @PropertyDef(label = "瀹宠櫕绉嶇被")
+ private String hczl;
+
+ @PropertyDef(label = "铏彛瀵嗗害鍊奸泦鍚�")
+ private String ckmdzjh;
+
+ @PropertyDef(label = "铏伯绛夌骇鍒ゅ畾")
+ private String cldjpd;
+
+ @PropertyDef(label = "瀹宠櫕鎶楄嵂鎬у垎鏋�")
+ private String hckyxfx;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ private Date zhgxsj;
+
+ @PropertyDef(label = "鎵规鍙�")
+ private String pch;
+
+ @PropertyDef(label = "鏍囪浣�")
+ private String bjw;
+
+}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1304.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1304.java
new file mode 100644
index 0000000..1680a0b
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1304.java
@@ -0,0 +1,75 @@
+package com.fzzy.push.sh2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import com.fzzy.api.entity.ApiParent;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鎺ュ彛琛�-姘斾綋妫�娴嬫暟鎹〃
+ *
+ * @author chen
+ * @date 2022-09-02 16:12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SH2023Api1304 implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 5367656121593571013L;
+
+ @PropertyDef(label = "姘斾綋娴撳害妫�娴嬪崟鍙�")
+ private String qtndjcdh;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "妫�娴嬫椂闂�")
+ private Date jcsj;
+
+ @PropertyDef(label = "璐т綅浠ｇ爜")
+ private String hwdm;
+
+ @PropertyDef(label = "姘ф皵鍚噺鍊奸泦鍚�")
+ private String yqhlzjh;
+
+ @PropertyDef(label = "浜屾哀鍖栫⒊鍚噺鍊奸泦鍚�")
+ private String eyhthlzjh;
+
+ @PropertyDef(label = "纭叞姘熸祿搴﹀�奸泦鍚�")
+ private String lxfndzjh;
+
+ @PropertyDef(label = "纾峰寲姘㈡祿搴﹀�奸泦鍚�")
+ private String lhqndzjh;
+
+ @PropertyDef(label = "涓�姘у寲姘惈閲忓�奸泦鍚�")
+ private String yyhdhlzjh;
+
+ @PropertyDef(label = "涓�姘у寲纰冲惈閲忓�奸泦鍚�")
+ private String yyhthlzjh;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @PropertyDef(label = "浣滀笟绫诲瀷")
+ private String zylx;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ private Date zhgxsj;
+
+ @PropertyDef(label = "鎵规鍙�")
+ private String pch;
+
+ @PropertyDef(label = "鏍囪浣�")
+ private String bjw;
+
+}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1305.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1305.java
new file mode 100644
index 0000000..7e85197
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1305.java
@@ -0,0 +1,192 @@
+package com.fzzy.push.sh2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import com.fzzy.api.entity.ApiParent;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鎺ュ彛琛�-閫氶浣滀笟鏁版嵁琛�
+ *
+ * @author chen
+ * @date 2022-09-02 16:17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SH2023Api1305 implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ @PropertyDef(label = "閫氶浣滀笟鍗曞彿")
+ private String tfzydh;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "閫氶鏃ユ湡")
+ private Date tfrq;
+
+ @PropertyDef(label = "浠撴埧浠ｇ爜")
+ private String cfdm;
+
+ @PropertyDef(label = "閫氶鐩殑")
+ private String tfmd;
+
+ @PropertyDef(label = "绮爢瀛旈殭搴�")
+ private double ldkxd;
+
+ @PropertyDef(label = "閫氶绫诲瀷")
+ private String tflx;
+
+ @PropertyDef(label = "椋庨亾鍨嬪紡")
+ private String fdxs;
+
+ @PropertyDef(label = "椋庣綉璁剧疆鏂瑰紡")
+ private String fwszfs;
+
+ @PropertyDef(label = "涓婚閬撴埅闈㈢Н")
+ private double zfdjmj;
+
+ @PropertyDef(label = "鏀閬撴埅闈㈢Н")
+ private double zhfdjmj;
+
+ @PropertyDef(label = "鏀閬撴�婚暱搴�")
+ private double zfdzcd;
+
+ @PropertyDef(label = "椋庣綉寮�瀛旂巼")
+ private double fwkkl;
+
+ @PropertyDef(label = "绌烘皵閫斿緞姣�")
+ private double kqtjb;
+
+ @PropertyDef(label = "閫氶鍙ｈ缃釜鏁�")
+ private Integer tfkszgs;
+
+ @PropertyDef(label = "閫氶鏈哄瀷鍙�")
+ private String tfjxh;
+
+ @PropertyDef(label = "閫氶鏈哄彴鏁�")
+ private Integer tfjts;
+
+ @PropertyDef(label = "鍗曞彴椋庢満棰濆畾鍏ㄥ帇")
+ private double dtfjedqy;
+
+ @PropertyDef(label = "鍗曞彴椋庢満棰濆畾椋庨噺")
+ private double dtfjedfl;
+
+ @PropertyDef(label = "鍗曞彴椋庢満棰濆畾鍔熺巼")
+ private double dtfjedgl;
+
+ @PropertyDef(label = "閫侀鏂瑰紡")
+ private String sffs;
+
+ @PropertyDef(label = "鍗曞彴椋庢満瀹炴祴椋庨噺")
+ private double dtfjscfl;
+
+ @PropertyDef(label = "鍗曞彴椋庢満杞村姛鐜�")
+ private double dtfjzgl;
+
+ @PropertyDef(label = "鎬婚閲�")
+ private double zfl;
+
+ @PropertyDef(label = "鍗曚綅閫氶閲�")
+ private double dwtfl;
+
+ @PropertyDef(label = "瀹炴祴绯荤粺闃诲姏")
+ private double scxtzl;
+
+ @PropertyDef(label = "鎬昏�楃數閲�")
+ private double zhdl;
+
+ @PropertyDef(label = "浣滀笟鏃舵皵娓�")
+ private double zysqw;
+
+ @PropertyDef(label = "浣滀笟鏃舵皵婀�")
+ private double zysqs;
+
+ @PropertyDef(label = "閫氶鏃堕暱")
+ private double tfsc;
+
+ @PropertyDef(label = "浣滀笟鍓嶅钩鍧囩伯娓�")
+ private double zyqpjlw;
+
+ @PropertyDef(label = "缁撴潫鍚庡钩鍧囩伯娓�")
+ private double jshpjlw;
+
+ @PropertyDef(label = "闄嶆俯骞呭害")
+ private double jwfd;
+
+ @PropertyDef(label = "鍚ㄧ伯闄嶆俯鑳借��")
+ private double dljwnh;
+
+ @PropertyDef(label = "澶辨按鐜�")
+ private double ssl;
+
+ @PropertyDef(label = "淇濇按鏁堟灉璇勪环缁撴灉")
+ private String bsxgpjjg;
+
+ @PropertyDef(label = "閫氶闄嶆俯鍧囧寑鎬ц瘎浠穇鏁翠粨")
+ private String tfjwjyxpjzc;
+
+ @PropertyDef(label = "閫氶闄嶆俯鍧囧寑鎬ц瘎浠穇涓婂眰")
+ private String tfjwjyxpjsc;
+
+ @PropertyDef(label = "閫氶闄嶆俯鍧囧寑鎬ц瘎浠穇涓�(闂�)灞�")
+ private String tfjwjyxpjzjc;
+
+ @PropertyDef(label = "閫氶闄嶆俯鍧囧寑鎬ц瘎浠穇涓嬪眰")
+ private String tfjwjyxpjxc;
+
+ @PropertyDef(label = "浣滀笟鍓嶅钩鍧囨按鍒�")
+ private double zyqpjsf;
+
+ @PropertyDef(label = "缁撴潫鍚庡钩鍧囨按鍒�")
+ private double zyhpjsf;
+
+ @PropertyDef(label = "闄嶆按骞呭害")
+ private double jsfd;
+
+ @PropertyDef(label = "鍚ㄧ伯闄嶆按鑳借��")
+ private double dljsnh;
+
+ @PropertyDef(label = "閫氶闄嶆按鍧囧寑鎬у垎鏋恄鏁翠粨")
+ private String tfjsjyxfxzc;
+
+ @PropertyDef(label = "閫氶闄嶆按鍧囧寑鎬у垎鏋恄涓婂眰")
+ private String tfjsjyxfxsc;
+
+ @PropertyDef(label = "閫氶闄嶆按鍧囧寑鎬у垎鏋恄涓�(闂�)灞�")
+ private String tfjsjyxfxzjc;
+
+ @PropertyDef(label = "閫氶闄嶆按鍧囧寑鎬у垎鏋恄涓嬪眰")
+ private String tfjsjyxfxxc;
+
+ @PropertyDef(label = "閫氶浣滀笟璐熻矗浜�")
+ private String tfzyfzr;
+
+ @PropertyDef(label = "閫氶浣滀笟浜哄憳")
+ private String tfzyry;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ private Date zhgxsj;
+
+ @PropertyDef(label = "寤掗棿鏁�")
+ private String ajdm;
+
+ @PropertyDef(label = "鏍囪浣�")
+ private String bjw;
+
+}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1306.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1306.java
new file mode 100644
index 0000000..24e3afb
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1306.java
@@ -0,0 +1,240 @@
+package com.fzzy.push.sh2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import com.fzzy.api.entity.ApiParent;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鎺ュ彛琛�-鐔忚捀浣滀笟鏁版嵁琛�
+ *
+ * @author chen
+ * @date 2022-09-02 16:21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SH2023Api1306 implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ @PropertyDef(label = "鐔忚捀浣滀笟鍗曞彿")
+ private String xzzydh;
+
+ @PropertyDef(label = "浠撴埧浠ｇ爜")
+ private String cfdm;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "鐔忚捀寮�濮嬫椂闂�")
+ private Date xzkssj;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "鐔忚捀缁撴潫鏃堕棿")
+ private Date xzjssj;
+
+ @PropertyDef(label = "瀹宠櫕妫�娴嬪崟鍙�")
+ private String hcjcdh;
+
+ @PropertyDef(label = "灏佷粨鍚庣啅钂哥殑娆℃暟 绗嚑娆＄啅钂�")
+ private Integer djcxz;
+
+ @PropertyDef(label = "甯歌鐔忚捀鏂瑰紡")
+ private String cgxzfs;
+
+ @PropertyDef(label = "鐜祦鐔忚捀鏂瑰紡")
+ private String hlxzfs;
+
+ @PropertyDef(label = "鐜祦鐔忚捀涓庡唴鐜祦鎶�鏈粨鍚�")
+ private String hlxzynhljsjh;
+
+ @PropertyDef(label = "鐔忚捀鏂规鍒跺畾")
+ private String xzfazd;
+
+ @PropertyDef(label = "鐔忚捀鏂规璧疯崏浜�")
+ private String xzfaqcr;
+
+ @PropertyDef(label = "鐔忚捀鏂规鎵瑰噯浜�")
+ private String xzfapzr;
+
+ @PropertyDef(label = "鐔忚捀鏂规鎶ュ鎯呭喌")
+ private String xzfabbqk;
+
+ @PropertyDef(label = "鏂借嵂浜哄憳璧勮川鎯呭喌")
+ private String syryzzqk;
+
+ @PropertyDef(label = "鏂借嵂璧勮川瀹℃牳")
+ private String syzzsh;
+
+ @PropertyDef(label = "鑽墏鍚嶇О")
+ private String yjmc;
+
+ @PropertyDef(label = "鍓傚瀷")
+ private String jx;
+
+ @PropertyDef(label = "娴撳害")
+ private Double nd;
+
+ @PropertyDef(label = "绮爢鍗曚綅鐢ㄨ嵂閲�")
+ private Double lddwyyl;
+
+ @PropertyDef(label = "绌洪棿鍗曚綅鐢ㄨ嵂閲�")
+ private Double kjdwyyl;
+
+ @PropertyDef(label = "鎬荤敤鑽噺")
+ private Double zyyl;
+
+ @PropertyDef(label = "鏂借嵂鏂规硶")
+ private String syff;
+
+ @PropertyDef(label = "杈呭姪鏂借嵂鎺柦")
+ private String fzsycs;
+
+ @PropertyDef(label = "绌烘皵鍛煎惛鍣ㄥ強瀹夊叏妫�鏌ユ儏鍐�")
+ private String kqhqjaqjcqk;
+
+ @PropertyDef(label = "纾峰寲姘㈡娴嬭缃皟璇曟儏鍐�")
+ private String lhqjczztsqk;
+
+ @PropertyDef(label = "姘ф皵娣卞害妫�娴嬭缃皟璇曟儏鍐�")
+ private String yqsdjczztsqk;
+
+ @PropertyDef(label = "纾峰寲姘㈡姤璀︿华瀹夊叏妫�鏌�")
+ private String lhqbjyaqjc;
+
+ @PropertyDef(label = "姘ф皵鎶ヨ浠畨鍏ㄦ鏌�")
+ private String yqbjyaqjc;
+
+ @PropertyDef(label = "琛ヨ嵂鍓嶄粨鍐呯７鍖栨阿娴撳害")
+ private Double byqcnlhqnd;
+
+ @PropertyDef(label = "纾峰寲姘㈡祿搴﹀崟浣�", description = "1锛歡/m鲁 (榛樿) 2锛歱pm 3:ml/m鲁 4锛�%VOL銆�")
+ private String nlhqnddw;
+
+ @PropertyDef(label = "鐩爣娴撳害")
+ private Double mbnd;
+
+ @PropertyDef(label = "璁＄畻琛ヨ嵂閲�")
+ private Double jsbyl;
+
+ @PropertyDef(label = "瀹為檯琛ヨ嵂閲�")
+ private Double sjbyl;
+
+ @PropertyDef(label = "琛ヨ嵂鏂规硶")
+ private String byff;
+
+ @PropertyDef(label = "浣滀笟浜烘暟")
+ private Integer zyrs;
+
+ @PropertyDef(label = "琛ヨ嵂浣滀笟鎵瑰噯浜�")
+ private String byzypzr;
+
+ @PropertyDef(label = "鐜板満鎸囨尌浜�")
+ private String xczhr;
+
+ @PropertyDef(label = "宄板�兼祿搴�")
+ private Double fznd;
+
+ @PropertyDef(label = "鐩爣娴撳害缁存寔澶╂暟")
+ private Integer mbndwcts;
+
+ @PropertyDef(label = "婕忔皵浣嶇疆鐩戞祴")
+ private String lswzjc;
+
+ @PropertyDef(label = "婕忔皵閮ㄤ綅閲囧彇鐨勮ˉ鏁戞帾鏂�")
+ private String lqbwcqdbjcs;
+
+ @PropertyDef(label = "瀵嗛棴鏃堕棿")
+ private Integer mbsj;
+
+ @PropertyDef(label = "CT鍊�")
+ private Double ctz;
+
+ @PropertyDef(label = "鏁ｆ皵鍓嶇７鍖栨阿娴撳害")
+ private Double sqqlhqnd;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "鏁ｆ皵鏃ユ湡")
+ private Date sqrq;
+
+ @PropertyDef(label = "鏁ｆ皵鏂规硶")
+ private String sqff;
+
+ @PropertyDef(label = "鏁ｆ皵鎵瑰噯浜�")
+ private String sqpzr;
+
+ @PropertyDef(label = "鏁ｆ皵鎸佺画澶╂暟")
+ private Integer sqcsts;
+
+ @PropertyDef(label = "鏁ｆ皵缁撴潫鏃剁７鍖栨阿娴撳害")
+ private Double sqjsslhqnd;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "娈嬫福鏀堕泦浣滀笟鏃堕棿")
+ private Date czsjzysj;
+
+ @PropertyDef(label = "娈嬫福鏀堕泦浣滀笟浜烘暟")
+ private Integer czsjzyrs;
+
+ @PropertyDef(label = "娈嬫福鏀堕泦鏂规硶")
+ private String czsjff;
+
+ @PropertyDef(label = "娈嬫福鏀堕泦浣滀笟鎵瑰噯浜�")
+ private String czsjzypzr;
+
+ @PropertyDef(label = "娈嬫福澶勭悊鎺柦")
+ private String czclcs;
+
+ @PropertyDef(label = "娈嬫福澶勭悊浣滀笟浜烘暟")
+ private Integer czclzyrs;
+
+ @PropertyDef(label = "娈嬫福澶勭悊鎵瑰噯浜�")
+ private String czclpzr;
+
+ @PropertyDef(label = "鐔忚捀鍚庢椿铏鍑烘儏鍐�")
+ private String xzhhcjcqk;
+
+ @PropertyDef(label = "鐔忚捀鍚庤櫕鍙ｅ瘑搴�")
+ private Integer xzhckmd;
+
+ @PropertyDef(label = "鍩瑰吇15澶╁悗娲昏櫕鏁�")
+ private Integer pyswthhcs;
+
+ @PropertyDef(label = "鍩瑰吇45澶╁悗娲昏櫕鏁�")
+ private Integer pysswthhcs;
+
+ @PropertyDef(label = "鐔忚捀鏁堟灉璇勪环")
+ private String xzxgpj;
+
+ @PropertyDef(label = "鐔忚捀璐熻矗浜�")
+ private String xzfzr;
+
+ @PropertyDef(label = "鐔忚捀浣滀笟浜哄憳")
+ private String xzzyry;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ private Date zhgxsj;
+
+ @PropertyDef(label = "寤掗棿浠ｇ爜")
+ private String ajdm;
+
+ @PropertyDef(label = "鎵规鍙�")
+ private String pch;
+
+ @PropertyDef(label = "鏍囪浣�")
+ private String bjw;
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1307.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1307.java
new file mode 100644
index 0000000..f8831dc
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1307.java
@@ -0,0 +1,68 @@
+package com.fzzy.push.sh2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import 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
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SH2023Api1307 implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ private String kqdm;
+
+ @PropertyDef(label = "瑙嗛鐩戞帶璁惧id")
+ private String spjksbid;
+
+ @PropertyDef(label = "浠撴埧浠ｇ爜")
+ private String cfdm;
+
+ @PropertyDef(label = "璐т綅浠ｇ爜")
+ private String hwdm;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鎶撴媿鏃堕棿")
+ private Date zpsj;
+
+ @PropertyDef(label = "鍥惧儚缂栧彿")
+ private String txbh;
+
+ @PropertyDef(label = "鏂囦欢id")
+ private String fileStorageId;
+
+ @JSONField(name = "yzwbh")
+ @PropertyDef(label = "棰勭疆浣嶇紪鍙�")
+ private String yzwbh;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private Date zhgxsj;
+
+ @PropertyDef(label = "寤掗棿浠ｇ爜")
+ private String ajdm;
+
+ @PropertyDef(label = "鏍囪浣�")
+ private String bjw;
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1310.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1310.java
new file mode 100644
index 0000000..9f98c54
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1310.java
@@ -0,0 +1,132 @@
+package com.fzzy.push.sh2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import com.fzzy.api.entity.ApiParent;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鎺ュ彛琛�-璐ㄦ鏁版嵁琛�
+ *
+ * @author chen
+ * @date 2022-09-02 16:03
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SH2023Api1310 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;
+
+ @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;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "妫�楠屾棩鏈�")
+ private Date jyrq;
+
+ @PropertyDef(label = "鏍囪浣�")
+ private String bjw;
+
+ @PropertyDef(label = "鎵规鍙�")
+ private String pch;
+
+ @PropertyDef(label = "绮鎬ц川浠ｇ爜")
+ private String lsxzdm;
+
+}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1401.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1401.java
new file mode 100644
index 0000000..e9c0b01
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1401.java
@@ -0,0 +1,67 @@
+package com.fzzy.push.sh2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.GenericGenerator;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鎺ュ彛琛�-鍌ㄥ瑙勬ā鏁版嵁琛�
+ *
+ * @author chen
+ * @date 2022-09-02 16:03
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SH2023Api1401 implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ @Column(name = "kqdm", length = 21)
+ private String kqdm;
+
+ @PropertyDef(label = "骞翠唤")
+ private String nf;
+
+ @PropertyDef(label = "琛屾斂鍖哄垝浠ｇ爜")
+ private String xzqhdm;
+
+ @PropertyDef(label = "鎵垮偍浼佷笟")
+ private String ccqy;
+
+ @PropertyDef(label = "绮鍝佺")
+ private String ylpz;
+
+ @PropertyDef(label = "绮鎬ц川")
+ private String ylxz;
+
+ @PropertyDef(label = "鍌ㄥ瑙勬ā璁″垝鏁伴噺")
+ private double ylcbgmjhsl;
+
+ @PropertyDef(label = "鍌ㄥ瑙勬ā璁″垝鏂囧彿")
+ private String cbgmjhwh;
+
+ @PropertyDef(label = "澶囨敞")
+ private String remarks;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ private Date zhgxsj;
+
+ @PropertyDef(label = "鏍囪浣�")
+ private String bjw;
+
+}
--
Gitblit v1.9.3