From c7be2ef037c5aebb0cd8f1f33e5fa934389e6083 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 26 十月 2022 17:51:43 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleBindingService.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 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 f46f4a7..9d4f0cd 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
@@ -190,6 +190,32 @@
}
}
+
+
+ /**
+ * 鐏潌瑙ｇ粦璁惧锛屽垹闄よ澶囧墠闇�瑕佽В缁�
+ *
+ * @param deviceCode
+ */
+ public boolean unBindPole(Long poleId, String deviceCode,Integer deviceType) {
+ if (deviceCode == null) {
+ throw new BusinessException("璁惧缂栧彿涓嶈兘涓虹┖");
+ }
+ PoleBinding one;
+ //鐩存帴鍒犻櫎璁惧涓嶉渶瑕佺伅鏉咺D
+ if (poleId == null) {
+ one = getOne(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getDeviceCode, deviceCode).eq(PoleBinding::getDeviceType, deviceType));
+ } else {
+ one = getOne(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getDeviceCode, deviceCode)
+ .eq(PoleBinding::getDeviceType, deviceType).eq(PoleBinding::getPoleId, poleId));
+ }
+ if (one != null) {
+ return removeById(one.getId());
+ } else {
+ throw new BusinessException("璁惧涓嶅瓨鍦ㄧ粦瀹氭儏鍐垫垨鐏潌ID涓嶆纭�");
+ }
+ }
+
/**
* 璁惧鍒犻櫎,鐩存帴瑙ｇ粦璁惧鐩稿叧缁戝畾鏁版嵁
*
@@ -217,7 +243,7 @@
}
public PoleBinding getPoleIdByMac(String deviceCode) {
- return getOne(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getDeviceCode, deviceCode));
+ return getOne(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getDeviceCode, deviceCode).eq(PoleBinding::getDeviceType,0));
}
--
Gitblit v1.9.3