From 77d75870f40cc677c7652c7d8694da1d7eb45834 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期二, 30 十一月 2021 18:27:32 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 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 58e2ff9..0e434a9 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
@@ -35,22 +35,26 @@
*/
public List<Monitor> listMonitorByKeyword(MonitorParam monitorParam) {
//璁惧鐘舵��:鍦ㄧ嚎/绂荤嚎/鍏ㄩ儴
- String equipmentState1;
- String equipmentState2;
- if ("鍏ㄩ儴".equals(monitorParam.getEquipmentState())) {
- equipmentState1 = "鍦ㄧ嚎";
- equipmentState2 = "绂荤嚎";
+ int equipmentState1;
+ int equipmentState2;
+ if (2 == monitorParam.getEquipmentState()) {
+ //鍦ㄧ嚎
+ equipmentState1 = 1;
+ //绂荤嚎
+ equipmentState2 = 0;
} else {
equipmentState1 = monitorParam.getEquipmentState();
equipmentState2 = monitorParam.getEquipmentState();
}
//缁戝畾鐘舵�侊細宸茬粦瀹�/鏈粦瀹�/鍏ㄩ儴
- String bindingState1;
- String bindingState2;
- if ("鍏ㄩ儴".equals(monitorParam.getBindingState())) {
- bindingState1 = "宸茬粦瀹�";
- bindingState2 = "鏈粦瀹�";
+ int bindingState1;
+ int bindingState2;
+ if (2 == monitorParam.getBindingState()) {
+ //宸茬粦瀹�
+ bindingState1 = 1;
+ //鏈粦瀹�
+ bindingState2 = 0;
} else {
bindingState1 = monitorParam.getBindingState();
bindingState2 = monitorParam.getBindingState();
@@ -71,7 +75,6 @@
}
return removeById(Id);
}
-
}
--
Gitblit v1.9.3