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); }