Shikong/wvp-gb28181-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

支持删除在线设备

Browse Source
This commit is contained in:
648540858 2022-02-28 17:56:27 +08:00
parent 0cd86a79c2
commit 9c5b1060af
2 changed files with 38 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java
View File

@ -204,10 +204,7 @@ public class DeviceQuery {
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {
logger.debug("设备信息删除API调用，deviceId：" + deviceId); logger.debug("设备信息删除API调用，deviceId：" + deviceId);
} }
if (offLineDetector.isOnline(deviceId)) {
return new ResponseEntity<String>("不允许删除在线设备！", HttpStatus.NOT_ACCEPTABLE);
}
// 清除redis记录 // 清除redis记录
boolean isSuccess = storager.delete(deviceId); boolean isSuccess = storager.delete(deviceId);
if (isSuccess) { if (isSuccess) {
@ -319,20 +316,20 @@ public class DeviceQuery {
if (!StringUtils.isEmpty(device.getCharset())) deviceInStore.setCharset(device.getCharset()); if (!StringUtils.isEmpty(device.getCharset())) deviceInStore.setCharset(device.getCharset());
if (!StringUtils.isEmpty(device.getMediaServerId())) deviceInStore.setMediaServerId(device.getMediaServerId()); if (!StringUtils.isEmpty(device.getMediaServerId())) deviceInStore.setMediaServerId(device.getMediaServerId());
if ((deviceInStore.getSubscribeCycleForCatalog() <=0 && device.getSubscribeCycleForCatalog() > 0) if (device.getSubscribeCycleForCatalog() > 0) {
|| deviceInStore.getSubscribeCycleForCatalog() != device.getSubscribeCycleForCatalog()) { if (deviceInStore.getSubscribeCycleForCatalog() == 0 || deviceInStore.getSubscribeCycleForCatalog() != device.getSubscribeCycleForCatalog()) {
deviceInStore.setSubscribeCycleForCatalog(device.getSubscribeCycleForCatalog()); // 开启订阅
// 开启订阅 deviceService.addCatalogSubscribe(deviceInStore);
deviceService.addCatalogSubscribe(deviceInStore); }
} }else if (device.getSubscribeCycleForCatalog() == 0) {
if (deviceInStore.getSubscribeCycleForCatalog() > 0 && device.getSubscribeCycleForCatalog() <= 0) { if (deviceInStore.getSubscribeCycleForCatalog() != 0) {
deviceInStore.setSubscribeCycleForCatalog(device.getSubscribeCycleForCatalog()); // 取消订阅
// 取消订阅 deviceService.removeCatalogSubscribe(deviceInStore);
deviceService.removeCatalogSubscribe(deviceInStore); }
} }
storager.updateDevice(deviceInStore); storager.updateDevice(device);
cmder.deviceInfoQuery(deviceInStore); cmder.deviceInfoQuery(device);
} }
WVPResult<String> result = new WVPResult<>(); WVPResult<String> result = new WVPResult<>();
result.setCode(0); result.setCode(0);

36
web_src/src/components/DeviceList.vue
View File

@ -55,14 +55,14 @@
<el-table-column prop="createTime" label="创建时间" align="center" width="140"> <el-table-column prop="createTime" label="创建时间" align="center" width="140">
</el-table-column> </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"> <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 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-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-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-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-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> </el-button-group>
</template> </template>
</el-table-column> </el-table-column>
@ -165,15 +165,29 @@
}, },
deleteDevice: function(row) { deleteDevice: function(row) {
let that = this; let msg = "确定删除此设备？"
this.$axios({ if (row.online !== 0) {
method: 'delete', msg = "在线设备删除后仍可通过注册再次上线。<br/>如需彻底删除请先将设备离线。<br/><strong>确定删除此设备？</strong>"
url:`/api/device/query/devices/${row.deviceId}/delete` }
}).then((res)=>{ this.$confirm(msg, '提示', {
this.getDeviceList(); dangerouslyUseHTMLString : true,
}).catch((error) =>{ confirmButtonText: '确定',
console.log(error); 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) { showChannelList: function(row) {