From 58568157827e900d0bfb32efdd31ea1bf9254e5c Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 21 十二月 2021 15:41:13 +0800
Subject: [PATCH] LED节目完善

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java |   42 ++++++++++++++----------------------------
 1 files changed, 14 insertions(+), 28 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 0f19ea5..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();
@@ -72,23 +76,5 @@
         return removeById(Id);
     }
 
-    /**
-     * 缂栬緫鎽勫儚澶�
-     * @param Id
-     * @param monitorParam
-     * @return
-     */
-    public boolean updateBanner(Long Id, MonitorParam monitorParam) {
-        Monitor monitor = getById(Id);
-        if (monitor == null) {
-            throw new BusinessException("鎵句笉鍒版憚鍍忓ご");
-        }
-        Monitor update = new Monitor();
-        update.setId(Id);
-        update.setSerialNumber(monitorParam.());
-        update.setBannerUrl(bannerParam.getUrl());
-        update.setId(bannerId);
-        return updateById(update);
-    }
 
 }

--
Gitblit v1.9.3