roouzenn/wvp
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化重复sql

Browse Source
This commit is contained in:
648540858
2024-09-29 14:44:29 +08:00
parent c9d14bb23b
commit cdea514705
6 changed files with 35 additions and 594 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/genersoft/iot/vmp/gb28181/service/IDeviceService.java
View File

@@ -2,7 +2,6 @@ package com.genersoft.iot.vmp.gb28181.service;
import com.genersoft.iot.vmp.common.CommonCallback;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
import com.genersoft.iot.vmp.gb28181.bean.SipTransactionInfo;
import com.genersoft.iot.vmp.gb28181.bean.SyncStatus;
import com.genersoft.iot.vmp.vmanager.bean.ResourceBaseInfo;
@@ -118,14 +117,6 @@ public interface IDeviceService {
*/
void updateDevice(Device device);
/**
* 查询树节点下的通道
* @param deviceId 设备ID
* @param parentId 父ID
* @return
*/
List<DeviceChannel> queryVideoDeviceInTreeNode(String deviceId, String parentId);
/**
* 检查设备编号是否已经存在
* @param deviceId 设备编号

4
src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceChannelServiceImpl.java
View File

@@ -338,7 +338,7 @@ public class DeviceChannelServiceImpl implements IDeviceChannelService {
if (device == null) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), "未找到通道：" + deviceId);
}
return channelMapper.queryAllChannels(device.getId());
return channelMapper.queryChannelsByDeviceDbId(device.getId());
}
@Override
@@ -637,7 +637,7 @@ public class DeviceChannelServiceImpl implements IDeviceChannelService {
@Override
public DeviceChannel getBroadcastChannel(int deviceDbId) {
List<DeviceChannel> channels = channelMapper.getByDeviceId(deviceDbId);
List<DeviceChannel> channels = channelMapper.queryChannelsByDeviceDbId(deviceDbId);
if (channels.size() == 1) {
return channels.get(0);
}

14
src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceServiceImpl.java
View File

@@ -168,7 +168,7 @@ public class DeviceServiceImpl implements IDeviceService {
}
}else {
if (deviceChannelMapper.queryAllChannels(device.getId()).isEmpty()) {
if (deviceChannelMapper.queryChannelsByDeviceDbId(device.getId()).isEmpty()) {
log.info("[设备上线]: {}，通道数为0,查询通道信息", device.getDeviceId());
sync(device);
}
@@ -404,18 +404,6 @@ public class DeviceServiceImpl implements IDeviceService {
redisCatchStorage.updateDevice(device);
}
}
@Override
public List<DeviceChannel> queryVideoDeviceInTreeNode(String deviceId, String parentId) {
Device device = deviceMapper.getDeviceByDeviceId(deviceId);
if (device == null) {
return null;
}
if (ObjectUtils.isEmpty(parentId) || parentId.equals(deviceId)) {
return deviceChannelMapper.getSubChannelsByDeviceId(device.getId(), null, false);
}else {
return deviceChannelMapper.getSubChannelsByDeviceId(device.getId(), parentId, false);
}
}
@Override
public boolean isExist(String deviceId) {