From 34ee53680318cef28c80cf40959b6fd3d55a0c4e Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期四, 24 二月 2022 17:28:40 +0800
Subject: [PATCH] 功能完善
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 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 4358388..2a6ae70 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
@@ -206,16 +206,15 @@
/**
* 缁欑伅鏉嗘敞鍐屼笁鍏冪爜
*/
-
-
public boolean setMac(String baseMac) {
+ // 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);
@@ -339,16 +338,24 @@
* 鐢ㄦ埛缁戝畾鐏潌
*
* @param clientId 鐢ㄦ埛ID
- * @param poleId 鐏潌ID
+ * @param poleIds 鐏潌ID
* @return
*/
- public boolean ClientBindingPole(long clientId, int poleId) {
- Pole pole = getById(poleId);
- if (pole == null) {
- throw new BusinessException("鐏潌涓嶅瓨鍦�");
- }
- pole.setClientId(clientId);
+ public boolean ClientBindingPole(long clientId, int[] poleIds) {
+ boolean r=false;
+ for (int poleId:poleIds) {
+ Pole pole = getById(poleId);
+ if (pole == null) {
+ throw new BusinessException("鐏潌涓嶅瓨鍦�");
+ }
+ pole.setClientId(clientId);
+ r=updateById(pole);
- return updateById(pole);
+ if(!r){
+ throw new BusinessException("鐏潌ID涓�"+poleId+"璁剧疆澶辫触,鑷姩鍋滄");
+ }
+
+ }
+ return r;
}
}
--
Gitblit v1.9.3