From e9b99385b9ce0883e6c4993b7e8f854404c14a41 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期三, 25 十月 2023 19:51:45 +0800
Subject: [PATCH] 调整上海接口-视频监控接口
---
src/main/java/com/fzzy/otherview/sh2023/pr/SHApi1311PR.java | 23 +++++++++++------------
src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java | 2 +-
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 9 +++++++++
3 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
index 6cafadf..126b510 100644
--- a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
+++ b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
@@ -85,7 +85,7 @@
fzzySync1207.syncData(kqdm, deptId, start, end);
//鍑哄叆搴撴枃浠朵俊鎭悓姝�
-// fzzySync1109.syncData(kqdm, deptId, start, end);
+ fzzySync1109.syncData(kqdm, deptId, start, end);
//绮搴撳瓨鍚屾
fzzySync1208.syncData(kqdm, deptId, start, end);
diff --git a/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi1311PR.java b/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi1311PR.java
index 45c9c3a..8d0872d 100644
--- a/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi1311PR.java
+++ b/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi1311PR.java
@@ -113,7 +113,7 @@
public void saveData(SH2023Api1311 data) {
ApiInfoData infoData;
- List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_1311, data.getSpjksbid(),data.getKqdm());
+ List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_1311, data.getSpjksbid(), data.getKqdm());
if (apiInfoList.size() != 0) {
infoData = apiInfoList.get(0);
infoData.setData(JSON.toJSONString(data));
@@ -137,7 +137,7 @@
*/
@Expose
public void delData(SH2023Api1311 data) {
- List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_1311, data.getSpjksbid(),data.getKqdm());
+ List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_1311, data.getSpjksbid(), data.getKqdm());
apiInfoDataRep.deleteById(apiInfoList.get(0).getId());
}
@@ -149,7 +149,7 @@
if (null == data) {
return "鏃犳暟鎹墽琛�";
}
- List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_1311, data.getSpjksbid(),data.getKqdm());
+ List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_1311, data.getSpjksbid(), data.getKqdm());
data.setCzbz(Constant.CZBZ_D);
apiInfoDataRep.updateStatus(apiInfoList.get(0).getId(), JSON.toJSONString(data), Constant.CZBZ_D);
return null;
@@ -157,11 +157,11 @@
/**
- * sHApi1311PR#delUpdate
+ * sHApi1311PR#delUpdate
*/
@Expose
public String pushData(List<SH2023Api1311> items) {
- ResponseDto responseDto;
+
String result = "";
String kqdm = items.get(0).getKqdm();
@@ -180,15 +180,14 @@
return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
}
- //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
- responseDto = apiService.pushData(param, apiConf, items);
- if (responseDto.getSuccess() == 0) {
- //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
- ApiInfoData infoData;
- for (SH2023Api1311 data : items) {
+ ApiInfoData infoData;
+ ResponseDto responseDto;
+ for (SH2023Api1311 data : items) {
+ responseDto = apiService.pushData(param, apiConf, data);
+ if (responseDto.getSuccess() == 0) {
if (Constant.CZBZ_I.equals(data.getCzbz())) {
//鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
- List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_1311, data.getSpjksbid(),data.getKqdm());
+ List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_1311, data.getSpjksbid(), data.getKqdm());
data.setCzbz(Constant.CZBZ_U);
infoData = apiInfoList.get(0);
infoData.setUpdateTime(new Date());
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index b007083..cef14d7 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -662,6 +662,15 @@
changeObject(api1310);
return api1310;
}
+ if (SH2023Constant.SH_2023_API_CODE_1311.equals(inteId)) {
+ SH2023Api1311 api1311 = new SH2023Api1311();
+ BeanUtils.copyProperties(data, api1311);
+ api1311.setBjw(ShAreaBjw.getBjw(code));
+
+ //璁剧疆绌哄睘鎬т负榛樿鍊�
+ changeObject(api1311);
+ return api1311;
+ }
if (SH2023Constant.SH_2023_API_CODE_1401.equals(inteId)) {
SH2023Api1401 api1401 = new SH2023Api1401();
BeanUtils.copyProperties(data, api1401);
--
Gitblit v1.9.3