临时提交

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)

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<Integer> channelIds;
 
+    @Schema(description = "所有通道， 和channelIds参数二选一")
+    private Boolean all;
+
 }

web_src/src/components/dialog/UnusualRegionChannelSelect.vue

@@ -77,14 +77,14 @@
               icon="el-icon-plus"
               @click="addRegion(scope.row)"
             >
-              添加行政区划
+              添加
             </el-button>
           </template>
         </el-table-column>
       </el-table>
       <div style="display: grid; grid-template-columns: 1fr 1fr">
         <div style="text-align: left; line-height: 32px">
-          <i class="el-icon-info"></i>清除后通道可正常添加到行政区划，添加行政区划可以自动添加对应的行政区划节点。
+          <i class="el-icon-info"></i> 清除后通道可正常添加到行政区划，添加可以自动添加对应的行政区划节点。
         </div>
         <el-pagination
           style="text-align: right"
@@ -164,7 +164,6 @@ export default {
 
     },
     openDialog: function () {
-      console.log(2222)
       this.showDialog = true;
       this.initData();
     },
@@ -172,6 +171,42 @@ export default {
       this.showDialog = false;
     },
     clearUnusualRegion: function () {
+      if (this.multipleSelection.length === 0) {
+        return;
+      }
+      let channels = []
+      for (let i = 0; i < this.multipleSelection.length; i++) {
+        channels.push(this.multipleSelection[i].gbId)
+      }
+
+      this.$axios({
+        method: 'post',
+        url: `/api/common/channel/region/add`,
+        data: {
+          civilCode: regionDeviceId,
+          channelIds: channels
+        }
+      }).then((res) => {
+        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) {