From 8d771a2ae38c9d8a19d7de2b80c993fe7f4dce41 Mon Sep 17 00:00:00 2001 From: zch Date: Tue, 17 Dec 2024 14:42:18 +0800 Subject: [PATCH] =?UTF-8?q?refactor(ems):=20=E4=BC=98=E5=8C=96=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E7=9B=91=E6=8E=A7=E7=9C=8B=E6=9D=BF=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改 EmsBaseMonitorInfoController 中的 list 方法，移除预授权注解 - 在 baseAlarmInfo 页面中注释掉部分搜索条件 - 优化 board/index2.vue 中的数据获取逻辑，使用 e[0] 访问第一条数据 - 移除 RecordBusbarAlarmController 中的预授权注解- 更新 SecurityConfig，允许匿名访问更多接口 - 在 TWTempertureDataMapper 中添加新的查询方法- 更新 TWTempertureDataMapper.xml，优化 SQL 查询语句 - 修改 TWTempertureDataServiceImpl 中的数据获取逻辑 --- .../EmsBaseMonitorInfoController.java | 2 +- .../record/mapper/TWTempertureDataMapper.java | 2 + .../impl/TWTempertureDataServiceImpl.java | 4 +- .../ems/record/TWTempertureDataMapper.xml | 41 ++++++++++++++++--- .../framework/config/SecurityConfig.java | 10 +++++ .../RecordBusbarAlarmController.java | 1 - .../src/views/base/baseAlarmInfo/index.vue | 8 ++-- ruoyi-ui/src/views/board/index2.vue | 8 ++-- 8 files changed, 59 insertions(+), 17 deletions(-) diff --git a/ruoyi-ems/src/main/java/com/ruoyi/ems/base/controller/EmsBaseMonitorInfoController.java b/ruoyi-ems/src/main/java/com/ruoyi/ems/base/controller/EmsBaseMonitorInfoController.java index 61e02a5..2251f28 100644 --- a/ruoyi-ems/src/main/java/com/ruoyi/ems/base/controller/EmsBaseMonitorInfoController.java +++ b/ruoyi-ems/src/main/java/com/ruoyi/ems/base/controller/EmsBaseMonitorInfoController.java @@ -38,7 +38,7 @@ public class EmsBaseMonitorInfoController extends BaseController /** * 查询计量设备信息列表 */ - @PreAuthorize("@ss.hasPermi('ems/base:baseMonitorInfo:list')") + @GetMapping("/list") public AjaxResult list(EmsBaseMonitorInfo emsBaseMonitorInfo) { diff --git a/ruoyi-ems/src/main/java/com/ruoyi/ems/record/mapper/TWTempertureDataMapper.java b/ruoyi-ems/src/main/java/com/ruoyi/ems/record/mapper/TWTempertureDataMapper.java index c532502..459f051 100644 --- a/ruoyi-ems/src/main/java/com/ruoyi/ems/record/mapper/TWTempertureDataMapper.java +++ b/ruoyi-ems/src/main/java/com/ruoyi/ems/record/mapper/TWTempertureDataMapper.java @@ -83,4 +83,6 @@ public interface TWTempertureDataMapper public TWTempertureData selectLastTWTempertureDataByMonitorCode(String monitorId); public List selectLastTWTempertureDataByMonitorCodes(List monitorCodes); + + public List selectLastTWTempertureData(TWTempertureData tWTempertureData); } diff --git a/ruoyi-ems/src/main/java/com/ruoyi/ems/record/service/impl/TWTempertureDataServiceImpl.java b/ruoyi-ems/src/main/java/com/ruoyi/ems/record/service/impl/TWTempertureDataServiceImpl.java index 6465f8a..baed0f2 100644 --- a/ruoyi-ems/src/main/java/com/ruoyi/ems/record/service/impl/TWTempertureDataServiceImpl.java +++ b/ruoyi-ems/src/main/java/com/ruoyi/ems/record/service/impl/TWTempertureDataServiceImpl.java @@ -134,8 +134,8 @@ public class TWTempertureDataServiceImpl implements ITWTempertureDataService @Override public List selectLastTWTempertureData(TWTempertureData tWTempertureData) { try { - // 从数据库中查询温度数据列表 - List twlist = tWTempertureDataMapper.selectTWTempertureDataList(tWTempertureData); + // 从数据库中查询数据列表 + List twlist = tWTempertureDataMapper.selectLastTWTempertureData(tWTempertureData); if (twlist == null || twlist.isEmpty()) { // 如果查询结果为空或列表为空，返回一个空列表 return Collections.emptyList(); 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 09e1bf1..449e4a9 100644 --- a/ruoyi-ems/src/main/resources/mapper/ems/record/TWTempertureDataMapper.xml +++ b/ruoyi-ems/src/main/resources/mapper/ems/record/TWTempertureDataMapper.xml @@ -79,7 +79,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and twtd.pm10 = #{pm10} and twtd.standby = #{standby} - order by twtd.recodeTime desc - SELECT twtd.*,ebmi.monitor_name + SELECT twtd.objid, + twtd.monitorId, + twtd.collectTime, + twtd.tempreture, + twtd.humidity, + twtd.illuminance, + twtd.noise, + twtd.concentration, + twtd.recodeTime, + twtd.alarmType, + twtd.pm1, + twtd.pm2, + twtd.pm10, + twtd.standby, + ebmi.monitor_name FROM ( - select *, - row_number() over(partition by monitorId order by recodeTime desc) as rownum + select objid, + monitorId, + collectTime, + tempreture, + humidity, + illuminance, + noise, + concentration, + recodeTime, + alarmType, + pm1, + pm2, + pm10, + standby + row_number() over(partition by monitorId order by objid desc) as rownum from T_W_TempertureData ) twtd left join ems_base_monitor_info ebmi on twtd.monitorId = ebmi.monitor_code @@ -219,5 +245,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + 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 a253516..3791a9c 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 @@ -125,8 +125,18 @@ public class SecurityConfig .antMatchers("/record/recordBusbarTemp/boardTempList").permitAll() .antMatchers("/ems/base/baseMonitorInfo/list").permitAll() .antMatchers("/ems/base/baseMonitorInfo/monitorInfoTree").permitAll() + .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() // 除上面外的所有请求全部需要鉴权认证 .anyRequest().authenticated(); diff --git a/ruoyi-module/src/main/java/com/ruoyi/record/controller/RecordBusbarAlarmController.java b/ruoyi-module/src/main/java/com/ruoyi/record/controller/RecordBusbarAlarmController.java index 6e23278..6b4057f 100644 --- a/ruoyi-module/src/main/java/com/ruoyi/record/controller/RecordBusbarAlarmController.java +++ b/ruoyi-module/src/main/java/com/ruoyi/record/controller/RecordBusbarAlarmController.java @@ -110,7 +110,6 @@ public class RecordBusbarAlarmController extends BaseController * @param recordBusbarAlarm 需要查询的故巡检报警记录信息。 * @return 返回包含所有符合条件的巡检报警记录的列表，如果没有找到任何记录，则返回空列表。 */ - @PreAuthorize("@ss.hasPermi('record:recordBusbarAlarm:list')") @PostMapping("/recordBusbarAlarmList") public AjaxResult recordBusbarAlarmList(RecordBusbarAlarm recordBusbarAlarm) { diff --git a/ruoyi-ui/src/views/base/baseAlarmInfo/index.vue b/ruoyi-ui/src/views/base/baseAlarmInfo/index.vue index bddd219..710583e 100644 --- a/ruoyi-ui/src/views/base/baseAlarmInfo/index.vue +++ b/ruoyi-ui/src/views/base/baseAlarmInfo/index.vue @@ -35,14 +35,14 @@ /> - + - + 搜索 重置 diff --git a/ruoyi-ui/src/views/board/index2.vue b/ruoyi-ui/src/views/board/index2.vue index 30758d9..6b6c2ac 100644 --- a/ruoyi-ui/src/views/board/index2.vue +++ b/ruoyi-ui/src/views/board/index2.vue @@ -178,10 +178,10 @@ export default { }) selectLastTWTempertureData().then(e=>{ this.data2 = { - num1:e?.tempreture || 0, - num2:e?.humidity || 0, - num3:e?.illuminance || 0, - num4:e?.noise || 0, + num1:e[0]?.tempreture || 0, + num2:e[0]?.humidity || 0, + num3:e[0]?.illuminance || 0, + num4:e[0]?.noise || 0, } }) boardTempList().then(e=>{