From 547692ee899f3aa5e087c713aed4504914c6a91c Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Wed, 5 Jun 2024 08:38:44 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E6=8C=AF=E5=8A=A8=E4=BC=A0?=
 =?UTF-8?q?=E6=84=9F=E5=99=A8=E7=BB=B4=E6=8A=A4=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/web/controller/system/T_MonitorController.java   | 2 ++
 .../ruoyi/system/service/impl/T_MonitorServiceImpl.java    | 7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/T_MonitorController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/T_MonitorController.java
index bddfbd8..a886b0b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/T_MonitorController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/T_MonitorController.java
@@ -78,8 +78,10 @@ public class T_MonitorController extends BaseController {
                 break;
             case 17:
                 url = "/monitor_tw";
+                break;
             case 20:
                 url = "/vibrationSensorMonitor";
+                break;
             case 30:
                 url = "/arrayMonitor";
                 break;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/T_MonitorServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/T_MonitorServiceImpl.java
index 8521bb2..d518a61 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/T_MonitorServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/T_MonitorServiceImpl.java
@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 import java.util.List;
 import java.util.ArrayList;
 import com.ruoyi.common.core.domain.Ztree;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.domain.TSetmonitorthresholdvalue;
 import com.ruoyi.system.domain.dto.T_MonitorDTO;
 import com.ruoyi.system.service.ITSetmonitorthresholdvalueService;
@@ -99,8 +100,10 @@ public class T_MonitorServiceImpl implements IT_MonitorService
     @Override
     public int updateT_Monitor(T_Monitor t_Monitor)
     {
-        t_Monitor.setMonitorType(16);
-        t_Monitor.setSecondType(0);
+//        if (StringUtils.isNull(t_Monitor.getMonitorType())){
+//            t_Monitor.setMonitorType(16);
+//            t_Monitor.setSecondType(0);
+//        }
         return t_MonitorMapper.updateT_Monitor(t_Monitor);
     }