From fb8437af9708a8dac215169c50abf94c27654c5c Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期二, 19 九月 2023 20:33:03 +0800
Subject: [PATCH] 更新提交
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1311.java | 10 ++--------
1 files changed, 2 insertions(+), 8 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..177cecf 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1311.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1311.java
@@ -4,7 +4,6 @@
import com.fzzy.api.Constant;
import com.fzzy.api.entity.ApiInfoData;
import com.fzzy.api.entity.ApiLog;
-import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.api.view.repository.ApiLogRep;
@@ -13,10 +12,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 +29,6 @@
private ApiLogRep apiLogRep;
@Autowired
private Fzzy40Sync1311Rep fzzy40Sync1311Rep;
- @Autowired
- private ApiCommonService commonService;
@Autowired
private ApiInfoDataRep apiInfoDataRep;
@@ -60,12 +55,11 @@
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.setTdbh(sysData.getChanNum());
sh2023Api1311.setTdmc(sysData.getChanNum() + "鍙烽�氶亾");
sh2023Api1311.setJksbmc(sysData.getName());
@@ -106,7 +100,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