From 161ec503806c8b71f5caa2d42c2fa9c03ca062d6 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期一, 28 二月 2022 15:17:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java | 58 +++++++++-------------------------------------------------
1 files changed, 9 insertions(+), 49 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 7e9cbd8..777ba66 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
@@ -58,59 +58,19 @@
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
List<MonitorBo> monitorList;
//缁戝畾鐘舵�侊細宸茬粦瀹�/鏈粦瀹�/鍏ㄩ儴
- if (monitorParam.getBindingState() == null || 2 == monitorParam.getBindingState()) {
+ if (monitorParam.getBindingState() == null) {
//鍏ㄩ儴
- int bindingState = 2;
- monitorList = monitorMapper.listMonitorByIds(monitorParam.getKeyword(), clientId, bindingState);
- } else {
- monitorList = monitorMapper.listMonitorByIds(monitorParam.getKeyword(), clientId, monitorParam.getBindingState());
+ monitorParam.setBindingState(2);
}
+ if (monitorParam.getEquipmentState() == null) {
+ //鍏ㄩ儴
+ monitorParam.setEquipmentState(2);
+ }
+
+ monitorList = monitorMapper.listMonitorByIds(monitorParam.getKeyword(), clientId, monitorParam.getBindingState(), monitorParam.getEquipmentState());
+
return monitorList;
}
-
-
-// /**
-// * 鏌ヨ鍏ㄩ儴鎽勫儚澶�
-// */
-// public List<Monitor> listMonitor() {
-// LambdaQueryWrapper<Monitor> wrapper = Wrappers.lambdaQuery(Monitor.class);
-// List<Monitor> list = list(wrapper);
-//
-// return list;
-// }
-//
-// /**
-// * 妯＄硦鏌ヨ
-// */
-// public List<Monitor> listMonitorByKeyword(MonitorParam monitorParam) {
-// //璁惧鐘舵��:鍦ㄧ嚎/绂荤嚎/鍏ㄩ儴
-// int equipmentState1;
-// int equipmentState2;
-// if (2 == monitorParam.getEquipmentState()) {
-// //鍦ㄧ嚎
-// equipmentState1 = 1;
-// //绂荤嚎
-// equipmentState2 = 0;
-// } else {
-// equipmentState1 = monitorParam.getEquipmentState();
-// equipmentState2 = monitorParam.getEquipmentState();
-// }
-//
-// //缁戝畾鐘舵�侊細宸茬粦瀹�/鏈粦瀹�/鍏ㄩ儴
-// int bindingState1;
-// int bindingState2;
-// if (2 == monitorParam.getBindingState()) {
-// //宸茬粦瀹�
-// bindingState1 = 1;
-// //鏈粦瀹�
-// bindingState2 = 0;
-// } else {
-// bindingState1 = monitorParam.getBindingState();
-// bindingState2 = monitorParam.getBindingState();
-// }
-//// return monitorMapper.listMonitorByKeyword(monitorParam.getKeyword(), equipmentState1, equipmentState2, bindingState1, bindingState2);
-// return monitorMapper.listMonitorByKeyword1(baseConditionVO, monitorParam.getKeyword(), bindingState1, bindingState2);
-// }
/**
* 鍒犻櫎鎽勫儚澶�
--
Gitblit v1.9.3