From 88d264f71473e83cf5787a9e973e3a0f7762c353 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 11 十一月 2024 10:19:05 +0800
Subject: [PATCH] Merge branch 'master' of http://dlindusit.com:53929/r/iailab-plat

---
 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/video/service/impl/CameraServiceImpl.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/video/service/impl/CameraServiceImpl.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/video/service/impl/CameraServiceImpl.java
index 12f46e9..5084c84 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/video/service/impl/CameraServiceImpl.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/video/service/impl/CameraServiceImpl.java
@@ -10,6 +10,7 @@
 import com.iailab.framework.web.core.util.WebFrameworkUtils;
 import com.iailab.module.data.mq.consumer.ImageMessage;
 import com.iailab.module.data.video.controller.admin.camera.vo.CameraPageReqVO;
+import com.iailab.module.data.video.dahua.DHConfiguration;
 import com.iailab.module.data.video.dahua.DHSavePath;
 import com.iailab.module.data.video.dao.CameraDao;
 import com.iailab.module.data.video.dao.ImageDao;
@@ -98,7 +99,7 @@
         CameraDTO devCamera = getByCode(params.get("cmdSerial"));
         String strFileName = params.get("strFileName");
         String imagePath = strFileName.replace("\\", "/");
-        String imageUrl = imagePath.replace(DHSavePath.capturePath, "");
+        String imageUrl = imagePath.replace(DHConfiguration.staticCapturePath, "");
         ImageEntity image = new ImageEntity();
         image.setCameraId(devCamera.getId());
         image.setImagePath(imagePath);
@@ -157,6 +158,7 @@
         imageMessage.setCreateTime(createTime);
         imageMessage.setImageDTO(BeanUtils.toBean(image, ImageDTO.class));
         rabbitTemplate.convertAndSend(ImageMessage.EXCHANGE, ImageMessage.DAHUA_ROUTING_KEY, imageMessage);
+        rabbitTemplate.convertAndSend(ImageMessage.EXCHANGE, ImageMessage.HIKVISION_ROUTING_KEY, imageMessage);
     }
 
 }
\ No newline at end of file

--
Gitblit v1.9.3