From 93d6fdb255ebd9d33adebc4e96ecc5f74b6281ea Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 08 三月 2022 14:11:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java
index 777ba66..ebca42b 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java
@@ -85,7 +85,7 @@
}
//鍒犻櫎鎽勫儚澶磋澶囧墠闇�瑕佸厛瑙ｇ粦
- poleBindingService.unBindPole(monitor.getDeviceSerial());
+ poleBindingService.unBindPole(null, monitor.getDeviceSerial());
return removeById(Id);
}
@@ -107,14 +107,15 @@
*
* @param accessToken 鎺堟潈杩囩▼鑾峰彇鐨刟ccess_token
* @param deviceSerial 璁惧搴忓垪鍙�,瀛樺湪鑻辨枃瀛楁瘝鐨勮澶囧簭鍒楀彿锛屽瓧姣嶉渶涓哄ぇ鍐�
- * @param validateCode 璁惧楠岃瘉鐮侊紝璁惧鏈鸿韩涓婄殑鍏綅澶у啓瀛楁瘝
+ * // * @param validateCode 璁惧楠岃瘉鐮侊紝璁惧鏈鸿韩涓婄殑鍏綅澶у啓瀛楁瘝
*/
- public YSY_MonitorDto addYSYMonitor(String accessToken, String deviceSerial, String validateCode) {
+// public YSY_MonitorDto addYSYMonitor(String accessToken, String deviceSerial, String validateCode) {
+ public YSY_MonitorDto addYSYMonitor(String accessToken, String deviceSerial) {
Map<String, Object> paramMap = new HashMap<>();
paramMap.put("accessToken", accessToken);
paramMap.put("deviceSerial", deviceSerial);
- paramMap.put("validateCode", validateCode);
+// paramMap.put("validateCode", validateCode);
String s = HttpUtil.post(YSY_URL + ADD_DEVICE_URL, paramMap);
System.out.println(s);
YSY_MonitorDto monitorDto = JSON.parseObject(s, YSY_MonitorDto.class);
@@ -221,5 +222,28 @@
}
}
+ /**
+ * 淇敼璁惧缁戝畾鐘舵��
+ *
+ * @param flag true涓虹粦瀹� false 涓鸿В缁�
+ */
+ public void updateBingdingState(boolean flag, String deviceCode) {
+ if (flag) {//缁戝畾
+ Monitor monitor = getOne(Wrappers.lambdaQuery(Monitor.class).eq(Monitor::getDeviceSerial, deviceCode));
+ if (monitor == null) {
+ return;
+ }
+ monitor.setBindingState(1);
+ updateById(monitor);
+ } else {//瑙ｇ粦
+ Monitor monitor = getOne(Wrappers.lambdaQuery(Monitor.class).eq(Monitor::getDeviceSerial, deviceCode));
+ if (monitor == null) {
+ return;
+ }
+ monitor.setBindingState(0);
+ updateById(monitor);
+ }
+ }
+
}
--
Gitblit v1.9.3