From cadcf4f5b412b2eb7cef5078978d13dd7414fec2 Mon Sep 17 00:00:00 2001
From: zch <zangch@mesnac.com>
Date: Wed, 18 Dec 2024 17:02:45 +0800
Subject: [PATCH] =?UTF-8?q?refactor(ems):=20=E4=BC=98=E5=8C=96=E6=B8=A9?=
 =?UTF-8?q?=E5=BA=A6=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2=E5=92=8C=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改 TWTempertureDataMapper.xml 中的查询语句，增加时间范围限制
- 更新 board 页面的 AlarmInfo 数据处理方式
- 调整 baseAlarmInfo 页面的字段显示
- 移除不必要的权限配置
---
 .../ems/record/TWTempertureDataMapper.xml     | 23 ++++++++++++++++++-
 .../framework/config/SecurityConfig.java      |  6 +----
 .../src/views/base/baseAlarmInfo/index.vue    |  8 +++----
 ruoyi-ui/src/views/board/index.vue            |  4 ++--
 ruoyi-ui/src/views/board/index2.vue           |  4 ++--
 5 files changed, 31 insertions(+), 14 deletions(-)

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>
 
 
-    <select id="selectLastTWTempertureData" parameterType="TWTempertureData" resultMap="TWTempertureDataResult">
+<!--    <select id="selectLastTWTempertureData" parameterType="TWTempertureData" resultMap="TWTempertureDataResult">
         select *
         from T_W_TempertureData
         ORDER BY objid DESC
             LIMIT 1000
+    </select>-->
+    <select id="selectLastTWTempertureData" parameterType="TWTempertureData" resultMap="TWTempertureDataResult">
+        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
     </select>
 </mapper>
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 @@
           <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>
         </template>
       </el-table-column>
-      <el-table-column label="创建人" align="center" prop="createdBy" />
+<!--      <el-table-column label="创建人" align="center" prop="createdBy" />
       <el-table-column label="创建时间" align="center" prop="createdTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d}') }}</span>
@@ -186,7 +186,7 @@
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d}') }}</span>
         </template>
-      </el-table-column>
+      </el-table-column>-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -258,7 +258,7 @@
             >{{dict.label}}</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="创建人" prop="createdBy">
+<!--        <el-form-item label="创建人" prop="createdBy">
           <el-input v-model="form.createdBy" placeholder="请输入创建人" />
         </el-form-item>
         <el-form-item label="创建时间" prop="createdTime">
@@ -279,7 +279,7 @@
             value-format="yyyy-MM-dd"
             placeholder="请选择更新时间">
           </el-date-picker>
-        </el-form-item>
+        </el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
diff --git a/ruoyi-ui/src/views/board/index.vue b/ruoyi-ui/src/views/board/index.vue
index 41e14b5..55af0b7 100644
--- a/ruoyi-ui/src/views/board/index.vue
+++ b/ruoyi-ui/src/views/board/index.vue
@@ -323,7 +323,7 @@ export default {
           left: 89.7
         },
       ],
-      AlarmInfo: {},
+      AlarmInfo: [],
       DeviceInfo: {},
       TemParam: {}
     }
@@ -624,7 +624,7 @@ export default {
       socket.onmessage = function (event) {
         let data = JSON.parse(event.data)
         if (data.AlarmInfo) {
-          _this.AlarmInfo = data.AlarmInfo
+          _this.AlarmInfo = [data.AlarmInfo]
         }
         if (data.DeviceInfo) {
           _this.DeviceInfo = data.DeviceInfo
diff --git a/ruoyi-ui/src/views/board/index2.vue b/ruoyi-ui/src/views/board/index2.vue
index 6465e09..eff97e5 100644
--- a/ruoyi-ui/src/views/board/index2.vue
+++ b/ruoyi-ui/src/views/board/index2.vue
@@ -107,7 +107,7 @@ import {
 } from "@/api/board/index2";
 
 export default {
-  dicts:['alarm_type'],
+/*  dicts:['alarm_type'],*/
   data() {
     return {
       scrollTableOption: {
@@ -171,7 +171,7 @@ export default {
   },
   methods: {
     setAlarmType(e){
-      console.log(this.dict.type.alarm_type)
+/*      console.log(this.dict.type.alarm_type)*/
     },
     getData(){