From 9c5b1060af4e6c468b2cf95fbb9ec6d0a05fad5c Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Mon, 28 Feb 2022 17:56:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=88=A0=E9=99=A4=E5=9C=A8?=
 =?UTF-8?q?=E7=BA=BF=E8=AE=BE=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vmanager/gb28181/device/DeviceQuery.java  | 29 +++++++--------
 web_src/src/components/DeviceList.vue         | 36 +++++++++++++------
 2 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java
index d9357d20..1d639098 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java
@@ -204,10 +204,7 @@ public class DeviceQuery {
 		if (logger.isDebugEnabled()) {
 			logger.debug("设备信息删除API调用，deviceId：" + deviceId);
 		}
-		
-		if (offLineDetector.isOnline(deviceId)) {
-			return new ResponseEntity<String>("不允许删除在线设备！", HttpStatus.NOT_ACCEPTABLE);
-		}
+
 		// 清除redis记录
 		boolean isSuccess = storager.delete(deviceId);
 		if (isSuccess) {
@@ -319,20 +316,20 @@ public class DeviceQuery {
 			if (!StringUtils.isEmpty(device.getCharset())) deviceInStore.setCharset(device.getCharset());
 			if (!StringUtils.isEmpty(device.getMediaServerId())) deviceInStore.setMediaServerId(device.getMediaServerId());
 
-			if ((deviceInStore.getSubscribeCycleForCatalog() <=0 && device.getSubscribeCycleForCatalog() > 0)
-					|| deviceInStore.getSubscribeCycleForCatalog() != device.getSubscribeCycleForCatalog()) {
-				deviceInStore.setSubscribeCycleForCatalog(device.getSubscribeCycleForCatalog());
-				// 开启订阅
-				deviceService.addCatalogSubscribe(deviceInStore);
-			}
-			if (deviceInStore.getSubscribeCycleForCatalog() > 0 && device.getSubscribeCycleForCatalog() <= 0) {
-				deviceInStore.setSubscribeCycleForCatalog(device.getSubscribeCycleForCatalog());
-				// 取消订阅
-				deviceService.removeCatalogSubscribe(deviceInStore);
+			if (device.getSubscribeCycleForCatalog() > 0) {
+				if (deviceInStore.getSubscribeCycleForCatalog() == 0 || deviceInStore.getSubscribeCycleForCatalog() != device.getSubscribeCycleForCatalog()) {
+					// 开启订阅
+					deviceService.addCatalogSubscribe(deviceInStore);
+				}
+			}else if (device.getSubscribeCycleForCatalog() == 0) {
+				if (deviceInStore.getSubscribeCycleForCatalog() != 0) {
+					// 取消订阅
+					deviceService.removeCatalogSubscribe(deviceInStore);
+				}
 			}
 
-			storager.updateDevice(deviceInStore);
-			cmder.deviceInfoQuery(deviceInStore);
+			storager.updateDevice(device);
+			cmder.deviceInfoQuery(device);
 		}
 		WVPResult<String> result = new WVPResult<>();
 		result.setCode(0);
diff --git a/web_src/src/components/DeviceList.vue b/web_src/src/components/DeviceList.vue
index 0dab7465..7922a934 100644
--- a/web_src/src/components/DeviceList.vue
+++ b/web_src/src/components/DeviceList.vue
@@ -55,14 +55,14 @@
           <el-table-column prop="createTime" label="创建时间" align="center" width="140">
           </el-table-column>
 
-					<el-table-column label="操作" width="360" align="center" fixed="right">
+					<el-table-column label="操作" width="450" align="center" fixed="right">
 						<template slot-scope="scope">
 							<el-button size="mini" :ref="scope.row.deviceId + 'refbtn' "  v-if="scope.row.online!=0" icon="el-icon-refresh"  @click="refDevice(scope.row)">刷新</el-button>
 							<el-button-group>
                 <el-button size="mini" icon="el-icon-video-camera-solid" v-bind:disabled="scope.row.online==0"  type="primary" @click="showChannelList(scope.row)">通道</el-button>
                 <el-button size="mini" icon="el-icon-location" v-bind:disabled="scope.row.online==0"  type="primary" @click="showDevicePosition(scope.row)">定位</el-button>
                 <el-button size="mini" icon="el-icon-edit" type="primary" @click="edit(scope.row)">编辑</el-button>
-                <el-button size="mini" icon="el-icon-delete" type="danger" v-if="scope.row.online==0"  @click="deleteDevice(scope.row)">删除</el-button>
+                <el-button size="mini" icon="el-icon-delete" type="danger" @click="deleteDevice(scope.row)">删除</el-button>
 							</el-button-group>
 							</template>
 					</el-table-column>
@@ -165,15 +165,29 @@
 
 			},
       deleteDevice: function(row) {
-				let that = this;
-				this.$axios({
-					method: 'delete',
-					url:`/api/device/query/devices/${row.deviceId}/delete`
-				}).then((res)=>{
-          this.getDeviceList();
-				}).catch((error) =>{
-					console.log(error);
-				});
+        let msg = "确定删除此设备？"
+        if (row.online !== 0) {
+          msg = "在线设备删除后仍可通过注册再次上线。<br/>如需彻底删除请先将设备离线。<br/><strong>确定删除此设备？</strong>"
+        }
+        this.$confirm(msg, '提示', {
+          dangerouslyUseHTMLString : true,
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          center: true,
+          type: 'warning'
+        }).then(() => {
+          this.$axios({
+            method: 'delete',
+            url:`/api/device/query/devices/${row.deviceId}/delete`
+          }).then((res)=>{
+            this.getDeviceList();
+          }).catch((error) =>{
+            console.log(error);
+          });
+        }).catch(() => {
+
+        });
+
 
 			},
 			showChannelList: function(row) {