From bca4a2c079affdbf0754bd2922bf16a9777463de Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 30 十二月 2021 16:02:18 +0800
Subject: [PATCH] 轮播图优化
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 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 5949671..58d05ff 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
@@ -41,6 +41,9 @@
//鑾峰彇钀ょ煶浜戞憚鍍忓ご鎾斁鍦板潃URL
private static final String GET_VEDIO_URL = "/v2/live/address/get";
+
+ private final PoleBindingService poleBindingService;
+
/**
* 鏌ヨ鍏ㄩ儴鎽勫儚澶�
*/
@@ -80,7 +83,8 @@
bindingState1 = monitorParam.getBindingState();
bindingState2 = monitorParam.getBindingState();
}
- return monitorMapper.listMonitorByKeyword(monitorParam.getKeyword(), equipmentState1, equipmentState2, bindingState1, bindingState2);
+// return monitorMapper.listMonitorByKeyword(monitorParam.getKeyword(), equipmentState1, equipmentState2, bindingState1, bindingState2);
+ return monitorMapper.listMonitorByKeyword1(monitorParam.getKeyword(), bindingState1, bindingState2);
}
/**
@@ -94,6 +98,9 @@
if (monitor == null) {
throw new BusinessException("鎵句笉鍒版憚鍍忓ご");
}
+
+ //鍒犻櫎鎽勫儚澶磋澶囧墠闇�瑕佸厛瑙ｇ粦
+ poleBindingService.unBindPole(monitor.getDeviceSerial());
return removeById(Id);
}
--
Gitblit v1.9.3