From 404689ed75b3782630e577ed4212b0997580d29e Mon Sep 17 00:00:00 2001
From: WS <1143478319@qq.com>
Date: 星期四, 17 八月 2023 18:58:24 +0800
Subject: [PATCH] 提交熏蒸 通风 数据上报
---
src/main/java/com/fzzy/api/view/repository/Api1305Rep.java | 12 ++++++
src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java | 6 +-
src/main/java/com/fzzy/api/view/repository/Api1306Rep.java | 12 ++++++
src/main/java/com/fzzy/push/gd2022/GD2022PushService13.java | 6 +++
src/main/java/com/fzzy/push/impl/ComPushService13.java | 63 +++++++++++++++++++++++++++++--
5 files changed, 92 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1305Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1305Rep.java
index a11adcd..1994f9e 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1305Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1305Rep.java
@@ -4,9 +4,12 @@
import com.fzzy.api.entity.Api1306;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
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;
@@ -14,4 +17,13 @@
@Query("from Api1305 where tfzydh=:tfzydh ")
List<Api1305> getDataById(@Param("tfzydh") String tfzydh);
+
+ @Transactional
+ @Modifying
+ @Query("update Api1305 set czbz =:czbz where tfzydh=:tfzydh")
+ void updateStatus(@Param("tfzydh") String tfzydh, @Param("czbz") String czbz);
+
+ @Query("from Api1305 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Api1305> findPushDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
+
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1306Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1306Rep.java
index 215d8b4..f8aed5e 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1306Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1306Rep.java
@@ -1,12 +1,16 @@
package com.fzzy.api.view.repository;
import com.fzzy.api.entity.Api1203;
+import com.fzzy.api.entity.Api1305;
import com.fzzy.api.entity.Api1306;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
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;
@@ -15,4 +19,12 @@
@Query("from Api1306 where xzzydh=:xzzydh ")
List<Api1306> getDataById(@Param("xzzydh") String xzzydh);
+ @Transactional
+ @Modifying
+ @Query("update Api1306 set czbz =:czbz where xzzydh=:xzzydh")
+ void updateStatus(@Param("xzzydh") String xzzydh, @Param("czbz") String czbz);
+
+ @Query("from Api1306 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Api1306> findPushDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
+
}
diff --git a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java
index f69a35d..13f0fc2 100644
--- a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java
+++ b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java
@@ -50,13 +50,13 @@
//璐ㄦ鍚屾
fzzySync1310.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
- //閫氶浣滀笟淇℃伅鍚屾 TODO
+ //閫氶浣滀笟淇℃伅鍚屾
fzzySync1305.syncData(param.getDeptId(), param.getStart(), param.getEnd());
- //鐔忚捀浣滀笟淇℃伅鍚屾 TODO
+ //鐔忚捀浣滀笟淇℃伅鍚屾
fzzySync1306.syncData(param.getDeptId(), param.getStart(), param.getEnd());
- //鐔忚捀澶囨鏁版嵁鍚屾 TODO--寰呭畾
+ //鐔忚捀澶囨鏁版嵁鍚屾
}
diff --git a/src/main/java/com/fzzy/push/gd2022/GD2022PushService13.java b/src/main/java/com/fzzy/push/gd2022/GD2022PushService13.java
index b96d574..73395c9 100644
--- a/src/main/java/com/fzzy/push/gd2022/GD2022PushService13.java
+++ b/src/main/java/com/fzzy/push/gd2022/GD2022PushService13.java
@@ -43,6 +43,12 @@
//璐ㄦ
pushService.pushData1310(apiRemoteService, param);
+
+ //閫氶
+ pushService.pushData1305(apiRemoteService, param);
+
+ //鐔忚捀
+ pushService.pushData1306(apiRemoteService, param);
}
}
diff --git a/src/main/java/com/fzzy/push/impl/ComPushService13.java b/src/main/java/com/fzzy/push/impl/ComPushService13.java
index 5301a70..8097914 100644
--- a/src/main/java/com/fzzy/push/impl/ComPushService13.java
+++ b/src/main/java/com/fzzy/push/impl/ComPushService13.java
@@ -5,10 +5,7 @@
import com.fzzy.api.dto.ResponseDto;
import com.fzzy.api.entity.*;
import com.fzzy.api.service.ApiRemoteService;
-import com.fzzy.api.view.repository.Api1302Rep;
-import com.fzzy.api.view.repository.Api1303Rep;
-import com.fzzy.api.view.repository.Api1304Rep;
-import com.fzzy.api.view.repository.Api1310Rep;
+import com.fzzy.api.view.repository.*;
import com.fzzy.push.shjdjw2023.ShjdjwApiRemoteService2023;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -31,6 +28,10 @@
private Api1303Rep apiRep1303;
@Autowired
private Api1304Rep apiRep1304;
+ @Autowired
+ private Api1305Rep apiRep1305;
+ @Autowired
+ private Api1306Rep apiRep1306;
@Autowired
private Api1310Rep apiRep1310;
@@ -89,6 +90,60 @@
}
}
+ public void pushData1305(ApiRemoteService apiRemoteService, ApiParam param) {
+
+ //鑾峰彇闇�瑕佹帹閫佺殑鏁版嵁
+ List<Api1305> items = apiRep1305.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
+
+ if (null == items || items.isEmpty()) {
+ log.info("-------------娌℃湁閫氶浣滀笟鏁版嵁闇�瑕佹帹閫�-----------");
+ return;
+ }
+
+ param.setInteCategory(Constant.API_CATEGORY_13);
+ param.setInteId(Constant.API_CODE_1305);
+
+ ResponseDto responseDto;
+
+ for (Api1305 data : items) {
+ param.setBizId(data.getBizId());
+ responseDto = apiRemoteService.pushData(param, data);
+
+ if (responseDto.getSuccess() == 0) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ apiRep1305.updateStatus(data.getTfzydh(), Constant.CZBZ_U);
+ }
+ }
+ }
+ }
+
+ public void pushData1306(ApiRemoteService apiRemoteService, ApiParam param) {
+
+ //鑾峰彇闇�瑕佹帹閫佺殑鏁版嵁
+ List<Api1306> items = apiRep1306.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
+
+ if (null == items || items.isEmpty()) {
+ log.info("-------------娌℃湁鐔忚捀浣滀笟鏁版嵁闇�瑕佹帹閫�-----------");
+ return;
+ }
+
+ param.setInteCategory(Constant.API_CATEGORY_13);
+ param.setInteId(Constant.API_CODE_1306);
+
+ ResponseDto responseDto;
+
+ for (Api1306 data : items) {
+ param.setBizId(data.getBizId());
+ responseDto = apiRemoteService.pushData(param, data);
+
+ if (responseDto.getSuccess() == 0) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ apiRep1306.updateStatus(data.getXzzydh(), Constant.CZBZ_U);
+ }
+ }
+ }
+ }
+
public void pushData1303(ApiRemoteService apiRemoteService, ApiParam param) {
//鑾峰彇闇�瑕佹帹閫佺殑鏁版嵁
--
Gitblit v1.9.3