From 4b7eb0c1ff7bed6cdfdf19b19b992efa943aee6e Mon Sep 17 00:00:00 2001
From: WS <1143478319@qq.com>
Date: 星期三, 23 八月 2023 17:59:49 +0800
Subject: [PATCH] 上海接口接数据上报
---
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2102.java | 53 +++
src/main/java/com/fzzy/api/view/repository/Api1402Rep.java | 9
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1210.java | 81 +++++
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2203.java | 2
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1402.java | 70 +++++
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1405.java | 13
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 155 ++++++++++
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1211.java | 71 +++++
src/main/java/com/fzzy/push/sh2023/SH2023PushService14.java | 122 +++++++-
src/main/java/com/fzzy/api/view/repository/Api1405Rep.java | 9
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1207.java | 71 +++++
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1209.java | 110 +++++++
src/main/java/com/fzzy/push/sh2023/SH2023PushService12.java | 67 ++++
13 files changed, 803 insertions(+), 30 deletions(-)
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1402Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1402Rep.java
index bce906e..fce9bc7 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1402Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1402Rep.java
@@ -1,10 +1,19 @@
package com.fzzy.api.view.repository;
+import com.fzzy.api.entity.Api1401;
import com.fzzy.api.entity.Api1402;
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 Api1402Rep extends JpaRepository<Api1402, String>, JpaSpecificationExecutor<Api1402> {
+ @Query("from Api1402 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Api1402> findPushDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
+
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1405Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1405Rep.java
index ded483d..69d780b 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1405Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1405Rep.java
@@ -1,10 +1,19 @@
package com.fzzy.api.view.repository;
+import com.fzzy.api.entity.Api1402;
import com.fzzy.api.entity.Api1405;
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 Api1405Rep extends JpaRepository<Api1405, String>, JpaSpecificationExecutor<Api1405> {
+ @Query("from Api1405 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Api1405> findPushDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
+
}
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index 4694e59..03999ed 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -277,14 +277,13 @@
SH2023Api1109 api1109;
//鏈�鍚庤浆鎹负json
List<SH2023Api1109> list = new ArrayList<>();
- FileUtil file;
+ FileUtil file = new FileUtil();
//鎶奷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);
}
@@ -439,6 +438,23 @@
list.add(api1206);
}
return JSON.toJSONString(list);
+ } else if (SH2023Constant.SH_2023_API_CODE_1207.equals(inteId)) {
+ SH2023Api1207 api1207;
+ //鏈�鍚庤浆鎹负json
+ List<SH2023Api1207> list = new ArrayList<>();
+ //鎶奷ata杞寲鎴恖ist闆嗗悎
+ List<Api1207> api1207List = castList(data, Api1207.class);
+ for (Api1207 apiData : api1207List) {
+ api1207 = new SH2023Api1207();
+ BeanUtils.copyProperties(apiData, api1207);
+
+ api1207.setDcrq(apiData.getDcrq());
+ api1207.setBjw(ShAreaBjw.getBjw(code));
+ //TODO 搴撹皟鍗曞彿
+
+ list.add(api1207);
+ }
+ return JSON.toJSONString(list);
} else if (SH2023Constant.SH_2023_API_CODE_1208.equals(inteId)) {
SH2023Api1208 api1208;
//鏈�鍚庤浆鎹负json
@@ -455,6 +471,55 @@
api1208.setBjw(ShAreaBjw.getBjw(code));
api1208.setPch(apiData.getHwdm() + apiData.getShnd());
list.add(api1208);
+ }
+ return JSON.toJSONString(list);
+ } else if (SH2023Constant.SH_2023_API_CODE_1209.equals(inteId)) {
+ SH2023Api1209 api1209;
+ //鏈�鍚庤浆鎹负json
+ List<SH2023Api1209> list = new ArrayList<>();
+ //鎶奷ata杞寲鎴恖ist闆嗗悎
+ List<Api1209> api1209List = castList(data, Api1209.class);
+ for (Api1209 apiData : api1209List) {
+ api1209 = new SH2023Api1209();
+ BeanUtils.copyProperties(apiData, api1209);
+ // TODO 璁拌处鏃ユ湡 鍗曟嵁绫诲瀷
+
+ api1209.setSzjl(apiData.getQzszkl());
+ api1209.setZrshde(apiData.getQzzrshde());
+ api1209.setBjw(ShAreaBjw.getBjw(code));
+ api1209.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getYwrq(), "yyyy"));
+ list.add(api1209);
+ }
+ return JSON.toJSONString(list);
+ } else if (SH2023Constant.SH_2023_API_CODE_1210.equals(inteId)) {
+ SH2023Api1210 api1210;
+ //鏈�鍚庤浆鎹负json
+ List<SH2023Api1210> list = new ArrayList<>();
+ //鎶奷ata杞寲鎴恖ist闆嗗悎
+ List<Api1210> api1210List = castList(data, Api1210.class);
+ for (Api1210 apiData : api1210List) {
+ api1210 = new SH2023Api1210();
+ BeanUtils.copyProperties(apiData, api1210);
+
+ api1210.setBjw(ShAreaBjw.getBjw(code));
+ api1210.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getHzrq(), "yyyy"));
+ list.add(api1210);
+ }
+ return JSON.toJSONString(list);
+ } else if (SH2023Constant.SH_2023_API_CODE_1211.equals(inteId)) {
+ SH2023Api1211 api1211;
+ //鏈�鍚庤浆鎹负json
+ List<SH2023Api1211> list = new ArrayList<>();
+ //鎶奷ata杞寲鎴恖ist闆嗗悎
+ List<Api1211> api1211List = castList(data, Api1211.class);
+ for (Api1211 apiData : api1211List) {
+ api1211 = new SH2023Api1211();
+ BeanUtils.copyProperties(apiData, api1211);
+
+ //TODO 璐т綅浠ｇ爜 绮鎬ц川浠ｇ爜 鏉ョ伯浠ｇ爜
+
+ api1211.setBjw(ShAreaBjw.getBjw(code));
+ list.add(api1211);
}
return JSON.toJSONString(list);
} else if (SH2023Constant.SH_2023_API_CODE_1212.equals(inteId)) {
@@ -601,6 +666,19 @@
list.add(api1401);
}
return JSON.toJSONString(list);
+ } else if (SH2023Constant.SH_2023_API_CODE_1402.equals(inteId)) {
+ SH2023Api1402 api1402;
+ //鏈�鍚庤浆鎹负json
+ List<SH2023Api1402> list = new ArrayList<>();
+ //鎶奷ata杞寲鎴恖ist闆嗗悎
+ List<Api1402> api1402List = castList(data, Api1402.class);
+ for (Api1402 apiData : api1402List) {
+ api1402 = new SH2023Api1402();
+ BeanUtils.copyProperties(apiData, api1402);
+ api1402.setBjw(ShAreaBjw.getBjw(code));
+ list.add(api1402);
+ }
+ return JSON.toJSONString(list);
} else if (SH2023Constant.SH_2023_API_CODE_1403.equals(inteId)) {
SH2023Api1403 api1403;
//鏈�鍚庤浆鎹负json
@@ -629,6 +707,79 @@
list.add(api1404);
}
return JSON.toJSONString(list);
+ }
+// TODO 椤圭洰淇℃伅
+// else if (SH2023Constant.SH_2023_API_CODE_1405.equals(inteId)) {
+// SH2023Api1405 api1405;
+// //鏈�鍚庤浆鎹负json
+// List<SH2023Api1405> list = new ArrayList<>();
+// //鎶奷ata杞寲鎴恖ist闆嗗悎
+// List<Api1405> api1405List = castList(data, Api1405.class);
+// for (Api1405 apiData : api1405List) {
+// api1405 = new SH2023Api1405();
+// BeanUtils.copyProperties(apiData, api1405);
+//
+// list.add(api1405);
+// }
+// return JSON.toJSONString(list);
+// }
+ else if (SH2023Constant.SH_2023_API_CODE_2102.equals(inteId)) {
+ SH2023Api2102 api2102;
+ //鏈�鍚庤浆鎹负json
+ List<SH2023Api2102> list = new ArrayList<>();
+ //鎶奷ata杞寲鎴恖ist闆嗗悎
+ List<Api1207> api1207List = castList(data, Api1207.class);
+ for (Api1207 apiData : api1207List) {
+ api2102 = new SH2023Api2102();
+ BeanUtils.copyProperties(apiData, api2102);
+ api2102.setDrdh(apiData.getDcdh());
+ api2102.setDcrq(apiData.getDcrq());
+ api2102.setPch(api2102.getDrhwdm() + DateFormatUtils.format(apiData.getDcrq(), "yyyy"));
+ api2102.setBjw(ShAreaBjw.getBjw(code));
+ //TODO 搴撹皟鍗曞彿
+
+ list.add(api2102);
+ }
+ return JSON.toJSONString(list);
+ } else if (SH2023Constant.SH_2023_API_CODE_2203.equals(inteId)) {
+ SH2023Api2203 api2203;
+ //鏈�鍚庤浆鎹负json
+ List<SH2023Api2203> list = new ArrayList<>();
+ //鎶奷ata杞寲鎴恖ist闆嗗悎
+ List<Api1201> api1201List = castList(data, Api1201.class);
+ for (Api1201 apiData : api1201List) {
+ api2203 = new SH2023Api2203();
+ BeanUtils.copyProperties(apiData, api2203);
+ api2203.setHtbh(apiData.getHth());
+
+// api2203.setBdh();
+ api2203.setCjrq(apiData.getQdrq());
+// api2203.setJyzt();
+// api2203.setLsxz();
+// api2203.setLspzmx();
+// api2203.setScnf();
+// api2203.setKd();
+ //
+ list.add(api2203);
+ }
+ return JSON.toJSONString(list);
+ }else if (SH2023Constant.SH_2023_API_CODE_2204.equals(inteId)) {
+ SH2023Api2204 api2204;
+ //鏈�鍚庤浆鎹负json
+ List<SH2023Api2204> list = new ArrayList<>();
+ //鎶奷ata杞寲鎴恖ist闆嗗悎
+ List<Api1310> api1310List = castList(data, Api1310.class);
+ for (Api1310 apiData : api1310List) {
+ api2204 = new SH2023Api2204();
+ BeanUtils.copyProperties(apiData, api2204);
+// api2204.setSf();
+// api2204.setRksf();
+// api2204.setlldm();
+ api2204.setBjw(ShAreaBjw.getBjw(code));
+ api2204.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getJysj(), "yyyy"));
+ list.add(api2204);
+ }
+ return JSON.toJSONString(list);
} else {
return JSON.toJSONString(data);
}
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023PushService12.java b/src/main/java/com/fzzy/push/sh2023/SH2023PushService12.java
index 0340836..ecd3ff4 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023PushService12.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023PushService12.java
@@ -10,6 +10,7 @@
import com.fzzy.api.service.PushService11;
import com.fzzy.api.view.repository.*;
import com.fzzy.otherview.sh2023.dto.ShApi2101;
+import com.fzzy.push.sh2023.dto.SH2023Api1401;
import com.fzzy.push.sh2023.dto.SH2023Api2101;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -265,7 +266,27 @@
* 1207 鍊掍粨鍊掑嚭
*/
public void pushData1207(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //鑾峰彇鍊掍粨淇℃伅
+ List<Api1207> list = api1207Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
+
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌鍊掍粨淇℃伅锛屼笉鎺ㄩ��-----");
+ return;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1207);
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1207 data : list) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1207Rep.save(data);
+ }
+ }
+ }
}
@@ -301,7 +322,28 @@
* 1209 鎹熸孩鍗�
*/
public void pushData1209(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //鑾峰彇鎹熺泭鍗曚俊鎭�
+ List<Api1209> list = api1209Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
+
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌绮搴撳瓨淇℃伅锛屼笉鎺ㄩ��-----");
+ return;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1209);
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1209 data : list) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1209Rep.save(data);
+ }
+ }
+ }
+
}
@@ -309,8 +351,27 @@
* 1210 绮鎬ц川杞彉鍗�
*/
public void pushData1210(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //绮鎬ц川杞彉鍗�
+ List<Api1210> list = api1210Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌绮搴撳瓨淇℃伅锛屼笉鎺ㄩ��-----");
+ return;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1210);
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1210 data : list) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1210Rep.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 cceda4a..7e0ba90 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023PushService14.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023PushService14.java
@@ -4,14 +4,10 @@
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.entity.Api1403;
+import com.fzzy.api.entity.*;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.service.PushService11;
-import com.fzzy.api.view.repository.Api1401Rep;
-import com.fzzy.api.view.repository.Api1403Rep;
-import com.fzzy.api.view.repository.Api1404Rep;
+import com.fzzy.api.view.repository.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -34,9 +30,17 @@
@Autowired
private Api1401Rep api1401Rep;
@Autowired
+ private Api1402Rep api1402Rep;
+ @Autowired
private Api1403Rep api1403Rep;
@Autowired
private Api1404Rep api1404Rep;
+ @Autowired
+ private Api1405Rep api1405Rep;
+ @Autowired
+ private Api1201Rep api1201Rep;
+ @Autowired
+ private Api1310Rep api1310Rep;
@Override
public String getProtocol() {
@@ -86,7 +90,27 @@
* 1402 鍌ㄥ璁″垝淇℃伅
*/
public void pushData1402(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //鑾峰彇鍌ㄥ璁″垝
+ List<Api1402> list = api1402Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
+
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌鍌ㄥ璁″垝锛屼笉鎺ㄩ��-----");
+ return;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1402);
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1402 data : list) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1402Rep.save(data);
+ }
+ }
+ }
}
@@ -94,11 +118,11 @@
* 1403 杞崲璁″垝淇℃伅
*/
public void pushData1403(ApiRemoteService apiRemoteService, ApiParam param) {
- //鑾峰彇鍌ㄥ瑙勬ā
+ //鑾峰彇杞崲璁″垝
List<Api1403> list = api1403Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == list || list.isEmpty()) {
- log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌鍌ㄥ瑙勬ā锛屼笉鎺ㄩ��-----");
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌杞崲璁″垝锛屼笉鎺ㄩ��-----");
return;
}
param.setInteId(SH2023Constant.SH_2023_API_CODE_1403);
@@ -121,24 +145,24 @@
* 1404 杞崲璁″垝鏄庣粏淇℃伅
*/
public void pushData1404(ApiRemoteService apiRemoteService, ApiParam param) {
- ///鑾峰彇鍌ㄥ瑙勬ā
- List<Api1401> list = api1401Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
+ //鑾峰彇杞崲璁″垝鏄庣粏
+ List<Api1404> list = api1404Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == list || list.isEmpty()) {
- log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌鍌ㄥ瑙勬ā锛屼笉鎺ㄩ��-----");
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌杞崲璁″垝鏄庣粏锛屼笉鎺ㄩ��-----");
return;
}
- param.setInteId(SH2023Constant.SH_2023_API_CODE_1401);
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1404);
//鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
ResponseDto responseDto = apiRemoteService.pushData(param, list);
if (responseDto.getSuccess() == 0) {
//鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
- for (Api1401 data : list) {
+ for (Api1404 data : list) {
if (Constant.CZBZ_I.equals(data.getCzbz())) {
data.setCzbz(Constant.CZBZ_U);
//鏇存柊鐘舵��
- api1401Rep.save(data);
+ api1404Rep.save(data);
}
}
}
@@ -149,7 +173,28 @@
* 1405 椤圭洰淇℃伅
*/
public void pushData1405(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+// TODO 椤圭洰淇℃伅 寰呭畾
+// //鑾峰彇椤圭洰淇℃伅
+// List<Api1405> list = api1405Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
+//
+// if (null == list || list.isEmpty()) {
+// log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌椤圭洰淇℃伅锛屼笉鎺ㄩ��-----");
+// return;
+// }
+// param.setInteId(SH2023Constant.SH_2023_API_CODE_1405);
+// //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+// ResponseDto responseDto = apiRemoteService.pushData(param, list);
+// if (responseDto.getSuccess() == 0) {
+// //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+// for (Api1405 data : list) {
+// if (Constant.CZBZ_I.equals(data.getCzbz())) {
+//
+// data.setCzbz(Constant.CZBZ_U);
+// //鏇存柊鐘舵��
+// api1405Rep.save(data);
+// }
+// }
+// }
}
@@ -157,7 +202,28 @@
* 2203 浜ゆ槗涓績鍚堝悓
*/
public void pushData2203(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_2203);
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ 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);
+ }
+ }
+ }
+
}
@@ -165,7 +231,27 @@
* 2204 瀹氬寲姘存楠�
*/
public void pushData2204(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_2204);
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ 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);
+ }
+ }
+ }
}
}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1207.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1207.java
new file mode 100644
index 0000000..ef7a2dd
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1207.java
@@ -0,0 +1,71 @@
+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 java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鎺ュ彛琛�-鍊掍粨鍊掑嚭淇℃伅
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SH2023Api1207 implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = -8778664614878279565L;
+
+ @PropertyDef(label = "鍊掑嚭鍗曞彿")
+ private String dcdh;
+
+ @PropertyDef(label = "鍊掍粨绫诲瀷")
+ private String dclx;
+
+ @PropertyDef(label = "鍊掍粨璁″垝鏂囦欢缂栧彿")
+ private String dcjhwjbh;
+
+ @PropertyDef(label = "閫氱煡鍗曞彿")
+ private String tzdh;
+
+ @PropertyDef(label = "鍊掑嚭鍗曚綅")
+ private String dcdw;
+
+ @PropertyDef(label = "绮鍝佺浠ｇ爜")
+ private String lspzdm;
+
+ @PropertyDef(label = "鍊掑嚭璐т綅浠ｇ爜")
+ private String dchwdm;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "鍊掑嚭鏃ユ湡")
+ private Date dcrq;
+
+ @PropertyDef(label = "鍊掑嚭鏁伴噺")
+ private Double dcsl;
+
+ @PropertyDef(label = "鍖呰鐗�")
+ private String bzw;
+
+ @PropertyDef(label = "鏍囧噯鍖呬欢鏁�")
+ private Integer bzbjs;
+
+ @PropertyDef(label = "瑁呭嵏浣滀笟鍗曚綅")
+ private String zxzydw;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ private Date zhgxsj;
+
+ @PropertyDef(label = "搴撹皟鍗曞彿")
+ private String kddh;
+
+ @PropertyDef(label = "鏍囪浣�")
+ private String bjw;
+}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1209.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1209.java
new file mode 100644
index 0000000..caa2853
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1209.java
@@ -0,0 +1,110 @@
+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 java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鎺ュ彛琛�-鎹熺泭鍗曚俊鎭�
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SH2023Api1209 implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = -8778664614878279565L;
+
+ @PropertyDef(label = "鎹熸孩鍗曞彿")
+ private String sydh;
+
+ @PropertyDef(label = "璐т綅浠ｇ爜")
+ private String hwdm;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "璁拌处鏃ユ湡")
+ private Date jzrq;
+
+ @PropertyDef(label = "鍏ュ簱鍑�閲�")
+ private Double rkjz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鍏ュ簱鏃堕棿")
+ private Date rksj;
+
+ @PropertyDef(label = "鍏ュ簱姘村垎")
+ private Double rksf;
+
+ @PropertyDef(label = "鍏ュ簱鏉傝川")
+ private Double rkzz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鍑哄簱鏃堕棿")
+ private Date cksj;
+
+ @PropertyDef(label = "鍑哄簱鍑�閲�")
+ private Double ckjz;
+
+ @PropertyDef(label = "鍑哄簱姘村垎")
+ private Double cksf;
+
+ @PropertyDef(label = "鍑哄簱鏉傝川")
+ private Double ckzz;
+
+ @PropertyDef(label = "鍑�閲嶆崯婧㈡暟閲�")
+ private Double jzsysl;
+
+ @PropertyDef(label = "姘存潅鍑忛噺")
+ private Double szjl;
+
+ @PropertyDef(label = "鑷劧鎹熻�楀畾棰�")
+ private Double zrshde;
+
+ @PropertyDef(label = "瓒呰�楁暟閲�")
+ private Double chsl;
+
+ @PropertyDef(label = "鎹熺泭鏄惁姝ｅ父")
+ private String sysfzc;
+
+ @PropertyDef(label = "鎹熸孩鍘熷洜")
+ private String syyy;
+
+ @PropertyDef(label = "浠撳偍瀹℃牳浜�")
+ private String ccshr;
+
+ @PropertyDef(label = "璐ㄦ瀹℃牳浜�")
+ private String zjshr;
+
+ @PropertyDef(label = "缁熻瀹℃牳浜�")
+ private String tjshr;
+
+ @PropertyDef(label = "浼氳瀹℃牳浜�")
+ private String kjshr;
+
+ @PropertyDef(label = "棰嗗瀹℃牳浜�")
+ private String ldshr;
+
+ @PropertyDef(label = "澶囨敞")
+ private String bz;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @PropertyDef(label = "鍗曟嵁绫诲瀷")
+ private String djlx;
+
+ @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/SH2023Api1210.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1210.java
new file mode 100644
index 0000000..eb3f8e6
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1210.java
@@ -0,0 +1,81 @@
+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 java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鎺ュ彛琛�-绮鎬ц川杞彉鍗曚俊鎭�
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SH2023Api1210 implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = -8778664614878279565L;
+
+ @PropertyDef(label = "绮鎬ц川杞彉鍗曞彿")
+ private String lsxzzbdh;
+
+ @PropertyDef(label = "璐т綅浠ｇ爜")
+ private String hwdm;
+
+ @PropertyDef(label = "绮鏁伴噺")
+ private Double lssl;
+
+ @PropertyDef(label = "鍒掕浆鏁伴噺")
+ private Double hzsl;
+
+ @PropertyDef(label = "鎵瑰噯鏂囧彿")
+ private String bzwh;
+
+ @PropertyDef(label = "绮鍝佺浠ｇ爜")
+ private String lspzdm;
+
+ @PropertyDef(label = "鍒掕浆鍓嶇伯椋熸�ц川浠ｇ爜")
+ private String hzqlsxzdm;
+
+ @PropertyDef(label = "鍒掕浆鍚庣伯椋熸�ц川浠ｇ爜")
+ private String hzhlsxzdm;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "鍒掕浆鏃ユ湡")
+ private Date hzrq;
+
+ @PropertyDef(label = "浠撳偍瀹℃牳浜�")
+ private String ccshr;
+
+ @PropertyDef(label = "璐ㄦ瀹℃牳浜�")
+ private String zjshr;
+
+ @PropertyDef(label = "缁熻瀹℃牳浜�")
+ private String tjshr;
+
+ @PropertyDef(label = "浼氳瀹℃牳浜�")
+ private String kjshr;
+
+ @PropertyDef(label = "棰嗗瀹℃牳浜�")
+ private String ldshr;
+
+ @PropertyDef(label = "澶囨敞")
+ private String bz;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String 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/SH2023Api1211.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1211.java
new file mode 100644
index 0000000..77489a6
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1211.java
@@ -0,0 +1,71 @@
+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 java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鎺ュ彛琛�-璐﹂潰搴撳瓨淇℃伅
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SH2023Api1211 implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = -8778664614878279565L;
+
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ private String kqdm;
+
+ @PropertyDef(label = "绮鍝佺浠ｇ爜")
+ private String lspzdm;
+
+ @PropertyDef(label = "璐т綅浠ｇ爜")
+ private String hwdm;
+
+ @PropertyDef(label = "骞村害")
+ private String nd;
+
+ @PropertyDef(label = "鏈堜唤")
+ private String yf;
+
+ @PropertyDef(label = "鏈熷垵鏁伴噺")
+ private Double qcsl;
+
+ @PropertyDef(label = "鏈湡鏀跺叆鏁伴噺")
+ private Double bqsrsl;
+
+ @PropertyDef(label = "鏈湡鏀嚭鏁伴噺")
+ private Double bqzcsl;
+
+ @PropertyDef(label = "鏈熸湯鏁伴噺")
+ private Double qmye;
+
+ @PropertyDef(label = "鏈堢粨鏍囧織")
+ private Integer yjbz;
+
+ @PropertyDef(label = "涓氬姟鏃ユ湡")
+ private Date ywrq;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ private Date zhgxsj;
+
+ @PropertyDef(label = "绮鎬ц川浠ｇ爜")
+ private String lsxzdm;
+
+ @PropertyDef(label = "鏍囪浣�")
+ private String bjw;
+
+ @PropertyDef(label = "鏉ョ伯浠ｇ爜")
+ private String lldm;
+
+}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1402.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1402.java
new file mode 100644
index 0000000..78c84e5
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1402.java
@@ -0,0 +1,70 @@
+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 java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鎺ュ彛琛�-鍌ㄥ璁″垝琛�
+ *
+ * @author chen
+ * @date 2022-09-02 16:03
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SH2023Api1402 implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+
+ @PropertyDef(label = "璁″垝鍗曞彿")
+ @Column(name = "jhdh", length = 21)
+ private String jhdh;
+
+ @PropertyDef(label = "璁″垝鏂囧彿")
+ private String jhwh;
+
+ @PropertyDef(label = "璁″垝鍚嶇О")
+ private String jhmc;
+
+ @PropertyDef(label = "璁″垝骞村害")
+ private String jhnd;
+
+ @PropertyDef(label = "鍒跺畾璁″垝鍗曚綅")
+ private String jhzddw;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "璁″垝涓嬭揪鏃堕棿")
+ private String jhxdsj;
+
+ @PropertyDef(label = "绮鍝佺浠ｇ爜")
+ private String lspzdm;
+
+ @PropertyDef(label = "绮绛夌骇浠ｇ爜")
+ private String lsdjdm;
+
+ @PropertyDef(label = "绮鎬ц川浠ｇ爜")
+ private String lsxzdm;
+
+ @PropertyDef(label = "鏁伴噺")
+ private Double sl;
+
+ @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/SH2023Api1405.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1405.java
index 30c733d..db0a256 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1405.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1405.java
@@ -93,12 +93,13 @@
@PropertyDef(label = "涓ぎ璐㈡斂璧勯噾")
private double zyczzj;
- @PropertyDef(label = "鐪佽储鏀胯祫閲�")
- private double sczzj;
-
- @JSONField(name = "sczzj01")
- @PropertyDef(label = "甯傝储鏀胯祫閲�")
- private double sczzj2;
+// 寰呭畾
+// @PropertyDef(label = "鐪佽储鏀胯祫閲�")
+// private double sczzj;
+//
+// @JSONField(name = "sczzj01")
+// @PropertyDef(label = "甯傝储鏀胯祫閲�")
+// private double sczzj2;
@PropertyDef(label = "閾惰璐锋")
private double yhdk;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2102.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2102.java
new file mode 100644
index 0000000..40523ba
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2102.java
@@ -0,0 +1,53 @@
+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 java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鎺ュ彛琛�-鍊掍粨鍊掑叆淇℃伅
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SH2023Api2102 implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = -8778664614878279565L;
+
+ @PropertyDef(label = "鍊掑叆鍗曞彿")
+ private String drdh;
+
+ @PropertyDef(label = "鍊掑叆鍗曚綅")
+ private String drdw;
+
+ @PropertyDef(label = "鍊掑叆鏁伴噺")
+ private String drhwsl;
+
+ @PropertyDef(label = "鍊掑叆璐т綅浠ｇ爜")
+ private String drhwdm;
+
+ @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 dcrq;
+
+ @PropertyDef(label = "搴撹皟鍗曞彿")
+ private String kddh;
+
+ @PropertyDef(label = "鏍囪浣�")
+ private String bjw;
+
+ @PropertyDef(label = "鎵规鍙�")
+ private String pch;
+}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2203.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2203.java
index c947cec..0809e07 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2203.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2203.java
@@ -25,7 +25,7 @@
@PropertyDef(label = "鎴愪氦鏃ユ湡")
@JSONField(format = "yyMMdd")
- private String cjrq;
+ private Date cjrq;
@PropertyDef(label = "浜ゆ槗鐘舵��")
private String jyzt;
--
Gitblit v1.9.3