From e4be1455e4ed17a8c92f479f4ab35f03529cfd8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E4=B9=90=E8=A8=80?= <leyan930401@163.com>
Date: Tue, 10 Mar 2026 16:46:22 +0800
Subject: [PATCH] =?UTF-8?q?0310=E6=B5=B7=E5=AE=81=E9=A2=84=E8=AD=A6?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/WorkRecordServiceImpl.java    | 18 +++++++++++++++++-
 .../main/resources/mapper/WorkRecordMapper.xml |  2 +-
 .../src/views/workmng/warningtask/index.vue    |  2 +-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/ibs/src/main/java/com/ruoyi/ibs/task/service/impl/WorkRecordServiceImpl.java b/ibs/src/main/java/com/ruoyi/ibs/task/service/impl/WorkRecordServiceImpl.java
index a1be851..5d5fd2d 100644
--- a/ibs/src/main/java/com/ruoyi/ibs/task/service/impl/WorkRecordServiceImpl.java
+++ b/ibs/src/main/java/com/ruoyi/ibs/task/service/impl/WorkRecordServiceImpl.java
@@ -30,6 +30,7 @@ import java.time.temporal.TemporalAdjusters;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
@@ -200,11 +201,22 @@ public class WorkRecordServiceImpl implements WorkRecordService {
 
     /**
      * 获取预警类型及各类型预警数量
-     * 每天首次查询存储到redis里
+     * 每天首次查询存储到redis里，后面都从redis读取
      */
     @Override
     public List<WarnInfoVO> getAlterTypes() {
         String headId = SecurityUtils.getHeadId();
+        String redisKey = alterTypeRedisKey + headId;
+
+        // 先从 redis 获取缓存
+        if (redisCache.hasKey(redisKey)) {
+            List<WarnInfoVO> cachedList = redisCache.getCacheObject(redisKey);
+            if (cachedList != null && !cachedList.isEmpty()) {
+                log.debug("从 redis 获取预警类型缓存, headId: {}", headId);
+                return cachedList;
+            }
+        }
+
         String username = SecurityUtils.getUsername();
 
         // 先查询预警类型列表
@@ -220,6 +232,10 @@ public class WorkRecordServiceImpl implements WorkRecordService {
             return warnInfoVO;
         }).collect(Collectors.toList());
 
+        // 存入 redis，过期时间 1 天
+        redisCache.setCacheObject(redisKey, resultList, 86400, TimeUnit.SECONDS);
+        log.debug("预警类型数据已存入 redis, headId: {}, 数量: {}", headId, resultList.size());
+
         return resultList;
     }
 
diff --git a/ibs/src/main/resources/mapper/WorkRecordMapper.xml b/ibs/src/main/resources/mapper/WorkRecordMapper.xml
index 4c0fb23..d62ff0a 100644
--- a/ibs/src/main/resources/mapper/WorkRecordMapper.xml
+++ b/ibs/src/main/resources/mapper/WorkRecordMapper.xml
@@ -169,7 +169,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and alter_type = #{alterType}
             </if>
         </where>
-        order by create_time desc, status asc
+        order by status asc, create_time desc
     </select>
 
     <select id="selectAlterTypesByHeadId" resultType="String">
diff --git a/szzh-h5/src/views/workmng/warningtask/index.vue b/szzh-h5/src/views/workmng/warningtask/index.vue
index 5342a5b..283eaad 100644
--- a/szzh-h5/src/views/workmng/warningtask/index.vue
+++ b/szzh-h5/src/views/workmng/warningtask/index.vue
@@ -284,7 +284,7 @@ export default {
       recordRead({ id: item.id }).then(res => {
         if (res.code === 200) {
           this.$toast("已读成功");
-          this.queryList();
+          this.onRefresh();
         }
       })
     }