From da6ea6d775461e6d56eb50cbdd79e6ba3b8f41e4 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期二, 01 三月 2022 14:22:30 +0800
Subject: [PATCH] 灯杆绑定设备，解绑设备
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
index f76390b..b2fe1a5 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
@@ -157,6 +157,15 @@
return poleBindingService.bindPole(poleId, param);
}
+ /**
+ * 鐏潌瑙ｇ粦缁戝畾璁惧
+ *
+ * @return 鏄惁鎴愬姛
+ */
+ public boolean unBindPole(String deviceCode) {
+ return poleBindingService.unBindPole(deviceCode);
+ }
+
/**
* 鐏潌鎭㈠鍑哄巶璁剧疆
@@ -206,17 +215,15 @@
/**
* 缁欑伅鏉嗘敞鍐屼笁鍏冪爜
*/
-
-
public boolean setMac(String baseMac) {
- // public boolean setMac() {
+ // public boolean setMac() {
//Pole pole = getById(poleId);
/* if (pole == null) {
throw new BusinessException("鏈壘鍒拌鐏潌");
}*/
boolean setMac = false;
- //String baseMac = "baseDevice";
+ //String baseMac = "baseDevice";
A1Frame a1Frame = new A1Frame(A1OrderEnum.REQUEST_READ_DEVICE_UNIQUE_MAC.getCode(), new EmptyRequestInnerFrame());
CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance()
.sendRRPC(baseMac, a1Frame);
@@ -340,21 +347,21 @@
* 鐢ㄦ埛缁戝畾鐏潌
*
* @param clientId 鐢ㄦ埛ID
- * @param poleIds 鐏潌ID
+ * @param poleIds 鐏潌ID
* @return
*/
public boolean ClientBindingPole(long clientId, int[] poleIds) {
- boolean r=false;
- for (int poleId:poleIds) {
+ boolean r = false;
+ for (int poleId : poleIds) {
Pole pole = getById(poleId);
if (pole == null) {
throw new BusinessException("鐏潌涓嶅瓨鍦�");
}
pole.setClientId(clientId);
- r=updateById(pole);
+ r = updateById(pole);
- if(!r){
- throw new BusinessException("鐏潌ID涓�"+poleId+"璁剧疆澶辫触,鑷姩鍋滄");
+ if (!r) {
+ throw new BusinessException("鐏潌ID涓�" + poleId + "璁剧疆澶辫触,鑷姩鍋滄");
}
}
--
Gitblit v1.9.3