This commit is contained in:
parent
1b3fd18873
commit
ef7ca1fa5a
@ -15,6 +15,7 @@ import org.dromara.common.log.annotation.Log;
|
|||||||
import org.dromara.common.log.enums.BusinessType;
|
import org.dromara.common.log.enums.BusinessType;
|
||||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
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.common.web.core.BaseController;
|
||||||
import org.dromara.sis.domain.bo.SisDeviceManageBo;
|
import org.dromara.sis.domain.bo.SisDeviceManageBo;
|
||||||
import org.dromara.sis.domain.vo.SisDeviceManageVo;
|
import org.dromara.sis.domain.vo.SisDeviceManageVo;
|
||||||
@ -79,6 +80,7 @@ public class SisDeviceManageController extends BaseController {
|
|||||||
@RepeatSubmit()
|
@RepeatSubmit()
|
||||||
@PostMapping()
|
@PostMapping()
|
||||||
public R<Boolean> add(@Validated(AddGroup.class) @RequestBody SisDeviceManageBo bo) {
|
public R<Boolean> add(@Validated(AddGroup.class) @RequestBody SisDeviceManageBo bo) {
|
||||||
|
bo.setTenantId(LoginHelper.getTenantId());
|
||||||
return R.ok("设备添加成功", sisDeviceManageService.insertByBo(bo));
|
return R.ok("设备添加成功", sisDeviceManageService.insertByBo(bo));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -74,6 +74,7 @@ public class ZkMediaHookController {
|
|||||||
@PostMapping(value = "/on_stream_not_found", produces = "application/json;charset=UTF-8")
|
@PostMapping(value = "/on_stream_not_found", produces = "application/json;charset=UTF-8")
|
||||||
public HookResult onStreamNotFound(@RequestBody OnStreamNotFoundHookParam param) {
|
public HookResult onStreamNotFound(@RequestBody OnStreamNotFoundHookParam param) {
|
||||||
log.info("[ZLM HOOK] 流未找到:{}->{}->{}/{}", param.getMediaServerId(), param.getSchema(), param.getApp(), param.getStream());
|
log.info("[ZLM HOOK] 流未找到:{}->{}->{}/{}", param.getMediaServerId(), param.getSchema(), param.getApp(), param.getStream());
|
||||||
|
log.info("params={}", JSONObject.toJSONString(param));
|
||||||
return HookResult.SUCCESS();
|
return HookResult.SUCCESS();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -8,7 +8,6 @@ import lombok.EqualsAndHashCode;
|
|||||||
import org.dromara.common.core.validate.AddGroup;
|
import org.dromara.common.core.validate.AddGroup;
|
||||||
import org.dromara.common.core.validate.EditGroup;
|
import org.dromara.common.core.validate.EditGroup;
|
||||||
import org.dromara.common.mybatis.core.domain.BaseEntity;
|
import org.dromara.common.mybatis.core.domain.BaseEntity;
|
||||||
import org.dromara.common.translation.annotation.Translation;
|
|
||||||
import org.dromara.sis.domain.SisDeviceManage;
|
import org.dromara.sis.domain.SisDeviceManage;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -78,5 +77,6 @@ public class SisDeviceManageBo extends BaseEntity {
|
|||||||
*/
|
*/
|
||||||
private Long groupId;
|
private Long groupId;
|
||||||
|
|
||||||
|
private String tenantId;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -9,8 +9,8 @@ import lombok.Getter;
|
|||||||
@Getter
|
@Getter
|
||||||
public enum FactoryNoEnum {
|
public enum FactoryNoEnum {
|
||||||
|
|
||||||
HIK("DS1013"),
|
HIK("1"),
|
||||||
DAHUA("DS1014");
|
DAHUA("2");
|
||||||
|
|
||||||
private final String code;
|
private final String code;
|
||||||
|
|
||||||
|
@ -7,6 +7,7 @@ import org.dromara.sis.domain.SisDeviceChannel;
|
|||||||
import org.dromara.sis.domain.bo.SisDeviceChannelBo;
|
import org.dromara.sis.domain.bo.SisDeviceChannelBo;
|
||||||
import org.dromara.sis.domain.bo.SisDeviceManageBo;
|
import org.dromara.sis.domain.bo.SisDeviceManageBo;
|
||||||
import org.dromara.sis.domain.vo.SisDeviceChannelVo;
|
import org.dromara.sis.domain.vo.SisDeviceChannelVo;
|
||||||
|
import org.springframework.web.context.request.RequestAttributes;
|
||||||
|
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@ -85,7 +86,7 @@ public interface ISisDeviceChannelService {
|
|||||||
List<TreeNode<Long>> queryTree();
|
List<TreeNode<Long>> queryTree();
|
||||||
|
|
||||||
|
|
||||||
Boolean handleHikDeviceChannel(SisDeviceManageBo bo);
|
void handleHikDeviceChannel(SisDeviceManageBo bo);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 通过设备ids 删除设备通道信息
|
* 通过设备ids 删除设备通道信息
|
||||||
|
@ -198,27 +198,34 @@ public class SisDeviceChannelServiceImpl implements ISisDeviceChannelService {
|
|||||||
|
|
||||||
@Async
|
@Async
|
||||||
@Override
|
@Override
|
||||||
public Boolean handleHikDeviceChannel(SisDeviceManageBo bo) {
|
public void handleHikDeviceChannel(SisDeviceManageBo bo) {
|
||||||
// 调用hik sdk登录
|
// 调用hik sdk登录
|
||||||
boolean isLogin = HikApiService.getInstance().login(bo.getDeviceIp(), bo.getDevicePort().shortValue(), bo.getDeviceAccount(), bo.getDevicePwd());
|
boolean isLogin = HikApiService.getInstance().login(bo.getDeviceIp(), bo.getDevicePort().shortValue(), bo.getDeviceAccount(), bo.getDevicePwd());
|
||||||
if (!isLogin) {
|
if (!isLogin) {
|
||||||
throw new RuntimeException("海康设备添加失败.");
|
throw new RuntimeException("海康设备添加失败.");
|
||||||
}
|
}
|
||||||
if (DeviceTypeEnum.IPC.getType().equals(bo.getDeviceType())) {
|
if (DeviceTypeEnum.IPC.getType().equals(bo.getDeviceType())) {
|
||||||
// 写入设备通道信息
|
// 校验设备通道是否存在,如果存在则放弃添加
|
||||||
SisDeviceChannel channel = new SisDeviceChannel();
|
SisDeviceChannel channel1 = this.queryByChannelIp(bo.getDeviceIp());
|
||||||
channel.setDeviceId(bo.getId());
|
if (channel1 != null) {
|
||||||
channel.setChannelName(bo.getDeviceName());
|
// 写入设备通道信息
|
||||||
channel.setGroupId(bo.getGroupId());
|
SisDeviceChannel channel = new SisDeviceChannel();
|
||||||
channel.setDeviceIp(bo.getDeviceIp());
|
channel.setDeviceId(bo.getId());
|
||||||
channel.setDevicePort(HikSdkConstans.DEFAULT_RTSP_PORT);
|
channel.setChannelName(bo.getDeviceName());
|
||||||
channel.setFactoryNo(bo.getFactoryNo());
|
channel.setGroupId(bo.getGroupId());
|
||||||
channel.setDeviceAccount(bo.getDeviceAccount());
|
channel.setDeviceIp(bo.getDeviceIp());
|
||||||
channel.setDevicePwd(bo.getDevicePwd());
|
channel.setDevicePort(HikSdkConstans.DEFAULT_RTSP_PORT);
|
||||||
channel.setDeviceMac(bo.getDeviceMac());
|
channel.setFactoryNo(bo.getFactoryNo());
|
||||||
channel.setChannelNo(HikSdkConstans.DEFAULT_CHANNEL);
|
channel.setDeviceAccount(bo.getDeviceAccount());
|
||||||
this.insert(channel);
|
channel.setDevicePwd(bo.getDevicePwd());
|
||||||
return true;
|
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())) {
|
} else if (DeviceTypeEnum.NVR.getType().equals(bo.getDeviceType()) || DeviceTypeEnum.DVR.getType().equals(bo.getDeviceType())) {
|
||||||
DeviceInfo channelInfo = HikApiService.getInstance().getChannelInfo(bo.getDeviceIp());
|
DeviceInfo channelInfo = HikApiService.getInstance().getChannelInfo(bo.getDeviceIp());
|
||||||
if (channelInfo != null && CollUtil.isNotEmpty(channelInfo.getChannelInfo())) {
|
if (channelInfo != null && CollUtil.isNotEmpty(channelInfo.getChannelInfo())) {
|
||||||
@ -247,12 +254,16 @@ public class SisDeviceChannelServiceImpl implements ISisDeviceChannelService {
|
|||||||
channel.setNvrAccount(bo.getDeviceAccount());
|
channel.setNvrAccount(bo.getDeviceAccount());
|
||||||
channel.setNvrPwd(bo.getDevicePwd());
|
channel.setNvrPwd(bo.getDevicePwd());
|
||||||
channel.setNvrFactoryNo(bo.getFactoryNo());
|
channel.setNvrFactoryNo(bo.getFactoryNo());
|
||||||
|
channel.setNvrChannelNo(item.getChannelId() + HikSdkConstans.DEFAULT_CHANNEL_PREFX);
|
||||||
|
|
||||||
// 系统设备信息
|
// 系统设备信息
|
||||||
channel.setDeviceMac(bo.getDeviceMac());
|
channel.setDeviceMac(bo.getDeviceMac());
|
||||||
|
// 将设备id 更改为nvr的设备id
|
||||||
|
channel.setDeviceId(bo.getId());
|
||||||
channel.setGroupId(bo.getGroupId());
|
channel.setGroupId(bo.getGroupId());
|
||||||
channel.setChannelName(item.getChannelName());
|
channel.setChannelName(item.getChannelName());
|
||||||
channel.setChannelNo(item.getChannelId() + HikSdkConstans.DEFAULT_CHANNEL_PREFX);
|
channel.setChannelNo(item.getChannelId() + HikSdkConstans.DEFAULT_CHANNEL_PREFX);
|
||||||
|
channel.setTenantId(bo.getTenantId());
|
||||||
if (isUpdate) {
|
if (isUpdate) {
|
||||||
updateChannels.add(channel);
|
updateChannels.add(channel);
|
||||||
} else {
|
} else {
|
||||||
@ -265,14 +276,12 @@ public class SisDeviceChannelServiceImpl implements ISisDeviceChannelService {
|
|||||||
}
|
}
|
||||||
// 写入新的通道信息
|
// 写入新的通道信息
|
||||||
if (CollUtil.isNotEmpty(insertChannels)) {
|
if (CollUtil.isNotEmpty(insertChannels)) {
|
||||||
this.baseMapper.insertBatch(updateChannels);
|
this.baseMapper.insertBatch(insertChannels);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return true;
|
|
||||||
} else {
|
} else {
|
||||||
log.info("未知的设备类型,不处理。");
|
log.info("未知的设备类型,不处理。");
|
||||||
}
|
}
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -288,4 +297,5 @@ public class SisDeviceChannelServiceImpl implements ISisDeviceChannelService {
|
|||||||
lqw.in(SisDeviceChannel::getDeviceId, deviceIds);
|
lqw.in(SisDeviceChannel::getDeviceId, deviceIds);
|
||||||
return baseMapper.delete(lqw);
|
return baseMapper.delete(lqw);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -23,6 +23,8 @@ import org.dromara.sis.service.ISisDeviceManageService;
|
|||||||
import org.springframework.scheduling.annotation.Async;
|
import org.springframework.scheduling.annotation.Async;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
import org.springframework.web.context.request.RequestAttributes;
|
||||||
|
import org.springframework.web.context.request.RequestContextHolder;
|
||||||
|
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
|
||||||
@ -104,18 +106,13 @@ public class SisDeviceManageServiceImpl implements ISisDeviceManageService {
|
|||||||
if (flag) {
|
if (flag) {
|
||||||
bo.setId(add.getId());
|
bo.setId(add.getId());
|
||||||
// 获取设备通道信息
|
// 获取设备通道信息
|
||||||
handleDeviceChannelInfo(bo);
|
if (Objects.equals(bo.getFactoryNo(), FactoryNoEnum.HIK.getCode())) {
|
||||||
|
deviceChannelService.handleHikDeviceChannel(bo);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return flag;
|
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
|
@Async
|
||||||
public void deleteDeviceRef(List<SisDeviceManage> sisDeviceManages) {
|
public void deleteDeviceRef(List<SisDeviceManage> sisDeviceManages) {
|
||||||
List<Long> deviceIds = new ArrayList<>(sisDeviceManages.size());
|
List<Long> deviceIds = new ArrayList<>();
|
||||||
Map<String, List<SisDeviceManage>> factoryGroup = new HashMap<>(10);
|
sisDeviceManages.forEach(item -> {
|
||||||
sisDeviceManages.forEach(sisDeviceManage -> {
|
// 删除设备
|
||||||
deviceIds.add(sisDeviceManage.getId());
|
deviceIds.add(item.getId());
|
||||||
factoryGroup.computeIfAbsent(sisDeviceManage.getFactoryNo(), k -> new ArrayList<>()).add(sisDeviceManage);
|
if (FactoryNoEnum.HIK.getCode().equals(item.getFactoryNo())) {
|
||||||
|
HikApiService.getInstance().loginOut(item.getDeviceIp());
|
||||||
|
}
|
||||||
});
|
});
|
||||||
// 删除设备通道
|
|
||||||
int num = deviceChannelService.deleteByDeviceIds(deviceIds);
|
int num = deviceChannelService.deleteByDeviceIds(deviceIds);
|
||||||
log.info("删除设备通道完成,num={}", num);
|
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());
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user