From d2d278ae767b6a550fe1dce7bfa958d83f7dc661 Mon Sep 17 00:00:00 2001
From: shikong <919411476@qq.com>
Date: Thu, 7 Sep 2023 17:15:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E4=B8=BB=E9=94=AEid=20?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E8=AE=BE=E5=A4=87=E7=BC=96=E7=A0=81(21?=
 =?UTF-8?q?=E4=BD=8D)=20=E5=9B=BD=E6=A0=87=E8=AE=BE=E5=A4=87id(20=E4=BD=8D?=
 =?UTF-8?q?)=20=E5=88=A0=E9=99=A4=E6=8C=87=E5=AE=9A=E8=AE=BE=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wvp/api/device/DeviceController.java      | 25 +++++++++++++++++++
 .../wvp/service/device/DeviceService.java     |  6 ++---
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/gb28181-wvp-proxy-api/src/main/java/cn/skcks/docking/gb28181/wvp/api/device/DeviceController.java b/gb28181-wvp-proxy-api/src/main/java/cn/skcks/docking/gb28181/wvp/api/device/DeviceController.java
index 19e1738..a1c3d56 100644
--- a/gb28181-wvp-proxy-api/src/main/java/cn/skcks/docking/gb28181/wvp/api/device/DeviceController.java
+++ b/gb28181-wvp-proxy-api/src/main/java/cn/skcks/docking/gb28181/wvp/api/device/DeviceController.java
@@ -1,5 +1,6 @@
 package cn.skcks.docking.gb28181.wvp.api.device;
 
+import cn.skcks.docking.gb28181.annotation.web.JsonMapping;
 import cn.skcks.docking.gb28181.annotation.web.methods.GetJson;
 import cn.skcks.docking.gb28181.annotation.web.methods.PostJson;
 import cn.skcks.docking.gb28181.common.json.JsonResponse;
@@ -58,4 +59,28 @@ public class DeviceController {
         WvpProxyDevice wvpProxyDevice = deviceService.getDeviceByGbDeviceId(gbDeviceId).orElse(null);
         return JsonResponse.success(wvpProxyDevice);
     }
+
+    @Operation(summary = "根据设备编码(21位) 删除指定设备")
+    @JsonMapping(value = "/delete/deviceCode",method = {RequestMethod.GET,RequestMethod.DELETE})
+    public JsonResponse<Boolean> deleteByDeviceCode(@RequestParam String deviceCode){
+        WvpProxyDevice wvpProxyDevice = new WvpProxyDevice();
+        wvpProxyDevice.setDeviceCode(deviceCode);
+        return JsonResponse.success(deviceService.deleteDevice(wvpProxyDevice));
+    }
+
+    @Operation(summary = "根据国标id(20位) 删除指定设备")
+    @JsonMapping(value = "/delete/gbDeviceId",method = {RequestMethod.GET,RequestMethod.DELETE})
+    public JsonResponse<Boolean> deleteByGbDeviceId(@RequestParam String gbDeviceId){
+        WvpProxyDevice wvpProxyDevice = new WvpProxyDevice();
+        wvpProxyDevice.setGbDeviceId(gbDeviceId);
+        return JsonResponse.success(deviceService.deleteDevice(wvpProxyDevice));
+    }
+
+    @Operation(summary = "根据主键 id 删除指定设备")
+    @JsonMapping(value = "/delete/id",method = {RequestMethod.GET,RequestMethod.DELETE})
+    public JsonResponse<Boolean> deleteByGbDeviceId(@RequestParam Long id){
+        WvpProxyDevice wvpProxyDevice = new WvpProxyDevice();
+        wvpProxyDevice.setId(id);
+        return JsonResponse.success(deviceService.deleteDevice(wvpProxyDevice));
+    }
 }
diff --git a/gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/service/device/DeviceService.java b/gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/service/device/DeviceService.java
index 0d522e2..e0ea765 100644
--- a/gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/service/device/DeviceService.java
+++ b/gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/service/device/DeviceService.java
@@ -75,7 +75,7 @@ public class DeviceService {
      * @param device 设备
      * @return 是否成功
      */
-    public boolean updateDevice(WvpProxyDevice device){
+    public boolean deleteDevice(WvpProxyDevice device){
         if(device == null){
             return false;
         }
@@ -84,11 +84,11 @@ public class DeviceService {
         String deviceCode = device.getDeviceCode();
         String gbDeviceId = device.getGbDeviceId();
         if(id != null){
-            return deviceMapper.updateByPrimaryKey(device) > 0;
+            return deviceMapper.deleteByPrimaryKey(id) > 0;
         } else if(StringUtils.isNotBlank(deviceCode)){
             return deviceMapper.delete(d->d.where(WvpProxyDeviceDynamicSqlSupport.deviceCode,isEqualTo(deviceCode))) > 0;
         } else if(StringUtils.isNotBlank(gbDeviceId)){
-            return deviceMapper.delete(d->d.where(WvpProxyDeviceDynamicSqlSupport.gbDeviceId,isEqualTo(deviceCode))) > 0;
+            return deviceMapper.delete(d->d.where(WvpProxyDeviceDynamicSqlSupport.gbDeviceId,isEqualTo(gbDeviceId))) > 0;
         } else {
             return false;
         }