From 6681665f66b71633182eec48597c952834843a1d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 27 一月 2026 17:06:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/ProjectCategoryCalculator.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ProjectCategoryCalculator.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ProjectCategoryCalculator.java
index a594f0d..ac95942 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ProjectCategoryCalculator.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ProjectCategoryCalculator.java
@@ -316,6 +316,8 @@
.average()
.orElse(0.0);
+ System.out.println("results"+results);
+
// 计算设备检查平均分（需要解析 device_res_map）
List<Float> deviceScores = results.stream()
.filter(e -> StringUtils.hasText(e.getDeviceResMap()))
@@ -495,11 +497,11 @@
// 根据阈值判断类别（从高到低判断）
if (finalScore >= thresholdC) {
- return "A";
+ return "C";
} else if (finalScore >= thresholdB) {
return "B";
} else if (finalScore >= thresholdA) {
- return "C";
+ return "A";
} else {
return "C"; // 不满足任何类别
}
--
Gitblit v1.7.1