From 63d1ebf21f1b75157ff1de535e050ccfdf335738 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E4=B9=90=E8=A8=80?= <leyan930401@163.com>
Date: Thu, 5 Mar 2026 18:36:56 +0800
Subject: [PATCH] =?UTF-8?q?0305=E6=B5=B7=E5=AE=81=E9=A2=84=E8=AD=A6?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/ibs/tabs/domain/vo/PotListVo.java   |  2 +-
 .../impl/CustTabListInfoServiceImpl.java      | 18 +++---
 .../ibs/task/service/WorkRecordService.java   | 23 ++++---
 .../service/impl/WorkRecordServiceImpl.java   | 61 ++++++++++---------
 szzh-h5/src/views/workBench/workHomeNew.vue   |  7 ++-
 5 files changed, 59 insertions(+), 52 deletions(-)

diff --git a/ibs/src/main/java/com/ruoyi/ibs/tabs/domain/vo/PotListVo.java b/ibs/src/main/java/com/ruoyi/ibs/tabs/domain/vo/PotListVo.java
index 139c6e1..05e3877 100644
--- a/ibs/src/main/java/com/ruoyi/ibs/tabs/domain/vo/PotListVo.java
+++ b/ibs/src/main/java/com/ruoyi/ibs/tabs/domain/vo/PotListVo.java
@@ -2,7 +2,7 @@ package com.ruoyi.ibs.tabs.domain.vo;
 
 
 import io.swagger.annotations.ApiModelProperty;
-import javafx.scene.effect.Light;
+//import javafx.scene.effect.Light;
 import lombok.Builder;
 import lombok.Data;
 
diff --git a/ibs/src/main/java/com/ruoyi/ibs/tabs/service/impl/CustTabListInfoServiceImpl.java b/ibs/src/main/java/com/ruoyi/ibs/tabs/service/impl/CustTabListInfoServiceImpl.java
index cc600e5..1bf5441 100644
--- a/ibs/src/main/java/com/ruoyi/ibs/tabs/service/impl/CustTabListInfoServiceImpl.java
+++ b/ibs/src/main/java/com/ruoyi/ibs/tabs/service/impl/CustTabListInfoServiceImpl.java
@@ -1,15 +1,5 @@
 package com.ruoyi.ibs.tabs.service.impl;
 
-import java.rmi.ServerException;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import com.ruoyi.common.annotation.DataScope;
-import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.spring.SpringUtils;
@@ -22,12 +12,18 @@ import com.ruoyi.ibs.tabs.enums.IndexThresholdTypeEnum;
 import com.ruoyi.ibs.tabs.mapper.CustTabListInfoMapper;
 import com.ruoyi.ibs.tabs.service.ICustTabDetailService;
 import com.ruoyi.ibs.tabs.service.ICustTabListInfoService;
-import javafx.util.Builder;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.rmi.ServerException;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
 import static com.ruoyi.common.utils.SecurityUtils.getUsername;
 
 
diff --git a/ibs/src/main/java/com/ruoyi/ibs/task/service/WorkRecordService.java b/ibs/src/main/java/com/ruoyi/ibs/task/service/WorkRecordService.java
index 0549189..ae8a7b0 100644
--- a/ibs/src/main/java/com/ruoyi/ibs/task/service/WorkRecordService.java
+++ b/ibs/src/main/java/com/ruoyi/ibs/task/service/WorkRecordService.java
@@ -1,24 +1,27 @@
 package com.ruoyi.ibs.task.service;
 
-import java.util.List;
-
 import com.ruoyi.common.core.page.TableDataPageInfo;
+import com.ruoyi.ibs.dashboard.domain.vo.WarnInfoVO;
 import com.ruoyi.ibs.task.domain.dto.WorkRecordDTO;
 import com.ruoyi.ibs.task.domain.entity.Alter;
 import com.ruoyi.ibs.task.domain.entity.WorkRecord;
-import com.ruoyi.ibs.task.domain.vo.*;
+import com.ruoyi.ibs.task.domain.vo.AlterVO;
+import com.ruoyi.ibs.task.domain.vo.WorkCompleteVO;
+import com.ruoyi.ibs.task.domain.vo.WorkRecordVO;
+
+import java.util.List;
 
 /**
  * 工作清单记录Service接口
- * 
+ *
  * @author ruoyi
  * @date 2025-10-11
  */
-public interface WorkRecordService{
+public interface WorkRecordService {
 
     /**
      * 查询工作清单记录列表
-     * 
+     *
      * @param workRecordDTO 工作清单记录
      * @return 工作清单记录集合
      */
@@ -26,7 +29,7 @@ public interface WorkRecordService{
 
     /**
      * 修改工作清单记录
-     * 
+     *
      * @param workRecordList 工作清单记录
      * @return 结果
      */
@@ -61,7 +64,11 @@ public interface WorkRecordService{
      */
     int setOverdue();
 
-    String getAlterTypes();
+    /**
+     * 获取预警类型及各类型预警数量
+     * @return 预警类型及数量列表
+     */
+    List<WarnInfoVO> getAlterTypes();
 
     int updateReadTime(Long id);
 }
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 4ea4439..a1be851 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
@@ -1,30 +1,17 @@
 package com.ruoyi.ibs.task.service.impl;
 
-import java.math.BigDecimal;
-import java.time.DayOfWeek;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.temporal.TemporalAdjusters;
-import java.util.*;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONObject;
 import com.github.pagehelper.Page;
 import com.ruoyi.common.core.page.TableDataPageInfo;
 import com.ruoyi.common.core.redis.RedisCache;
-import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.http.HttpUtils;
-import com.ruoyi.ibs.dashboard.domain.entity.UrlRegistry;
+import com.ruoyi.ibs.dashboard.domain.vo.WarnInfoVO;
 import com.ruoyi.ibs.task.domain.dto.WorkRecordDTO;
 import com.ruoyi.ibs.task.domain.entity.Alter;
 import com.ruoyi.ibs.task.domain.entity.WorkRecord;
-import com.ruoyi.ibs.task.domain.vo.*;
+import com.ruoyi.ibs.task.domain.vo.AlterVO;
+import com.ruoyi.ibs.task.domain.vo.WorkCompleteVO;
+import com.ruoyi.ibs.task.domain.vo.WorkRecordVO;
 import com.ruoyi.ibs.task.mapper.WorkRecordMapper;
 import com.ruoyi.ibs.task.service.WorkRecordService;
 import com.ruoyi.system.domain.SysPost;
@@ -35,6 +22,16 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.time.DayOfWeek;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.temporal.TemporalAdjusters;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 /**
  * 工作清单记录Service业务层处理
@@ -202,22 +199,28 @@ public class WorkRecordServiceImpl implements WorkRecordService {
     }
 
     /**
-     * 获取预警类型
+     * 获取预警类型及各类型预警数量
      * 每天首次查询存储到redis里
      */
     @Override
-    public String getAlterTypes() {
+    public List<WarnInfoVO> getAlterTypes() {
         String headId = SecurityUtils.getHeadId();
-//        if (redisCache.hasKey(alterTypeRedisKey + headId)){
-//            String alterTypes = redisCache.getCacheObject(alterTypeRedisKey + headId);
-//            if (alterTypes != null){
-//                return alterTypes;
-//            }
-//        }
-        List<String> result = workRecordMapper.selectAlterTypesByHeadId(headId);
-        String valueToCache = result.stream().collect(Collectors.joining(","));
-        redisCache.setCacheObjectToEndDay(alterTypeRedisKey + headId, valueToCache);
-        return valueToCache;
+        String username = SecurityUtils.getUsername();
+
+        // 先查询预警类型列表
+        List<String> alterTypes = workRecordMapper.selectAlterTypesByHeadId(headId);
+
+        // 为每个预警类型查询对应的预警数量
+        List<WarnInfoVO> resultList = alterTypes.stream().map(alterType -> {
+            // 调用 getAlterList 方法获取该类型的所有预警记录（status为空表示查询全部）
+            List<AlterVO> alterList = getAlterList("", alterType);
+            WarnInfoVO warnInfoVO = new WarnInfoVO();
+            warnInfoVO.setInfoName(alterType);
+            warnInfoVO.setInfoCount((long) alterList.size());
+            return warnInfoVO;
+        }).collect(Collectors.toList());
+
+        return resultList;
     }
 
     /**
diff --git a/szzh-h5/src/views/workBench/workHomeNew.vue b/szzh-h5/src/views/workBench/workHomeNew.vue
index 8646f17..7493101 100644
--- a/szzh-h5/src/views/workBench/workHomeNew.vue
+++ b/szzh-h5/src/views/workBench/workHomeNew.vue
@@ -39,9 +39,10 @@
                                     <div class="yj_top_left">
                                         <van-icon name="bulb-o yjclIcon"></van-icon>
                                     </div>
-                                    <div class="tjclTitle">{{ item }}</div>
+                                    <div class="tjclTitle">{{ item.infoName }}</div>
                                 </div>
                             </div>
+                            <div class="yjcl_custNum">预警条数：{{ item.infoCount }}</div>
                         </div>
                     </van-tab>
                 </van-tabs>
@@ -121,7 +122,7 @@ export default {
         initwarnType() {
             workWarningListType().then(res => {
                 if (res.code == 200) {
-                    this.yjclOtherList = res.msg ? res.msg.split(',') : []
+                    this.yjclOtherList = res.data || []
                 }
             })
         },
@@ -148,7 +149,7 @@ export default {
             this.$router.push('/WarningProcessing');
         },
         handleClickYjclOther(item) {
-            sessionStorage.setItem('yujingrenwyType', item);
+            sessionStorage.setItem('yujingrenwyType', item.infoName);
             this.$router.push('/workmngwarningtask');
         }
     }