From c00a73b74e67dbeb508865c3da4ed8d57c8631db Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 20 四月 2022 14:16:12 +0800
Subject: [PATCH] fix admin LIST
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 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 68b63fa..c55a2c4 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
@@ -55,7 +55,9 @@
*/
public List<MonitorBo> listMonitorByKeyword(BaseConditionVO baseConditionVO, MonitorParam monitorParam) {
Long clientId = SecurityUtils.getClientId();
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ if (baseConditionVO != null) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ }
List<MonitorBo> monitorList;
//缁戝畾鐘舵�侊細宸茬粦瀹�/鏈粦瀹�/鍏ㄩ儴
if (monitorParam.getBindingState() == null) {
@@ -264,4 +266,25 @@
}
+ /**
+ * 淇敼note
+ *
+ * @param deviceSerial
+ * @param notes
+ * @return
+ */
+ public boolean updateNotes(String deviceSerial, String notes) {
+ if (deviceSerial == null || deviceSerial.trim().length() == 0 || notes == null) {
+ throw new BusinessException("淇敼澶囨敞鍙傛暟鏈夎锛�");
+ }
+ Monitor one = getOne(Wrappers.lambdaQuery(Monitor.class).eq(Monitor::getDeviceSerial, deviceSerial));
+ if (one != null) {
+ one.setNote(notes);
+ return updateById(one);
+ } else {
+ throw new BusinessException("鎽勫儚澶磋澶囦笉瀛樺湪锛�");
+ }
+ }
+
+
}
--
Gitblit v1.9.3