From 9e64b2df66a7ab69b9daf258999d88844cccecce Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期二, 03 二月 2026 18:02:18 +0800
Subject: [PATCH] 抓拍和ai事件回显逻辑调整
---
fzzy-igdss-web/src/main/java/com/fzzy/security/manager/SnapRecordManager.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/security/manager/SnapRecordManager.java b/fzzy-igdss-web/src/main/java/com/fzzy/security/manager/SnapRecordManager.java
index 7184b91..8625424 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/security/manager/SnapRecordManager.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/security/manager/SnapRecordManager.java
@@ -1,17 +1,22 @@
package com.fzzy.security.manager;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fzzy.common.manager.CommonManager;
import com.fzzy.igds.data.IgdsBaseParam;
+import com.fzzy.igds.domain.Camera;
import com.fzzy.igds.domain.SnapRecord;
+import com.fzzy.igds.service.SecCameraService;
import com.fzzy.igds.service.SnapRecordService;
import com.fzzy.igds.utils.ContextUtil;
-import com.fzzy.common.manager.CommonManager;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
@Slf4j
@Component
@@ -21,6 +26,8 @@
private SnapRecordService snapRecordService;
@Resource
private CommonManager commonManager;
+ @Resource
+ private SecCameraService secCameraService;
/**
* 鍒嗛〉鏌ヨ鏁版嵁
@@ -39,9 +46,18 @@
if (null == corePage.getRecords() || corePage.getRecords().isEmpty()) {
return corePage.setRecords(new ArrayList<>());
}
+ //鑾峰彇鐩戞帶璁惧
+ List<Camera> cameras = secCameraService.listCamera(ContextUtil.getCompanyId(), null);
+
//鍒ゆ柇鏂囦欢鏄惁瀛樺湪
for (SnapRecord record : corePage.getRecords()) {
- record.setImgName(commonManager.isImgExit( record.getImgName(), null));
+ record.setImgName(commonManager.isImgExit(record.getImgName(), null));
+ //鏄犲皠鐩戞帶璁惧鍚嶇О
+ List<Camera> collect = cameras.stream().filter(camera -> camera.getId().equals(record.getCameraId())).collect(Collectors.toList());
+ if (!collect.isEmpty()) {
+ record.setCameraId(collect.get(0).getName());
+ }
+
}
return corePage;
--
Gitblit v1.9.3