From d490c866d02659609270472e533235705613e5ab Mon Sep 17 00:00:00 2001
From: WS <1143478319@qq.com>
Date: 星期三, 23 八月 2023 10:20:52 +0800
Subject: [PATCH] 上海接口接数据上报-轮换计划 轮换计划明细
---
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1404.java | 62 +++++++++++++++
src/main/java/com/fzzy/push/sh2023/SH2023PushService14.java | 50 ++++++++++++
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1403.java | 61 +++++++++++++++
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 33 ++++++--
4 files changed, 195 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index 7abcb9b..4694e59 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -601,17 +601,32 @@
list.add(api1401);
}
return JSON.toJSONString(list);
- }else if (SH2023Constant.SH_2023_API_CODE_1401.equals(inteId)) {
- SH2023Api1401 api1401;
+ } else if (SH2023Constant.SH_2023_API_CODE_1403.equals(inteId)) {
+ SH2023Api1403 api1403;
//鏈�鍚庤浆鎹负json
- List<SH2023Api1401> list = new ArrayList<>();
+ List<SH2023Api1403> 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);
+ List<Api1403> api1403List = castList(data, Api1403.class);
+ for (Api1403 apiData : api1403List) {
+ api1403 = new SH2023Api1403();
+ BeanUtils.copyProperties(apiData, api1403);
+ api1403.setJhzxdw(apiData.getJhxddw());
+ api1403.setJhzxdwmc(apiData.getJhxddwmc());
+ list.add(api1403);
+ }
+ return JSON.toJSONString(list);
+ } else if (SH2023Constant.SH_2023_API_CODE_1404.equals(inteId)) {
+ SH2023Api1404 api1404;
+ //鏈�鍚庤浆鎹负json
+ List<SH2023Api1404> list = new ArrayList<>();
+ //鎶奷ata杞寲鎴恖ist闆嗗悎
+ List<Api1404> api1404List = castList(data, Api1404.class);
+ for (Api1404 apiData : api1404List) {
+ api1404 = new SH2023Api1404();
+ BeanUtils.copyProperties(apiData, api1404);
+ //TODO 鏄庣粏鐘舵��
+
+ list.add(api1404);
}
return JSON.toJSONString(list);
} else {
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023PushService14.java b/src/main/java/com/fzzy/push/sh2023/SH2023PushService14.java
index c77ce45..cceda4a 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023PushService14.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023PushService14.java
@@ -6,9 +6,12 @@
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.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 lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -30,6 +33,10 @@
private SH2023ApiRemoteService apiRemoteService;
@Autowired
private Api1401Rep api1401Rep;
+ @Autowired
+ private Api1403Rep api1403Rep;
+ @Autowired
+ private Api1404Rep api1404Rep;
@Override
public String getProtocol() {
@@ -87,7 +94,26 @@
* 1403 杞崲璁″垝淇℃伅
*/
public void pushData1403(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //鑾峰彇鍌ㄥ瑙勬ā
+ List<Api1403> list = api1403Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
+
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌鍌ㄥ瑙勬ā锛屼笉鎺ㄩ��-----");
+ return;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1403);
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1403 data : list) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1403Rep.save(data);
+ }
+ }
+ }
}
@@ -95,7 +121,27 @@
* 1404 杞崲璁″垝鏄庣粏淇℃伅
*/
public void pushData1404(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);
+ }
+ }
+ }
}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1403.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1403.java
new file mode 100644
index 0000000..34c449b
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1403.java
@@ -0,0 +1,61 @@
+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 SH2023Api1403 implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+
+ @PropertyDef(label = "杞崲璁″垝鍗曞彿")
+ private String lhjhdh;
+
+ @PropertyDef(label = "璁″垝鏂囧彿")
+ private String jhwh;
+
+ @PropertyDef(label = "璁″垝鍚嶇О")
+ private String jhmc;
+
+ @PropertyDef(label = "璁″垝骞村害")
+ private String jhnd;
+
+ @PropertyDef(label = "寮�濮嬫墽琛屾棩鏈�")
+ private Date kszxrq;
+
+ @PropertyDef(label = "鎴鎵ц鏃ユ湡")
+ private Date jzzxrq;
+
+ @PropertyDef(label = "璁″垝鎵ц鍗曚綅")
+ private String jhzxdw;
+
+ @PropertyDef(label = "璁″垝鎵ц鍗曚綅鍚嶇О")
+ private String jhzxdwmc;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "璁″垝涓嬭揪鏃堕棿")
+ private Date jhxdsj;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ private Date zhgxsj;
+
+
+}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1404.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1404.java
new file mode 100644
index 0000000..a844a58
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1404.java
@@ -0,0 +1,62 @@
+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 SH2023Api1404 implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+
+ @PropertyDef(label = "璁″垝鏄庣粏鍗曞彿")
+ private String jhmxdh;
+
+ @PropertyDef(label = "杞崲璁″垝鍗曞彿")
+ private String lhjhdh;
+
+ @PropertyDef(label = "绮鍝佺浠ｇ爜")
+ private String lspzdm;
+
+ @PropertyDef(label = "绮绛夌骇浠ｇ爜")
+ private String lsdjdm;
+
+ @PropertyDef(label = "绮鎬ц川浠ｇ爜")
+ private String lsxzdm;
+
+ @PropertyDef(label = "鏀惰幏骞村害")
+ private String shnd;
+
+ @PropertyDef(label = "杞崲璐т綅浠ｇ爜")
+ private String lhhwdm;
+
+ @PropertyDef(label = "杞崲鏁伴噺")
+ private Double lhsl;
+
+ @PropertyDef(label = "杞崲绫诲瀷")
+ private String lhlx;
+
+ @PropertyDef(label = "鏄庣粏鐘舵��" , description = "0锛氫綔搴燂紱1锛氭湁鏁�")
+ private String mxzt;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ private Date zhgxsj;
+
+}
--
Gitblit v1.9.3