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

Merge branch 'master' into dev/数据库统合

Browse Source
This commit is contained in:
648540858
2025-01-03 15:10:23 +08:00
parent b0b3f32e03 cb7c41c3c1
commit 3903bc31b5
7 changed files with 42 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -531,10 +531,10 @@ public class DeviceChannelServiceImpl implements IDeviceChannelService {
deviceChannel.setHasAudio(channelInDb.isHasAudio());
deviceChannel.setId(channelInDb.getId());
if (channelInDb.getStatus() != null && channelInDb.getStatus().equalsIgnoreCase(deviceChannel.getStatus())){
List<Integer> ids = platformChannelMapper.queryParentPlatformByChannelId(deviceChannel.getDeviceId());
if (!CollectionUtils.isEmpty(ids)){
ids.forEach(platformId->{
eventPublisher.catalogEventPublish(platformId, deviceChannel, deviceChannel.getStatus().equals("ON")? CatalogEvent.ON:CatalogEvent.OFF);
List<Platform> platformList = platformChannelMapper.queryParentPlatformByChannelId(deviceChannel.getDeviceId());
if (!CollectionUtils.isEmpty(platformList)){
platformList.forEach(platform->{
eventPublisher.catalogEventPublish(platform, deviceChannel, deviceChannel.getStatus().equals("ON")? CatalogEvent.ON:CatalogEvent.OFF);
});
}
}

2
src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GroupServiceImpl.java
View File

@@ -209,7 +209,7 @@ public class GroupServiceImpl implements IGroupService {
for (Platform platform : platformList) {
try {
// 发送catalog
eventPublisher.catalogEventPublish(platform.getId(), channel, CatalogEvent.DEL);
eventPublisher.catalogEventPublish(platform, channel, CatalogEvent.DEL);
}catch (Exception e) {
log.warn("[业务分组/虚拟组织删除] 发送失败，{}", groupForDelete.getDeviceId(), e);
}

30
src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlatformChannelServiceImpl.java
View File

@@ -213,6 +213,10 @@ public class PlatformChannelServiceImpl implements IPlatformChannelService {
@Transactional
public int addChannelList(Integer platformId, List<CommonGBChannel> channelList) {
Platform platform = platformMapper.query(platformId);
if (platform == null) {
return 0;
}
int result = platformChannelMapper.addChannels(platformId, channelList);
if (result > 0) {
// 查询通道相关的行政区划信息是否共享，如果没共享就添加
@@ -242,7 +246,7 @@ public class PlatformChannelServiceImpl implements IPlatformChannelService {
// 发送消息
try {
// 发送catalog
eventPublisher.catalogEventPublish(platformId, channelList, CatalogEvent.ADD);
eventPublisher.catalogEventPublish(platform, channelList, CatalogEvent.ADD);
} catch (Exception e) {
log.warn("[关联通道] 发送失败，数量：{}", channelList.size(), e);
}
@@ -252,6 +256,11 @@ public class PlatformChannelServiceImpl implements IPlatformChannelService {
@Override
public int removeAllChannel(Integer platformId) {
Platform platform = platformMapper.query(platformId);
if (platform == null) {
return 0;
}
List<CommonGBChannel> channelListShare = platformChannelMapper.queryShare(platformId, null);
Assert.notEmpty(channelListShare, "未共享任何通道");
int result = platformChannelMapper.removeChannelsWithPlatform(platformId, channelListShare);
@@ -276,7 +285,7 @@ public class PlatformChannelServiceImpl implements IPlatformChannelService {
// 发送消息
try {
// 发送catalog
eventPublisher.catalogEventPublish(platformId, channelListShare, CatalogEvent.DEL);
eventPublisher.catalogEventPublish(platform, channelListShare, CatalogEvent.DEL);
} catch (Exception e) {
log.warn("[移除全部关联通道] 发送失败，数量：{}", channelListShare.size(), e);
}
@@ -300,6 +309,10 @@ public class PlatformChannelServiceImpl implements IPlatformChannelService {
@Transactional
public int removeChannelList(Integer platformId, List<CommonGBChannel> channelList) {
Platform platform = platformMapper.query(platformId);
if (platform == null) {
return 0;
}
int result = platformChannelMapper.removeChannelsWithPlatform(platformId, channelList);
if (result > 0) {
// 查询通道相关的分组信息
@@ -322,7 +335,7 @@ public class PlatformChannelServiceImpl implements IPlatformChannelService {
// 发送消息
try {
// 发送catalog
eventPublisher.catalogEventPublish(platformId, channelList, CatalogEvent.DEL);
eventPublisher.catalogEventPublish(platform, channelList, CatalogEvent.DEL);
} catch (Exception e) {
log.warn("[移除关联通道] 发送失败，数量：{}", channelList.size(), e);
}
@@ -423,11 +436,12 @@ public class PlatformChannelServiceImpl implements IPlatformChannelService {
@Override
public void updateCustomChannel(PlatformChannel channel) {
platformChannelMapper.updateCustomChannel(channel);
Platform platform = platformMapper.query(channel.getPlatformId());
CommonGBChannel commonGBChannel = platformChannelMapper.queryShareChannel(channel.getPlatformId(), channel.getGbId());
// 发送消息
try {
// 发送catalog
eventPublisher.catalogEventPublish(channel.getPlatformId(), commonGBChannel, CatalogEvent.UPDATE);
eventPublisher.catalogEventPublish(platform, commonGBChannel, CatalogEvent.UPDATE);
} catch (Exception e) {
log.warn("[自定义通道信息] 发送失败， 平台ID： {}， 通道： {}（{}）", channel.getPlatformId(),
channel.getGbName(), channel.getId(), e);
@@ -466,7 +480,7 @@ public class PlatformChannelServiceImpl implements IPlatformChannelService {
// 发送消息
try {
// 发送catalog
eventPublisher.catalogEventPublish(platform.getId(), channelListForEvent, CatalogEvent.DEL);
eventPublisher.catalogEventPublish(platform, channelListForEvent, CatalogEvent.DEL);
} catch (Exception e) {
log.warn("[移除关联通道] 发送失败，数量：{}", channelList.size(), e);
}
@@ -504,7 +518,7 @@ public class PlatformChannelServiceImpl implements IPlatformChannelService {
// 发送消息
try {
// 发送catalog
eventPublisher.catalogEventPublish(platform.getId(), channelListForEvent, CatalogEvent.DEL);
eventPublisher.catalogEventPublish(platform, channelListForEvent, CatalogEvent.DEL);
} catch (Exception e) {
log.warn("[移除关联通道] 发送失败，数量：{}", channelList.size(), e);
}
@@ -535,7 +549,7 @@ public class PlatformChannelServiceImpl implements IPlatformChannelService {
// 发送消息
try {
// 发送catalog
eventPublisher.catalogEventPublish(platform.getId(), channelListForEvent, CatalogEvent.ADD);
eventPublisher.catalogEventPublish(platform, channelListForEvent, CatalogEvent.ADD);
} catch (Exception e) {
log.warn("[移除关联通道] 发送失败，数量：{}", channelList.size(), e);
}
@@ -565,7 +579,7 @@ public class PlatformChannelServiceImpl implements IPlatformChannelService {
// 发送消息
try {
// 发送catalog
eventPublisher.catalogEventPublish(platform.getId(), channelListForEvent, CatalogEvent.ADD);
eventPublisher.catalogEventPublish(platform, channelListForEvent, CatalogEvent.ADD);
} catch (Exception e) {
log.warn("[移除关联通道] 发送失败，数量：{}", channelList.size(), e);
}