From d44b4f3576c1183873d03d6a7d404a5c88287665 Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Mon, 15 Jun 2026 14:52:16 +0800
Subject: [PATCH] =?UTF-8?q?fix(service):=20=E4=BF=AE=E5=A4=8D=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=90=8D=E7=A7=B0=E8=8E=B7=E5=8F=96=E5=92=8C=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E8=AE=A1=E7=AE=97=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修正设备名称字段从 getName() 改为 getDeviceName()
- 修正完整性计算逻辑从 Math.max 改为 Math.min
- 修正在线率计算逻辑从 Math.max 改为 Math.min
- 确保统计数据不会超过100%的最大限制
---
 .../njcn/csharmonic/service/impl/CsEventPOServiceImpl.java    | 2 +-
 .../service/impl/StatisticsDataDataServiceImpl.java           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventPOServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventPOServiceImpl.java
index b964a63..befa182 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventPOServiceImpl.java
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventPOServiceImpl.java
@@ -736,7 +736,7 @@ public class CsEventPOServiceImpl extends ServiceImpl<CsEventPOMapper, CsEventPO
                     vo.setLineName(lineMap.get(item.getLineId()).getName());
                 }
                 if (!Objects.isNull(item.getDeviceId())) {
-                    vo.setDeviceName(devMap.get(item.getDeviceId()).get(0).getName());
+                    vo.setDeviceName(devMap.get(item.getDeviceId()).get(0).getDeviceName());
                 }
                 vo.setEvent(item.getTag());
                 voRecords.add(vo);
diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StatisticsDataDataServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StatisticsDataDataServiceImpl.java
index 9ca9347..341721c 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StatisticsDataDataServiceImpl.java
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StatisticsDataDataServiceImpl.java
@@ -154,7 +154,7 @@ public class StatisticsDataDataServiceImpl implements IStatisticsDataDataService
                                             BigDecimal.valueOf(l1.stream().mapToDouble(RStatIntegrityD::getDueTime).sum()),
                                             2, RoundingMode.HALF_UP
                                     ).doubleValue();
-                                    vo.setIntegrity(Math.max(ratio,100.0));
+                                    vo.setIntegrity(Math.min(ratio,100.0));
                                 } else {
                                     vo.setIntegrity(0.0);
                                 }
@@ -163,7 +163,7 @@ public class StatisticsDataDataServiceImpl implements IStatisticsDataDataService
                                 if (CollectionUtil.isNotEmpty(l2)) {
                                     int onlineMin = l2.stream().mapToInt(RStatOnlineRateD::getOnlineMin).sum();
                                     double ratio = new BigDecimal(onlineMin * 100.0 / (1440 * l2.size())).setScale(2,RoundingMode.HALF_UP).doubleValue();
-                                    vo.setOnlineRate(Math.max(ratio,100.0));
+                                    vo.setOnlineRate(Math.min(ratio,100.0));
                                 } else {
                                     vo.setOnlineRate(0.0);
                                 }