From 4cf57b750ba4e43e6b354fb5b2eabe5fb0b951d6 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 30 三月 2022 10:42:03 +0800
Subject: [PATCH] 充电桩

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleBindingService.java |   37 ++++++++++++++++++++++++++++++++-----
 1 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleBindingService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleBindingService.java
index 76c0dca..62d5eef 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleBindingService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleBindingService.java
@@ -50,13 +50,40 @@
      *
      * @param deviceCode
      */
-    public void unBindPole(String deviceCode) {
-        if (deviceCode == null)
+    public boolean unBindPole(Long poleId, String deviceCode) {
+        if (deviceCode == null) {
             throw new BusinessException("璁惧缂栧彿涓嶈兘涓虹┖");
-
-        PoleBinding one = getOne(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getDeviceCode, deviceCode));
+        }
+        PoleBinding one;
+        //鐩存帴鍒犻櫎璁惧涓嶉渶瑕佺伅鏉咺D
+        if (poleId == null) {
+            one = getOne(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getDeviceCode, deviceCode));
+        } else {
+            one = getOne(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getDeviceCode, deviceCode).eq(PoleBinding::getPoleId, poleId));
+        }
         if (one != null) {
-            removeById(one.getId());
+            return removeById(one.getId());
+        } else {
+            throw new BusinessException("璁惧涓嶅瓨鍦ㄧ粦瀹氭儏鍐垫垨鐏潌ID涓嶆纭�");
+        }
+    }
+
+    /**
+     * 璁惧鍒犻櫎,鐩存帴瑙g粦璁惧鐩稿叧缁戝畾鏁版嵁
+     *
+     * @param deviceCode
+     */
+    public boolean unBindPole(String deviceCode) {
+        if (deviceCode == null) {
+            throw new BusinessException("璁惧缂栧彿涓嶈兘涓虹┖");
+        }
+        //鐩存帴鍒犻櫎璁惧涓嶉渶瑕佺伅鏉咺D
+        PoleBinding one = getOne(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getDeviceCode, deviceCode));
+
+        if (one != null) {
+            return removeById(one.getId());
+        } else {
+            return false;
         }
     }
 }

--
Gitblit v1.9.3