From 89df03f26fc5d2cb56910378d83269ff64a65082 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 12 二月 2026 10:07:05 +0800
Subject: [PATCH] bug修改
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DeviceUsageServiceImpl.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DeviceUsageServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DeviceUsageServiceImpl.java
index 85d06a7..0b036f9 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DeviceUsageServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DeviceUsageServiceImpl.java
@@ -148,10 +148,13 @@
}
Map<Integer, Integer> projectMap = projectMapper.selectList(new LambdaQueryWrapper<Project>()
+
.eq(Project::getDeleted, false)).stream().collect(Collectors.toMap(Project::getId, Project::getClientId));
- Map<Integer, String> clientParamMap = clientParamMapper.selectList(new LambdaQueryWrapper<ClientParam>())
+ Map<Integer, String> clientParamMap = clientParamMapper.selectList(new LambdaQueryWrapper<ClientParam>()
+ .isNotNull(ClientParam::getUnderConstructionProject))
.stream().collect(Collectors.toMap(ClientParam::getClientId, ClientParam::getUnderConstructionProject));
- Map<Integer, String> assetParamMap = clientParamMapper.selectList(new LambdaQueryWrapper<ClientParam>())
+ Map<Integer, String> assetParamMap = clientParamMapper.selectList(new LambdaQueryWrapper<ClientParam>()
+ .isNotNull(ClientParam::getAssetProject))
.stream().collect(Collectors.toMap(ClientParam::getClientId, ClientParam::getAssetProject));
Map<Integer, List<Task>> taskMap = taskMapper.selectList(new LambdaQueryWrapper<Task>()
.ge(Task::getCreateTime, startTime)
@@ -257,7 +260,7 @@
.collect(Collectors.groupingBy(Record::getLevel, Collectors.counting()));
// 获取客户参数配置
- String s = clientParamMap.get(query.getClientId());
+ String s = assetParamMap.get(query.getClientId());
JSONObject jsonObject = JSON.parseObject(s);
// 初始化风险等级
--
Gitblit v1.7.1