From 5f506f5a3895f1dd4770bd61368320293309d2ad Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Mon, 20 Oct 2025 17:10:17 +0800
Subject: [PATCH] =?UTF-8?q?AI=E8=AF=86=E5=88=AB=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PoliceCameraItemFileController.java           |  2 +-
 .../AiAnalyseHardWareAlarmRecordServiceImpl.java  | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/policecamera/controller/PoliceCameraItemFileController.java b/src/main/java/com/zhgd/xmgl/modules/policecamera/controller/PoliceCameraItemFileController.java
index cd2061cb6..1fa373740 100644
--- a/src/main/java/com/zhgd/xmgl/modules/policecamera/controller/PoliceCameraItemFileController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/policecamera/controller/PoliceCameraItemFileController.java
@@ -181,7 +181,7 @@ public class PoliceCameraItemFileController {
             @ApiImplicitParam(name = "createDate_end", value = "查询结束日期yyyy-MM-dd HH:mm:ss", paramType = "query", required = false, dataType = "String"),
     })
     @PostMapping(value = "/deleteBy")
-    public Result<PoliceCameraItemFile> deleteBy(@ApiIgnore @RequestBody HashMap<String, Object> map) {
+    public Result<PoliceCameraItemFile> deleteBy(@Parameter(hidden = true) @RequestBody HashMap<String, Object> map) {
         List<PoliceCameraItemFileVo> vos = policeCameraItemFileService.queryList(map);
         if (CollUtil.isNotEmpty(vos)) {
             Integer deleteFileModel = MapUtils.getInteger(map, "deleteFileModel");
diff --git a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java
index 1153987e9..6bfd028ee 100644
--- a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java
@@ -38,10 +38,7 @@ import com.zhgd.xmgl.modules.project.entity.ProjectJqmDev;
 import com.zhgd.xmgl.modules.project.entity.vo.ProjectInfoExtVo;
 import com.zhgd.xmgl.modules.project.service.IProjectService;
 import com.zhgd.xmgl.modules.project.service.ProjectJqmDevService;
-import com.zhgd.xmgl.modules.video.entity.AiAnalyseHardWareAlarmRecord;
-import com.zhgd.xmgl.modules.video.entity.AiAnalyseHardWareRecord;
-import com.zhgd.xmgl.modules.video.entity.VideoItem;
-import com.zhgd.xmgl.modules.video.entity.WorkerInfoToAiAnalyseHardWareAlarmRecord;
+import com.zhgd.xmgl.modules.video.entity.*;
 import com.zhgd.xmgl.modules.video.entity.bo.AiAnalyseHardWareAlarmRecordNoticeBo;
 import com.zhgd.xmgl.modules.video.entity.vo.AiAnalyseHardWareAlarmTotalVo;
 import com.zhgd.xmgl.modules.video.entity.vo.AiAnalyseHardWareAlarmTrendVo;
@@ -50,6 +47,7 @@ import com.zhgd.xmgl.modules.video.mapper.AiAnalyseHardWareAlarmRecordMapper;
 import com.zhgd.xmgl.modules.video.mapper.AiAnalyseHardWareRecordMapper;
 import com.zhgd.xmgl.modules.video.mapper.WorkerInfoToAiAnalyseHardWareAlarmRecordMapper;
 import com.zhgd.xmgl.modules.video.service.IAiAnalyseHardWareAlarmRecordService;
+import com.zhgd.xmgl.modules.video.service.IVideoGroupService;
 import com.zhgd.xmgl.modules.video.service.IVideoItemService;
 import com.zhgd.xmgl.modules.worker.entity.WorkerInfo;
 import com.zhgd.xmgl.modules.worker.mapper.WorkerInfoMapper;
@@ -142,6 +140,10 @@ public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl<AiAnaly
     @Autowired
     private IVideoItemService videoItemService;
 
+    @Lazy
+    @Autowired
+    private IVideoGroupService videoGroupService;
+
     @Override
     public IPage<AiAnalyseHardWareAlarmRecord> queryAiAnalyseHardWareAlarmPageList(Map<String, Object> map) {
         int pageNo = Integer.parseInt(map.getOrDefault("pageNo", 1).toString());
@@ -219,10 +221,13 @@ public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl<AiAnaly
                         .eq(VideoItem::getSerialNumber, body.getString("remark")));
                 if (videoItem != null) {
                     aiAnalyseHardWareAlarmRecord.setLocation(videoItem.getVideoName());
+                    VideoGroup videoGroup = videoGroupService.getById(videoItem.getGroupId());
+                    aiAnalyseHardWareAlarmRecord.setProjectSn(videoGroup == null ? aiAnalyseHardWareRecord.getProjectSn() : videoGroup.getProjectSn());
                 }
             }
         } catch (Exception e) {}
-        aiAnalyseHardWareAlarmRecord.setProjectSn(aiAnalyseHardWareRecord.getProjectSn());
+
+//        aiAnalyseHardWareAlarmRecord.setProjectSn(aiAnalyseHardWareRecord.getProjectSn());
         aiAnalyseHardWareAlarmRecord.setStatus(1);
         if (StringUtils.isNotEmpty(body.getString(IMAGE))) {
             String base64data = "";