0305海宁预警修改

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;
 

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;
 
 

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);
 }

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;
     }
 
     /**