diff --git a/ruoyi-ems/src/main/resources/mapper/ems/record/TWTempertureDataMapper.xml b/ruoyi-ems/src/main/resources/mapper/ems/record/TWTempertureDataMapper.xml index 449e4a9..5a95377 100644 --- a/ruoyi-ems/src/main/resources/mapper/ems/record/TWTempertureDataMapper.xml +++ b/ruoyi-ems/src/main/resources/mapper/ems/record/TWTempertureDataMapper.xml @@ -245,10 +245,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + select objid, + monitorId, + collectTime, + tempreture, + humidity, + illuminance, + noise, + concentration, + recodeTime, + alarmType, + pm1, + pm2, + pm10, + standby + from T_W_TempertureData + WHERE + recodeTime >= date_sub(CURDATE(), INTERVAL 7 DAY) + ORDER BY objid DESC + LIMIT 1000 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java index ddb83fa..629e2ef 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java @@ -128,16 +128,12 @@ public class SecurityConfig .antMatchers("/ems/base/baseMonitorInfo/monitorInfo").permitAll() .antMatchers("/ems/base/baseMonitorInfo/**").permitAll() .antMatchers("/ems/record/recordIOTInstant/selectLastTWTempertureData").permitAll() - .antMatchers("/ems/base/baseMonitorInfo/list").permitAll() + .antMatchers("/ems/base/baseMonitorInfo/monitorInfo/**").permitAll() .antMatchers("/record/recordBusbarAlarm/recordBusbarAlarmList").permitAll() // 允许匿名访问 看板 下所有页面 .antMatchers("/board/**").permitAll() - .antMatchers("/board/index2").permitAll() - .antMatchers("/board/index1").permitAll() - .antMatchers("/board/index").permitAll() - .antMatchers("/board/index3").permitAll() // 允许匿名访问 字典类型 .antMatchers("/system/dict/data/type/**").permitAll() diff --git a/ruoyi-ui/src/views/base/baseAlarmInfo/index.vue b/ruoyi-ui/src/views/base/baseAlarmInfo/index.vue index 710583e..335fee2 100644 --- a/ruoyi-ui/src/views/base/baseAlarmInfo/index.vue +++ b/ruoyi-ui/src/views/base/baseAlarmInfo/index.vue @@ -175,7 +175,7 @@ - +