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; 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)); //映射监控设备名称 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; 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> </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> 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> </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>
