设备通道逻辑修改

ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisDeviceManageController.java

@@ -15,6 +15,7 @@ import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.sis.domain.bo.SisDeviceManageBo;
 import org.dromara.sis.domain.vo.SisDeviceManageVo;
@@ -78,8 +79,9 @@ public class SisDeviceManageController extends BaseController {
     @Log(title = "设备管理", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody SisDeviceManageBo bo) {
-        return toAjax(sisDeviceManageService.insertByBo(bo));
+    public R<Boolean> add(@Validated(AddGroup.class) @RequestBody SisDeviceManageBo bo) {
+        bo.setTenantId(LoginHelper.getTenantId());
+        return R.ok("设备添加成功", sisDeviceManageService.insertByBo(bo));
     }
 
     /**

ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/zkmedia/ZKLmediaController.java

@@ -1,6 +1,8 @@
 package org.dromara.sis.controller.zkmedia;
 
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.crypto.SecureUtil;
+import cn.hutool.crypto.digest.MD5;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.domain.R;
 import org.dromara.sis.domain.enums.FactoryNoEnum;
@@ -48,8 +50,9 @@ public class ZKLmediaController {
     public R<AddStreamProxyResp> alarm(@RequestBody @Validated AddStreamProxy data) {
         StartStreamProxy proxy = new StartStreamProxy();
         proxy.setApp("realtime");
-        String s = IdUtil.fastSimpleUUID();
-        proxy.setStream(s);
+        // 实时流不用每次都去拉流，流不存在的情况下在拉取
+        String streanStr = data.getVideoIp() + "_" + data.getChannelId();
+        proxy.setStream(SecureUtil.md5(streanStr));
         if (FactoryNoEnum.HIK.getCode().equals(data.getFactoryNo())) {
             proxy.setUrl(String.format(HIK_REALTIME_RTSP_TEMPLATE, data.getAccount(), data.getPwd(), data.getVideoIp(), data.getVideoPort(), data.getChannelId()));
         } else if (FactoryNoEnum.DAHUA.getCode().equals(data.getFactoryNo())) {

ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/zkmedia/ZkMediaHookController.java

@@ -74,6 +74,7 @@ public class ZkMediaHookController {
     @PostMapping(value = "/on_stream_not_found", produces = "application/json;charset=UTF-8")
     public HookResult onStreamNotFound(@RequestBody OnStreamNotFoundHookParam param) {
         log.info("[ZLM HOOK] 流未找到：{}->{}->{}/{}", param.getMediaServerId(), param.getSchema(), param.getApp(), param.getStream());
+        log.info("params={}", JSONObject.toJSONString(param));
         return HookResult.SUCCESS();
     }
 

ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisDeviceChannel.java

@@ -74,5 +74,38 @@ public class SisDeviceChannel extends TenantEntity {
      */
     private String channelNo;
 
+    /**
+     * nvr 设备id
+     */
+    private Long nvrId;
 
+    /**
+     * nvr 设备厂商编号
+     */
+    private String nvrFactoryNo;
+
+    /**
+     * nvr设备ip
+     */
+    private String nvrIp;
+
+    /**
+     * nvr 端口
+     */
+    private Integer nvrPort;
+
+    /**
+     * nvr 账号
+     */
+    private String nvrAccount;
+
+    /**
+     * nvr 密码
+     */
+    private String nvrPwd;
+
+    /**
+     * nvr 通道编号
+     */
+    private String nvrChannelNo;
 }

ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisDeviceChannelBo.java

@@ -1,13 +1,14 @@
 package org.dromara.sis.domain.bo;
 
-import org.dromara.sis.domain.SisDeviceChannel;
-import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.common.core.validate.AddGroup;
-import org.dromara.common.core.validate.EditGroup;
 import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import jakarta.validation.constraints.*;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.sis.domain.SisDeviceChannel;
 
 /**
  * 设备通道管理业务对象 sis_device_channel
@@ -23,13 +24,13 @@ public class SisDeviceChannelBo extends BaseEntity {
     /**
      * 主键id
      */
-    @NotNull(message = "主键id不能为空", groups = { EditGroup.class })
+    @NotNull(message = "主键id不能为空", groups = {EditGroup.class})
     private Long id;
 
     /**
      * 设备id
      */
-    @NotNull(message = "设备id不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotNull(message = "设备id不能为空", groups = {AddGroup.class, EditGroup.class})
     private Long deviceId;
 
     /**
@@ -42,31 +43,31 @@ public class SisDeviceChannelBo extends BaseEntity {
     /**
      * 通道分组组id
      */
-    @NotNull(message = "通道分组组id不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotNull(message = "通道分组组id不能为空", groups = {AddGroup.class, EditGroup.class})
     private Long groupId;
 
     /**
      * 设备ip
      */
-    @NotBlank(message = "设备ip不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "设备ip不能为空", groups = {AddGroup.class, EditGroup.class})
     private String deviceIp;
 
     /**
      * 设备端口
      */
-    @NotNull(message = "设备端口不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotNull(message = "设备端口不能为空", groups = {AddGroup.class, EditGroup.class})
     private Integer devicePort;
 
     /**
      * 设备账号
      */
-    @NotBlank(message = "设备账号不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "设备账号不能为空", groups = {AddGroup.class, EditGroup.class})
     private String deviceAccount;
 
     /**
      * 设备密码
      */
-    @NotBlank(message = "设备密码不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "设备密码不能为空", groups = {AddGroup.class, EditGroup.class})
     private String devicePwd;
 
     /**
@@ -79,5 +80,41 @@ public class SisDeviceChannelBo extends BaseEntity {
      */
     private String channelNo;
 
+    /**
+     * nvr 设备id
+     */
+    private Long nvrId;
+
+    /**
+     * nvr 设备厂商编号
+     */
+    private String nvrFactoryNo;
+
+    /**
+     * nvr设备ip
+     */
+    private String nvrIp;
+
+    /**
+     * nvr 端口
+     */
+    private Integer nvrPort;
+
+    /**
+     * nvr 账号
+     */
+    private String nvrAccount;
+
+    /**
+     * nvr 密码
+     */
+    private String nvrPwd;
+
+    /**
+     * nvr 通道编号
+     */
+    private String nvrChannelNo;
+
+
 
 }

ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisDeviceManageBo.java

@@ -8,7 +8,6 @@ import lombok.EqualsAndHashCode;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.common.translation.annotation.Translation;
 import org.dromara.sis.domain.SisDeviceManage;
 
 /**
@@ -78,5 +77,6 @@ public class SisDeviceManageBo extends BaseEntity {
      */
     private Long groupId;
 
+    private String tenantId;
 
 }

ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/enums/FactoryNoEnum.java

@@ -9,8 +9,8 @@ import lombok.Getter;
 @Getter
 public enum FactoryNoEnum {
 
-    HIK("DS1013"),
-    DAHUA("DS1014");
+    HIK("1"),
+    DAHUA("2");
 
     private final String code;
 

ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDeviceChannelVo.java

@@ -90,5 +90,38 @@ public class SisDeviceChannelVo implements Serializable {
     @ExcelProperty(value = "设备通道编号")
     private String channelNo;
 
+    /**
+     * nvr 设备id
+     */
+    private Long nvrId;
 
+    /**
+     * nvr 设备厂商编号
+     */
+    private String nvrFactoryNo;
+
+    /**
+     * nvr设备ip
+     */
+    private String nvrIp;
+
+    /**
+     * nvr 端口
+     */
+    private Integer nvrPort;
+
+    /**
+     * nvr 账号
+     */
+    private String nvrAccount;
+
+    /**
+     * nvr 密码
+     */
+    private String nvrPwd;
+
+    /**
+     * nvr 通道编号
+     */
+    private String nvrChannelNo;
 }

ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/model/DeviceInfo.java

@@ -1,6 +1,7 @@
 package org.dromara.sis.sdk.hik.model;
 
 import lombok.Data;
+import org.dromara.sis.domain.enums.FactoryNoEnum;
 
 import java.util.List;
 
@@ -27,6 +28,8 @@ public class DeviceInfo {
      */
     private Integer dwStartDChan;
 
+    private String factoryNo = FactoryNoEnum.HIK.getCode();
+
     private List<DeviceChannelInfo> channelInfo;
 
     @Data

ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisDeviceChannelService.java

@@ -7,6 +7,7 @@ import org.dromara.sis.domain.SisDeviceChannel;
 import org.dromara.sis.domain.bo.SisDeviceChannelBo;
 import org.dromara.sis.domain.bo.SisDeviceManageBo;
 import org.dromara.sis.domain.vo.SisDeviceChannelVo;
+import org.springframework.web.context.request.RequestAttributes;
 
 import java.util.Collection;
 import java.util.List;
@@ -85,13 +86,16 @@ public interface ISisDeviceChannelService {
     List<TreeNode<Long>> queryTree();
 
 
-    Boolean handleHikDeviceChannel(SisDeviceManageBo bo);
+    void handleHikDeviceChannel(SisDeviceManageBo bo);
 
     /**
      * 通过设备ids 删除设备通道信息
+     *
      * @param deviceIds 设备ids
      * @return 返回删除数量
      */
     Integer deleteByDeviceIds(List<Long> deviceIds);
 
+    SisDeviceChannel queryByChannelIp(String channelIp);
+
 }

ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisDeviceChannelServiceImpl.java

@@ -1,6 +1,7 @@
 package org.dromara.sis.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -24,6 +25,7 @@ import org.dromara.sis.sdk.hik.HikSdkConstans;
 import org.dromara.sis.sdk.hik.model.DeviceInfo;
 import org.dromara.sis.service.ISisDeviceChannelService;
 import org.dromara.sis.service.ISisDeviceGroupService;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -194,54 +196,99 @@ public class SisDeviceChannelServiceImpl implements ISisDeviceChannelService {
         return TreeUtils.build(treeNodes, -1L);
     }
 
+    @Async
     @Override
-    public Boolean handleHikDeviceChannel(SisDeviceManageBo bo) {
+    public void handleHikDeviceChannel(SisDeviceManageBo bo) {
         // 调用hik sdk登录
         boolean isLogin = HikApiService.getInstance().login(bo.getDeviceIp(), bo.getDevicePort().shortValue(), bo.getDeviceAccount(), bo.getDevicePwd());
         if (!isLogin) {
             throw new RuntimeException("海康设备添加失败.");
         }
         if (DeviceTypeEnum.IPC.getType().equals(bo.getDeviceType())) {
-            // 写入设备通道信息
-            SisDeviceChannel channel = new SisDeviceChannel();
-            channel.setDeviceId(bo.getId());
-            channel.setChannelName(bo.getDeviceName());
-            channel.setGroupId(bo.getGroupId());
-            channel.setDeviceIp(bo.getDeviceIp());
-            channel.setDevicePort(HikSdkConstans.DEFAULT_RTSP_PORT);
-            channel.setFactoryNo(bo.getFactoryNo());
-            channel.setDeviceAccount(bo.getDeviceAccount());
-            channel.setDevicePwd(bo.getDevicePwd());
-            channel.setDeviceMac(bo.getDeviceMac());
-            channel.setChannelNo(HikSdkConstans.DEFAULT_CHANNEL);
-            this.insert(channel);
-            return true;
+            // 校验设备通道是否存在，如果存在则放弃添加
+            SisDeviceChannel channel1 = this.queryByChannelIp(bo.getDeviceIp());
+            if (channel1 != null) {
+                // 写入设备通道信息
+                SisDeviceChannel channel = new SisDeviceChannel();
+                channel.setDeviceId(bo.getId());
+                channel.setChannelName(bo.getDeviceName());
+                channel.setGroupId(bo.getGroupId());
+                channel.setDeviceIp(bo.getDeviceIp());
+                channel.setDevicePort(HikSdkConstans.DEFAULT_RTSP_PORT);
+                channel.setFactoryNo(bo.getFactoryNo());
+                channel.setDeviceAccount(bo.getDeviceAccount());
+                channel.setDevicePwd(bo.getDevicePwd());
+                channel.setDeviceMac(bo.getDeviceMac());
+                channel.setChannelNo(HikSdkConstans.DEFAULT_CHANNEL);
+                channel.setTenantId(bo.getTenantId());
+                Boolean insert = this.insert(channel);
+                log.info("设备[{}]通道添加完成,result={}", bo.getDeviceIp(), insert);
+            } else {
+                log.info("设备通道[{}]已存在，放弃添加通道信息", bo.getDeviceIp());
+            }
         } else if (DeviceTypeEnum.NVR.getType().equals(bo.getDeviceType()) || DeviceTypeEnum.DVR.getType().equals(bo.getDeviceType())) {
             DeviceInfo channelInfo = HikApiService.getInstance().getChannelInfo(bo.getDeviceIp());
             if (channelInfo != null && CollUtil.isNotEmpty(channelInfo.getChannelInfo())) {
-                List<SisDeviceChannel> channels = new ArrayList<>(channelInfo.getChannelInfo().size());
+                List<SisDeviceChannel> insertChannels = new ArrayList<>(channelInfo.getChannelInfo().size());
+                List<SisDeviceChannel> updateChannels = new ArrayList<>(channelInfo.getChannelInfo().size());
                 channelInfo.getChannelInfo().forEach(item -> {
-                    SisDeviceChannel channel = new SisDeviceChannel();
+                    // 校验通道信息是否存在
+                    SisDeviceChannel channel = queryByChannelIp(item.getChannelIp());
+                    boolean isUpdate = true;
+                    if (channel == null) {
+                        channel = new SisDeviceChannel();
+                        isUpdate = false;
+                    }
+                    // 通道设备信息
+                    channel.setDeviceIp(item.getChannelIp());
+                    channel.setDevicePort(Integer.valueOf(item.getChannelPort()));
+                    channel.setDeviceAccount(item.getChannelAccount());
+                    channel.setFactoryNo(channelInfo.getFactoryNo());
+                    if (StrUtil.isNotEmpty(item.getChannelPwd())) {
+                        channel.setDevicePwd(item.getChannelPwd());
+                    }
+                    // nvr 设备信息
+                    channel.setNvrId(bo.getId());
+                    channel.setNvrIp(bo.getDeviceIp());
+                    channel.setNvrPort(HikSdkConstans.DEFAULT_RTSP_PORT);
+                    channel.setNvrAccount(bo.getDeviceAccount());
+                    channel.setNvrPwd(bo.getDevicePwd());
+                    channel.setNvrFactoryNo(bo.getFactoryNo());
+                    channel.setNvrChannelNo(item.getChannelId() + HikSdkConstans.DEFAULT_CHANNEL_PREFX);
+
+                    // 系统设备信息
+                    channel.setDeviceMac(bo.getDeviceMac());
+                    // 将设备id 更改为nvr的设备id
                     channel.setDeviceId(bo.getId());
                     channel.setGroupId(bo.getGroupId());
-                    channel.setDeviceIp(bo.getDeviceIp());
-                    channel.setDevicePort(HikSdkConstans.DEFAULT_RTSP_PORT);
-                    channel.setFactoryNo(bo.getFactoryNo());
-                    channel.setDeviceAccount(bo.getDeviceAccount());
-                    channel.setDevicePwd(bo.getDevicePwd());
-                    channel.setDeviceMac(bo.getDeviceMac());
-
                     channel.setChannelName(item.getChannelName());
                     channel.setChannelNo(item.getChannelId() + HikSdkConstans.DEFAULT_CHANNEL_PREFX);
-                    channels.add(channel);
+                    channel.setTenantId(bo.getTenantId());
+                    if (isUpdate) {
+                        updateChannels.add(channel);
+                    } else {
+                        insertChannels.add(channel);
+                    }
                 });
-                this.baseMapper.insertBatch(channels);
+                // 更新通道信息
+                if (CollUtil.isNotEmpty(updateChannels)) {
+                    this.baseMapper.updateBatchById(updateChannels);
+                }
+                // 写入新的通道信息
+                if (CollUtil.isNotEmpty(insertChannels)) {
+                    this.baseMapper.insertBatch(insertChannels);
+                }
             }
-            return true;
         } else {
             log.info("未知的设备类型，不处理。");
         }
-        return false;
+    }
+
+    @Override
+    public SisDeviceChannel queryByChannelIp(String channelIp) {
+        LambdaQueryWrapper<SisDeviceChannel> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(SisDeviceChannel::getDeviceIp, channelIp);
+        return baseMapper.selectOne(queryWrapper);
     }
 
     @Override
@@ -250,4 +297,5 @@ public class SisDeviceChannelServiceImpl implements ISisDeviceChannelService {
         lqw.in(SisDeviceChannel::getDeviceId, deviceIds);
         return baseMapper.delete(lqw);
     }
+
 }

ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisDeviceManageServiceImpl.java

@@ -23,6 +23,8 @@ import org.dromara.sis.service.ISisDeviceManageService;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
 
 import java.util.*;
 
@@ -104,18 +106,13 @@ public class SisDeviceManageServiceImpl implements ISisDeviceManageService {
         if (flag) {
             bo.setId(add.getId());
             // 获取设备通道信息
-            handleDeviceChannelInfo(bo);
+            if (Objects.equals(bo.getFactoryNo(), FactoryNoEnum.HIK.getCode())) {
+                deviceChannelService.handleHikDeviceChannel(bo);
+            }
         }
         return flag;
     }
 
-    public void handleDeviceChannelInfo(SisDeviceManageBo bo) {
-        if (Objects.equals(bo.getFactoryNo(), FactoryNoEnum.HIK.getCode())) {
-            deviceChannelService.handleHikDeviceChannel(bo);
-        }
-    }
-
-
     /**
      * 修改设备管理
      *
@@ -165,24 +162,16 @@ public class SisDeviceManageServiceImpl implements ISisDeviceManageService {
      */
     @Async
     public void deleteDeviceRef(List<SisDeviceManage> sisDeviceManages) {
-        List<Long> deviceIds = new ArrayList<>(sisDeviceManages.size());
-        Map<String, List<SisDeviceManage>> factoryGroup = new HashMap<>(10);
-        sisDeviceManages.forEach(sisDeviceManage -> {
-            deviceIds.add(sisDeviceManage.getId());
-            factoryGroup.computeIfAbsent(sisDeviceManage.getFactoryNo(), k -> new ArrayList<>()).add(sisDeviceManage);
-
+        List<Long> deviceIds = new ArrayList<>();
+        sisDeviceManages.forEach(item -> {
+            // 删除设备
+            deviceIds.add(item.getId());
+            if (FactoryNoEnum.HIK.getCode().equals(item.getFactoryNo())) {
+                HikApiService.getInstance().loginOut(item.getDeviceIp());
+            }
         });
-        // 删除设备通道
         int num = deviceChannelService.deleteByDeviceIds(deviceIds);
         log.info("删除设备通道完成,num={}", num);
-        // 设备sdk注销
-        for (Map.Entry<String, List<SisDeviceManage>> entry : factoryGroup.entrySet()) {
-            if (entry.getKey().equals(FactoryNoEnum.HIK.getCode())) {
-                entry.getValue().forEach(item -> {
-                    HikApiService.getInstance().loginOut(item.getDeviceIp());
-                });
-            }
-        }
     }