diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/controller/CommonChannelController.java b/src/main/java/com/genersoft/iot/vmp/gb28181/controller/CommonChannelController.java index b2451990..ef81848f 100755 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/controller/CommonChannelController.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/controller/CommonChannelController.java @@ -160,6 +160,16 @@ public class CommonChannelController { return channelService.queryListByCivilCodeForUnusual(page, count, query, online, channelType); } + @Operation(summary = "清除存在行政区划但无法挂载的通道列表", security = @SecurityRequirement(name = JwtUtils.HEADER)) + @Parameter(name = "param", description = "当前页", required = true) + @GetMapping("/civilCode/unusual/clear") + public void queryListByCivilCodeForUnusual(ChannelToRegionParam param){ + if (ObjectUtils.isEmpty(query)){ + query = null; + } + return channelService.queryListByCivilCodeForUnusual(page, count, query, online, channelType); + } + @Operation(summary = "获取关联业务分组通道列表", security = @SecurityRequirement(name = JwtUtils.HEADER)) @Parameter(name = "page", description = "当前页", required = true) @Parameter(name = "count", description = "每页查询数量", required = true) diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/controller/bean/ChannelToRegionParam.java b/src/main/java/com/genersoft/iot/vmp/gb28181/controller/bean/ChannelToRegionParam.java index 32505b23..7f740041 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/controller/bean/ChannelToRegionParam.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/controller/bean/ChannelToRegionParam.java @@ -1,13 +1,21 @@ package com.genersoft.iot.vmp.gb28181.controller.bean; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.util.List; @Data +@Schema(description="提交行政区划关联多个通道的参数") public class ChannelToRegionParam { + @Schema(description = "行政区划编号") private String civilCode; + + @Schema(description = "选择的通道, 和all参数二选一") private List channelIds; + @Schema(description = "所有通道, 和channelIds参数二选一") + private Boolean all; + } diff --git a/web_src/src/components/dialog/GbChannelSelect.vue b/web_src/src/components/dialog/GbChannelSelect.vue index 1bc92cd2..d7008e5d 100644 --- a/web_src/src/components/dialog/GbChannelSelect.vue +++ b/web_src/src/components/dialog/GbChannelSelect.vue @@ -66,7 +66,7 @@
- 未找到通道,可在国标设备/通道中选择编辑按钮, 选择{{dataType === 'civilCode'?'行政区划':'父节点编码'}} + 未找到通道,可在国标设备/通道中选择编辑按钮, 选择{{dataType === 'civilCode'?'行政区划':'父节点编码'}}
- 添加行政区划 + 添加
- 清除后通道可正常添加到行政区划,添加行政区划可以自动添加对应的行政区划节点。 + 清除后通道可正常添加到行政区划,添加可以自动添加对应的行政区划节点。
{ + if (res.data.code === 0) { + this.$message.success({ + showClose: true, + message: "保存成功" + }) + this.getChannelList() + } else { + this.$message.error({ + showClose: true, + message: res.data.msg + }) + } + this.loading = false + }).catch((error) => { + this.$message.error({ + showClose: true, + message: error + }) + this.loading = false + }); }, addRegion: function (row) {