From a091a0552ba1374386910571ab9d929f84582fb5 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期一, 20 十二月 2021 14:36:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleBindingService.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 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 8f810d5..749fd9c 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
@@ -20,15 +20,15 @@
public boolean bindPole(Long poleId, PoleBindingParam param) {
Integer deviceType = param.getDeviceType();
- if (PoleBindingEnums.LIGHT.getCode().equals(deviceType)) {
- PoleBinding poleBinding = new PoleBinding();
- poleBinding.setPoleId(poleId);
- poleBinding.setDeviceType(deviceType);
- poleBinding.setDeviceName(param.getDeviceName());
- poleBinding.setDeviceMac(param.getDeviceMac());
- return save(poleBinding);
- }
+// if (PoleBindingEnums.LIGHT.getCode().equals(deviceType)) {
+// }
+ PoleBinding poleBinding = new PoleBinding();
+ poleBinding.setPoleId(poleId);
+ poleBinding.setDeviceType(deviceType);
+ poleBinding.setDeviceName(param.getDeviceName());
+ poleBinding.setDeviceCode(param.getDeviceCode());
+ return save(poleBinding);
- return false;
+// return false;
}
}
--
Gitblit v1.9.3