From dd794d48685caa3fb1bf87597411600e8c4efaa1 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: Tue, 27 Aug 2024 17:56:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iot/vmp/gb28181/bean/CommonGBChannel.java | 2 + .../genersoft/iot/vmp/gb28181/bean/Group.java | 5 + .../iot/vmp/gb28181/dao/GroupMapper.java | 26 +- .../gb28181/dao/PlatformChannelMapper.java | 27 +- .../service/IPlatformChannelService.java | 3 + .../impl/DeviceChannelServiceImpl.java | 40 +- .../service/impl/GbChannelServiceImpl.java | 1 + .../service/impl/GroupServiceImpl.java | 27 +- .../impl/PlatformChannelServiceImpl.java | 51 ++- .../cmd/KeepaliveNotifyMessageHandler.java | 2 +- .../media/zlm/ZLMMediaServerStatusManger.java | 2 +- web_src/src/components/DeviceList.vue | 10 +- web_src/src/components/common/GroupTree.vue | 1 + web_src/src/components/common/RegionTree.vue | 10 +- .../components/dialog/SyncChannelProgress.vue | 7 +- .../dialog/chooseChannelForCatalog.vue | 313 ---------------- .../components/dialog/chooseChannelForGb.vue | 351 ------------------ .../dialog/chooseChannelForStream.vue | 281 -------------- web_src/src/components/dialog/getCatalog.vue | 167 --------- web_src/src/components/dialog/groupEdit.vue | 17 +- web_src/src/components/dialog/regionCode.vue | 118 ++---- web_src/src/components/dialog/regionEdit.vue | 345 +++++++++++++++++ 数据库/2.7.2-重构/初始化-mysql-2.7.2.sql | 3 +- 23 files changed, 552 insertions(+), 1257 deletions(-) delete mode 100755 web_src/src/components/dialog/chooseChannelForCatalog.vue delete mode 100755 web_src/src/components/dialog/chooseChannelForGb.vue delete mode 100755 web_src/src/components/dialog/chooseChannelForStream.vue delete mode 100755 web_src/src/components/dialog/getCatalog.vue create mode 100644 web_src/src/components/dialog/regionEdit.vue diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/CommonGBChannel.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/CommonGBChannel.java index bf221dbd..74179cae 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/CommonGBChannel.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/CommonGBChannel.java @@ -422,12 +422,14 @@ public class CommonGBChannel { // 业务分组 channel.setGbName(group.getName()); channel.setGbDeviceId(group.getDeviceId()); + channel.setGbCivilCode(group.getCivilCode()); } else { // 虚拟组织 channel.setGbName(group.getName()); channel.setGbDeviceId(group.getDeviceId()); channel.setGbParentId(group.getParentDeviceId()); channel.setGbBusinessGroupId(group.getBusinessGroup()); + channel.setGbCivilCode(group.getCivilCode()); } return channel; } diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Group.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Group.java index 9cc392de..e50c1ad5 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Group.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Group.java @@ -58,6 +58,11 @@ public class Group implements Comparable{ */ @Schema(description = "更新时间") private String updateTime; + /** + * 行政区划 + */ + @Schema(description = "行政区划") + private String civilCode; public static Group getInstance(DeviceChannel channel) { GbCode gbCode = GbCode.decode(channel.getDeviceId()); diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/GroupMapper.java b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/GroupMapper.java index 78c8fb61..de3f9442 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/GroupMapper.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/GroupMapper.java @@ -3,6 +3,7 @@ package com.genersoft.iot.vmp.gb28181.dao; import com.genersoft.iot.vmp.gb28181.bean.CommonGBChannel; import com.genersoft.iot.vmp.gb28181.bean.Group; import com.genersoft.iot.vmp.gb28181.bean.GroupTree; +import com.genersoft.iot.vmp.gb28181.bean.Platform; import org.apache.ibatis.annotations.*; import java.util.List; @@ -11,13 +12,13 @@ import java.util.Set; @Mapper public interface GroupMapper { - @Insert("INSERT INTO wvp_common_group (device_id, name, parent_id, parent_device_id, business_group, create_time, update_time) " + - "VALUES (#{deviceId}, #{name}, #{parentId}, #{parentDeviceId}, #{businessGroup}, #{createTime}, #{updateTime})") + @Insert("INSERT INTO wvp_common_group (device_id, name, parent_id, parent_device_id, business_group, create_time, update_time, civil_code) " + + "VALUES (#{deviceId}, #{name}, #{parentId}, #{parentDeviceId}, #{businessGroup}, #{createTime}, #{updateTime}, #{civilCode})") @Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id") int add(Group group); - @Insert("INSERT INTO wvp_common_group (device_id, name, business_group, create_time, update_time) " + - "VALUES (#{deviceId}, #{name}, #{businessGroup}, #{createTime}, #{updateTime})") + @Insert("INSERT INTO wvp_common_group (device_id, name, business_group, create_time, update_time, civil_code) " + + "VALUES (#{deviceId}, #{name}, #{businessGroup}, #{createTime}, #{updateTime}, #{civilCode})") @Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id") int addBusinessGroup(Group group); @@ -25,7 +26,8 @@ public interface GroupMapper { int delete(@Param("id") int id); @Update(" UPDATE wvp_common_group " + - " SET update_time=#{updateTime}, device_id=#{deviceId}, name=#{name}, parent_id=#{parentId}, parent_device_id=#{parentDeviceId}, business_group=#{businessGroup}" + + " SET update_time=#{updateTime}, device_id=#{deviceId}, name=#{name}, parent_id=#{parentId}, " + + " parent_device_id=#{parentDeviceId}, business_group=#{businessGroup}, civil_code=#{civilCode}" + " WHERE id = #{id}") int update(Group group); @@ -52,10 +54,11 @@ public interface GroupMapper { " parent_id," + " business_group," + " create_time," + + " civil_code," + " update_time) " + " VALUES " + " " + - " (#{item.deviceId}, #{item.name}, #{item.parentDeviceId}, #{item.parentId}, #{item.businessGroup},#{item.createTime},#{item.updateTime})" + + " (#{item.deviceId}, #{item.name}, #{item.parentDeviceId}, #{item.parentId}, #{item.businessGroup},#{item.createTime},#{item.civilCode},#{item.updateTime})" + " " + " ") @Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id") @@ -210,4 +213,15 @@ public interface GroupMapper { " ") void updateParentIdWithBusinessGroup(List groupListForAdd); + @Select(" ") + List queryForPlatformByGroupId(@Param("groupId") int groupId); + + @Delete("DELETE FROM wvp_platform_group WHERE group_id = #{groupId}") + void deletePlatformGroup(@Param("groupId") int groupId); } diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/PlatformChannelMapper.java b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/PlatformChannelMapper.java index 1ec07186..f9ed954a 100755 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/PlatformChannelMapper.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/PlatformChannelMapper.java @@ -339,7 +339,17 @@ public interface PlatformChannelMapper { " " + "" + "") - int removeChannels(@Param("platformId") Integer platformId, List channelList); + int removeChannelsWithPlatform(@Param("platformId") Integer platformId, List channelList); + + @Delete("") + int removeChannels(List channelList); @Insert("") Set queryShareParentRegionByRegionSet(Set regionSet, @Param("platformId") Integer platformId); + + @Select(" ") + List queryPlatFormListByChannelList(List channelList); } diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/service/IPlatformChannelService.java b/src/main/java/com/genersoft/iot/vmp/gb28181/service/IPlatformChannelService.java index b50dbda2..7b80304c 100755 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/service/IPlatformChannelService.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/service/IPlatformChannelService.java @@ -1,5 +1,6 @@ package com.genersoft.iot.vmp.gb28181.service; +import com.genersoft.iot.vmp.gb28181.bean.CommonGBChannel; import com.genersoft.iot.vmp.gb28181.bean.PlatformChannel; import com.github.pagehelper.PageInfo; @@ -20,4 +21,6 @@ public interface IPlatformChannelService { int addChannels(Integer platformId, List channelIds); int removeChannels(Integer platformId, List channelIds); + + void removeChannels(List channelList); } diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceChannelServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceChannelServiceImpl.java index d5808a33..49556739 100755 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceChannelServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceChannelServiceImpl.java @@ -6,9 +6,11 @@ import com.genersoft.iot.vmp.common.InviteInfo; import com.genersoft.iot.vmp.common.InviteSessionType; import com.genersoft.iot.vmp.conf.UserSetting; import com.genersoft.iot.vmp.conf.exception.ControllerException; +import com.genersoft.iot.vmp.gb28181.bean.CommonGBChannel; import com.genersoft.iot.vmp.gb28181.bean.Device; import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel; import com.genersoft.iot.vmp.gb28181.bean.MobilePosition; +import com.genersoft.iot.vmp.gb28181.controller.bean.ChannelReduce; import com.genersoft.iot.vmp.gb28181.dao.DeviceChannelMapper; import com.genersoft.iot.vmp.gb28181.dao.DeviceMapper; import com.genersoft.iot.vmp.gb28181.dao.DeviceMobilePositionMapper; @@ -17,11 +19,11 @@ import com.genersoft.iot.vmp.gb28181.event.EventPublisher; import com.genersoft.iot.vmp.gb28181.event.subscribe.catalog.CatalogEvent; import com.genersoft.iot.vmp.gb28181.service.IDeviceChannelService; import com.genersoft.iot.vmp.gb28181.service.IInviteStreamService; +import com.genersoft.iot.vmp.gb28181.service.IPlatformChannelService; import com.genersoft.iot.vmp.storager.IRedisCatchStorage; import com.genersoft.iot.vmp.utils.DateUtil; import com.genersoft.iot.vmp.vmanager.bean.ErrorCode; import com.genersoft.iot.vmp.vmanager.bean.ResourceBaseInfo; -import com.genersoft.iot.vmp.gb28181.controller.bean.ChannelReduce; import com.genersoft.iot.vmp.web.gb28181.dto.DeviceChannelExtend; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -68,6 +70,10 @@ public class DeviceChannelServiceImpl implements IDeviceChannelService { @Autowired private IRedisCatchStorage redisCatchStorage; + @Autowired + private IPlatformChannelService platformChannelService; + + @Override public void updateChannel(String deviceId, DeviceChannel channel) { String channelId = channel.getDeviceId(); @@ -503,7 +509,6 @@ public class DeviceChannelServiceImpl implements IDeviceChannelService { return false; } int limitCount = 50; - boolean result = false; if (!addChannels.isEmpty()) { if (addChannels.size() > limitCount) { for (int i = 0; i < addChannels.size(); i += limitCount) { @@ -511,39 +516,52 @@ public class DeviceChannelServiceImpl implements IDeviceChannelService { if (i + limitCount > addChannels.size()) { toIndex = addChannels.size(); } - result = result || channelMapper.batchAdd(addChannels.subList(i, toIndex)) > 0; + channelMapper.batchAdd(addChannels.subList(i, toIndex)); } }else { - result = channelMapper.batchAdd(addChannels) > 0; + channelMapper.batchAdd(addChannels); } } - if (!result && !updateChannels.isEmpty()) { + if (!updateChannels.isEmpty()) { if (updateChannels.size() > limitCount) { for (int i = 0; i < updateChannels.size(); i += limitCount) { int toIndex = i + limitCount; if (i + limitCount > updateChannels.size()) { toIndex = updateChannels.size(); } - result = result || channelMapper.batchUpdate(updateChannels.subList(i, toIndex)) > 0; + channelMapper.batchUpdate(updateChannels.subList(i, toIndex)); } }else { - result = channelMapper.batchUpdate(updateChannels) > 0; + channelMapper.batchUpdate(updateChannels); } + // 不对收到的通道做比较，已确定是否真的发生变化，所以不发送更新通知 + } - if (!result && !deleteChannels.isEmpty()) { + if (!deleteChannels.isEmpty()) { if (deleteChannels.size() > limitCount) { for (int i = 0; i < deleteChannels.size(); i += limitCount) { int toIndex = i + limitCount; if (i + limitCount > deleteChannels.size()) { toIndex = deleteChannels.size(); } - result = result || channelMapper.batchDel(deleteChannels.subList(i, toIndex)) < 0; + channelMapper.batchDel(deleteChannels.subList(i, toIndex)); } }else { - result = channelMapper.batchDel(deleteChannels) < 0; + channelMapper.batchDel(deleteChannels); } + // 这些通道可能关联了，上级平台需要删除同时发送消息 + + List channelList = new ArrayList<>(); + deleteChannels.stream().forEach(deviceChannel -> { + CommonGBChannel commonGBChannel = new CommonGBChannel(); + commonGBChannel.setGbId(deviceChannel.getId()); + commonGBChannel.setGbDeviceId(deviceChannel.getDeviceId()); + commonGBChannel.setGbName(deviceChannel.getName()); + channelList.add(commonGBChannel); + }); + platformChannelService.removeChannels(channelList); } - return result; + return true; } diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelServiceImpl.java index ac0fc484..b68f2818 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelServiceImpl.java @@ -536,6 +536,7 @@ public class GbChannelServiceImpl implements IGbChannelService { return; } commonGBChannelMapper.removeParentIdByChannels(channelList); + // TODO 可能需要发送通道更新通知 } @Override diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GroupServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GroupServiceImpl.java index 5f7417b6..ebb631cb 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GroupServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GroupServiceImpl.java @@ -1,9 +1,6 @@ package com.genersoft.iot.vmp.gb28181.service.impl; -import com.genersoft.iot.vmp.gb28181.bean.CommonGBChannel; -import com.genersoft.iot.vmp.gb28181.bean.GbCode; -import com.genersoft.iot.vmp.gb28181.bean.Group; -import com.genersoft.iot.vmp.gb28181.bean.GroupTree; +import com.genersoft.iot.vmp.gb28181.bean.*; import com.genersoft.iot.vmp.gb28181.dao.CommonGBChannelMapper; import com.genersoft.iot.vmp.gb28181.dao.GroupMapper; import com.genersoft.iot.vmp.gb28181.event.EventPublisher; @@ -202,14 +199,22 @@ public class GroupServiceImpl implements IGroupService { gbChannelService.removeParentIdByGroupList(groupListForDelete); } groupManager.batchDelete(groupListForDelete); + for (Group groupForDelete : groupListForDelete) { - // 将变化信息发送通知 - CommonGBChannel channel = CommonGBChannel.build(groupForDelete); - try { - // 发送catalog - eventPublisher.catalogEventPublish(null, channel, CatalogEvent.DEL); - }catch (Exception e) { - log.warn("[业务分组/虚拟组织删除] 发送失败，{}", groupForDelete.getDeviceId(), e); + // 删除平台关联的分组信息。同时发送通知 + List platformList = groupManager.queryForPlatformByGroupId(groupForDelete.getId()); + if ( !platformList.isEmpty()) { + groupManager.deletePlatformGroup(groupForDelete.getId()); + // 将变化信息发送通知 + CommonGBChannel channel = CommonGBChannel.build(groupForDelete); + for (Platform platform : platformList) { + try { + // 发送catalog + eventPublisher.catalogEventPublish(platform.getId(), channel, CatalogEvent.DEL); + }catch (Exception e) { + log.warn("[业务分组/虚拟组织删除] 发送失败，{}", groupForDelete.getDeviceId(), e); + } + } } } return true; diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlatformChannelServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlatformChannelServiceImpl.java index 439e5db7..03e3a2bd 100755 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlatformChannelServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlatformChannelServiceImpl.java @@ -1,10 +1,7 @@ package com.genersoft.iot.vmp.gb28181.service.impl; import com.baomidou.dynamic.datasource.annotation.DS; -import com.genersoft.iot.vmp.gb28181.bean.CommonGBChannel; -import com.genersoft.iot.vmp.gb28181.bean.Group; -import com.genersoft.iot.vmp.gb28181.bean.PlatformChannel; -import com.genersoft.iot.vmp.gb28181.bean.Region; +import com.genersoft.iot.vmp.gb28181.bean.*; import com.genersoft.iot.vmp.gb28181.dao.CommonGBChannelMapper; import com.genersoft.iot.vmp.gb28181.dao.GroupMapper; import com.genersoft.iot.vmp.gb28181.dao.PlatformChannelMapper; @@ -273,7 +270,7 @@ public class PlatformChannelServiceImpl implements IPlatformChannelService { public int removeAllChannel(Integer platformId) { List channelListShare = platformChannelMapper.queryShare(platformId, null); Assert.notEmpty(channelListShare, "未共享任何通道"); - int result = platformChannelMapper.removeChannels(platformId, channelListShare); + int result = platformChannelMapper.removeChannelsWithPlatform(platformId, channelListShare); if (result > 0) { // 查询通道相关的分组信息 Set regionSet = regionMapper.queryByChannelList(channelListShare); @@ -308,7 +305,7 @@ public class PlatformChannelServiceImpl implements IPlatformChannelService { public int removeChannels(Integer platformId, List channelIds) { List channelList = platformChannelMapper.queryShare(platformId, channelIds); Assert.notEmpty(channelList, "所选通道未共享"); - int result = platformChannelMapper.removeChannels(platformId, channelList); + int result = platformChannelMapper.removeChannelsWithPlatform(platformId, channelList); if (result > 0) { // 查询通道相关的分组信息 Set regionSet = regionMapper.queryByChannelList(channelList); @@ -337,4 +334,46 @@ public class PlatformChannelServiceImpl implements IPlatformChannelService { } return result; } + + @Override + public void removeChannels(List channelList) { + List platformList = platformChannelMapper.queryPlatFormListByChannelList(channelList); + if (platformList.isEmpty()) { + return; + } + + + + + // TODO 不对呀 + for (Platform platform : platformList) { + int result = platformChannelMapper.removeChannelsWithPlatform(platform.getId(), channelList); + if (result > 0) { + // 查询通道相关的分组信息 + Set regionSet = regionMapper.queryByChannelList(channelList); + Set deleteRegion = deleteEmptyRegion(regionSet, platform.getId()); + if (!deleteRegion.isEmpty()) { + for (Region region : deleteRegion) { + channelList.add(0, CommonGBChannel.build(region)); + } + } + + // 查询通道相关的分组信息 + Set groupSet = groupMapper.queryByChannelList(channelList); + Set deleteGroup = deleteEmptyGroup(groupSet, platform.getId()); + if (!deleteGroup.isEmpty()) { + for (Group group : deleteGroup) { + channelList.add(0, CommonGBChannel.build(group)); + } + } + } + // 发送消息 + try { + // 发送catalog + eventPublisher.catalogEventPublish(platform.getId(), channelList, CatalogEvent.DEL); + } catch (Exception e) { + log.warn("[移除关联通道] 发送失败，数量：{}", channelList.size(), e); + } + } + } } diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/KeepaliveNotifyMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/KeepaliveNotifyMessageHandler.java index 6eba7ffe..aa0e05e7 100755 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/KeepaliveNotifyMessageHandler.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/KeepaliveNotifyMessageHandler.java @@ -60,7 +60,7 @@ public class KeepaliveNotifyMessageHandler extends SIPRequestProcessorParent imp return; } SIPRequest request = (SIPRequest) evt.getRequest(); - log.info("[收到心跳] device: {}, callId: {}", device.getDeviceId(), request.getCallIdHeader().getCallId()); + log.debug("[收到心跳] device: {}, callId: {}", device.getDeviceId(), request.getCallIdHeader().getCallId()); if (userSetting.getGbDeviceOnline() == 0 && !device.isOnLine()) { log.warn("[收到心跳] 设备离线，心跳不进行回复， device: {}, callId: {}", device.getDeviceId(), request.getCallIdHeader().getCallId()); return; diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaServerStatusManger.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaServerStatusManger.java index 39d8a181..863919c5 100644 --- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaServerStatusManger.java +++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaServerStatusManger.java @@ -105,7 +105,7 @@ public class ZLMMediaServerStatusManger { if (serverItem == null) { return; } - log.info("[ZLM-HOOK事件-心跳] ID：" + event.getMediaServerItem().getId()); + log.debug("[ZLM-HOOK事件-心跳] ID：" + event.getMediaServerItem().getId()); online(serverItem, null); } diff --git a/web_src/src/components/DeviceList.vue b/web_src/src/components/DeviceList.vue index d899384d..7dad0fe5 100755 --- a/web_src/src/components/DeviceList.vue +++ b/web_src/src/components/DeviceList.vue @@ -238,12 +238,10 @@ export default { type: 'error' }); } else { - // that.$message({ - // showClose: true, - // message: res.data.msg, - // type: 'success' - // }); - this.$refs.syncChannelProgress.openDialog(itemData.deviceId) + this.$refs.syncChannelProgress.openDialog(itemData.deviceId, ()=>{ + console.log(32322) + this.initData() + }) } that.initData() }).catch((e) => { diff --git a/web_src/src/components/common/GroupTree.vue b/web_src/src/components/common/GroupTree.vue index 595b7c9c..9bc7ecb6 100755 --- a/web_src/src/components/common/GroupTree.vue +++ b/web_src/src/components/common/GroupTree.vue @@ -339,6 +339,7 @@ export default { id: 0, name: "", deviceId: "", + civilCode: "", parentDeviceId: node.level > 2 ? node.data.deviceId:"", parentId: node.data.id, businessGroup: node.level > 2 ? node.data.businessGroup: node.data.deviceId, diff --git a/web_src/src/components/common/RegionTree.vue b/web_src/src/components/common/RegionTree.vue index 46125a1f..d4cc1881 100755 --- a/web_src/src/components/common/RegionTree.vue +++ b/web_src/src/components/common/RegionTree.vue @@ -37,20 +37,20 @@ - + - - diff --git a/web_src/src/components/dialog/chooseChannelForGb.vue b/web_src/src/components/dialog/chooseChannelForGb.vue deleted file mode 100755 index 4655e219..00000000 --- a/web_src/src/components/dialog/chooseChannelForGb.vue +++ /dev/null @@ -1,351 +0,0 @@ - - - - - diff --git a/web_src/src/components/dialog/chooseChannelForStream.vue b/web_src/src/components/dialog/chooseChannelForStream.vue deleted file mode 100755 index 71209fcf..00000000 --- a/web_src/src/components/dialog/chooseChannelForStream.vue +++ /dev/null @@ -1,281 +0,0 @@ - - - - - diff --git a/web_src/src/components/dialog/getCatalog.vue b/web_src/src/components/dialog/getCatalog.vue deleted file mode 100755 index fdc26de1..00000000 --- a/web_src/src/components/dialog/getCatalog.vue +++ /dev/null @@ -1,167 +0,0 @@ - - - - - - diff --git a/web_src/src/components/dialog/groupEdit.vue b/web_src/src/components/dialog/groupEdit.vue index b0954f17..72795cb4 100755 --- a/web_src/src/components/dialog/groupEdit.vue +++ b/web_src/src/components/dialog/groupEdit.vue @@ -20,6 +20,11 @@ + + + 生成 + +
@@ -32,15 +37,17 @@
+ diff --git a/web_src/src/components/dialog/regionEdit.vue b/web_src/src/components/dialog/regionEdit.vue new file mode 100644 index 00000000..780a824f --- /dev/null +++ b/web_src/src/components/dialog/regionEdit.vue @@ -0,0 +1,345 @@ + + + + + diff --git a/数据库/2.7.2-重构/初始化-mysql-2.7.2.sql b/数据库/2.7.2-重构/初始化-mysql-2.7.2.sql index beb79410..3d013db4 100644 --- a/数据库/2.7.2-重构/初始化-mysql-2.7.2.sql +++ b/数据库/2.7.2-重构/初始化-mysql-2.7.2.sql @@ -145,7 +145,7 @@ create table wvp_device_channel has_audio bool default false, gps_time character varying(50), stream_identification character varying(50), - channel_type int default 0 not null, + channel_type int default 0 not null, gb_device_id character varying(50), gb_name character varying(255), gb_manufacturer character varying(255), @@ -462,6 +462,7 @@ CREATE TABLE wvp_common_group business_group varchar(50) NOT NULL, create_time varchar(50) NOT NULL, update_time varchar(50) NOT NULL, + civil_code varchar(50) default null, UNIQUE KEY common_group_device_platform (device_id) );