From 52ccae38d7d236765eb2dfd8c325fd94f99d43b1 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期一, 02 三月 2026 14:38:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fzzy-igdss-web/src/main/java/com/fzzy/security/manager/EventInfoManager.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/security/manager/EventInfoManager.java b/fzzy-igdss-web/src/main/java/com/fzzy/security/manager/EventInfoManager.java
index 89e6619..92ae567 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/security/manager/EventInfoManager.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/security/manager/EventInfoManager.java
@@ -2,8 +2,10 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fzzy.igds.data.IgdsBaseParam;
+import com.fzzy.igds.domain.Camera;
import com.fzzy.igds.domain.EventInfo;
import com.fzzy.igds.service.EventInfoService;
+import com.fzzy.igds.service.SecCameraService;
import com.fzzy.igds.utils.ContextUtil;
import com.fzzy.common.manager.CommonManager;
import com.ruoyi.common.utils.StringUtils;
@@ -12,6 +14,8 @@
import javax.annotation.Resource;
import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
@Slf4j
@Component
@@ -21,6 +25,9 @@
private EventInfoService eventInfoService;
@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 (EventInfo record : corePage.getRecords()) {
record.setImgName(commonManager.isImgExit( record.getImgName(), null));
+
+ //鏄犲皠鐩戞帶璁惧鍚嶇О
+ List<Camera> collect = cameras.stream().filter(camera -> camera.getId().equals(record.getSerId())).collect(Collectors.toList());
+ if (!collect.isEmpty()) {
+ record.setSerId(collect.get(0).getName());
+ }
}
return corePage;
--
Gitblit v1.9.3