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/resources/templates/security/snapRecord.html | 14 ------
fzzy-igdss-web/src/main/resources/templates/security/eventInfo.html | 13 ------
fzzy-igdss-web/src/main/java/com/fzzy/security/manager/SnapRecordManager.java | 20 +++++++++-
fzzy-igdss-web/src/main/java/com/fzzy/security/manager/EventInfoManager.java | 16 ++++++++
4 files changed, 36 insertions(+), 27 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;
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;
diff --git a/fzzy-igdss-web/src/main/resources/templates/security/eventInfo.html b/fzzy-igdss-web/src/main/resources/templates/security/eventInfo.html
index bd7d5b6..3588b6e 100644
--- a/fzzy-igdss-web/src/main/resources/templates/security/eventInfo.html
+++ b/fzzy-igdss-web/src/main/resources/templates/security/eventInfo.html
@@ -91,16 +91,7 @@
<div style="display: flex; align-items: center; gap: 15px;width: 100%">
<div class="meta-item" style="width: 50%">
<i class="layui-icon layui-icon-video"></i>
- <th:block th:with="matchedCameras=${cameraList.?[id == #root.eventInfo.serId]}">
- <!-- 濡傛灉鏈夊尮閰嶉」锛屾樉绀虹涓�涓尮閰嶇殑鎽勫儚澶村悕绉� -->
- <th:block th:if="${!#lists.isEmpty(matchedCameras)}">
- <span th:text="${matchedCameras[0].name}"></span>
- </th:block>
- <!-- 濡傛灉娌℃湁鍖归厤椤癸紝鏄剧ず鍘熷ID -->
- <th:block th:if="${#lists.isEmpty(matchedCameras)}">
- <span th:text="${eventInfo.serId}"></span>
- </th:block>
- </th:block>
+ <span th:text="${eventInfo.serId}"></span>
</div>
<div class="meta-item" style="width: 50%">
<i class="layui-icon layui-icon-date"></i>
@@ -110,11 +101,9 @@
<div class="meta-item">
<i class="layui-icon layui-icon-component"></i>
<th:block th:with="matchedTypes=${bizTypeList.?[code == #root.eventInfo.bizType]}">
- <!-- 濡傛灉鏈夊尮閰嶉」锛屾樉绀虹涓�涓尮閰嶇殑鎽勫儚澶村悕绉� -->
<th:block th:if="${!#lists.isEmpty(matchedTypes)}">
<span th:text="${matchedTypes[0].msg}"></span>
</th:block>
- <!-- 濡傛灉娌℃湁鍖归厤椤癸紝鏄剧ず鍘熷ID -->
<th:block th:if="${#lists.isEmpty(matchedTypes)}">
<span th:text="${eventInfo.bizType}"></span>
</th:block>
diff --git a/fzzy-igdss-web/src/main/resources/templates/security/snapRecord.html b/fzzy-igdss-web/src/main/resources/templates/security/snapRecord.html
index d0f430b..03fbda7 100644
--- a/fzzy-igdss-web/src/main/resources/templates/security/snapRecord.html
+++ b/fzzy-igdss-web/src/main/resources/templates/security/snapRecord.html
@@ -97,17 +97,7 @@
<div style="display: flex; align-items: center; gap: 15px;width: 100%">
<div class="meta-item" style="width: 50%">
<i class="layui-icon layui-icon-video"></i>
- <!-- 浣跨敤鏍囧織鍙橀噺璁板綍鏄惁宸插尮閰� -->
- <th:block th:with="matchedCameras=${cameraList.?[id == #root.snapRecord.cameraId]}">
- <!-- 濡傛灉鏈夊尮閰嶉」锛屾樉绀虹涓�涓尮閰嶇殑鎽勫儚澶村悕绉� -->
- <th:block th:if="${!#lists.isEmpty(matchedCameras)}">
- <span th:text="${matchedCameras[0].name}"></span>
- </th:block>
- <!-- 濡傛灉娌℃湁鍖归厤椤癸紝鏄剧ず鍘熷ID -->
- <th:block th:if="${#lists.isEmpty(matchedCameras)}">
- <span th:text="${snapRecord.cameraId}"></span>
- </th:block>
- </th:block>
+ <span th:text="${snapRecord.cameraId}"></span>
</div>
@@ -120,11 +110,9 @@
<i class="layui-icon layui-icon-home"></i>
<!-- <span th:text="${snapRecord.deptId}"></span>-->
<th:block th:with="matchedDept=${deptList.?[id == #root.snapRecord.deptId]}">
- <!-- 濡傛灉鏈夊尮閰嶉」锛屾樉绀虹涓�涓尮閰嶇殑鎽勫儚澶村悕绉� -->
<th:block th:if="${!#lists.isEmpty(matchedDept)}">
<span th:text="${matchedDept[0].kqmc}"></span>
</th:block>
- <!-- 濡傛灉娌℃湁鍖归厤椤癸紝鏄剧ず鍘熷ID -->
<th:block th:if="${#lists.isEmpty(matchedDept)}">
<span th:text="${snapRecord.deptId}"></span>
</th:block>
--
Gitblit v1.9.3