From abd0a1d82cbfedcc826007f808800a4a3db58902 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期五, 15 九月 2023 18:22:02 +0800
Subject: [PATCH] 优化报文接口查询
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2103.java | 2 +-
src/main/java/com/fzzy/api/view/repository/ApiInfoDataRep.java | 1 +
src/main/java/com/fzzy/otherview/gd2022/pr/GDApi1023PR.java | 8 ++++----
src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2101PR.java | 8 ++++----
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2101.java | 4 ++--
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1311.java | 4 ++--
src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2104PR.java | 8 ++++----
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2104.java | 4 ++--
src/main/resources/application.yml | 2 +-
9 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/fzzy/api/view/repository/ApiInfoDataRep.java b/src/main/java/com/fzzy/api/view/repository/ApiInfoDataRep.java
index 565e0ff..448b740 100644
--- a/src/main/java/com/fzzy/api/view/repository/ApiInfoDataRep.java
+++ b/src/main/java/com/fzzy/api/view/repository/ApiInfoDataRep.java
@@ -51,4 +51,5 @@
*/
@Query("from ApiInfoData where inteId=:inteId and dataId=:dataId and kqdm=:kqdm")
List<ApiInfoData> getDataByInteAndData(@Param("inteId") String inteId, @Param("dataId") String dataId, @Param("kqdm") String kqdm);
+
}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1311.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1311.java
index 97bfb6f..0eba4ae 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1311.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1311.java
@@ -60,7 +60,7 @@
String secType = "01,02,03,04,05";
for (Fz40SecCamera sysData : list) {
dataID = kqdm.substring(3, 8) + "01401327" + String.format("%06d", num++);
- List<ApiInfoData> apiInfoData = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_1311, dataID);
+ List<ApiInfoData> apiInfoData = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_1311, dataID, kqdm);
if (null != apiInfoData && apiInfoData.size() > 0) {
continue;
}
@@ -106,7 +106,7 @@
infoData.setDataId(dataID);
infoData.setRemarks("瑙嗛鐩戞帶淇℃伅");
//璁剧疆鎿嶄綔鏍囧織
- apiInfoDataList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_1311, infoData.getDataId());
+ apiInfoDataList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_1311, infoData.getDataId(), kqdm);
if (null == apiInfoDataList || apiInfoDataList.isEmpty()) {
infoData.setCzbz(Constant.CZBZ_I);
} else {
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2101.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2101.java
index eecdd8c..892275e 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2101.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2101.java
@@ -83,7 +83,7 @@
bjw = ShAreaBjw.getBjw(api1102List.get(0).getXzqhdm());
}
for (Fz40InoutRecord sysData : list) {
- List<ApiInfoData> apiInfoData = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2101, sysData.getCheckId());
+ List<ApiInfoData> apiInfoData = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2101, sysData.getCheckId(), kqdm);
if (null != apiInfoData && apiInfoData.size() > 0) {
continue;
}
@@ -128,7 +128,7 @@
infoData.setRemarks("甯傚偍妫�鏂ゅ崟");
//璁剧疆鎿嶄綔鏍囧織
- apiInfoDataList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2101, infoData.getDataId());
+ apiInfoDataList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2101, infoData.getDataId(), kqdm);
if (null == apiInfoDataList || apiInfoDataList.isEmpty()) {
infoData.setCzbz(Constant.CZBZ_I);
sh2023Api2101.setCzbz(Constant.CZBZ_I);
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2103.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2103.java
index 421b69c..4afc291 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2103.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2103.java
@@ -173,7 +173,7 @@
infoData.setRemarks("绮儏璁惧閰嶇疆淇℃伅");
//璁剧疆鎿嶄綔鏍囧織
- apiInfoDataList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2103, infoData.getDataId());
+ apiInfoDataList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2103, infoData.getDataId(),kqdm);
if (null == apiInfoDataList || apiInfoDataList.isEmpty()) {
infoData.setCzbz(Constant.CZBZ_I);
} else {
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2104.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2104.java
index 91a8217..4944aab 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2104.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2104.java
@@ -83,7 +83,7 @@
bjw = ShAreaBjw.getBjw(api1102List.get(0).getXzqhdm());
}
for (Fz40InoutRecord sysData : list) {
- List<ApiInfoData> apiInfoData = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2104, sysData.getId().substring(2));
+ List<ApiInfoData> apiInfoData = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2104, sysData.getId().substring(2),kqdm);
if (null != apiInfoData && apiInfoData.size() > 0) {
continue;
}
@@ -121,7 +121,7 @@
infoData.setRemarks("甯傚偍椹宠繍鍗�");
//璁剧疆鎿嶄綔鏍囧織
- apiInfoDataList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2104, infoData.getDataId());
+ apiInfoDataList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2104, infoData.getDataId(),kqdm);
if (null == apiInfoDataList || apiInfoDataList.isEmpty()) {
infoData.setCzbz(Constant.CZBZ_I);
sh2023Api2104.setCzbz(Constant.CZBZ_I);
diff --git a/src/main/java/com/fzzy/otherview/gd2022/pr/GDApi1023PR.java b/src/main/java/com/fzzy/otherview/gd2022/pr/GDApi1023PR.java
index c2b54a5..7258a00 100644
--- a/src/main/java/com/fzzy/otherview/gd2022/pr/GDApi1023PR.java
+++ b/src/main/java/com/fzzy/otherview/gd2022/pr/GDApi1023PR.java
@@ -144,7 +144,7 @@
data.setWayList(JSON.toJSONString(data.getWays()));
data.setPeopleList(JSON.toJSONString(data.getPeoples()));
ApiInfoData infoData;
- List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, data.getXzbm());
+ List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, data.getXzbm(), data.getKqdm());
if (apiInfoList.size() != 0) {
infoData = apiInfoList.get(0);
infoData.setData(JSON.toJSONString(data));
@@ -167,7 +167,7 @@
*/
@Expose
public void delData(GdApi1023 data) {
- List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, data.getXzbm());
+ List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, data.getXzbm(), data.getKqdm());
apiInfoDataRep.deleteById(apiInfoList.get(0).getId());
}
@@ -179,7 +179,7 @@
if (null == data) {
return "鏃犳暟鎹墽琛�";
}
- List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, data.getXzbm());
+ List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, data.getXzbm(), data.getKqdm());
data.setCzbz(Constant.CZBZ_D);
apiInfoDataRep.updateStatus(apiInfoList.get(0).getId(), JSON.toJSONString(data), Constant.CZBZ_D);
return null;
@@ -219,7 +219,7 @@
ApiInfoData infoData;
for (GdApi1023 data : items) {
- List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, data.getXzbm());
+ List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, data.getXzbm(), data.getKqdm());
data.setCzbz(Constant.CZBZ_U);
infoData = apiInfoList.get(0);
infoData.setUpdateTime(new Date());
diff --git a/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2101PR.java b/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2101PR.java
index 01284de..299f8a4 100644
--- a/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2101PR.java
+++ b/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2101PR.java
@@ -121,7 +121,7 @@
data.setPch(data.getHwdm() + DateFormatUtils.format(data.getJjrq(), "yyyy"));
}
ApiInfoData infoData;
- List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2101, data.getJjdh());
+ List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2101, data.getJjdh(),data.getKqdm());
if (apiInfoList.size() != 0) {
infoData = apiInfoList.get(0);
infoData.setData(JSON.toJSONString(data));
@@ -145,7 +145,7 @@
*/
@Expose
public void delData(SH2023Api2101 data) {
- List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2101, data.getJjdh());
+ List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2101, data.getJjdh(),data.getKqdm());
apiInfoDataRep.deleteById(apiInfoList.get(0).getId());
}
@@ -157,7 +157,7 @@
if (null == data) {
return "鏃犳暟鎹墽琛�";
}
- List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2101, data.getJjdh());
+ List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2101, data.getJjdh(),data.getKqdm());
data.setCzbz(Constant.CZBZ_D);
apiInfoDataRep.updateStatus(apiInfoList.get(0).getId(), JSON.toJSONString(data), Constant.CZBZ_D);
return null;
@@ -192,7 +192,7 @@
for (SH2023Api2101 data : items) {
if (Constant.CZBZ_I.equals(data.getCzbz())) {
//鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
- List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2101, data.getJjdh());
+ List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2101, data.getJjdh(),data.getKqdm());
data.setCzbz(Constant.CZBZ_U);
infoData = apiInfoList.get(0);
infoData.setUpdateTime(new Date());
diff --git a/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2104PR.java b/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2104PR.java
index f234eda..5a2de76 100644
--- a/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2104PR.java
+++ b/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2104PR.java
@@ -112,7 +112,7 @@
@DataResolver
public void saveData(SH2023Api2104 data) {
ApiInfoData infoData;
- List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2101, data.getBydh());
+ List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2101, data.getBydh(),data.getKqdm());
if (apiInfoList.size() != 0) {
infoData = apiInfoList.get(0);
infoData.setData(JSON.toJSONString(data));
@@ -135,7 +135,7 @@
*/
@Expose
public void delData(SH2023Api2104 data) {
- List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2104, data.getBydh());
+ List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2104, data.getBydh(),data.getKqdm());
apiInfoDataRep.deleteById(apiInfoList.get(0).getId());
}
@@ -147,7 +147,7 @@
if (null == data) {
return "鏃犳暟鎹墽琛�";
}
- List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2104, data.getBydh());
+ List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2104, data.getBydh(),data.getKqdm());
data.setCzbz(Constant.CZBZ_D);
apiInfoDataRep.updateStatus(apiInfoList.get(0).getId(), JSON.toJSONString(data), Constant.CZBZ_D);
return null;
@@ -182,7 +182,7 @@
for (SH2023Api2104 data : items) {
if (Constant.CZBZ_I.equals(data.getCzbz())) {
//鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
- List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2104, data.getBydh());
+ List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2104, data.getBydh(),data.getKqdm());
data.setCzbz(Constant.CZBZ_U);
infoData = apiInfoList.get(0);
infoData.setUpdateTime(new Date());
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index bf2561d..0e225ad 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,7 +1,7 @@
########################## Server ##########################
spring:
profiles:
- active: pro
+ active: dev
application:
name: igds-api
main:
--
Gitblit v1.9.3