From 2eb1ee7ee94cb0769009e1ce6a15dbd7eea792c9 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期三, 27 九月 2023 10:23:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1311.java | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
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..1d86dd8 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1311.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1311.java
@@ -13,10 +13,8 @@
import com.fzzy.push.sh2023.SH2023Constant;
import com.fzzy.push.sh2023.dto.SH2023Api1311;
import lombok.extern.slf4j.Slf4j;
-import org.aspectj.weaver.ConcreteTypeMunger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-
import java.util.Date;
import java.util.List;
@@ -32,8 +30,6 @@
private ApiLogRep apiLogRep;
@Autowired
private Fzzy40Sync1311Rep fzzy40Sync1311Rep;
- @Autowired
- private ApiCommonService commonService;
@Autowired
private ApiInfoDataRep apiInfoDataRep;
@@ -60,12 +56,12 @@
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;
}
sh2023Api1311 = new SH2023Api1311();
- sh2023Api1311.setSxtbh(dataID);
+ sh2023Api1311.setSpjksbid(dataID);
sh2023Api1311.setTdbh(sysData.getChanNum());
sh2023Api1311.setTdmc(sysData.getChanNum() + "鍙烽�氶亾");
sh2023Api1311.setJksbmc(sysData.getName());
@@ -106,7 +102,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 {
--
Gitblit v1.9.3