From 2627c9d3c01458587f9e1873a2a0284b8a08be04 Mon Sep 17 00:00:00 2001
From: WS <1143478319@qq.com>
Date: 星期二, 22 八月 2023 18:54:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1105.java | 56
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1205.java | 174 +
src/main/java/com/fzzy/api/view/repository/Api1301Rep.java | 9
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java | 20
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1113.java | 48
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java | 26
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1305.java | 192 ++
src/main/java/com/fzzy/otherview/sh2023/dto/ShApi1311.java | 133 +
src/main/java/com/fzzy/api/view/repository/Api1205Rep.java | 8
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java | 18
src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40SyncDepotRep.java | 28
src/main/java/com/fzzy/async/fzzy40/entity/Fz40Depot.java | 134 +
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/dto/SH2023Api1106.java | 88
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2103.java | 195 ++
src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1202Rep.java | 2
src/main/java/com/fzzy/api/view/repository/Api1202Rep.java | 12
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java | 43
src/main/java/com/fzzy/push/sh2023/dto/ShAreaBjw.java | 146
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/api/view/repository/Api1113Rep.java | 5
src/main/java/com/fzzy/async/fzzy40/entity/Fz40DepotConf.java | 128 +
src/main/java/com/fzzy/api/view/repository/Api1401Rep.java | 8
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 376 ++++
src/main/java/com/fzzy/push/sh2023/SH2023PushService11.java | 167 +
src/main/java/com/fzzy/push/sh2023/SH2023PushService14.java | 39
src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java | 18
src/main/java/com/fzzy/api/view/repository/Api1108Rep.java | 6
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1204.java | 92 +
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2103Item.java | 38
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2101.java | 114 +
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1201.java | 176 +
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1401.java | 67
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1202.java | 227 ++
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java | 13
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1108.java | 90 +
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1302.java | 106 +
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1110.java | 51
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java | 19
src/main/java/com/fzzy/async/fzzy40/entity/Fz40DepotConfKey.java | 16
src/main/java/com/fzzy/push/sh2023/SH2023PushService13.java | 284 +++
src/main/java/com/fzzy/otherview/sh2023/repository/ShApi1311Rep.java | 21
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1310.java | 132 +
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java | 18
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1311.java | 130 +
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java | 30
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1109.java | 41
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1111.java | 55
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1203.java | 94 +
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1303.java | 72
src/main/java/com/fzzy/push/sh2023/SH2023PushService12.java | 220 ++
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1109.java | 47
src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40SyncDepotConfRep.java | 25
src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java | 56
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1109.java | 41
src/main/java/com/fzzy/api/view/repository/Api1110Rep.java | 11
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1112.java | 106 +
src/main/java/com/fzzy/api/view/repository/Api1109Rep.java | 6
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2103.java | 71
src/main/java/com/fzzy/otherview/sh2023/repository/ShApi2101Rep.java | 20
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1307.java | 68
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1304.java | 75
src/main/java/com/fzzy/api/timer/SyncDataScheduled.java | 1
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1107.java | 73
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1104.java | 76
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1301.java | 101 +
src/main/java/com/fzzy/api/view/repository/Api1107Rep.java | 1
69 files changed, 5,122 insertions(+), 265 deletions(-)
diff --git a/src/main/java/com/fzzy/api/timer/SyncDataScheduled.java b/src/main/java/com/fzzy/api/timer/SyncDataScheduled.java
index 8b81d8a..f232f3a 100644
--- a/src/main/java/com/fzzy/api/timer/SyncDataScheduled.java
+++ b/src/main/java/com/fzzy/api/timer/SyncDataScheduled.java
@@ -135,6 +135,7 @@
ApiParam param = new ApiParam();
param.setSyncProtocol(conf.getSyncProtocol());
+ param.setPushProtocol(conf.getPushProtocol());
param.setKqdm(conf.getKqdm());
param.setStart(start);
param.setEnd(exeDate);
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1107Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1107Rep.java
index 0dbc4f1..0adf05d 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1107Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1107Rep.java
@@ -1,7 +1,6 @@
package com.fzzy.api.view.repository;
import com.fzzy.api.entity.Api1107;
-import com.fzzy.api.entity.Api1112;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1108Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1108Rep.java
index 97fb8db..49be127 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1108Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1108Rep.java
@@ -7,6 +7,8 @@
import org.springframework.data.repository.query.Param;
import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
+
public interface Api1108Rep extends JpaRepository<Api1108, String> {
@@ -23,4 +25,8 @@
@Query("update Api1108 set czbz=:czbz where id=:id ")
int updateStatus(@Param("id") String id, @Param("czbz") String czbz);
+ @Query("from Api1108 where kqdm=:kqdm")
+ List<Api1108> findPushData(@Param("kqdm") String kqdm);
+
+
}
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/Api1110Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1110Rep.java
index 7cf0851..a6f28d1 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1110Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1110Rep.java
@@ -7,19 +7,24 @@
import org.springframework.data.repository.query.Param;
import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
+
public interface Api1110Rep extends JpaRepository<Api1110, String> {
/**
* 鏍规嵁琛ㄥ崟涓婚敭鏇存柊鎿嶄綔鏍囧織鐘舵��
*
- * @param id 涓婚敭ID
+ * @param hwdm 涓婚敭ID
* @param czbz 鎿嶄綔鏍囧織
* @return
*/
@Transactional
@Modifying
- @Query("update Api1110 set czbz=:czbz where id=:id ")
- int updateStatus(@Param("id") String id, @Param("czbz") String czbz);
+ @Query("update Api1110 set czbz=:czbz where hwdm=:hwdm ")
+ int updateStatus(@Param("hwdm") String hwdm, @Param("czbz") String czbz);
+
+ @Query("from Api1110 where kqdm=:kqdm")
+ List<Api1110> findPushData(@Param("kqdm") String kqdm);
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1113Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1113Rep.java
index a302b50..3b0f246 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1113Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1113Rep.java
@@ -7,6 +7,8 @@
import org.springframework.data.repository.query.Param;
import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
+
public interface Api1113Rep extends JpaRepository<Api1113, String> {
@@ -23,4 +25,7 @@
@Query("update Api1113 set czbz=:czbz where dwdm=:id ")
int updateStatus(@Param("id") String id, @Param("czbz") String czbz);
+ @Query("from Api1113 where kqdm=:kqdm")
+ List<Api1113> findPushData(@Param("kqdm") String kqdm);
+
}
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..95879c1 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);
@@ -29,4 +33,12 @@
@Query("from Api1202 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
List<Api1202> findPushDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
+
+ /**
+ * 鏍规嵁bizId鏌ヨ鏁版嵁
+ * @param bizId
+ * @return
+ */
+ @Query("from Api1202 where bizId =:bizId")
+ List<Api1202> getDataByBizId(@Param("bizId") String bizId);
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1205Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1205Rep.java
index f2e1b1e..0de6e06 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1205Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1205Rep.java
@@ -26,4 +26,12 @@
@Query("from Api1205 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
List<Api1205> findPushDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
+
+ /**
+ * 鏍规嵁bizId鏌ヨ鏁版嵁
+ * @param bizId
+ * @return
+ */
+ @Query("from Api1205 where bizId =:bizId")
+ List<Api1205> getDataByBizId(@Param("bizId") String bizId);
}
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/async/fzzy35/impl/Fzzy35Sync1109.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1109.java
index 20589bd..bef4291 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1109.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1109.java
@@ -2,15 +2,17 @@
import com.fzzy.api.Constant;
import com.fzzy.api.entity.Api1109;
+import com.fzzy.api.entity.Api1202;
+import com.fzzy.api.entity.Api1205;
import com.fzzy.api.entity.ApiLog;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.utils.FileUtil;
import com.fzzy.api.view.repository.Api1109Rep;
+import com.fzzy.api.view.repository.Api1202Rep;
+import com.fzzy.api.view.repository.Api1205Rep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.fzzy35.entity.Fz35FileInfo;
-import com.fzzy.async.fzzy35.entity.Fz35InoutRecord;
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1109Rep;
-import com.fzzy.async.fzzy35.repository.Fzzy35Sync1202Rep;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -47,9 +49,11 @@
@Autowired
private Fzzy35Sync1109Rep fzzySync1109Rep;
@Autowired
- private Fzzy35Sync1202Rep fzzySync1202Rep;
- @Autowired
private Api1109Rep api1109Rep;
+ @Autowired
+ private Api1202Rep api1202Rep;
+ @Autowired
+ private Api1205Rep api1205Rep;
@Autowired
private ApiLogRep apiLogRep;
@Autowired
@@ -87,24 +91,29 @@
String wjlx;
String wjmc;
List<Api1109> api1109List;
- List<Fz35InoutRecord> listInout;
+ List<Api1202> api1202List;
+ List<Api1205> api1205List;
+ String str = "";
for (Fz35FileInfo sysData : list) {
if (StringUtils.isEmpty(sysData.getBizId())) {
continue;
}
//鏍规嵁鍥剧墖id鏌ヨ瀵瑰簲鍑哄叆搴撲俊鎭�
- listInout = fzzySync1202Rep.listInoutRecordById(sysData.getBizId());
- if(null == listInout || listInout.isEmpty()){
- continue;
+ if(sysData.getBizId().startsWith(IMG_START_R)){
+ api1202List = api1202Rep.getDataByBizId(sysData.getBizId());
+ if (null == api1202List || api1202List.isEmpty()) {
+ continue;
+ }
+ str = api1202List.get(0).getRkywdh();
}
- //鑻ュ嚭鍏ュ簱淇℃伅涓哄垹闄ゆ垨鑰呴敊璇姸鎬侊紝鍒欎笉鍚屾
- if("DEL".equals(listInout.get(0).getRecordStatus()) || "ERROR".equals(listInout.get(0).getRecordStatus())){
- continue;
+ if(sysData.getBizId().startsWith(IMG_START_C)){
+ api1205List = api1205Rep.getDataByBizId(sysData.getBizId());
+ if (null == api1205List || api1205List.isEmpty()) {
+ continue;
+ }
+ str = api1205List.get(0).getCkywdh();
}
- //鑻ュ嚭鍏ュ簱淇℃伅涓叆搴撻噸閲忎负绌烘垨涓�0锛屽垯涓嶅悓姝�
- if(null == listInout.get(0).getRecordWeight() || listInout.get(0).getRecordWeight() == 0){
- continue;
- }
+
//鍙悓姝ョО閲�
if(BIZ_TAG_WEIGHT_FULL.equals(sysData.getBizTag()) || BIZ_TAG_WEIGHT_EMPTY.equals(sysData.getBizTag())){
wjlx = "";
@@ -132,7 +141,7 @@
apiData.setWjdz(fileUtil.getInoutFilePath(sysData.getCreateTime()) + sysData.getFileName());
//鏂囦欢鍚嶇О
- wjmc = getImgNameType(wjmc, sysData.getBizTag(), sysData.getBizId(), sysData.getFileName(), map);
+ wjmc = getImgNameType(wjmc, sysData.getBizTag(), str, sysData.getFileName(), map);
apiData.setWjmc(wjmc);
//鏂囦欢绫诲瀷
apiData.setWjlx(wjlx);
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java
index 8d4540b..4fdc9f4 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java
@@ -20,9 +20,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
/**
* 绮鍏ュ簱淇℃伅
@@ -81,6 +79,9 @@
List<Fz35InoutNoticeIn> listInoutNotice;
List<Api1202> api1202List;
Calendar c = Calendar.getInstance();
+ String ywsj = "";
+ String num = "";
+ Map<String, Integer> map = new HashMap<>();
for (Fz35InoutRecord sysData : list) {
if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
sysData.setRecordWeight(sysData.getSettleWeight());
@@ -97,6 +98,16 @@
apiData = new Api1202();
apiData.setRkywdh(Constant.INOUT_TYPE_14 + sysData.getId().substring(4));
+ //鍒ゆ柇涓氬姟鏃堕棿涓庡崟鎹彿鏄惁鍖归厤
+ ywsj = DateFormatUtils.format(sysData.getCompleteTime(),"yyMMdd");
+ if(!ywsj.equals(sysData.getId().substring(4, 10))){
+ if(null == map.get(ywsj)){
+ map.put(ywsj, 10201);
+ }
+ num = String.valueOf(map.get(ywsj)).substring(1);
+ apiData.setRkywdh(Constant.INOUT_TYPE_14 + ywsj + num);
+ map.put(ywsj, map.get(ywsj) + 1);
+ }
//璐т綅浠ｇ爜
apiData.setHwdm(api1105.getHwdm());
@@ -107,7 +118,7 @@
//榛樿涓�涓殢渚垮��
apiData.setLxdh(StringUtils.isEmpty(sysData.getUserContact()) ? "13012345678" : sysData.getUserContact());
- apiData.setSfzh(null == sysData.getUserId() ? "410183200010100000" : sysData.getUserId());
+ apiData.setSfzh(null == sysData.getUserId() ? "410183200010100000" : sysData.getUserId().trim());
//鑾峰彇鍚堝悓鍙�
listInoutNotice = fzzy35SyncNoticeInRep.listInoutNoticeInById(sysData.getNoticeId());
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java
index f383d4b..2583529 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java
@@ -5,6 +5,7 @@
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.Api1202Rep;
import com.fzzy.api.view.repository.Api1203Rep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.api.view.repository.GbCheckItemRep;
@@ -14,6 +15,7 @@
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1203Rep;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.time.DateFormatUtils;
import org.apache.commons.lang.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -37,9 +39,10 @@
private Fzzy35Sync1202Rep fzzySync1202Rep;
@Autowired
private Fzzy35Sync1203Rep fzzySync1203Rep;
-
@Autowired
private ApiTriggerService apiTriggerService;
+ @Autowired
+ private Api1202Rep api1202Rep;
@Autowired
private Api1203Rep api1203Rep;
@Autowired
@@ -86,12 +89,11 @@
String zkj;
String zkl;
List<Api1203> api1203List;
+ List<Api1202> api1102List;
for (Fz35InoutRecord sysData : list) {
- if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
- sysData.setRecordWeight(sysData.getSettleWeight());
- }
- //鍒ゆ柇鍑�閲嶆槸鍚﹀ぇ浜�0锛岀瓑浜�0琛ㄧず涓嶅悎鏍硷紝涓嶈繘琛屽悓姝ヤ笂浼�
- if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
+ //鏌ヨ绮鍏ュ簱淇℃伅锛岃嫢涓虹┖鍒欎笉杩涜鍚屾涓婁紶
+ api1102List = api1202Rep.getDataByBizId(sysData.getId());
+ if(null == api1102List || api1102List.isEmpty()){
continue;
}
@@ -102,19 +104,12 @@
continue;
}
- //鑾峰彇璐т綅淇℃伅
- api1105 = commonService.getApi1105Cache(sysData.getDepotId());
- if (null == api1105) {
- continue;
- }
-
apiData = new Api1203();
- apiData.setRkjydh(Constant.INOUT_TYPE_14 + sysData.getId().substring(4));
-
+ apiData.setRkjydh(api1102List.get(0).getRkywdh());
//璐т綅浠ｇ爜
- apiData.setHwdm(api1105.getHwdm());
- apiData.setRkywdh(apiData.getRkjydh());
+ apiData.setHwdm(api1102List.get(0).getHwdm());
+ apiData.setRkywdh(api1102List.get(0).getRkywdh());
if(null == sysData.getFullWeightTime()){
sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 5));
}
@@ -160,6 +155,9 @@
String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
apiData.setLspzdm(mappingCode);
+ //淇濈鍛樺鏍�
+ apiData.setBgyfh(apiData.getJyjg());
+
//绮绛夌骇
mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSDJ, sysData.getFoodLevel());
apiData.setLsdd(mappingCode);
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java
index 45ac8b1..6cddd0d 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java
@@ -18,9 +18,8 @@
import org.apache.commons.lang.time.DateFormatUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
+
+import java.util.*;
/**
* 绮鍑哄簱淇℃伅
@@ -78,8 +77,10 @@
Api1105 api1105;
List<Fz35InoutNoticeOut> listInoutNotice;
List<Api1205> api1205List;
- // List<GbArea> gbAreaList;
Calendar c = Calendar.getInstance();
+ String ywsj = "";
+ String num = "";
+ Map<String, Integer> map = new HashMap<>();
for (Fz35InoutRecord sysData : list) {
if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
sysData.setRecordWeight(sysData.getSettleWeight());
@@ -95,7 +96,16 @@
}
apiData = new Api1205();
apiData.setCkywdh(Constant.INOUT_TYPE_15 + sysData.getId().substring(4));
-
+ //鍒ゆ柇涓氬姟鏃堕棿涓庡崟鎹彿鏄惁鍖归厤
+ ywsj = DateFormatUtils.format(sysData.getCompleteTime(),"yyMMdd");
+ if(!ywsj.equals(sysData.getId().substring(4, 10))){
+ if(null == map.get(ywsj)){
+ map.put(ywsj, 10201);
+ }
+ num = String.valueOf(map.get(ywsj)).substring(1);
+ apiData.setCkywdh(Constant.INOUT_TYPE_15 + ywsj + num);
+ map.put(ywsj, map.get(ywsj) + 1);
+ }
//璐т綅浠ｇ爜
apiData.setHwdm(api1105.getHwdm());
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java
index 4df4f97..bfafbc4 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java
@@ -71,6 +71,7 @@
Api1208 apiData;
Api1105 api1105;
+ List<Api1208> api1208List;
for (Fz35DepotStore fz35DepotStore : list) {
//鑾峰彇璐т綅淇℃伅
@@ -80,6 +81,7 @@
}
apiData = new Api1208();
+ apiData.setId(fz35DepotStore.getId());
apiData.setHwdm(api1105.getHwdm());
//绮鍝佺
@@ -135,7 +137,7 @@
apiData.setSjzlxg(6);
apiData.setLdtj(10000);
- apiData.setZhgxsj(new Date());
+ apiData.setZhgxsj(fz35DepotStore.getUpdateDate());
//涓氬姟id銆佸簱鍖虹紪鐮併�佸悓姝ユ椂闂�
apiData.setBizId(fz35DepotStore.getId());
@@ -143,8 +145,13 @@
apiData.setSyncTime(new Date());
//搴撳瓨姣忔鏂板
- apiData.setCzbz(Constant.CZBZ_I);
- apiData.setId(ContextUtil.getCurTimeMillis());
+ api1208List = api1208Rep.getDataById(apiData.getId());
+ if(null == api1208List || api1208List.isEmpty()){
+ apiData.setCzbz(Constant.CZBZ_I);
+ }else {
+ apiData.setCzbz(api1208List.get(0).getCzbz());
+ }
+
//淇濆瓨鏁版嵁
api1208Rep.save(apiData);
}
diff --git a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
index 1056074..94c7903 100644
--- a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
+++ b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
@@ -58,40 +58,40 @@
Date end = param.getEnd();
//瀹㈡埛鍚屾
- fzzySync1212.syncData(kqdm, deptId, start, end);
+// fzzySync1212.syncData(kqdm, deptId, start, end);
//鍚堝悓鍚屾
- fzzySync1201.syncData(kqdm, deptId, start, end);
+// fzzySync1201.syncData(kqdm, deptId, start, end);
- //绮鍏ュ簱鍚屾
+// //绮鍏ュ簱鍚屾
fzzySync1202.syncData(kqdm, deptId, start, end);
-
- //绮鍏ュ簱璐ㄦ
+//
+// //绮鍏ュ簱璐ㄦ
fzzySync1203.syncData(kqdm, deptId, start, end);
-
- //绮鍏ュ簱缁撶畻
- fzzySync1204.syncData(kqdm, deptId, start, end);
- //绮鍑哄簱鍚屾
- fzzySync1205.syncData(kqdm, deptId, start, end);
-
- //绮鍑哄簱缁撶畻
- fzzySync1206.syncData(kqdm, deptId, start, end);
- //绮鎹熺泭
- fzzySync1209.syncData(kqdm, deptId, start, end);
- //鍊掍粨淇℃伅鍚屾
- fzzySync1207.syncData(kqdm, deptId, start, end);
-
- //鍑哄叆搴撴枃浠朵俊鎭悓姝�
- fzzySync1109.syncData(kqdm, deptId, start, end);
-
- //绮搴撳瓨鍚屾
+//
+// //绮鍏ュ簱缁撶畻
+// fzzySync1204.syncData(kqdm, deptId, start, end);
+// //绮鍑哄簱鍚屾
+// fzzySync1205.syncData(kqdm, deptId, start, end);
+//
+// //绮鍑哄簱缁撶畻
+// fzzySync1206.syncData(kqdm, deptId, start, end);
+// //绮鎹熺泭
+// fzzySync1209.syncData(kqdm, deptId, start, end);
+// //鍊掍粨淇℃伅鍚屾
+// fzzySync1207.syncData(kqdm, deptId, start, end);
+//
+// //鍑哄叆搴撴枃浠朵俊鎭悓姝�
+// fzzySync1109.syncData(kqdm, deptId, start, end);
+//
+// //绮搴撳瓨鍚屾
fzzySync1208.syncData(kqdm, deptId, start, end);
-
- //绮鎬ц川杞彉淇℃伅鍚屾
- fzzySync1210.syncData(kqdm, deptId, start, end);
-
-
- //璐﹂潰搴撳瓨淇℃伅鍚屾 TODO
+//
+// //绮鎬ц川杞彉淇℃伅鍚屾
+// fzzySync1210.syncData(kqdm, deptId, start, end);
+//
+//
+// //璐﹂潰搴撳瓨淇℃伅鍚屾 TODO
}
diff --git a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java
index 2377849..f8dc6ef 100644
--- a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java
+++ b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java
@@ -1,9 +1,11 @@
package com.fzzy.async.fzzy40;
import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.data.SyncProtocol;
import com.fzzy.api.service.SyncService13;
import com.fzzy.async.fzzy40.impl.*;
+import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -31,6 +33,8 @@
private Fzzy40Sync1310 fzzySync1310;
@Autowired
private Fzzy40Sync1023 fzzySync1023;
+ @Autowired
+ private Fzzy40Sync2103 fzzy40Sync2103;
@Override
public String getProtocol() {
@@ -40,6 +44,20 @@
@Override
public void syncData(ApiParam param) {
+
+ //鍚勭渷鐙湁鎺ュ彛淇℃伅鍚屾
+ if(StringUtils.isNotEmpty(param.getPushProtocol()) && PushProtocol.SB_GD_2022.equals(param.getPushProtocol())){
+ //骞夸笢鐪佸钩鍙�2022鐗堬紝闇�瑕佸悓姝ョ啅钂稿妗堜俊鎭�
+ //TODO 鐔忚捀澶囨鍚屾
+
+ }
+ if(StringUtils.isNotEmpty(param.getPushProtocol()) && PushProtocol.SB_SH_2023.equals(param.getPushProtocol())){
+ //涓婃捣甯傚钩鍙�2023鐗堬紝闇�瑕佸悓姝ョ伯鎯呰澶囬厤缃俊鎭�
+
+ //鍚屾绮儏璁惧閰嶇疆淇℃伅
+ fzzy40Sync2103.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+ }
+
//娓╂箍搴︽娴嬫暟鎹悓姝�
fzzySync1302.syncData(param.getDeptId(), param.getStart(), param.getEnd());
diff --git a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40Depot.java b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40Depot.java
new file mode 100644
index 0000000..bfb2e56
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40Depot.java
@@ -0,0 +1,134 @@
+package com.fzzy.async.fzzy40.entity;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * @Desc: 鍩虹淇℃伅-璐т綅淇℃伅
+ * @author: Andy
+ * @update-time: 2023/5/26
+ */
+@Data
+@Entity
+@Table(name = "D_DEPOT")
+public class Fz40Depot implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+
+ @Id
+ @Column(name = "ID_", length = 50)
+ @PropertyDef(label = "璐т綅缂栧彿")
+ private String id;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
+
+ @Column(name = "DEPT_ID_", length = 40)
+ @PropertyDef(label = "鎵�灞炲垎搴�")
+ private String deptId;
+
+ @Column(name = "ggm", length = 50)
+ @PropertyDef(label = "鍥借鐮�")
+ private String ggm;
+
+ @Column(name = "NAME_", length = 50)
+ @PropertyDef(label = "璐т綅鍚嶇О")
+ private String name;
+
+ @Column(name = "BUILDING_ID_", length = 40)
+ @PropertyDef(label = "鎵�灞炰粨鎴�")
+ private String buildingId;
+
+ @Column(name = "GRANARY_ID_", length = 40)
+ @PropertyDef(label = "鎵�灞炲粧闂�")
+ private String granaryId;
+
+ @Column(name = "DEPOT_TYPE_", length = 10)
+ @PropertyDef(label = "浠撳簱绫诲瀷", description = "鏍规嵁鍥芥爣閰嶇疆绫诲瀷锛屽钩鎴夸粨銆佺珛绛掍粨銆佹祬鍦嗕粨銆佸偍娌圭綈")
+ private String depotType;
+
+ @Column(name = "DEPOT_STATUS_", length = 10)
+ @PropertyDef(label = "浠撳簱鐘舵��", description = "涓庡簱瀛樿〃鍏宠仈锛岄�氳繃搴撳瓨鍙樻洿")
+ private String depotStatus;
+
+ @Column(name = "STORE_TYPE_", length = 6)
+ @PropertyDef(label = "鍌ㄧ伯鏂瑰紡", description = "涓庡簱瀛樿〃鍏宠仈")
+ private String storeType;
+
+ @Column(name = "STORAGE_MAX_")
+ @PropertyDef(label = "璁捐鍌ㄩ噺", description = "鍗曚綅锛氬惃")
+ private Double storageMax;
+
+ @Column(name = "STORAGE_REAL_", insertable = true)
+ @PropertyDef(label = "瀹為檯鍌ㄩ噺", description = "鍗曚綅锛欿G锛岄�氳繃搴撳瓨鍙樻洿")
+ private Double storageReal;
+
+ @Column(name = "FOOD_TYPE_", length = 10)
+ @PropertyDef(label = "绮鎬ц川", description = "涓庡簱瀛樿〃鍏宠仈锛岄�氳繃搴撳瓨鍙樻洿")
+ private String foodType;
+
+ @Column(name = "FOOD_VARIETY_", length = 10)
+ @PropertyDef(label = "绮鍝佺", description = "涓庡簱瀛樿〃鍏宠仈锛岄�氳繃搴撳瓨鍙樻洿")
+ private String foodVariety;
+
+ @Column(name = "FOOD_LEVEL_", length = 10)
+ @PropertyDef(label = "绮绛夌骇", description = "涓庡簱瀛樿〃鍏宠仈锛岄�氳繃搴撳瓨鍙樻洿")
+ private String foodLevel;
+
+ @Column(name = "FOOD_LOCATION_", length = 50)
+ @PropertyDef(label = "绮浜у湴", description = "涓庡簱瀛樿〃鍏宠仈锛岄�氳繃搴撳瓨鍙樻洿")
+ private String foodLocation;
+
+ @Column(name = "FOOD_YEAR_", length = 10)
+ @PropertyDef(label = "绮骞翠唤", description = "涓庡簱瀛樿〃鍏宠仈锛岄�氳繃搴撳瓨鍙樻洿")
+ private String foodYear;
+
+ @Column(name = "PER_WET_")
+ @PropertyDef(label = "姘村垎", description = "鐧惧垎姣旓紝榛樿涓虹┖锛屾潵婧愯川妫�淇℃伅")
+ private Double perWet;
+
+ @Column(name = "PER_IMPURITY_")
+ @PropertyDef(label = "鏉傝川", description = "鐧惧垎姣旓紝榛樿涓虹┖锛屾潵婧愯川妫�淇℃伅")
+ private Double perImpurity;
+
+ @Column(name = "BULK_WEIGHT_")
+ @PropertyDef(label = "瀹归噸 g/L", description = "瀹归噸 g/L")
+ private Double bulkWeight;
+
+ @Column(name = "STORE_KEEPER_", length = 30)
+ @PropertyDef(label = "淇濈鍛樿处鍙�")
+ private String storeKeeper;
+
+ @Column(name = "STORE_KEEPER_NAME_", length = 50)
+ @PropertyDef(label = "淇濈鍛�", description = "涓枃鍚嶇О")
+ private String storeKeeperName;
+
+ @Column(name = "STORE_DATE_")
+ @PropertyDef(label = "鍏ュ簱鏃堕棿", description = "榛樿绌猴紝閫氳繃搴撳瓨鍙樻洿")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date storeDate;
+
+ @Column(name = "CHECK_DATE_")
+ @PropertyDef(label = "鏈�鍚庤川妫�鏃堕棿", description = "榛樿绌猴紝鏉ユ簮璐ㄦ淇℃伅")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date checkDate;
+
+ @Column(name = "REMARK_", length = 200)
+ @PropertyDef(label = "澶囨敞", description = "澶囨敞淇℃伅")
+ private String remark;
+
+ @Column(name = "UPDATE_TIME_")
+ @PropertyDef(label = "鏁版嵁鏇存柊鏃堕棿")
+ private Date updateTime;
+
+}
diff --git a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DepotConf.java b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DepotConf.java
new file mode 100644
index 0000000..a04e791
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DepotConf.java
@@ -0,0 +1,128 @@
+package com.fzzy.async.fzzy40.entity;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * 浠撳簱閰嶇疆 鐢ㄤ簬閰嶇疆绮儏鍒嗘満绛夐厤缃紝姘斾綋閲囬泦閰嶇疆绛�
+ */
+@Data
+@Entity
+@Table(name = "D_DEPOT_CONF")
+@IdClass(Fz40DepotConfKey.class)
+public class Fz40DepotConf implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ @Id
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
+
+ @Id
+ @Column(name = "DEPOT_ID_", length = 50)
+ @PropertyDef(label = "鎵�灞炰粨搴�")
+ private String depotId;
+
+ @Column(name = "GRAIN_SER_", length = 40)
+ @PropertyDef(label = "绮儏鍒嗘満", description = "浠呬粎绮儏閲囬泦鍒嗘満")
+ private String grainSer;
+
+ @Column(name = "TH_SER_", length = 40)
+ @PropertyDef(label = "娓╂箍搴﹀垎鏈�", description = "浠撴俯浠撴箍鐨勫垎鏈�")
+ private String thSer;
+
+ @Column(name = "ES_SER_", length = 40)
+ @PropertyDef(label = "鑳借�楀垎鏈�")
+ private String esSer;
+
+ @Column(name = "GAS_SER_", length = 40)
+ @PropertyDef(label = "姘斾綋鍒嗘満")
+ private String gasSer;
+
+ @Column(name = "GRAIN_FREQ_", length = 4)
+ @PropertyDef(label = "绮儏淇濆瓨棰戠巼", description = "榛樿涓�澶╁娆�")
+ private String grainFreq;
+
+ @Column(name = "TH_CONF_", length = 5)
+ @PropertyDef(label = "浠撴俯浠撴箍閫氶亾")
+ private String thConf = "1";
+
+ @Column(name = "CABLE_RULE_", length = 20)
+ @PropertyDef(label = "甯冪嚎瑙勫垯", description = "骞虫柟浠撹〃绀哄眰琛屽垪锛岀瓛浠撹〃绀烘瘡鍦堢殑鍒楁暟")
+ private String cableRule;
+
+ @Column(name = "CABLE_CIR_", length = 20)
+ @PropertyDef(label = "绛掍粨灞傝鍒�", description = "閽堝绛掍粨")
+ private String cableCir;
+
+ @Column(name = "CABLE_CONE_", length = 2)
+ @PropertyDef(label = "绛掍粨閿ュ舰", description = "閽堝绛掍粨閿ュ舰锛�0=鏃犲垽鏂紝1=涓婇敟褰紝2=涓嬮敟褰�")
+ private String cableCone;
+
+ @Column(name = "CABLE_START_")
+ @PropertyDef(label = "鐢电紗寮�濮嬪垪")
+ private int cableStart;
+
+ @Column(name = "CABLE_END_")
+ @PropertyDef(label = "鐢电紗鎴嚦鍒�")
+ private int cableEnd;
+
+ @Column(name = "START_ORIENTATION_", length = 20)
+ @PropertyDef(label = "鐢电紗寮�濮嬫柟浣�", description = "榛樿鍙宠竟(鍙宠竟銆佸彸涓娿�佸乏杈广�佸乏涓�)")
+ private String startOrientation;
+
+ @Column(name = "START_DIRECTION_", length = 20)
+ @PropertyDef(label = "鐢电紗寮�濮嬫柟鍚�", description = "榛樿绾靛悜(绾靛悜銆佹í鍚�)")
+ private String startDirection;
+
+ @Column(name = "START_POINT_", length = 20)
+ @PropertyDef(label = "鐢电紗寮�濮嬬偣浣�", description = "榛樿椤堕儴(椤堕儴銆佸簳閮�)")
+ private String startPoint;
+
+ @Column(name = "TEMP_MAX_")
+ @PropertyDef(label = "娓╁害涓婇檺")
+ private Double tempMax;
+
+ @Column(name = "GAS_START_")
+ @PropertyDef(label = "姘斾綋閲囬泦鐐瑰紑濮�")
+ private int gasStart;
+
+ @Column(name = "GAS_END_")
+ @PropertyDef(label = "姘斾綋閲囬泦鐐规埅鑷�")
+ private int gasEnd;
+
+ @Column(name = "N2_MAX_")
+ @PropertyDef(label = "姘皵涓婇檺")
+ private Double n2Max;
+
+ @Column(name = "CO2_MAX_")
+ @PropertyDef(label = "浜屾哀鍖栫⒊涓婇檺")
+ private Double co2Max;
+
+ @Column(name = "O2_MAX_")
+ @PropertyDef(label = "姘ф皵涓婇檺")
+ private Double o2Max;
+
+ @Column(name = "PH3_MAX_")
+ @PropertyDef(label = "纾峰寲姘笂闄�")
+ private Double ph3Max;
+
+ @Column(name = "PEST_START_")
+ @PropertyDef(label = "铏閲囬泦鐐瑰紑濮�")
+ private int pestStart;
+
+ @Column(name = "PEST_END_")
+ @PropertyDef(label = "铏閲囬泦鐐规埅鑷�")
+ private int pestEnd;
+
+ @Column(name = "PEST_MAX_")
+ @PropertyDef(label = "铏涓婇檺")
+ private Double pestMax;
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DepotConfKey.java b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DepotConfKey.java
new file mode 100644
index 0000000..0aa6234
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DepotConfKey.java
@@ -0,0 +1,16 @@
+package com.fzzy.async.fzzy40.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@AllArgsConstructor
+public class Fz40DepotConfKey implements Serializable {
+ private String depotId;
+ private String companyId;
+ public Fz40DepotConfKey(){
+ super();
+ }
+ }
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1109.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1109.java
index 1507f49..243c1e7 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1109.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1109.java
@@ -2,15 +2,17 @@
import com.fzzy.api.Constant;
import com.fzzy.api.entity.Api1109;
+import com.fzzy.api.entity.Api1202;
+import com.fzzy.api.entity.Api1205;
import com.fzzy.api.entity.ApiLog;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.utils.FileUtil;
import com.fzzy.api.view.repository.Api1109Rep;
+import com.fzzy.api.view.repository.Api1202Rep;
+import com.fzzy.api.view.repository.Api1205Rep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.fzzy40.entity.Fz40FileInfo;
-import com.fzzy.async.fzzy40.entity.Fz40InoutRecord;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1109Rep;
-import com.fzzy.async.fzzy40.repository.Fzzy40Sync1202Rep;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -48,9 +50,11 @@
@Autowired
private Fzzy40Sync1109Rep fzzySync1109Rep;
@Autowired
- private Fzzy40Sync1202Rep fzzySync1202Rep;
- @Autowired
private Api1109Rep api1109Rep;
+ @Autowired
+ private Api1202Rep api1202Rep;
+ @Autowired
+ private Api1205Rep api1205Rep;
@Autowired
private ApiLogRep apiLogRep;
@Autowired
@@ -88,24 +92,29 @@
String wjlx;
String wjmc;
List<Api1109> api1109List;
- List<Fz40InoutRecord> listInout;
+ List<Api1202> api1202List;
+ List<Api1205> api1205List;
+ String str = "";
for (Fz40FileInfo sysData : list) {
if (StringUtils.isEmpty(sysData.getBizId())) {
continue;
}
//鏍规嵁鍥剧墖id鏌ヨ瀵瑰簲鍑哄叆搴撲俊鎭�
- listInout = fzzySync1202Rep.listInoutRecordById(sysData.getBizId());
- if (null == listInout || listInout.isEmpty()) {
- continue;
+ if(sysData.getBizId().startsWith(IMG_START_R)){
+ api1202List = api1202Rep.getDataByBizId(sysData.getBizId());
+ if (null == api1202List || api1202List.isEmpty()) {
+ continue;
+ }
+ str = api1202List.get(0).getRkywdh();
}
- //鑻ュ嚭鍏ュ簱淇℃伅涓哄垹闄ゆ垨鑰呴敊璇姸鎬侊紝鍒欎笉鍚屾
- if ("DEL".equals(listInout.get(0).getRecordStatus()) || "ERROR".equals(listInout.get(0).getRecordStatus())) {
- continue;
+ if(sysData.getBizId().startsWith(IMG_START_C)){
+ api1205List = api1205Rep.getDataByBizId(sysData.getBizId());
+ if (null == api1205List || api1205List.isEmpty()) {
+ continue;
+ }
+ str = api1205List.get(0).getCkywdh();
}
- //鑻ュ嚭鍏ュ簱淇℃伅涓叆搴撻噸閲忎负绌烘垨涓�0锛屽垯涓嶅悓姝�
- if (null == listInout.get(0).getRecordWeight() || listInout.get(0).getRecordWeight() == 0) {
- continue;
- }
+
//鍙悓姝ョО閲�
if (BIZ_TAG_WEIGHT_FULL.equals(sysData.getBizTag()) || BIZ_TAG_WEIGHT_EMPTY.equals(sysData.getBizTag())) {
wjlx = "";
@@ -133,7 +142,7 @@
apiData.setWjdz(fileUtil.getInoutFilePath(sysData.getCreateTime()) + sysData.getFileName());
//鏂囦欢鍚嶇О
- wjmc = getImgNameType(wjmc, sysData.getBizTag(), sysData.getBizId(), sysData.getFileName(), map);
+ wjmc = getImgNameType(wjmc, sysData.getBizTag(), str, sysData.getFileName(), map);
apiData.setWjmc(wjmc);
//鏂囦欢绫诲瀷
apiData.setWjlx(wjlx);
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
index 696ffbc..c1eed03 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
@@ -18,9 +18,8 @@
import org.apache.commons.lang.time.DateFormatUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
+
+import java.util.*;
/**
* 绮鍏ュ簱淇℃伅
@@ -65,7 +64,6 @@
apiLog.setInteId(Constant.API_CODE_1202);
apiLog.setStatus(99);
apiLog.setId(ContextUtil.getUUID());
- String sfzh = "";
try {
//鑾峰彇绮鍏ュ簱璁板綍淇℃伅锛屾牴鎹祦绋嬪畬鎴愭椂闂磋幏鍙�
List<Fz40InoutRecord> list = fzzySync1202Rep.listInoutRecord(deptId, INOUT_TYPE_IN, start, end);
@@ -80,6 +78,9 @@
List<Fz40InoutNoticeIn> listInoutNotice;
List<Api1202> api1202List;
Calendar c = Calendar.getInstance();
+ String ywsj = "";
+ String num = "";
+ Map<String, Integer> map = new HashMap<>();
for (Fz40InoutRecord sysData : list) {
if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
sysData.setRecordWeight(sysData.getSettleWeight());
@@ -95,11 +96,16 @@
}
apiData = new Api1202();
-
apiData.setRkywdh(Constant.INOUT_TYPE_14 + sysData.getId().substring(4));
//鍒ゆ柇涓氬姟鏃堕棿涓庡崟鎹彿鏄惁鍖归厤
- if(!DateFormatUtils.format(sysData.getCompleteTime(),"yyMMdd").equals(sysData.getId().substring(4, 10))){
- apiData.setRkywdh(Constant.INOUT_TYPE_14 + DateFormatUtils.format(sysData.getCompleteTime(),"yyMMdd") + sysData.getId().substring(10));
+ ywsj = DateFormatUtils.format(sysData.getCompleteTime(),"yyMMdd");
+ if(!ywsj.equals(sysData.getId().substring(4, 10))){
+ if(null == map.get(ywsj)){
+ map.put(ywsj, 10201);
+ }
+ num = String.valueOf(map.get(ywsj)).substring(1);
+ apiData.setRkywdh(Constant.INOUT_TYPE_14 + ywsj + num);
+ map.put(ywsj, map.get(ywsj) + 1);
}
//璐т綅浠ｇ爜
@@ -111,7 +117,7 @@
//榛樿涓�涓殢渚垮��
apiData.setLxdh(StringUtils.isEmpty(sysData.getUserContact()) ? "13012345678" : sysData.getUserContact());
- apiData.setSfzh(null == sysData.getUserId() ? "410183200010100000" : sysData.getUserId());
+ apiData.setSfzh(null == sysData.getUserId() ? "410183200010100000" : sysData.getUserId().trim());
//鑾峰彇鍚堝悓鍙�
listInoutNotice = fzzySyncNoticeInRep.listInoutNoticeInById(sysData.getNoticeId());
@@ -189,13 +195,13 @@
}else {
apiData.setCzbz(api1202List.get(0).getCzbz());
}
- sfzh = apiData.getSfzh();
+
//淇濆瓨鏁版嵁
api1202Rep.save(apiData);
log.info("1202---鍚屾鏁版嵁锛歿}", apiData.toString());
}
} catch (Exception e) {
- System.out.println(sfzh);
+
log.error("---鍚屾澶辫触----{}", e);
apiLog.setResult("鍚屾澶辫触锛�" + e.getMessage());
apiLogRep.save(apiLog);
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java
index ded0330..ea46b9a 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java
@@ -1,13 +1,10 @@
package com.fzzy.async.fzzy40.impl;
import com.fzzy.api.Constant;
-import com.fzzy.api.entity.Api1105;
-import com.fzzy.api.entity.Api1203;
-import com.fzzy.api.entity.ApiLog;
-import com.fzzy.api.entity.GbCheckItem;
-import com.fzzy.api.service.ApiCommonService;
+import com.fzzy.api.entity.*;
import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.Api1202Rep;
import com.fzzy.api.view.repository.Api1203Rep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.api.view.repository.GbCheckItemRep;
@@ -20,9 +17,7 @@
import org.apache.commons.lang.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-
-import java.util.Date;
-import java.util.List;
+import java.util.*;
/**
* 绮鍏ュ簱妫�楠屼俊鎭�
@@ -40,15 +35,14 @@
private Fzzy40Sync1202Rep fzzySync1202Rep;
@Autowired
private Fzzy40Sync1203Rep fzzySync1203Rep;
-
@Autowired
private ApiTriggerService apiTriggerService;
+ @Autowired
+ private Api1202Rep api1202Rep;
@Autowired
private Api1203Rep api1203Rep;
@Autowired
private GbCheckItemRep gbCheckItemRep;
- @Autowired
- private ApiCommonService commonService;
@Autowired
private ApiLogRep apiLogRep;
@@ -81,7 +75,6 @@
}
Api1203 apiData;
- Api1105 api1105;
List<Fz40CheckItem> fz40CheckItems;
List<GbCheckItem> gbCheckList;
String jyxm;
@@ -89,12 +82,11 @@
String zkj;
String zkl;
List<Api1203> api1203List;
+ List<Api1202> api1102List;
for (Fz40InoutRecord sysData : list) {
- if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
- sysData.setRecordWeight(sysData.getSettleWeight());
- }
- //鍒ゆ柇鍑�閲嶆槸鍚﹀ぇ浜�0锛岀瓑浜�0琛ㄧず涓嶅悎鏍硷紝涓嶈繘琛屽悓姝ヤ笂浼�
- if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
+ //鏌ヨ绮鍏ュ簱淇℃伅锛岃嫢涓虹┖鍒欎笉杩涜鍚屾涓婁紶
+ api1102List = api1202Rep.getDataByBizId(sysData.getId());
+ if(null == api1102List || api1102List.isEmpty()){
continue;
}
@@ -105,19 +97,12 @@
continue;
}
- //鑾峰彇璐т綅淇℃伅
- api1105 = commonService.getApi1105Cache(sysData.getDepotId());
- if (null == api1105) {
- continue;
- }
-
apiData = new Api1203();
- apiData.setRkjydh(Constant.INOUT_TYPE_14 + sysData.getId().substring(4));
-
+ apiData.setRkjydh(api1102List.get(0).getRkywdh());
//璐т綅浠ｇ爜
- apiData.setHwdm(api1105.getHwdm());
- apiData.setRkywdh(apiData.getRkjydh());
+ apiData.setHwdm(api1102List.get(0).getHwdm());
+ apiData.setRkywdh(api1102List.get(0).getRkywdh());
if(null == sysData.getFullWeightTime()){
sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 5));
}
@@ -163,10 +148,8 @@
String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
apiData.setLspzdm(mappingCode);
- //绮瀹氱瓑
-
//淇濈鍛樺鏍�
-
+ apiData.setBgyfh(apiData.getJyjg());
//绮绛夌骇
mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSDJ, sysData.getFoodLevel());
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
index 29cd89c..f74319e 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
@@ -19,9 +19,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
/**
* 绮鍑哄簱淇℃伅
@@ -80,6 +78,9 @@
List<Fz40InoutNoticeOut> listInoutNotice;
List<Api1205> api1205List;
Calendar c = Calendar.getInstance();
+ String ywsj = "";
+ String num = "";
+ Map<String, Integer> map = new HashMap<>();
for (Fz40InoutRecord sysData : list) {
if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
sysData.setRecordWeight(sysData.getSettleWeight());
@@ -95,7 +96,16 @@
}
apiData = new Api1205();
apiData.setCkywdh(Constant.INOUT_TYPE_15 + sysData.getId().substring(4));
-
+ //鍒ゆ柇涓氬姟鏃堕棿涓庡崟鎹彿鏄惁鍖归厤
+ ywsj = DateFormatUtils.format(sysData.getCompleteTime(),"yyMMdd");
+ if(!ywsj.equals(sysData.getId().substring(4, 10))){
+ if(null == map.get(ywsj)){
+ map.put(ywsj, 10201);
+ }
+ num = String.valueOf(map.get(ywsj)).substring(1);
+ apiData.setCkywdh(Constant.INOUT_TYPE_15 + ywsj + num);
+ map.put(ywsj, map.get(ywsj) + 1);
+ }
//璐т綅浠ｇ爜
apiData.setHwdm(api1105.getHwdm());
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java
index a8aaf00..a841582 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java
@@ -1,10 +1,7 @@
package com.fzzy.async.fzzy40.impl;
import com.fzzy.api.Constant;
-import com.fzzy.api.entity.Api1102;
-import com.fzzy.api.entity.Api1105;
-import com.fzzy.api.entity.Api1208;
-import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.entity.*;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.ContextUtil;
@@ -75,6 +72,7 @@
Api1208 apiData;
Api1105 api1105;
+ List<Api1208> api1208List;
for (Fz40DepotStore fz40DepotStore : list) {
//鑾峰彇璐т綅淇℃伅
@@ -84,6 +82,7 @@
}
apiData = new Api1208();
+ apiData.setId(fz40DepotStore.getId());
apiData.setHwdm(api1105.getHwdm());
//绮鍝佺
@@ -139,7 +138,7 @@
apiData.setSjzlxg(6);
apiData.setLdtj(10000);
- apiData.setZhgxsj(new Date());
+ apiData.setZhgxsj(fz40DepotStore.getUpdateDate());
//涓氬姟id銆佸簱鍖虹紪鐮併�佸悓姝ユ椂闂�
apiData.setBizId(fz40DepotStore.getId());
@@ -147,8 +146,13 @@
apiData.setSyncTime(new Date());
//搴撳瓨姣忔鏂板
- apiData.setCzbz(Constant.CZBZ_I);
- apiData.setId(ContextUtil.getCurTimeMillis());
+ api1208List = api1208Rep.getDataById(apiData.getId());
+ if(null == api1208List || api1208List.isEmpty()){
+ apiData.setCzbz(Constant.CZBZ_I);
+ }else {
+ apiData.setCzbz(api1208List.get(0).getCzbz());
+ }
+
//淇濆瓨鏁版嵁
api1208Rep.save(apiData);
}
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2103.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2103.java
new file mode 100644
index 0000000..6d50dcb
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2103.java
@@ -0,0 +1,195 @@
+package com.fzzy.async.fzzy40.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.Api1102;
+import com.fzzy.api.entity.Api1105;
+import com.fzzy.api.entity.ApiInfoData;
+import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.service.ApiCommonService;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.Api1102Rep;
+import com.fzzy.api.view.repository.ApiInfoDataRep;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.fzzy40.entity.Fz40Depot;
+import com.fzzy.async.fzzy40.entity.Fz40DepotConf;
+import com.fzzy.async.fzzy40.repository.Fzzy40SyncDepotConfRep;
+import com.fzzy.async.fzzy40.repository.Fzzy40SyncDepotRep;
+import com.fzzy.push.sh2023.SH2023Constant;
+import com.fzzy.push.sh2023.dto.SH2023Api2103;
+import com.fzzy.push.sh2023.dto.SH2023Api2103Item;
+import com.fzzy.push.sh2023.dto.ShAreaBjw;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 绮儏妫�娴嬭澶囦俊鎭悓姝�
+ *
+ * @author czt
+ * @date 2023-08-21
+ */
+@Slf4j
+@Component
+public class Fzzy40Sync2103 {
+
+ @Autowired
+ private Fzzy40SyncDepotRep fzzy40SyncDepotRep;
+ @Autowired
+ private Fzzy40SyncDepotConfRep fzzy40SyncDepotConfRep;
+ @Autowired
+ private ApiCommonService commonService;
+ @Autowired
+ private Api1102Rep api1102Rep;
+ @Autowired
+ private ApiLogRep apiLogRep;
+ @Autowired
+ private ApiInfoDataRep apiInfoDataRep;
+
+
+ /**
+ * 鍚屾骞跺皝瑁呬繚瀛樻俯婀垮害妫�娴嬫暟鎹�
+ *
+ * @param kqdm
+ * @param deptId 绯荤粺瀵瑰簲搴撳尯缂栫爜
+ * @param start 璧峰鏃堕棿
+ * @param end 鎴鏃堕棿
+ */
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+
+ log.info("-------------1302鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(deptId);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1302);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+ try {
+ List<Fz40Depot> list = fzzy40SyncDepotRep.listDepotList(deptId);
+
+ if (null == list || list.isEmpty()) {
+ log.info("2103---绮儏璁惧閰嶇疆鍚屾鏁版嵁锛氭病鏈夋煡璇㈠埌浠撳簱淇℃伅");
+ return;
+ }
+
+ List<Api1102> api1102List = api1102Rep.findPushData(kqdm);
+ String bjw = "";
+ if(null != api1102List && api1102List.size() > 0){
+ bjw = ShAreaBjw.getBjw(api1102List.get(0).getXzqhdm());
+ }
+
+ SH2023Api2103 sh2023Api2103;
+ Api1105 api1105;
+ List<Fz40DepotConf> depotConfList;
+ Fz40DepotConf depotConf;
+
+ List<ApiInfoData> apiInfoDataList;
+ SH2023Api2103Item sh2023Api2103Item;
+ List<SH2023Api2103Item> listItem;
+ for (Fz40Depot fz40Depot : list) {
+ //鏍规嵁浠撳簱缂栫爜鑾峰彇閰嶇疆淇℃伅
+ depotConfList = fzzy40SyncDepotConfRep.findDataByDepotId(fz40Depot.getId());
+ if(null == depotConfList || depotConfList.isEmpty()){
+ continue;
+ }
+ //鑾峰彇璐т綅淇℃伅
+ api1105 = commonService.getApi1105Cache(fz40Depot.getId());
+ if (null == api1105) {
+ continue;
+ }
+
+ sh2023Api2103 = new SH2023Api2103();
+ sh2023Api2103.setHwdm(api1105.getHwdm());
+ depotConf = depotConfList.get(0);
+ String[] strs = depotConf.getCableRule().split("-");
+
+ sh2023Api2103.setDlcs(strs[0]);
+ sh2023Api2103.setDlhs(strs[1]);
+ sh2023Api2103.setDlls(strs[2]);
+ // 1-3-5
+ // 8-8-8
+ //绛掍粨瑙勫垯
+ if(StringUtils.isNotEmpty(depotConf.getCableCir())){
+ sh2023Api2103.setDlqs(String.valueOf(strs.length));
+ sh2023Api2103.setDlhs(null);
+ sh2023Api2103.setDlls(null);
+
+ //鐢电紗鍦堟帓鍒楄鎯�
+ listItem = new ArrayList<>();
+ String[] cableCir = depotConf.getCableCir().split("-");
+ int num1 = 0; //璧峰鏍�
+ int num2 = 0; //鎴鏍�
+ for(int i = 0; i < cableCir.length; i ++){
+ sh2023Api2103.setDlcs(cableCir[i]);
+
+ sh2023Api2103Item = new SH2023Api2103Item();
+ sh2023Api2103Item.setQh(i + 1 + "");
+ if(i == 0){
+ num1 += 1;
+ }else {
+ num1 = num2 + 1;
+ }
+ num2 += Integer.valueOf(strs[i]);
+ sh2023Api2103Item.setQsdlbh(num1 + "");
+ sh2023Api2103Item.setJsdlbh(num2 + "");
+ sh2023Api2103Item.setCs(cableCir[i]);
+ sh2023Api2103Item.setYbj((i + 1)*4 + "");
+ sh2023Api2103Item.setRowId(i + "");
+ listItem.add(sh2023Api2103Item);
+ }
+ sh2023Api2103.setDlqplxq(JSON.toJSONString(listItem));
+ }
+
+ sh2023Api2103.setScqd("1");
+ sh2023Api2103.setSczd(Integer.valueOf(strs[1])*Integer.valueOf(strs[2]) + "");
+
+ sh2023Api2103.setZcqd("1");
+ sh2023Api2103.setZczd(Integer.valueOf(strs[1])*Integer.valueOf(strs[2]) + "");
+
+ sh2023Api2103.setXcqd("1");
+ sh2023Api2103.setXczd(Integer.valueOf(strs[1])*Integer.valueOf(strs[2]) + "");
+
+ sh2023Api2103.setYxfwqsc("1");
+ sh2023Api2103.setYxfwjsc(strs[0]);
+
+ sh2023Api2103.setBjw(bjw);
+ sh2023Api2103.setZhgxsj(new Date());
+
+ //鎸佷箙鍖栦繚瀛橈紝鍗曠嫭瀛樺叆闈炲浗鏍囨帴鍙ｈ〃
+ ApiInfoData infoData = new ApiInfoData();
+ infoData.setId(sh2023Api2103.getHwdm());
+ infoData.setKqdm(kqdm);
+ infoData.setInteType(Constant.API_CATEGORY_13);
+ infoData.setInteId(SH2023Constant.SH_2023_API_CODE_2103);
+ infoData.setUpdateTime(new Date());
+ infoData.setDataId(sh2023Api2103.getHwdm());
+ infoData.setRemarks("绮儏璁惧閰嶇疆淇℃伅");
+
+ //璁剧疆鎿嶄綔鏍囧織
+ apiInfoDataList = apiInfoDataRep.getDataByDataId(infoData.getDataId());
+ if (null == apiInfoDataList || apiInfoDataList.isEmpty()) {
+ infoData.setCzbz(Constant.CZBZ_I);
+ } else {
+ infoData.setCzbz(apiInfoDataList.get(0).getCzbz());
+ }
+
+ infoData.setData(JSON.toJSONString(sh2023Api2103));
+ apiInfoDataRep.save(infoData);
+
+ log.info("2103---绮儏璁惧閰嶇疆-鍚屾鏁版嵁锛歿}", sh2023Api2103.toString());
+ }
+
+ } catch (Exception e) {
+ log.error("---鍚屾澶辫触----{}", e);
+ apiLog.setResult("鍚屾澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+
+ }
+}
diff --git a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1202Rep.java b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1202Rep.java
index 1ab8136..f2bebaf 100644
--- a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1202Rep.java
+++ b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1202Rep.java
@@ -23,7 +23,7 @@
* @param end
* @return
*/
- @Query("from Fz40InoutRecord where deptId=:deptId and type=:type and updateTime >=:start and updateTime <:end order by updateTime ")
+ @Query("from Fz40InoutRecord where deptId=:deptId and type=:type and updateTime >=:start and updateTime <:end order by id ")
List<Fz40InoutRecord> listInoutRecord(@Param("deptId") String deptId, @Param("type") String type, @Param("start") Date start, @Param("end") Date end);
/**
diff --git a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40SyncDepotConfRep.java b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40SyncDepotConfRep.java
new file mode 100644
index 0000000..004902d
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40SyncDepotConfRep.java
@@ -0,0 +1,25 @@
+package com.fzzy.async.fzzy40.repository;
+
+import com.fzzy.async.fzzy40.entity.Fz40DepotConf;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import java.util.List;
+
+/**
+ * 鏌ヨ绮儏妫�娴嬫暟鎹�
+ *
+ * @author czt
+ *
+ * @date 2023-08-21
+ */
+public interface Fzzy40SyncDepotConfRep extends JpaRepository<Fz40DepotConf, String> {
+
+ /**
+ * 鏍规嵁浠撳簱缂栫爜鑾峰彇绮儏鍙傛暟閰嶇疆淇℃伅
+ * @param depotId
+ * @return
+ */
+ @Query("from Fz40DepotConf where depotId =:depotId order by depotId ")
+ List<Fz40DepotConf> findDataByDepotId(@Param("depotId") String depotId);
+}
diff --git a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40SyncDepotRep.java b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40SyncDepotRep.java
new file mode 100644
index 0000000..bf9c53b
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40SyncDepotRep.java
@@ -0,0 +1,28 @@
+package com.fzzy.async.fzzy40.repository;
+
+import com.fzzy.async.fzzy40.entity.Fz40Depot;
+import com.fzzy.async.fzzy40.entity.Fz40InoutRecord;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鑾峰彇浠撳簱淇℃伅
+ *
+ * @author czt
+ * @date 2023-08-21
+ */
+public interface Fzzy40SyncDepotRep extends JpaRepository<Fz40Depot, String> {
+
+ /**
+ * 鏍规嵁搴撳尯缂栫爜鑾峰彇璐т綅鍒楄〃
+ * @param deptId
+ * @return
+ */
+ @Query("from Fz40Depot where deptId=:deptId order by id ")
+ List<Fz40Depot> listDepotList(@Param("deptId") String deptId);
+
+}
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 4ec8b8c..c21e5ec 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -9,9 +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.ApiLogRep;
+import com.fzzy.api.view.repository.*;
import com.fzzy.push.sh2023.dto.*;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
@@ -24,6 +22,7 @@
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
+import java.util.HashSet;
import java.util.List;
/**
@@ -49,6 +48,12 @@
private Api1102Rep api1102Rep;
@Autowired
private Api1104Rep api1104Rep;
+ @Autowired
+ private Api1109Rep api1109Rep;
+ @Autowired
+ private Api1202Rep api1202Rep;
+ @Autowired
+ private Api1205Rep api1205Rep;
@Override
public String getProtocol() {
@@ -200,6 +205,371 @@
list.add(api1103);
}
return JSON.toJSONString(list);
+ } else if (SH2023Constant.SH_2023_API_CODE_1104.equals(inteId)) {
+ SH2023Api1104 api1104;
+ //鏈�鍚庤浆鎹负json
+ List<SH2023Api1104> list = new ArrayList<>();
+ //鎶奷ata杞寲鎴恖ist闆嗗悎
+ List<Api1104> api1104List = castList(data, Api1104.class);
+ for (Api1104 apiData : api1104List) {
+ api1104 = new SH2023Api1104();
+ BeanUtils.copyProperties(apiData, api1104);
+ api1104.setAjdm(apiData.getAjdh());
+ api1104.setCfdm(apiData.getCfbh());
+ api1104.setSykqdm(apiData.getKqdm());
+ api1104.setBjw(ShAreaBjw.getBjw(code));
+ list.add(api1104);
+ }
+ return JSON.toJSONString(list);
+ } else if (SH2023Constant.SH_2023_API_CODE_1105.equals(inteId)) {
+ SH2023Api1105 api1105;
+ //鏈�鍚庤浆鎹负json
+ List<SH2023Api1105> list = new ArrayList<>();
+ //鎶奷ata杞寲鎴恖ist闆嗗悎
+ List<Api1105> api1105List = castList(data, Api1105.class);
+ for (Api1105 apiData : api1105List) {
+ api1105 = new SH2023Api1105();
+ BeanUtils.copyProperties(apiData, api1105);
+ api1105.setBjw(ShAreaBjw.getBjw(code));
+ list.add(api1105);
+ }
+ return JSON.toJSONString(list);
+ } else if (SH2023Constant.SH_2023_API_CODE_1106.equals(inteId)) {
+ SH2023Api1106 api1106;
+ //鏈�鍚庤浆鎹负json
+ List<SH2023Api1106> list = new ArrayList<>();
+ //鎶奷ata杞寲鎴恖ist闆嗗悎
+ List<Api1106> api1106List = castList(data, Api1106.class);
+ for (Api1106 apiData : api1106List) {
+ api1106 = new SH2023Api1106();
+ BeanUtils.copyProperties(apiData, api1106);
+ api1106.setBjw(ShAreaBjw.getBjw(code));
+ list.add(api1106);
+ }
+ return JSON.toJSONString(list);
+ } else if (SH2023Constant.SH_2023_API_CODE_1107.equals(inteId)) {
+ SH2023Api1107 api1107;
+ //鏈�鍚庤浆鎹负json
+ List<SH2023Api1107> list = new ArrayList<>();
+ //鎶奷ata杞寲鎴恖ist闆嗗悎
+ List<Api1107> api1107List = castList(data, Api1107.class);
+ for (Api1107 apiData : api1107List) {
+ api1107 = new SH2023Api1107();
+ BeanUtils.copyProperties(apiData, api1107);
+ api1107.setBjw(ShAreaBjw.getBjw(code));
+ list.add(api1107);
+ }
+ return JSON.toJSONString(list);
+ } else if (SH2023Constant.SH_2023_API_CODE_1108.equals(inteId)) {
+ SH2023Api1108 api1108;
+ //鏈�鍚庤浆鎹负json
+ List<SH2023Api1108> list = new ArrayList<>();
+ //鎶奷ata杞寲鎴恖ist闆嗗悎
+ List<Api1108> api1108List = castList(data, Api1108.class);
+ for (Api1108 apiData : api1108List) {
+ api1108 = new SH2023Api1108();
+ BeanUtils.copyProperties(apiData, api1108);
+ api1108.setBjw(ShAreaBjw.getBjw(code));
+ list.add(api1108);
+ }
+ return JSON.toJSONString(list);
+ } else if (SH2023Constant.SH_2023_API_CODE_1109.equals(inteId)) {
+ SH2023Api1109 api1109;
+ //鏈�鍚庤浆鎹负json
+ List<SH2023Api1109> list = new ArrayList<>();
+ FileUtil file;
+ //鎶奷ata杞寲鎴恖ist闆嗗悎
+ List<Api1109> api1109List = castList(data, Api1109.class);
+ for (Api1109 apiData : api1109List) {
+ api1109 = new SH2023Api1109();
+ BeanUtils.copyProperties(apiData, api1109);
+ api1109.setBjw(ShAreaBjw.getBjw(code));
+ file = new FileUtil();
+ api1109.setWjl(file.imgToIo(apiData.getWjdz() + apiData.getWjmc()));
+ list.add(api1109);
+ }
+ return JSON.toJSONString(list);
+ } else if (SH2023Constant.SH_2023_API_CODE_1110.equals(inteId)) {
+ SH2023Api1110 api1110;
+ //鏈�鍚庤浆鎹负json
+ List<SH2023Api1110> list = new ArrayList<>();
+ HashSet<String> set = new HashSet<>();
+ //鎶奷ata杞寲鎴恖ist闆嗗悎
+ List<Api1110> api1110List = castList(data, Api1110.class);
+ for (Api1110 apiData : api1110List) {
+ // 鍥犱负寤掗棿鏄牴鎹揣浣嶆埅鍙栵紝鎵�浠ヨ鍒ゆ柇寤掗棿鏄惁閲嶅
+ if (!set.add(apiData.getHwdm().substring(0, 28))) {
+ continue;
+ }
+ api1110 = new SH2023Api1110();
+ BeanUtils.copyProperties(apiData, api1110);
+ api1110.setBjw(ShAreaBjw.getBjw(code));
+ api1110.setAjdm(apiData.getHwdm().substring(0, 28));
+ api1110.setAjxdwz(apiData.getHwxdwz());
+ api1110.setAjwzys(apiData.getHwwzys());
+ list.add(api1110);
+ }
+ return JSON.toJSONString(list);
+ } else if (SH2023Constant.SH_2023_API_CODE_1111.equals(inteId)) {
+ SH2023Api1111 api1111;
+ //鏈�鍚庤浆鎹负json
+ List<SH2023Api1111> list = new ArrayList<>();
+ //鎶奷ata杞寲鎴恖ist闆嗗悎
+ List<Api1111> api1111List = castList(data, Api1111.class);
+ for (Api1111 apiData : api1111List) {
+ api1111 = new SH2023Api1111();
+ BeanUtils.copyProperties(apiData, api1111);
+ api1111.setBjw(ShAreaBjw.getBjw(code));
+ list.add(api1111);
+ }
+ return JSON.toJSONString(list);
+ } else if (SH2023Constant.SH_2023_API_CODE_1112.equals(inteId)) {
+ SH2023Api1112 api1112;
+ //鏈�鍚庤浆鎹负json
+ List<SH2023Api1112> list = new ArrayList<>();
+ //鎶奷ata杞寲鎴恖ist闆嗗悎
+ List<Api1112> api1112List = castList(data, Api1112.class);
+ for (Api1112 apiData : api1112List) {
+ api1112 = new SH2023Api1112();
+ BeanUtils.copyProperties(apiData, api1112);
+ api1112.setBjw(ShAreaBjw.getBjw(code));
+ list.add(api1112);
+ }
+ return JSON.toJSONString(list);
+ } else if (SH2023Constant.SH_2023_API_CODE_1113.equals(inteId)) {
+ SH2023Api1113 api1113;
+ //鏈�鍚庤浆鎹负json
+ List<SH2023Api1113> list = new ArrayList<>();
+ //鎶奷ata杞寲鎴恖ist闆嗗悎
+ List<Api1113> api1113List = castList(data, Api1113.class);
+ for (Api1113 apiData : api1113List) {
+ api1113 = new SH2023Api1113();
+ BeanUtils.copyProperties(apiData, api1113);
+ api1113.setBjw(ShAreaBjw.getBjw(code));
+ list.add(api1113);
+ }
+ return JSON.toJSONString(list);
+ } else if (SH2023Constant.SH_2023_API_CODE_1201.equals(inteId)) {
+ SH2023Api1201 api1201;
+ //鏈�鍚庤浆鎹负json
+ List<SH2023Api1201> list = new ArrayList<>();
+ //鎶奷ata杞寲鎴恖ist闆嗗悎
+ List<Api1201> api1201List = castList(data, Api1201.class);
+ for (Api1201 apiData : api1201List) {
+ api1201 = new SH2023Api1201();
+ BeanUtils.copyProperties(apiData, api1201);
+ api1201.setBjw(ShAreaBjw.getBjw(code));
+ api1201.setHtsfzz("0");
+ list.add(api1201);
+ }
+ return JSON.toJSONString(list);
+ } else if (SH2023Constant.SH_2023_API_CODE_1202.equals(inteId)) {
+ SH2023Api1202 api1202;
+ //鏈�鍚庤浆鎹负json
+ List<SH2023Api1202> list = new ArrayList<>();
+ //鎶奷ata杞寲鎴恖ist闆嗗悎
+ List<Api1202> api1202List = castList(data, Api1202.class);
+ for (Api1202 apiData : api1202List) {
+ api1202 = new SH2023Api1202();
+ BeanUtils.copyProperties(apiData, api1202);
+ api1202.setBjw(ShAreaBjw.getBjw(code));
+ api1202.setPch(apiData.getHwdm() + apiData.getShnd());
+ //todo 椹宠繍鍗曞彿(2104) 妫�鏂ゅ崟鍙�(2101) 鍧囦负闈炲繀濉�
+ api1202.setJzrq(apiData.getCmsj());
+ list.add(api1202);
+ }
+ return JSON.toJSONString(list);
+ } else if (SH2023Constant.SH_2023_API_CODE_1203.equals(inteId)) {
+ SH2023Api1203 api1203;
+ //鏈�鍚庤浆鎹负json
+ List<SH2023Api1203> list = new ArrayList<>();
+ //鎶奷ata杞寲鎴恖ist闆嗗悎
+ List<Api1203> api1203List = castList(data, Api1203.class);
+ for (Api1203 apiData : api1203List) {
+ api1203 = new SH2023Api1203();
+ BeanUtils.copyProperties(apiData, api1203);
+ api1203.setBjw(ShAreaBjw.getBjw(code));
+ //鏌ヨ鏀惰幏骞翠唤
+ List<Api1202> api1202List = api1202Rep.getDataById(apiData.getRkywdh());
+ api1203.setPch(apiData.getHwdm() + api1202List.get(0).getShnd());
+ list.add(api1203);
+ }
+ return JSON.toJSONString(list);
+ } else if (SH2023Constant.SH_2023_API_CODE_1204.equals(inteId)) {
+ SH2023Api1204 api1204;
+ //鏈�鍚庤浆鎹负json
+ List<SH2023Api1204> list = new ArrayList<>();
+ //鎶奷ata杞寲鎴恖ist闆嗗悎
+ List<Api1204> api1204List = castList(data, Api1204.class);
+ for (Api1204 apiData : api1204List) {
+ api1204 = new SH2023Api1204();
+ BeanUtils.copyProperties(apiData, api1204);
+ api1204.setBjw(ShAreaBjw.getBjw(code));
+ api1204.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getJssj(), "yyyy"));
+ list.add(api1204);
+ }
+ return JSON.toJSONString(list);
+ } else if (SH2023Constant.SH_2023_API_CODE_1205.equals(inteId)) {
+ SH2023Api1205 api1205;
+ //鏈�鍚庤浆鎹负json
+ List<SH2023Api1205> list = new ArrayList<>();
+ //鎶奷ata杞寲鎴恖ist闆嗗悎
+ List<Api1205> api1205List = castList(data, Api1205.class);
+ for (Api1205 apiData : api1205List) {
+ api1205 = new SH2023Api1205();
+ BeanUtils.copyProperties(apiData, api1205);
+ api1205.setBjw(ShAreaBjw.getBjw(code));
+ api1205.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getCmsj(), "yyyy"));
+ api1205.setJzrq(apiData.getCmsj());
+ list.add(api1205);
+ }
+ return JSON.toJSONString(list);
+ } else 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/SH2023PushService11.java b/src/main/java/com/fzzy/push/sh2023/SH2023PushService11.java
index a263dc7..a47640c 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023PushService11.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023PushService11.java
@@ -108,7 +108,7 @@
log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌鍗曚綅淇℃伅锛屼笉鎺ㄩ��-----");
return;
}
-
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1101);
//鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
ResponseDto responseDto = apiRemoteService.pushData(param, list);
if (responseDto.getSuccess() == 0) {
@@ -135,7 +135,7 @@
log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌搴撳尯淇℃伅锛屼笉鎺ㄩ��-----");
return;
}
-
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1102);
//鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
ResponseDto responseDto = apiRemoteService.pushData(param, list);
if (responseDto.getSuccess() == 0) {
@@ -163,7 +163,7 @@
log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌浠撴埧淇℃伅锛屼笉鎺ㄩ��-----");
return;
}
-
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1103);
//鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
ResponseDto responseDto = apiRemoteService.pushData(param, list);
if (responseDto.getSuccess() == 0) {
@@ -191,7 +191,7 @@
log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌寤掗棿淇℃伅锛屼笉鎺ㄩ��-----");
return;
}
-
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1104);
//鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
ResponseDto responseDto = apiRemoteService.pushData(param, list);
if (responseDto.getSuccess() == 0) {
@@ -205,8 +205,6 @@
}
}
}
-
-
}
/**
@@ -220,7 +218,7 @@
log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌璐т綅淇℃伅锛屼笉鎺ㄩ��-----");
return;
}
-
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1105);
//鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
ResponseDto responseDto = apiRemoteService.pushData(param, list);
if (responseDto.getSuccess() == 0) {
@@ -248,7 +246,7 @@
log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌娌圭綈淇℃伅锛屼笉鎺ㄩ��-----");
return;
}
-
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1106);
//鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
ResponseDto responseDto = apiRemoteService.pushData(param, list);
if (responseDto.getSuccess() == 0) {
@@ -269,7 +267,27 @@
* 1107 璁惧淇℃伅
*/
public void pushData1107(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //鑾峰彇璁惧淇℃伅
+ List<Api1107> list = api1107Rep.findPushData(param.getKqdm());
+
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌璁惧淇℃伅锛屼笉鎺ㄩ��-----");
+ return;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1107);
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1107 data : list) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1107Rep.save(data);
+ }
+ }
+ }
}
@@ -277,7 +295,27 @@
* 1108 鑽墏淇℃伅
*/
public void pushData1108(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //鑾峰彇鑽墏淇℃伅
+ List<Api1108> list = api1108Rep.findPushData(param.getKqdm());
+
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌鑽墏淇℃伅锛屼笉鎺ㄩ��-----");
+ return;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1108);
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1108 data : list) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1108Rep.save(data);
+ }
+ }
+ }
}
@@ -285,7 +323,27 @@
* 1109 鏂囦欢淇℃伅
*/
public void pushData1109(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //鑾峰彇鏂囦欢淇℃伅
+ List<Api1109> list = api1109Rep.findPushData(param.getKqdm());
+
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌鏂囦欢淇℃伅锛屼笉鎺ㄩ��-----");
+ return;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1109);
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1109 data : list) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1109Rep.save(data);
+ }
+ }
+ }
}
@@ -293,7 +351,27 @@
* 1110 搴撳尯鍥句粨鎴跨偣浣嶆爣娉�
*/
public void pushData1110(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //鑾峰彇搴撳尯鍥句粨鎴跨偣浣嶆爣娉�
+ List<Api1110> list = api1110Rep.findPushData(param.getKqdm());
+
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌搴撳尯鍥句粨鎴跨偣浣嶆爣娉紝涓嶆帹閫�-----");
+ return;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1110);
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1110 data : list) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1110Rep.save(data);
+ }
+ }
+ }
}
@@ -301,15 +379,54 @@
* 1111 搴撳尯鍥捐棰戠洃鎺ц澶囩偣浣嶆爣娉�
*/
public void pushData1111(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //鑾峰彇搴撳尯鍥捐棰戠洃鎺ц澶囩偣浣嶆爣娉�
+ List<Api1111> list = api1111Rep.findPushData(param.getKqdm());
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌搴撳尯鍥捐棰戠洃鎺ц澶囩偣浣嶆爣娉紝涓嶆帹閫�-----");
+ return;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1111);
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1111 data : list) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1111Rep.save(data);
+ }
+ }
+ }
}
/**
* 1112 浜哄憳淇℃伅
*/
public void pushData1112(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //鑾峰彇浜哄憳淇℃伅
+ List<Api1112> list = api1112Rep.findPushData(param.getKqdm());
+
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌浜哄憳淇℃伅锛屼笉鎺ㄩ��-----");
+ return;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1112);
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1112 data : list) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1112Rep.save(data);
+ }
+ }
+ }
}
@@ -317,7 +434,27 @@
* 1113 浼佷笟淇＄敤淇℃伅
*/
public void pushData1113(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //鑾峰彇浼佷笟淇＄敤淇℃伅
+ List<Api1113> list = api1113Rep.findPushData(param.getKqdm());
+
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌浼佷笟淇＄敤淇℃伅锛屼笉鎺ㄩ��-----");
+ return;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1113);
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1113 data : list) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1113Rep.save(data);
+ }
+ }
+ }
}
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023PushService12.java b/src/main/java/com/fzzy/push/sh2023/SH2023PushService12.java
index af4414e..db90a98 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023PushService12.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023PushService12.java
@@ -1,13 +1,22 @@
package com.fzzy.push.sh2023;
+import com.alibaba.fastjson.JSONObject;
+import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.PushProtocol;
+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.push.impl.ComPushService11;
+import com.fzzy.api.view.repository.*;
+import com.fzzy.otherview.sh2023.dto.ShApi2101;
+import com.fzzy.push.sh2023.dto.SH2023Api2101;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
/**
* 涓婃捣甯傚钩鍙�2023鐗�-鍩虹鏁版嵁涓婁紶
@@ -22,6 +31,32 @@
@Autowired
private SH2023ApiRemoteService apiRemoteService;
+ @Autowired
+ private Api1201Rep api1201Rep;
+ @Autowired
+ private Api1202Rep api1202Rep;
+ @Autowired
+ private Api1203Rep api1203Rep;
+ @Autowired
+ private Api1204Rep api1204Rep;
+ @Autowired
+ private Api1205Rep api1205Rep;
+ @Autowired
+ private Api1206Rep api1206Rep;
+ @Autowired
+ private Api1207Rep api1207Rep;
+ @Autowired
+ private Api1208Rep api1208Rep;
+ @Autowired
+ private Api1209Rep api1209Rep;
+ @Autowired
+ private Api1210Rep api1210Rep;
+ @Autowired
+ private Api1211Rep api1211Rep;
+ @Autowired
+ private Api1212Rep api1212Rep;
+ @Autowired
+ private ApiInfoDataRep apiInfoDataRep;
@Override
public String getProtocol() {
@@ -30,35 +65,116 @@
@Override
public void pushData(ApiParam param) {
- log.info("------->>>>鍩虹淇℃伅 鎺ュ彛妯″潡涓婃姤寮�濮�");
+ log.info("------->>>>绮璐攢 鎺ュ彛妯″潡涓婃姤寮�濮�");
- //鎺ㄩ�佸崟浣嶄俊鎭�
+ //鎺ㄩ�佸悎鍚屼俊鎭�
+ this.pushData1201(apiRemoteService, param);
+ //绮鍏ュ簱淇℃伅
+ this.pushData1202(apiRemoteService, param);
+ //绮鍏ュ簱妫�楠屼俊鎭�
+ this.pushData1203(apiRemoteService, param);
+ //绮鍏ュ簱缁撶畻淇℃伅
+ this.pushData1204(apiRemoteService, param);
+ //绮鍑哄簱淇℃伅
+ this.pushData1205(apiRemoteService, param);
+ //绮鍑哄簱缁撶畻淇℃伅
+ this.pushData1206(apiRemoteService, param);
+ //鍊掍粨鍊掑嚭
+ this.pushData1207(apiRemoteService, param);
+ //绮搴撳瓨
+ this.pushData1208(apiRemoteService, param);
+ //鎹熸孩鍗�
+ this.pushData1209(apiRemoteService, param);
+ //绮鎬ц川杞彉鍗�
+ this.pushData1210(apiRemoteService, param);
+ //璐﹂潰搴撳瓨
+ this.pushData1211(apiRemoteService, param);
+ //瀹㈡埛淇℃伅
+ this.pushData1212(apiRemoteService, param);
- log.info("------->>>>鍩虹淇℃伅 鎺ュ彛妯″潡涓婃姤缁撴潫");
+ log.info("------->>>>绮璐攢 鎺ュ彛妯″潡涓婃姤缁撴潫");
}
/**
* 1201 鍚堝悓淇℃伅
*/
public void pushData1201(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //鑾峰彇鍚堝悓淇℃伅
+ List<Api1201> list = api1201Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌鍚堝悓淇℃伅锛屼笉鎺ㄩ��-----");
+ return;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1201);
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1201 data : list) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1201Rep.save(data);
+ }
+ }
+ }
}
/**
* 1202 绮鍏ュ簱淇℃伅
*/
public void pushData1202(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //鑾峰彇绮鍏ュ簱淇℃伅
+ List<Api1202> list = api1202Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌绮鍏ュ簱淇℃伅锛屼笉鎺ㄩ��-----");
+ return;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1202);
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1202 data : list) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1202Rep.save(data);
+ }
+ }
+ }
}
/**
* 1203 绮鍏ュ簱妫�楠屼俊鎭�
*/
public void pushData1203(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //鑾峰彇绮鍏ュ簱妫�楠屼俊鎭�
+ List<Api1203> list = api1203Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
+
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌绮鍏ュ簱妫�楠屼俊鎭紝涓嶆帹閫�-----");
+ return;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1203);
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1203 data : list) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1203Rep.save(data);
+ }
+ }
+ }
}
@@ -66,7 +182,27 @@
* 1204 绮鍏ュ簱缁撶畻淇℃伅
*/
public void pushData1204(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //鑾峰彇绮鍏ュ簱缁撶畻淇℃伅
+ List<Api1204> list = api1204Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
+
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌绮鍏ュ簱缁撶畻淇℃伅锛屼笉鎺ㄩ��-----");
+ return;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1204);
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1204 data : list) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1204Rep.save(data);
+ }
+ }
+ }
}
@@ -74,15 +210,54 @@
* 1205 绮鍑哄簱淇℃伅
*/
public void pushData1205(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //鑾峰彇绮鍑哄簱淇℃伅
+ List<Api1205> list = api1205Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌绮鍑哄簱淇℃伅锛屼笉鎺ㄩ��-----");
+ return;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1205);
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1205 data : list) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1205Rep.save(data);
+ }
+ }
+ }
}
/**
* 1206 绮鍑哄簱缁撶畻淇℃伅
*/
public void pushData1206(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //鑾峰彇绮鍑哄簱缁撶畻淇℃伅
+ List<Api1206> list = api1206Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
+
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌绮鍑哄簱缁撶畻淇℃伅锛屼笉鎺ㄩ��-----");
+ return;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1206);
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1206 data : list) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1206Rep.save(data);
+ }
+ }
+ }
}
@@ -138,8 +313,31 @@
* 2101 妫�鏂ゅ崟
*/
public void pushData2101(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //鑾峰彇 妫�鏂ゅ崟淇℃伅
+ List<ApiInfoData> items = apiInfoDataRep.getDataByInteId(SH2023Constant.SH_2023_API_CODE_2101);
+
+ SH2023Api2101 shApi2101;
+ List<SH2023Api2101> list = new ArrayList<>();
+
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_2101);
+ for (ApiInfoData infoData : items) {
+ shApi2101 = JSONObject.parseObject(infoData.getData(), SH2023Api2101.class);
+ shApi2101.setCzbz(infoData.getCzbz());
+ shApi2101.setZhgxsj(infoData.getUpdateTime());
+ list.add(shApi2101);
+ }
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (ApiInfoData data : items) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ apiInfoDataRep.save(data);
+ }
+ }
+ }
}
/**
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023PushService13.java b/src/main/java/com/fzzy/push/sh2023/SH2023PushService13.java
index f116bb8..39c62dd 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023PushService13.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023PushService13.java
@@ -1,13 +1,27 @@
package com.fzzy.push.sh2023;
+import com.alibaba.fastjson.JSONObject;
+import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.PushProtocol;
+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.dto.ShApi2103;
+import com.fzzy.otherview.sh2023.repository.ShApi1311Rep;
import com.fzzy.push.impl.ComPushService11;
+import com.fzzy.push.sh2023.dto.SH2023Api1311;
+import com.fzzy.push.sh2023.dto.SH2023Api2103;
import lombok.extern.slf4j.Slf4j;
+import org.codehaus.jackson.JsonParser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
/**
* 涓婃捣甯傚钩鍙�2023鐗�-鍩虹鏁版嵁涓婁紶
@@ -22,6 +36,28 @@
@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;
+ @Autowired
+ private ApiInfoDataRep apiInfoDataRep;
@Override
public String getProtocol() {
@@ -30,19 +66,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;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1301);
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ 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 +115,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;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1302);
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ 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;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1303);
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ 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 +170,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;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1304);
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ 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 +198,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;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1305);
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ 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 +226,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;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1306);
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ 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;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1307);
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ 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,15 +297,61 @@
* 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;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1310);
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1310 data : list) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1310Rep.save(data);
+ }
+ }
+ }
}
/**
* 1311 瑙嗛鐩戞帶鎺ュ彛
*/
public void pushData1311(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ // 鑾峰彇 瑙嗛鐩戞帶鎺ュ彛鏁版嵁
+ List<ApiInfoData> items = apiInfoDataRep.getDataByInteId(SH2023Constant.SH_2023_API_CODE_1311);
+
+ if (null == items || items.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌瑙嗛鐩戞帶锛屼笉鎺ㄩ��-----");
+ return;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1311);
+
+ SH2023Api1311 shApi1311;
+ List<SH2023Api1311> list = new ArrayList<>();
+ for (ApiInfoData infoData : items) {
+ shApi1311 = JSONObject.parseObject(infoData.getData(), SH2023Api1311.class);
+ shApi1311.setCzbz(infoData.getCzbz());
+ shApi1311.setZhgxsj(infoData.getUpdateTime());
+ list.add(shApi1311);
+ }
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (ApiInfoData data : items) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ apiInfoDataRep.save(data);
+ }
+ }
+ }
}
@@ -130,7 +359,34 @@
* 2103 绮儏璁惧閰嶇疆
*/
public void pushData2103(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+
+ // 鑾峰彇绮儏璁惧閰嶇疆鏁版嵁
+ List<ApiInfoData> items = apiInfoDataRep.getDataByInteId(SH2023Constant.SH_2023_API_CODE_2103);
+
+ if (null == items || items.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌绮儏璁惧閰嶇疆锛屼笉鎺ㄩ��-----");
+ return;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_2103);
+ SH2023Api2103 shApi2103;
+ List<SH2023Api2103> list = new ArrayList<>();
+ for (ApiInfoData infoData : items) {
+ shApi2103 = JSONObject.parseObject(infoData.getData(), SH2023Api2103.class);
+ shApi2103.setZhgxsj(infoData.getUpdateTime());
+ list.add(shApi2103);
+ }
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (ApiInfoData data : items) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ apiInfoDataRep.save(data);
+ }
+ }
+ }
}
}
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023PushService14.java b/src/main/java/com/fzzy/push/sh2023/SH2023PushService14.java
index b76813d..c77ce45 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;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1401);
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ 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/SH2023Api1104.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1104.java
new file mode 100644
index 0000000..ecd26f4
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1104.java
@@ -0,0 +1,76 @@
+package com.fzzy.push.sh2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import com.fzzy.api.entity.ApiParent;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鎺ュ彛琛�-寤掗棿淇℃伅
+ *
+ * @author chen
+ * @date 2022-09-02 14:18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SH2023Api1104 implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 9157617424050247565L;
+
+ @PropertyDef(label = "寤掗棿浠ｇ爜")
+ private String ajdm;
+
+ @PropertyDef(label = "寤掗棿鍚嶇О")
+ private String ajmc;
+
+ @PropertyDef(label = "浠撴埧(鎴栨补缃�)缂栫爜")
+ private String cfdm;
+
+ @PropertyDef(label = "寤掗棿闀垮害")
+ private double ajcd;
+
+ @PropertyDef(label = "寤掗棿瀹藉害")
+ private double ajkd;
+
+ @PropertyDef(label = "寤掗棿楂樺害")
+ private double ajgd;
+
+ @PropertyDef(label = "寤掗棿璁捐浠撳")
+ private double ajsjcr;
+
+ @PropertyDef(label = "寤掗棿鑱旂郴鐢佃瘽")
+ private String ajlxdh;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "寤掗棿鍚敤鏃ユ湡")
+ private Date ajqyrq;
+
+ @PropertyDef(label = "寤掗棿鐘舵��")
+ private String ajzt;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ private Date zhgxsj;
+
+ @PropertyDef(label = "浣跨敤搴撳尯浠ｇ爜")
+ private String sykqdm;
+
+ @PropertyDef(label = "鏍囪浣�")
+ private String bjw;
+
+
+}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1105.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1105.java
new file mode 100644
index 0000000..f788b6c
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1105.java
@@ -0,0 +1,56 @@
+package com.fzzy.push.sh2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import com.fzzy.api.entity.ApiParent;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鎺ュ彛琛�-璐т綅淇℃伅
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SH2023Api1105 implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -6967028172020353365L;
+
+ @PropertyDef(label = "璐т綅浠ｇ爜")
+ private String hwdm;
+
+ @PropertyDef(label = "璐т綅鍚嶇О")
+ private String hwmc;
+
+ @PropertyDef(label = "寤掗棿浠ｇ爜")
+ private String ajdm;
+
+ @PropertyDef(label = "璐т綅鍚敤鏃ユ湡")
+ @JSONField(format = "yyyy-MM-dd")
+ private Date hwqyrq;
+
+ @PropertyDef(label = "璐т綅瀹归噺")
+ private double hwrl;
+
+ @PropertyDef(label = "淇濈鍗曚綅")
+ private String bgdw;
+
+ @PropertyDef(label = "淇濈鍛�")
+ private String bgy;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private Date zhgxsj;
+
+ @PropertyDef(label = "鏍囪浣�")
+ private String bjw;
+
+}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1106.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1106.java
new file mode 100644
index 0000000..0eefb92
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1106.java
@@ -0,0 +1,88 @@
+package com.fzzy.push.sh2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鎺ュ彛琛�-娌圭綈淇℃伅
+ */
+@Data
+public class SH2023Api1106 implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -9096483549679877168L;
+
+ @JSONField(serialize = false)
+ @PropertyDef(label = "涓氬姟id")
+ private String bizId;
+
+ @PropertyDef(label = "娌圭綈浠ｇ爜")
+ private String ygdm;
+
+ @PropertyDef(label = "娌圭綈鍚嶇О")
+ private String ygmc;
+
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ private String kqdm;
+
+ @PropertyDef(label = "缃愬")
+ private double gr;
+
+ @PropertyDef(label = "寤洪�犳椂闂�")
+ @JSONField(format = "yyyy-MM-dd")
+ private Date jzsj;
+
+ @PropertyDef(label = "娌圭綈鍙婇檮灞炶鏂芥槸鍚﹀畬濂�")
+ private String ygjfssssfwh;
+
+ @PropertyDef(label = "鏈夋棤鍔犵儹瑁呯疆")
+ private String ywjrzz;
+
+ @PropertyDef(label = "娌圭綈绫诲瀷")
+ private String yglx;
+
+ @PropertyDef(label = "缃愬唴鐩村緞")
+ private double gnzj;
+
+ @PropertyDef(label = "缃愬唴楂樺害")
+ private double gngd;
+
+ @PropertyDef(label = "妫�瀹氭柟寮�")
+ private String jdfs;
+
+ @PropertyDef(label = "鐒婃帴鏂瑰紡")
+ private String hjfs;
+
+ @PropertyDef(label = "娌圭綈鐘舵��")
+ private String ygzt;
+
+ @PropertyDef(label = "璁捐鍗曚綅")
+ private String sjdw;
+
+ @PropertyDef(label = "寤鸿鍗曚綅")
+ private String jsdw;
+
+ @PropertyDef(label = "鐩戠悊鍗曚綅")
+ private String jldw;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private Date zhgxsj;
+
+ @PropertyDef(label = "鏍囪浣�")
+ private String bjw;
+
+}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1107.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1107.java
new file mode 100644
index 0000000..6eb656e
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1107.java
@@ -0,0 +1,73 @@
+package com.fzzy.push.sh2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鎺ュ彛琛�-璁惧淇℃伅
+ */
+@Data
+public class SH2023Api1107 implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 4932872139553449835L;
+
+
+ @PropertyDef(label = "璁惧缂栧彿")
+ private String sbbh;
+
+
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ private String kqdm;
+
+ @PropertyDef(label = "璁惧浠櫒鍚嶇О")
+ private String sbyqmc;
+
+ @PropertyDef(label = "璁惧浠櫒浠ｇ爜")
+ private String sbyqdm;
+
+ @PropertyDef(label = "璁惧瑙勬牸鍨嬪彿")
+ private String sbggxh;
+
+ @PropertyDef(label = "鐢熶骇鍘傚")
+ private String sccj;
+
+ @PropertyDef(label = "鐢熶骇鏃ユ湡")
+ @JSONField(format = "yyyy-MM-dd")
+ private Date scrq;
+
+ @PropertyDef(label = "璁惧鎻忚堪")
+ private String sbms;
+
+ @PropertyDef(label = "璁惧鐘舵��")
+ private String sbzt;
+
+ @PropertyDef(label = "妫�瀹氭椂闂�")
+ @JSONField(format = "yyyy-MM-dd")
+ private Date jdsj;
+
+ @PropertyDef(label = "妫�瀹氬崟浣�")
+ private String jddw;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private Date zhgxsj;
+
+ @PropertyDef(label = "鏍囪浣�")
+ private String bjw;
+
+}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1108.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1108.java
new file mode 100644
index 0000000..378d94f
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1108.java
@@ -0,0 +1,90 @@
+package com.fzzy.push.sh2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鎺ュ彛琛�-鑽墏淇℃伅
+ */
+@Data
+public class SH2023Api1108 implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -7131774374918644731L;
+
+
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ @Column(name = "kqdm", length = 21)
+ private String kqdm;
+
+ @PropertyDef(label = "鑽墏缂栧彿")
+ @Column(name = "yjbh", length = 50)
+ private String yjbh;
+
+ @PropertyDef(label = "鑽墏鍚嶇О")
+ private String yjmc;
+
+ @PropertyDef(label = "鍖呰鐗�")
+ private String bzw;
+
+ @PropertyDef(label = "鍨嬪彿瑙勬牸")
+ private String ggxh;
+
+ @PropertyDef(label = "瀹夊叏浣跨敤璇存槑涔�")
+ private String aqsysms;
+
+ @PropertyDef(label = "鐢熶骇鍘傚")
+ private String sccj;
+
+ @PropertyDef(label = "閲囪喘鏉ユ簮")
+ private String cgly;
+
+ @PropertyDef(label = "鍌ㄥ瓨鏉′欢")
+ private String cctj;
+
+ @PropertyDef(label = "鍌ㄥ瓨鍦扮偣")
+ private String ccdd;
+
+ @PropertyDef(label = "鍖呰鐗╁鐞嗘柟寮�")
+ private String bzwclfs;
+
+ @PropertyDef(label = "娈嬫福澶勭悊鏂瑰紡")
+ private String czclfs;
+
+ @PropertyDef(label = "淇濊川鏈�")
+ @JSONField(format = "yyyy-MM-dd")
+ private Date bzq;
+
+ @PropertyDef(label = "閲囪喘鏃ユ湡")
+ @JSONField(format = "yyyy-MM-dd")
+ private Date cgrq;
+
+ @PropertyDef(label = "搴撳瓨鏁伴噺")
+ private Double kcsl;
+
+ @PropertyDef(label = "搴撳瓨鏁伴噺鍗曚綅")
+ private String kcsldw;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private Date zhgxsj;
+
+ @PropertyDef(label = "鏍囪浣�")
+ private String bjw;
+
+}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1109.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1109.java
new file mode 100644
index 0000000..e10e882
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1109.java
@@ -0,0 +1,47 @@
+package com.fzzy.push.sh2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鎺ュ彛琛�-鏂囦欢淇℃伅
+ */
+@Data
+public class SH2023Api1109 implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -6615204510395829490L;
+
+
+ @PropertyDef(label = "鏂囦欢鍚嶇О")
+ private String wjmc;
+
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ private String kqdm;
+
+ @PropertyDef(label = "鏂囦欢绫诲瀷", description = "1锛氬簱鍖洪笩鐬板浘 2锛氬叆搴撳浘鐗� 3锛氬嚭搴撳浘鐗� 4锛氬叆搴撴鏂よ棰戯紙鎴彇妫�鏂ゆ椂闂村墠鍚庡悇 5绉掗挓瑙嗛锛�5锛氬嚭搴撴鏂よ棰戯紙鎴彇妫�鏂ゆ椂闂村墠鍚庡悇 5 绉掗挓瑙嗛锛�104锛氱啅钂稿妗堟帴鍙ｉ檮浠�")
+ private String wjlx;
+
+ @PropertyDef(label = "鏂囦欢娴�")
+ private String wjl;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private Date zhgxsj;
+
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ private String bjw;
+}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1110.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1110.java
new file mode 100644
index 0000000..ff2a0e4
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1110.java
@@ -0,0 +1,51 @@
+package com.fzzy.push.sh2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鎺ュ彛琛�-搴撳尯鍥句粨鎴跨偣浣嶆爣娉�
+ */
+@Data
+public class SH2023Api1110 implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 2592349036859314053L;
+
+ @PropertyDef(label = "寤掗棿浠ｇ爜")
+ private String ajdm;
+
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ private String kqdm;
+
+ @PropertyDef(label = "寤掗棿鐩稿浣嶇疆")
+ private String ajxdwz;
+
+ @PropertyDef(label = "寤掗棿浣嶇疆鏍峰紡")
+ private String ajwzys;
+
+ @PropertyDef(label = "澶囨敞")
+ private String bz;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private Date zhgxsj;
+
+ @PropertyDef(label = "鏍囪浣�")
+ private String bjw;
+
+
+}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1111.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1111.java
new file mode 100644
index 0000000..ad59a1e
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1111.java
@@ -0,0 +1,55 @@
+package com.fzzy.push.sh2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鎺ュ彛琛�-搴撳尯鍥捐棰戠洃鎺ц澶囩偣浣嶆爣娉�
+ */
+@Data
+public class SH2023Api1111 implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -2000199652473542869L;
+
+ @PropertyDef(label = "瑙嗛鐩戞帶璁惧id")
+ private String spjksbid;
+
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ private String kqdm;
+
+ @PropertyDef(label = "瑙嗛鐩戞帶璁惧鍚嶇О")
+ private String spjksbmc;
+
+ @PropertyDef(label = "瑙嗛鐩戞帶璁惧鐩稿浣嶇疆")
+ private String spjksbxdwz;
+
+ @PropertyDef(label = "瑙嗛鐩戞帶璁惧浣嶇疆鏍峰紡")
+ private String spjksbwzys;
+
+ @PropertyDef(label = "澶囨敞")
+ private String bz;
+
+ @PropertyDef(label = "瑙嗛鐩戞帶绫诲瀷", description = "锛�1:浠撳唴锛�2:涓氬姟锛�3:瀹夐槻锛�")
+ private String spjklx;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private Date zhgxsj;
+
+ @PropertyDef(label = "鏍囪浣�")
+ private String bjw;
+}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1112.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1112.java
new file mode 100644
index 0000000..d20afe9
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1112.java
@@ -0,0 +1,106 @@
+package com.fzzy.push.sh2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鎺ュ彛琛�-浜哄憳淇℃伅
+ */
+@Data
+public class SH2023Api1112 implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -6628887714024258654L;
+
+ @PropertyDef(label = "韬唤璇佸彿鐮�")
+ private String sfzhm;
+
+ @PropertyDef(label = "鍗曚綅浠ｇ爜")
+ private String dwdm;
+
+
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ private String kqdm;
+
+ @PropertyDef(label = "鍗曚綅鍚嶇О")
+ private String dwmc;
+
+ @PropertyDef(label = "闅跺睘閮ㄩ棬")
+ private String lsbm;
+
+ @PropertyDef(label = "琛屾斂鍖哄垝浠ｇ爜")
+ private String xzqhdm;
+
+ @PropertyDef(label = "濮撳悕")
+ private String xm;
+
+ @PropertyDef(label = "鎬у埆")
+ private String xb;
+
+ @PropertyDef(label = "鍏ヨ亴鏃ユ湡")
+ @JSONField(format = "yyyy-MM-dd")
+ private Date rzrq;
+
+ @PropertyDef(label = "宀椾綅鎬ц川")
+ private String gwxz;
+
+ @PropertyDef(label = "鍦ㄥ矖鐘舵��")
+ private String zgzt;
+
+ @PropertyDef(label = "绂昏亴鏃ユ湡")
+ @JSONField(format = "yyyy-MM-dd")
+ private Date lzrq;
+
+ @PropertyDef(label = "搴ф満鐢佃瘽")
+ private String zjdh;
+
+ @PropertyDef(label = "绉诲姩鐢佃瘽")
+ private String yddh;
+
+ @PropertyDef(label = "鐢靛瓙閭")
+ private String dzyx;
+
+ @PropertyDef(label = "姘戞棌")
+ private String mz;
+
+ @PropertyDef(label = "鏀挎不闈㈣矊")
+ private String zzmm;
+
+ @PropertyDef(label = "浜哄憳绫诲埆")
+ private String rylb;
+
+ @PropertyDef(label = "涓撲笟")
+ private String zy;
+
+ @PropertyDef(label = "鍙栧緱鏈�楂樿亴绉版垨鑱屼笟璧勬牸鏃堕棿")
+ @JSONField(format = "yyyy-MM-dd")
+ private Date qdzgzchzyzgsj;
+
+ @PropertyDef(label = "瀛﹀巻")
+ private String xl;
+
+ @PropertyDef(label = "鑱屽姟")
+ private String zw;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private Date zhgxsj;
+
+ @PropertyDef(label = "鏍囪浣�")
+ private String bjw;
+
+
+}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1113.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1113.java
new file mode 100644
index 0000000..a5a1252
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1113.java
@@ -0,0 +1,48 @@
+package com.fzzy.push.sh2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鎺ュ彛琛�-浼佷笟淇＄敤淇℃伅
+ */
+@Data
+public class SH2023Api1113 implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 4416097604510905407L;
+
+ @PropertyDef(label = "鍗曚綅浠ｇ爜")
+ private String dwdm;
+
+ @PropertyDef(label = "淇＄敤绛夌骇")
+ private String xydj;
+
+ @PropertyDef(label = "璇勫畾骞翠唤")
+ private String pdnf;
+
+ @PropertyDef(label = "璇勫畾鍗曚綅/鏈烘瀯鍚嶇О")
+ private String pddw;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private Date zhgxsj;
+
+ @PropertyDef(label = "鏍囪浣�")
+ private String bjw;
+
+
+}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1201.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1201.java
new file mode 100644
index 0000000..a99e9e6
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1201.java
@@ -0,0 +1,176 @@
+package com.fzzy.push.sh2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import com.fzzy.conf.NumberSerializer;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 鎺ュ彛琛�-鍚堝悓淇℃伅
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SH2023Api1201 implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -3432123567533107674L;
+
+ @PropertyDef(label = "鍚堝悓鍙�")
+ private String hth;
+
+ @PropertyDef(label = "鍚堝悓鍚嶇О")
+ @Column(name = "htmc", length = 128)
+ private String htmc;
+
+ @PropertyDef(label = "鍗曚綅浠ｇ爜")
+ private String dwdm;
+
+ @PropertyDef(label = "涓氬姟绫诲埆")
+ private String ywlx;
+
+ @PropertyDef(label = "瀹㈡埛绫诲瀷")
+ private String khlx;
+
+ @PropertyDef(label = "瀹㈡埛缁熶竴绀句細淇＄敤浠ｇ爜")
+ private String khtyshxydm;
+
+ @PropertyDef(label = "瀹㈡埛鍚嶇О")
+ private String khmc;
+
+ @PropertyDef(label = "娉曞畾浠ｈ〃浜�")
+ private String fddbr;
+
+ @PropertyDef(label = "閫氳鍦板潃")
+ private String txdz;
+
+ @PropertyDef(label = "閭斂缂栫爜")
+ private String yzbm;
+
+ @PropertyDef(label = "鑱旂郴浜哄鍚�")
+ private String lxrxm;
+
+ @PropertyDef(label = "鑱旂郴鐢佃瘽")
+ private String lxrdh;
+
+ @PropertyDef(label = "韬唤璇佸彿")
+ private String sfzh;
+
+ @PropertyDef(label = "鐢靛瓙淇＄")
+ private String dzyx;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "绛捐鏃ユ湡")
+ private Date qdrq;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "绾﹀畾瀹屾垚鏃堕棿")
+ private Date ydwcsj;
+
+ @PropertyDef(label = "绛捐鍦扮偣")
+ private String qddd;
+
+ @PropertyDef(label = "绮鍝佺浠ｇ爜")
+ private String lspzdm;
+
+ @PropertyDef(label = "绮鎬ц川浠ｇ爜")
+ private String lsxzdm;
+
+ @PropertyDef(label = "鍚堝悓鍗曚环")
+ private double htdj;
+
+ @PropertyDef(label = "绾﹀畾璐攢绮鏁伴噺")
+ private double ydgxlssl;
+
+ @JSONField(serializeUsing = NumberSerializer.class)
+ @PropertyDef(label = "鍚堝悓鎬婚噾棰�")
+ private BigDecimal htzje;
+
+ @PropertyDef(label = "灞ョ害淇濊瘉閲�")
+ private double lybzj;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "瀹為檯瀹屾垚鏃堕棿")
+ private Date sswcsj;
+
+ @JSONField(name = "Lysl")
+ @PropertyDef(label = "灞ョ害鏁伴噺")
+ private double lysl;
+
+ @JSONField(name = "Lyl")
+ @PropertyDef(label = "灞ョ害鐜�")
+ private double lyl;
+
+ @JSONField(name = "Jsjg")
+ @PropertyDef(label = "缁撶畻浠锋牸")
+ private double jsjg;
+
+ @JSONField(name = "Jszje", serializeUsing = NumberSerializer.class)
+ @PropertyDef(label = "缁撶畻鎬婚噾棰�")
+ private BigDecimal jszje;
+
+ @PropertyDef(label = "缁撶畻涓庡悎鍚屼竴鑷存��")
+ private String jsyhtyzx;
+
+ @PropertyDef(label = "缁撶畻涓庡悎鍚屼笉涓�鑷村師鍥�")
+ private String jsyhtbyzyy;
+
+ @PropertyDef(label = "瀹㈡埛鏂瑰紑鎴疯")
+ private String khfkhh;
+
+ @PropertyDef(label = "瀹㈡埛鏂硅处鍙�")
+ private String khfzh;
+
+ @PropertyDef(label = "瀹㈡埛绛剧害浜�")
+ private String khqyr;
+
+ @PropertyDef(label = "鏈柟寮�鎴疯")
+ private String bfkhh;
+
+ @PropertyDef(label = "鏈柟璐﹀彿")
+ private String bfzh;
+
+ @PropertyDef(label = "鏈柟绛剧害浜�")
+ private String bfqyr;
+
+ @PropertyDef(label = "瀹℃壒浜�")
+ private String shr;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "瀹℃壒鏃堕棿")
+ private Date shsj;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏇存柊鏃堕棿")
+ private Date zhgxsj;
+
+ @JSONField(serialize = false)
+ @PropertyDef(label = "涓氬姟id")
+ private String bizId;
+
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ private String kqdm;
+
+ @JSONField(serialize = false)
+ @PropertyDef(label = "鍚屾鏃堕棿", description = "浠庣伯搴撶郴缁熷悓姝ュ埌鎺ュ彛绠＄悊涓績鐨勬椂闂�")
+ private Date syncTime;
+
+ @PropertyDef(label = "鍚堝悓鏄惁涓")
+ private String htsfzz;
+
+ @PropertyDef(label = "鏍囪浣�")
+ private String bjw;
+}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1202.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1202.java
new file mode 100644
index 0000000..12677c3
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1202.java
@@ -0,0 +1,227 @@
+package com.fzzy.push.sh2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import com.fzzy.api.entity.ApiParent;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鎺ュ彛琛�-绮鍏ュ簱淇℃伅
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SH2023Api1202 implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 760284619085936798L;
+
+
+ //12 浣嶆暟瀛楃粍鎴愶紝绗� 1-2 浣嶄负涓氬姟浠ｇ爜锛�14浠ｈ〃绮鍏ュ簱锛夛紝绗� 3-8 浣嶄緷娆′负骞翠唤鐨勫悗涓や綅銆�2 浣嶆湀浠姐��2 浣嶆棩鏈燂紝鍚庡洓浣嶄负椤哄簭鐮併�備緥濡傦細141605041234
+
+ @PropertyDef(label = "鍏ュ簱涓氬姟鍗曞彿")
+ private String rkywdh;
+
+ @PropertyDef(label = "璐т綅浠ｇ爜")
+ private String hwdm;
+
+ @PropertyDef(label = "涓氬姟绫诲瀷", description = "2锛氬叆搴擄紙榛樿锛�")
+ private String ywlx = "2";
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "涓氬姟鏃ユ湡")
+ private Date ywrq;
+
+ @PropertyDef(label = "璁″垝鏄庣粏鍙�")
+ private String jhmxh;
+
+ @PropertyDef(label = "鍚堝悓鍙�")
+ private String hth;
+
+ @PropertyDef(label = "绮潈褰掑睘鍗曚綅浠ｇ爜")
+ private String lqgsdwdm;
+
+ @PropertyDef(label = "鎵胯繍浜�")
+ private String cyr;
+
+ @PropertyDef(label = "鑱旂郴鐢佃瘽")
+ private String lxdh;
+
+ @PropertyDef(label = "韬唤璇佸彿")
+ private String sfzh;
+
+ @PropertyDef(label = "璇︾粏鍦板潃")
+ private String xxdz;
+
+ @PropertyDef(label = "杩愯緭宸ュ叿")
+ private String ysgj;
+
+ @PropertyDef(label = "杞﹁埞鍙�")
+ private String cch;
+
+ @PropertyDef(label = "杞﹁埞鍙风被鍨�")
+ private String cchlx;
+
+ @PropertyDef(label = "鎸傝溅鍙�")
+ private String gch;
+
+ @PropertyDef(label = "瑁呯伯鍦扮偣")
+ private String ldd;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鐧昏鏃堕棿")
+ private Date djsj;
+
+ @PropertyDef(label = "鐧昏闂ㄥ矖浜哄憳濮撳悕")
+ private String djmgryxm;
+
+ @PropertyDef(label = "绮鍝佺浠ｇ爜")
+ private String lspzdm;
+
+ @PropertyDef(label = "绮鎬ц川浠ｇ爜")
+ private String lsxzdm;
+
+ @PropertyDef(label = "鏀惰幏骞村害")
+ private String shnd;
+
+ @PropertyDef(label = "浜у湴浠ｇ爜")
+ private String cddm;
+
+ @PropertyDef(label = "妫�鏂ょ被鍨�")
+ private String jjlx;
+
+ @PropertyDef(label = "姣涢噸(鍏枻)")
+ private double mz;
+
+ @PropertyDef(label = "姣涢噸鐩戠鍛�")
+ private String mzjby;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "姣涢噸璁￠噺鏃堕棿")
+ private Date mzjlsj;
+
+ @PropertyDef(label = "姣涢噸璁￠噺鍛�")
+ private String mzjly;
+
+ @PropertyDef(label = "鍊间粨鍛�")
+ private String zcy;
+
+ @PropertyDef(label = "鐨噸(鍏枻)")
+ private double pz;
+
+ @PropertyDef(label = "鐨噸鐩戠鍛�")
+ private String pzjby;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鐨噸璁￠噺鏃堕棿")
+ private Date pzjlsj;
+
+ @PropertyDef(label = "鐨噸璁￠噺鍛�")
+ private String pzjly;
+
+ @PropertyDef(label = "鍖呰鐗�")
+ private String bzw;
+
+ @PropertyDef(label = "鏍囧噯鍖呭崟鍖呴噸(鍏枻)")
+ private double bzbdbz = 25;
+
+ @PropertyDef(label = "鏍囧噯鍖呬欢鏁�(浠�)")
+ private Integer bzbjs;
+
+ @PropertyDef(label = "璐ㄦ鎵ｉ噺(灏忚:鍏枻)")
+ private double zjklxj;
+
+ @PropertyDef(label = "鍏朵腑锛氭按鍒嗗鎵ｉ噺(鍏枻)")
+ private double qzsfzkl;
+
+ @PropertyDef(label = "鍏朵腑锛氭潅璐ㄥ鎵ｉ噺(鍏枻)")
+ private double qzzzzkl;
+
+ @PropertyDef(label = "鍏朵腑锛氫笉瀹屽杽绮掓墸閲�(鍏枻)")
+ private double qzbwslkl;
+
+ @PropertyDef(label = "鍏朵腑锛氫簰娣锋墸閲�(鍏枻)")
+ private double qzhhkl;
+
+ @PropertyDef(label = "鍏朵腑锛氱敓闇夌矑鎵ｉ噺(鍏枻)")
+ private double qzsmlkl;
+
+ @PropertyDef(label = "鍏朵腑锛氭暣绮剧背绮掓墸閲�(鍏枻)")
+ private double qzzjmlkl;
+
+ @PropertyDef(label = "鍏朵腑锛氳胺澶栫硻绫虫墸閲�(鍏枻)")
+ private double qzgwcmkl;
+
+ @PropertyDef(label = "鍏朵腑榛勭矑绫虫墸閲�(鍏枻)")
+ private double qzhlmkl;
+
+ @PropertyDef(label = "鍏朵腑锛氬叾浠栨墸閲�(鍏枻)")
+ private double qzqtkl;
+
+ @PropertyDef(label = "鏁寸悊璐圭敤鎶樻墸閲�(鍏枻)")
+ private double zlfyzkl;
+
+ @PropertyDef(label = "鍖呰鐗╂墸閲�(鍏枻)")
+ private double bzwkl;
+
+ @PropertyDef(label = "鍏朵粬鎵ｉ噺(鍏枻)")
+ private double qtkl;
+
+ @PropertyDef(label = "鎵ｉ噺鍘熷洜")
+ private String klyy;
+
+ @PropertyDef(label = "鐜板満鎵ｉ噺(鍏枻)")
+ @Column(name = "xckl")
+ private double xckl;
+
+ @PropertyDef(label = "澧炴墸浠�(鍏枻)")
+ private double zkj;
+
+ @PropertyDef(label = "澧炴墸浠峰師鍥�")
+ private String zkhyy;
+
+ @PropertyDef(label = "鍑�閲�(鍏枻)")
+ private double jz;
+
+ @PropertyDef(label = "瑁呭嵏浣滀笟鍗曚綅")
+ private String zxzydw;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鍑洪棬鏃堕棿")
+ private Date cmsj;
+
+ @PropertyDef(label = "鍑洪棬纭闂ㄥ矖浜哄憳濮撳悕")
+ private String cmqrmgryxm;
+
+ @PropertyDef(label = "鍏ュ簱缁撶畻鍗曞彿")
+ private String rkjsdh;
+
+ @PropertyDef(label = "澶囨敞")
+ private String bz;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏇存柊鏃堕棿")
+ private Date zhgxsj;
+
+ private String pch;
+ private String bjw;
+ private String bydh;
+ private String jjdh;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "璁拌处鏃ユ湡")
+ private Date jzrq;
+
+}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1203.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1203.java
new file mode 100644
index 0000000..7d77d0c
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1203.java
@@ -0,0 +1,94 @@
+package com.fzzy.push.sh2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import com.fzzy.api.entity.ApiParent;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鎺ュ彛琛�-绮鍏ュ簱妫�楠屼俊鎭�
+ */
+@Data
+
+@EqualsAndHashCode(callSuper = false)
+public class SH2023Api1203 implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -5707489334519718974L;
+
+
+ //鍏ュ簱涓氬姟鍗曞彿鐢� 12 浣嶆暟瀛楃粍鎴愶紝绗� 1-2 浣嶄负涓氬姟浠ｇ爜锛�14浠ｈ〃绮鍏ュ簱锛夛紝绗� 3-8 浣嶄緷娆′负骞翠唤鐨勫悗涓や綅銆�2 浣嶆湀浠姐��2 浣嶆棩鏈燂紝鍚庡洓浣嶄负椤哄簭鐮併�備緥濡傦細141605041234
+ @Id
+ @PropertyDef(label = "鍏ュ簱妫�楠屽崟鍙�")
+ private String rkjydh;
+
+ @PropertyDef(label = "璐т綅浠ｇ爜")
+ private String hwdm;
+
+ @PropertyDef(label = "鍏ュ簱涓氬姟鍗曞彿")
+ private String rkywdh;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鎵︽牱鏃堕棿")
+ private Date qysj;
+
+ @PropertyDef(label = "鎵︽牱浜哄鍚�")
+ private String qyrxm;
+
+ @PropertyDef(label = "鎵︽牱鏂瑰紡")
+ private String qyfs;
+
+ @PropertyDef(label = "妫�楠岄」鐩�,闅斿紑")
+ private String jyxm;
+
+ @PropertyDef(label = "妫�楠屽��,闅斿紑")
+ private String jyz;
+
+ @PropertyDef(label = "澧炴墸浠�(鍏�,闅斿紑)")
+ private String zkj;
+
+ @PropertyDef(label = "澧炴墸閲�(鍏枻,闅斿紑)")
+ private String zkl;
+
+ @PropertyDef(label = "妫�楠屼汉濮撳悕")
+ private String jyrxm;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "妫�楠屾椂闂�")
+ private Date jysj;
+
+ @PropertyDef(label = "妫�楠岀粨鏋�")
+ private String jyjg;
+
+ @PropertyDef(label = "绮鍝佺浠ｇ爜")
+ private String lspzdm;
+
+ @PropertyDef(label = "绮瀹氱瓑")
+ private String lsdd;
+
+ @PropertyDef(label = "淇濈鍛樺鏍�")
+ private String bgyfh;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏇存柊鏃堕棿")
+ private Date zhgxsj;
+
+ @PropertyDef(label = "鎵规鍙�")
+ private String pch;
+
+ @PropertyDef(label = "鏍囪浣�")
+ private String bjw;
+}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1204.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1204.java
new file mode 100644
index 0000000..2c4da07
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1204.java
@@ -0,0 +1,92 @@
+package com.fzzy.push.sh2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import com.fzzy.api.entity.ApiParent;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鎺ュ彛琛�-绮鍏ュ簱缁撶畻淇℃伅
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SH2023Api1204 implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -8378354337037404298L;
+
+ @PropertyDef(label = "鍏ュ簱缁撶畻鍗曞彿", description = "鐢卞簱鐐逛唬鐮�+缁撶畻鏃ユ湡锛坹yyyMMdd锛�+4 浣嶉『搴忓彿缁勬垚")
+ private String rkjsdh;
+
+ @PropertyDef(label = "璐т綅浠ｇ爜")
+ private String hwdm;
+
+ @PropertyDef(label = "鍚堝悓鍙�")
+ private String hth;
+
+ @PropertyDef(label = "缁撶畻鏁伴噺(鍏枻)")
+ private double jssl;
+
+ @PropertyDef(label = "缁撶畻鍗曚环(鍏�/鍏枻)")
+ private double jsdj;
+
+ @PropertyDef(label = "缁撶畻閲戦(鍏�)")
+ private double jsje;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "缁撶畻鏃堕棿")
+ private Date jssj;
+
+ @PropertyDef(label = "缁撶畻鏂瑰紡")
+ private String jsfs;
+
+ @PropertyDef(label = "鏀舵浜�")
+ private String skr;
+
+ @PropertyDef(label = "閾惰琛屽埆浠ｇ爜")
+ private String yhhbdm;
+
+ @PropertyDef(label = "鏀舵浜鸿韩浠借瘉鍙�")
+ private String skrsfzh;
+
+ @PropertyDef(label = "寮�鎴疯鍙�")
+ private String khhh;
+
+ @PropertyDef(label = "寮�鎴疯鍚嶇О")
+ private String khhmc;
+
+ @PropertyDef(label = "閾惰璐﹀彿")
+ private String yhzh;
+
+ @PropertyDef(label = "鍙戠エ鍙风爜")
+ private String fphm;
+
+ @PropertyDef(label = "鍙戠エ鐘舵��")
+ private String fpzt;
+
+ @PropertyDef(label = "浠樻鍗曚綅")
+ private String fkdw;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏇存柊鏃堕棿")
+ private Date zhgxsj;
+
+ @PropertyDef(label = "鎵规鍙�")
+ private String pch;
+
+ @PropertyDef(label = "鏍囪浣�")
+ private String bjw;
+}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1205.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1205.java
new file mode 100644
index 0000000..8cac8cf
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1205.java
@@ -0,0 +1,174 @@
+package com.fzzy.push.sh2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import com.fzzy.api.entity.ApiParent;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鎺ュ彛琛�-绮鍑哄簱淇℃伅
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SH2023Api1205 extends ApiParent implements Serializable {
+
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -6381473449862569451L;
+
+
+ //涓氬姟鍗曞彿鐢� 12 浣嶆暟瀛楃粍鎴愶紝绗� 1-2 浣嶄负涓氬姟缂栫爜锛�15 浠ｈ〃绮鍑哄簱锛夛紝绗� 3-8 浣嶄緷娆′负骞翠唤鐨勫悗涓や綅銆�2 浣嶆湀浠姐��2浣嶆棩鏈燂紝鍚庡洓浣嶄负椤哄簭鐮併�備緥濡傦細141605041234
+ @Id
+ @PropertyDef(label = "鍑哄簱涓氬姟鍗曞彿")
+ private String ckywdh;
+
+ @PropertyDef(label = "璐т綅浠ｇ爜")
+ private String hwdm;
+
+ @PropertyDef(label = "璁″垝鏄庣粏鍙�")
+ private String jhmxh;
+
+ @PropertyDef(label = "鍑哄簱閫氱煡鍗曞彿")
+ private String cktzdh;
+
+ @PropertyDef(label = "涓氬姟绫诲瀷", description = "1锛氬嚭搴擄紙榛樿锛�")
+ private String ywlx = "1";
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "涓氬姟鏃ユ湡")
+ private Date ywrq;
+
+ @PropertyDef(label = "鍚堝悓鍙�")
+ private String hth;
+
+ @PropertyDef(label = "鎵胯繍浜�")
+ private String cyr;
+
+ @PropertyDef(label = "鑱旂郴鐢佃瘽")
+ private String lxdh;
+
+ @PropertyDef(label = "韬唤璇佸彿")
+ private String sfzh;
+
+ @PropertyDef(label = "杩愯緭宸ュ叿")
+ private String ysgj;
+
+ @PropertyDef(label = "鍗哥伯鍦扮偣")
+ private String xldd;
+
+ @PropertyDef(label = "杞﹁埞鍙�")
+ private String cch;
+
+ @PropertyDef(label = "杞﹁埞鍙风被鍨�")
+ private String cchlx;
+
+ @PropertyDef(label = "鎸傝溅鍙�")
+ private String gch;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鐧昏鏃堕棿")
+ private Date djsj;
+
+ @PropertyDef(label = "鐧昏闂ㄥ矖浜哄憳濮撳悕")
+ private String djmgryxm;
+
+ @PropertyDef(label = "绮鍝佺浠ｇ爜")
+ private String lspzdm;
+
+ @PropertyDef(label = "绮绛夌骇浠ｇ爜")
+ private String lsdjdm;
+
+ @PropertyDef(label = "绮鎬ц川浠ｇ爜")
+ private String lsxzdm;
+
+ @PropertyDef(label = "鏀惰幏骞村害")
+ private String shnd;
+
+ @PropertyDef(label = "浜у湴浠ｇ爜")
+ private String cddm;
+
+ @PropertyDef(label = "鐨噸(鍏枻)")
+ private double pz;
+
+ @PropertyDef(label = "鐨噸鐩戠鍛�")
+ private String pzjby;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鐨噸璁￠噺鏃堕棿")
+ private Date pzjlsj;
+
+ @PropertyDef(label = "鐨噸璁￠噺鍛�")
+ private String pzjly;
+
+ @PropertyDef(label = "姣涢噸(鍏枻)")
+ private double mz;
+
+ @PropertyDef(label = "姣涢噸鐩戠鍛�")
+ private String mzjby;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "姣涢噸璁￠噺鏃堕棿")
+ private Date mzjlsj;
+
+ @PropertyDef(label = "姣涢噸璁￠噺鍛�")
+ private String mzjly;
+
+ @PropertyDef(label = "鍖呰鐗�")
+ private String bzw;
+
+ @PropertyDef(label = "鏍囧噯鍖呭崟鍖呴噸(鍏枻)")
+ private double bzbdbz;
+
+ @PropertyDef(label = "鏍囧噯鍖呬欢鏁�(浠�)")
+ private Integer bzbjs;
+
+ @PropertyDef(label = "鍑�閲�(鍏枻)")
+ private double jz;
+
+ @PropertyDef(label = "鎵�/澧為噺(鍏枻)")
+ private double kzl;
+
+ @PropertyDef(label = "鍊间粨淇濈鍛樺鍚�")
+ private String zcbgyxm;
+
+ @PropertyDef(label = "瑁呭嵏浣滀笟鍗曚綅")
+ private String zxzydw;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鍑洪棬鏃堕棿")
+ private Date cmsj;
+
+ @PropertyDef(label = "鍑洪棬纭闂ㄥ矖浜哄憳濮撳悕")
+ private String cmqrmgryxm;
+
+ @PropertyDef(label = "鍑哄簱缁撶畻鍗曞彿")
+ private String ckjsdh;
+
+ @PropertyDef(label = "澶囨敞")
+ private String bz;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ private Date zhgxsj;
+
+ private String pch;
+ private String bjw;
+ private String jjdh;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "璁拌处鏃ユ湡")
+ private Date jzrq;
+}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/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/SH2023Api1311.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1311.java
new file mode 100644
index 0000000..55a4912
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1311.java
@@ -0,0 +1,130 @@
+package com.fzzy.push.sh2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import com.fzzy.api.entity.ApiParent;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 瑙嗛鐩戞帶
+ *
+ * @Author:YAN
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SH2023Api1311 extends ApiParent implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ @PropertyDef(label = "鐩戞帶缂栧彿")
+ private String sxtbh;
+
+ @PropertyDef(label = "閫氶亾缂栧彿")
+ private int tdbh;
+
+ @PropertyDef(label = "閫氶亾鍚嶇О")
+ private String tdmc;
+
+ @PropertyDef(label = "鐩戞帶璁惧缂栫爜")
+ private String jksbbm;
+
+ @PropertyDef(label = "鐩戞帶璁惧鍚嶇О")
+ private String jksbmc;
+
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ private String kqdm;
+
+ /**
+ * 1 娴峰悍, 2 澶у崕, 3 瀹囪
+ * 4 澶╁湴浼熶笟,5 鍗庝负,9 鍏朵粬
+ */
+ @PropertyDef(label = "鐩戞帶鍘傚晢")
+ private String jkcs;
+
+ @PropertyDef(label = "鐩戞帶鍨嬪彿")
+ private String jkxh;
+
+ @PropertyDef(label = "鐩戞帶搴忓垪鍙�")
+ private String jkxlh;
+
+ /**
+ * 1:浠撳唴锛�2:涓氬姟锛�
+ * 3:瀹夐槻
+ */
+ @PropertyDef(label = "瑙嗛鐩戞帶绫诲瀷")
+ private String spjklx;
+
+ /**
+ * 1:DVR 2:NVR
+ */
+ @PropertyDef(label = "璁惧绫诲瀷")
+ private String sblxbm;
+
+ @PropertyDef(label = "瀹夎浣嶇疆")
+ private String azwz;
+
+ /**
+ * 绮簱澶ч棬锛�01锛夛紝鎵︽牱鏈猴紙02锛夛紝鍖栭獙瀹わ紙03锛夛紝缁撶畻瀹わ紙04锛夛紝
+ * 鍦扮鎴匡紙05锛夛紝搴撳尯涓诲共閬擄紙06锛夛紝浠撻棿鐩戞帶锛�07锛夛紝浠撳唴锛�08锛夛紝
+ * 鑽搧搴擄紙09锛夛紝鍣ㄦ潗搴擄紙10锛夛紝鍒堕珮鐐癸紙11锛夛紝鍛ㄧ晫锛�12锛夛紝鍏朵粬锛�99锛�
+ */
+ @PropertyDef(label = "瀹夎浣嶇疆绫诲瀷")
+ private String azwzlx;
+
+ @PropertyDef(label = "鐓у皠鍖哄煙")
+ private String zsqy;
+
+ /**
+ * Y/N
+ */
+ @PropertyDef(label = "鏄惁瀹夎琛ュ厜鐏�")
+ private String sfazbgd;
+
+ @PropertyDef(label = "寤掗棿浠ｇ爜")
+ private String ajdm;
+
+ @PropertyDef(label = "璐т綅浠ｇ爜")
+ private String hwdm;
+
+ /**
+ * 1 :鏋満 2 :鐞冩満
+ */
+ @PropertyDef(label = "鐩戞帶绫诲瀷缂栫爜")
+ private String jkjlxbm;
+
+ @PropertyDef(label = "鐩戞帶棰勭疆浣嶆暟閲�")
+ private int jktyzw;
+
+ @PropertyDef(label = "璁惧IP鍦板潃")
+ private String sbipdz;
+
+ @PropertyDef(label = "璁惧绔彛鍙�")
+ private int sbdkh;
+
+ @PropertyDef(label = "璁惧鐧诲綍鍚嶇О")
+ private String sbdlmc;
+
+ @PropertyDef(label = "璁惧鐧诲綍瀵嗙爜")
+ private String sbdlmm;
+
+ @PropertyDef(label = "澶囨敞")
+ private String bz;
+
+ @PropertyDef(label = "鏍囪浣�")
+ private String bjw;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ private Date zhgxsj;
+
+}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/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;
+
+}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2101.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2101.java
new file mode 100644
index 0000000..56b0a0e
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2101.java
@@ -0,0 +1,114 @@
+package com.fzzy.push.sh2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import com.fzzy.api.entity.ApiParent;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 涓婃捣甯傛帴鍙�-2101 妫�鏂ゅ崟
+ *
+ * @author czt
+ * @date 2023/8/17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SH2023Api2101 extends ApiParent implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ @PropertyDef(label = "妫�鏂ゅ崟鍙�")
+ private String jjdh;
+
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ private String kqdm;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "妫�鏂ゆ棩鏈�")
+ private Date jjrq;
+
+ @PropertyDef(label = "椹宠繍鍗曞彿/搴撻檯璋冩嫧鍗曞彿")
+ private String inbillno;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "璁拌处鏃ユ湡")
+ private Date jzrq;
+
+ @PropertyDef(label = "浣滀笟鍗曞彿")
+ private String zydh;
+
+ /**
+ * 1锛氬叆搴撲綔涓� 2锛氫腑杞皟鍑� 3锛氫腑杞繘浠�
+ * 4锛氬嚭搴撲綔涓� 5锛氬簱瀛樿皟鍑� 6锛氬簱瀛樿皟鍏� 7锛氱Щ浠撴々
+ */
+ @PropertyDef(label = "浣滀笟绫诲瀷")
+ private String zylx;
+
+ @PropertyDef(label = "瀹㈡埛缂栧彿")
+ private String khmc;
+
+ @PropertyDef(label = "鏉ョ伯棰勬姤鍙�/鎻愯揣鍗曞彿")
+ private String psplan;
+
+ @PropertyDef(label = "鍚堝悓鍙�")
+ private String hth;
+
+ @PropertyDef(label = "杞﹁埞鍙�")
+ private String cch;
+
+ @PropertyDef(label = "涓浆杞﹁埞鍙�")
+ private String zzchh;
+
+ @PropertyDef(label = "鍝佺澶х被")
+ private String lspzdmdl;
+
+ @PropertyDef(label = "绮鎬ц川浠ｇ爜")
+ private String lsxzdm;
+
+ @PropertyDef(label = "鏉ョ伯浠ｇ爜")
+ private String lldm;
+
+ @PropertyDef(label = "寤掗棿浠ｇ爜")
+ private String ajdm;
+
+ @PropertyDef(label = "璐т綅浠ｇ爜")
+ private String hwdm;
+
+ @PropertyDef(label = "绉诲叆寤掗棿浠ｇ爜")
+ private String yrajdh;
+
+ @PropertyDef(label = "绉诲叆璐т綅浠ｇ爜")
+ private String yrhwdm;
+
+ @PropertyDef(label = "瑁呭嵏鐝�")
+ private String zxb;
+
+ @PropertyDef(label = "鍖呰鐗╁鎵ｉ噺(鍏枻)")
+ private double bzwzkl;
+
+ @PropertyDef(label = "姣涢噸(鍏枻)")
+ private double mz;
+
+ @PropertyDef(label = "鍑�閲�(鍏枻)")
+ private double jz;
+
+ @PropertyDef(label = "鏁版嵁鐘舵��")
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ private Date zhgxsj;
+
+ @PropertyDef(label = "鎵规鍙�")
+ private String pch;
+
+ @PropertyDef(label = "鏍囪浣�")
+ private String bjw;
+
+}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2103.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2103.java
new file mode 100644
index 0000000..2492cde
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2103.java
@@ -0,0 +1,71 @@
+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 java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 绮儏璁惧閰嶇疆
+ *
+ * @author czt
+ *
+ * @date 2023-08-21
+ */
+@Data
+public class SH2023Api2103 extends ApiParent implements Serializable {
+
+ private static final long serialVersionUID = 9157617424050247565L;
+
+ @PropertyDef(label = "璐т綅浠ｇ爜")
+ private String hwdm;
+
+ @PropertyDef(label = "鐢电紗琛屾暟")
+ private String dlhs;
+
+ @PropertyDef(label = "鐢电紗鍒楁暟")
+ private String dlls;
+
+ @PropertyDef(label = "鐢电紗灞傛暟")
+ private String dlcs;
+
+ @PropertyDef(label = "鐢电紗鍦堟暟")
+ private String dlqs;
+
+ @PropertyDef(label = "鐢电紗鍦堟帓鍒楄鎯�")
+ private String dlqplxq;
+
+ @PropertyDef(label = "涓婂眰璧风偣")
+ private String scqd;
+
+ @PropertyDef(label = "涓婂眰缁堢偣")
+ private String sczd;
+
+ @PropertyDef(label = "涓眰璧风偣")
+ private String zcqd;
+
+ @PropertyDef(label = "涓眰缁堢偣")
+ private String zczd;
+
+ @PropertyDef(label = "涓嬪眰璧风偣")
+ private String xcqd;
+
+ @PropertyDef(label = "涓嬪眰缁堢偣")
+ private String xczd;
+
+ @PropertyDef(label = "鏈夋晥鑼冨洿璧峰灞�")
+ private String yxfwqsc;
+
+ @PropertyDef(label = "鏈夋晥鑼冨洿缁撴潫灞�")
+ private String yxfwjsc;
+
+ @PropertyDef(label = "鏍囪浣�")
+ private String bjw;
+
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private Date zhgxsj;
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2103Item.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2103Item.java
new file mode 100644
index 0000000..ba165d6
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2103Item.java
@@ -0,0 +1,38 @@
+package com.fzzy.push.sh2023.dto;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import com.fzzy.api.entity.ApiParent;
+import lombok.Data;
+import java.io.Serializable;
+
+/**
+ * 绮儏璁惧閰嶇疆-绛掍粨鐢电紗鍦堟帓鍒楄鎯�
+ *
+ * @author czt
+ *
+ * @date 2023-08-21
+ */
+@Data
+public class SH2023Api2103Item extends ApiParent implements Serializable {
+
+ private static final long serialVersionUID = 9157617424050247565L;
+
+ @PropertyDef(label = "鍦堝彿")
+ private String qh;
+
+ @PropertyDef(label = "璧峰鐢电紗缂栧彿")
+ private String qsdlbh;
+
+ @PropertyDef(label = "缁撴潫鐢电紗缂栧彿")
+ private String jsdlbh;
+
+ @PropertyDef(label = "鍚勫湀鎬诲眰鏁�")
+ private String cs;
+
+ @PropertyDef(label = "鍦堝崐寰�")
+ private String ybj;
+
+ @PropertyDef(label = "搴忓彿")
+ private String rowId;
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/ShAreaBjw.java b/src/main/java/com/fzzy/push/sh2023/dto/ShAreaBjw.java
index efe84df..d1e2e02 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/ShAreaBjw.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/ShAreaBjw.java
@@ -5,89 +5,89 @@
*/
public enum ShAreaBjw {
- BJW_310101("310101", "榛勬郸鍖�", "huangpu"),
- BJW_310104("310104", "寰愭眹鍖�", "xuhui"),
- BJW_310105("310105", "闀垮畞鍖�", "changning"),
- BJW_310106("310106", "闈欏畨鍖�", "jingan"),
- BJW_310107("310107", "鏅檧鍖�", "pituo"),
- BJW_310109("310109", "铏瑰彛鍖�", "honhkou"),
- BJW_310110("310110", "鏉ㄦ郸鍖�", "yangpu"),
- BJW_310112("310112", "闂佃鍖�", "minhang"),
- BJW_310113("310113", "瀹濆北鍖�", "baoshan"),
- BJW_310114("310114", "鍢夊畾鍖�", "jiading"),
- BJW_310115("310115", "娴︿笢鏂板尯", "pudong"),
- BJW_310116("310116", "閲戝北鍖�", "jinshan"),
- BJW_310117("310117", "鏉炬睙鍖�", "songjiang"),
- BJW_310118("310118", "闈掓郸鍖�", "qingpu"),
- BJW_310120("310120", "濂夎搐鍖�", "fengxian"),
- BJW_310151("310151", "宕囨槑鍖�", "chongming");
+ BJW_310101("310101", "榛勬郸鍖�", "huangpu"),
+ BJW_310104("310104", "寰愭眹鍖�", "xuhui"),
+ BJW_310105("310105", "闀垮畞鍖�", "changning"),
+ BJW_310106("310106", "闈欏畨鍖�", "jingan"),
+ BJW_310107("310107", "鏅檧鍖�", "putuo"),
+ BJW_310109("310109", "铏瑰彛鍖�", "hongkou"),
+ BJW_310110("310110", "鏉ㄦ郸鍖�", "yangpu"),
+ BJW_310112("310112", "闂佃鍖�", "minhang"),
+ BJW_310113("310113", "瀹濆北鍖�", "baoshan"),
+ BJW_310114("310114", "鍢夊畾鍖�", "jiading"),
+ BJW_310115("310115", "娴︿笢鏂板尯", "pudong"),
+ BJW_310116("310116", "閲戝北鍖�", "jinshan"),
+ BJW_310117("310117", "鏉炬睙鍖�", "songjiang"),
+ BJW_310118("310118", "闈掓郸鍖�", "qingpu"),
+ BJW_310120("310120", "濂夎搐鍖�", "fengxian"),
+ BJW_310151("310151", "宕囨槑鍖�", "chongming");
- private String code;
- private String name;
- private String bjw;
+ private String code;
+ private String name;
+ private String bjw;
- ShAreaBjw(String code, String name, String bjw) {
- this.code = code;
- this.name = name;
- this.bjw = bjw;
- }
+ ShAreaBjw(String code, String name, String bjw) {
+ this.code = code;
+ this.name = name;
+ this.bjw = bjw;
+ }
- public String getCode() {
- return code;
- }
+ public String getCode() {
+ return code;
+ }
- public String getName() {
- return name;
- }
+ public String getName() {
+ return name;
+ }
- public String getBjw() {
- return bjw;
- }
+ public String getBjw() {
+ return bjw;
+ }
- public static String getName(String code) {
- if(null == code) return null;
+ public static String getName(String code) {
+ if (null == code) return null;
- if(ShAreaBjw.BJW_310101.getCode().equals(code)) return ShAreaBjw.BJW_310101.getName();
- if(ShAreaBjw.BJW_310104.getCode().equals(code)) return ShAreaBjw.BJW_310104.getName();
- if(ShAreaBjw.BJW_310105.getCode().equals(code)) return ShAreaBjw.BJW_310105.getName();
- if(ShAreaBjw.BJW_310106.getCode().equals(code)) return ShAreaBjw.BJW_310106.getName();
- if(ShAreaBjw.BJW_310107.getCode().equals(code)) return ShAreaBjw.BJW_310107.getName();
- if(ShAreaBjw.BJW_310109.getCode().equals(code)) return ShAreaBjw.BJW_310109.getName();
- if(ShAreaBjw.BJW_310110.getCode().equals(code)) return ShAreaBjw.BJW_310110.getName();
- if(ShAreaBjw.BJW_310112.getCode().equals(code)) return ShAreaBjw.BJW_310112.getName();
- if(ShAreaBjw.BJW_310113.getCode().equals(code)) return ShAreaBjw.BJW_310113.getName();
- if(ShAreaBjw.BJW_310114.getCode().equals(code)) return ShAreaBjw.BJW_310114.getName();
- if(ShAreaBjw.BJW_310115.getCode().equals(code)) return ShAreaBjw.BJW_310115.getName();
- if(ShAreaBjw.BJW_310116.getCode().equals(code)) return ShAreaBjw.BJW_310116.getName();
- if(ShAreaBjw.BJW_310117.getCode().equals(code)) return ShAreaBjw.BJW_310117.getName();
- if(ShAreaBjw.BJW_310118.getCode().equals(code)) return ShAreaBjw.BJW_310118.getName();
- if(ShAreaBjw.BJW_310120.getCode().equals(code)) return ShAreaBjw.BJW_310120.getName();
- if(ShAreaBjw.BJW_310151.getCode().equals(code)) return ShAreaBjw.BJW_310151.getName();
+ if (ShAreaBjw.BJW_310101.getCode().equals(code)) return ShAreaBjw.BJW_310101.getName();
+ if (ShAreaBjw.BJW_310104.getCode().equals(code)) return ShAreaBjw.BJW_310104.getName();
+ if (ShAreaBjw.BJW_310105.getCode().equals(code)) return ShAreaBjw.BJW_310105.getName();
+ if (ShAreaBjw.BJW_310106.getCode().equals(code)) return ShAreaBjw.BJW_310106.getName();
+ if (ShAreaBjw.BJW_310107.getCode().equals(code)) return ShAreaBjw.BJW_310107.getName();
+ if (ShAreaBjw.BJW_310109.getCode().equals(code)) return ShAreaBjw.BJW_310109.getName();
+ if (ShAreaBjw.BJW_310110.getCode().equals(code)) return ShAreaBjw.BJW_310110.getName();
+ if (ShAreaBjw.BJW_310112.getCode().equals(code)) return ShAreaBjw.BJW_310112.getName();
+ if (ShAreaBjw.BJW_310113.getCode().equals(code)) return ShAreaBjw.BJW_310113.getName();
+ if (ShAreaBjw.BJW_310114.getCode().equals(code)) return ShAreaBjw.BJW_310114.getName();
+ if (ShAreaBjw.BJW_310115.getCode().equals(code)) return ShAreaBjw.BJW_310115.getName();
+ if (ShAreaBjw.BJW_310116.getCode().equals(code)) return ShAreaBjw.BJW_310116.getName();
+ if (ShAreaBjw.BJW_310117.getCode().equals(code)) return ShAreaBjw.BJW_310117.getName();
+ if (ShAreaBjw.BJW_310118.getCode().equals(code)) return ShAreaBjw.BJW_310118.getName();
+ if (ShAreaBjw.BJW_310120.getCode().equals(code)) return ShAreaBjw.BJW_310120.getName();
+ if (ShAreaBjw.BJW_310151.getCode().equals(code)) return ShAreaBjw.BJW_310151.getName();
- return code;
- }
+ return code;
+ }
- public static String getBjw(String code) {
- if(null == code) return null;
+ public static String getBjw(String code) {
+ if (null == code) return null;
- if(ShAreaBjw.BJW_310101.getCode().equals(code)) return ShAreaBjw.BJW_310101.getBjw();
- if(ShAreaBjw.BJW_310104.getCode().equals(code)) return ShAreaBjw.BJW_310104.getBjw();
- if(ShAreaBjw.BJW_310105.getCode().equals(code)) return ShAreaBjw.BJW_310105.getBjw();
- if(ShAreaBjw.BJW_310106.getCode().equals(code)) return ShAreaBjw.BJW_310106.getBjw();
- if(ShAreaBjw.BJW_310107.getCode().equals(code)) return ShAreaBjw.BJW_310107.getBjw();
- if(ShAreaBjw.BJW_310109.getCode().equals(code)) return ShAreaBjw.BJW_310109.getBjw();
- if(ShAreaBjw.BJW_310110.getCode().equals(code)) return ShAreaBjw.BJW_310110.getBjw();
- if(ShAreaBjw.BJW_310112.getCode().equals(code)) return ShAreaBjw.BJW_310112.getBjw();
- if(ShAreaBjw.BJW_310113.getCode().equals(code)) return ShAreaBjw.BJW_310113.getBjw();
- if(ShAreaBjw.BJW_310114.getCode().equals(code)) return ShAreaBjw.BJW_310114.getBjw();
- if(ShAreaBjw.BJW_310115.getCode().equals(code)) return ShAreaBjw.BJW_310115.getBjw();
- if(ShAreaBjw.BJW_310116.getCode().equals(code)) return ShAreaBjw.BJW_310116.getBjw();
- if(ShAreaBjw.BJW_310117.getCode().equals(code)) return ShAreaBjw.BJW_310117.getBjw();
- if(ShAreaBjw.BJW_310118.getCode().equals(code)) return ShAreaBjw.BJW_310118.getBjw();
- if(ShAreaBjw.BJW_310120.getCode().equals(code)) return ShAreaBjw.BJW_310120.getBjw();
- if(ShAreaBjw.BJW_310151.getCode().equals(code)) return ShAreaBjw.BJW_310151.getBjw();
+ if (ShAreaBjw.BJW_310101.getCode().equals(code)) return ShAreaBjw.BJW_310101.getBjw();
+ if (ShAreaBjw.BJW_310104.getCode().equals(code)) return ShAreaBjw.BJW_310104.getBjw();
+ if (ShAreaBjw.BJW_310105.getCode().equals(code)) return ShAreaBjw.BJW_310105.getBjw();
+ if (ShAreaBjw.BJW_310106.getCode().equals(code)) return ShAreaBjw.BJW_310106.getBjw();
+ if (ShAreaBjw.BJW_310107.getCode().equals(code)) return ShAreaBjw.BJW_310107.getBjw();
+ if (ShAreaBjw.BJW_310109.getCode().equals(code)) return ShAreaBjw.BJW_310109.getBjw();
+ if (ShAreaBjw.BJW_310110.getCode().equals(code)) return ShAreaBjw.BJW_310110.getBjw();
+ if (ShAreaBjw.BJW_310112.getCode().equals(code)) return ShAreaBjw.BJW_310112.getBjw();
+ if (ShAreaBjw.BJW_310113.getCode().equals(code)) return ShAreaBjw.BJW_310113.getBjw();
+ if (ShAreaBjw.BJW_310114.getCode().equals(code)) return ShAreaBjw.BJW_310114.getBjw();
+ if (ShAreaBjw.BJW_310115.getCode().equals(code)) return ShAreaBjw.BJW_310115.getBjw();
+ if (ShAreaBjw.BJW_310116.getCode().equals(code)) return ShAreaBjw.BJW_310116.getBjw();
+ if (ShAreaBjw.BJW_310117.getCode().equals(code)) return ShAreaBjw.BJW_310117.getBjw();
+ if (ShAreaBjw.BJW_310118.getCode().equals(code)) return ShAreaBjw.BJW_310118.getBjw();
+ if (ShAreaBjw.BJW_310120.getCode().equals(code)) return ShAreaBjw.BJW_310120.getBjw();
+ if (ShAreaBjw.BJW_310151.getCode().equals(code)) return ShAreaBjw.BJW_310151.getBjw();
- return code;
- }
+ return code;
+ }
}
--
Gitblit v1.9.3