From 670eaf7d384ca828f8bfedff065b7127dc5c6f4d Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Fri, 19 Dec 2025 10:19:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/pq/mapper/mapping/PqDataVerifyCountMapper.xml | 4 +--- .../pq/service/impl/DeviceRunEvaluateServiceImpl.java | 6 +++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/PqDataVerifyCountMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/PqDataVerifyCountMapper.xml index fd8baea6c..8e343716c 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/PqDataVerifyCountMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/PqDataVerifyCountMapper.xml @@ -8,9 +8,7 @@ SELECT line_id AS lineId, SUM(total) AS total, - SUM(total_all) AS totalAll, - SUM(flicker) AS flicker, - SUM(flicker_all) AS flickerAll + SUM(total_all) AS totalAll FROM pq_data_verify_count diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeviceRunEvaluateServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeviceRunEvaluateServiceImpl.java index 44881b764..1f2f74433 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeviceRunEvaluateServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeviceRunEvaluateServiceImpl.java @@ -440,7 +440,7 @@ public class DeviceRunEvaluateServiceImpl implements DeviceRunEvaluateService { List verifyLine = verifyList.stream().map(PqDataVerifyCount::getLineId).distinct().collect(Collectors.toList()); List devIdsLine = lineMapper.getDevIdsLine(verifyLine); if (CollUtil.isNotEmpty(devIdsLine)) { - return NumberUtil.round(Math.min(devIdsLine.size() * 100 / devIds.size(), 100), 2); + return NumberUtil.round(Math.min(devIdsLine.size() * 100.0 / devIds.size(), 100), 2); } else { return new BigDecimal(0); } @@ -455,7 +455,7 @@ public class DeviceRunEvaluateServiceImpl implements DeviceRunEvaluateService { if (totalAll == 0) { return new BigDecimal(0); } - return NumberUtil.round(Math.min((total ) * 100 / (totalAll), 100), 2); + return NumberUtil.round(Math.min(total * 100.0 / totalAll, 100), 2); } else { return new BigDecimal(0); } @@ -470,7 +470,7 @@ public class DeviceRunEvaluateServiceImpl implements DeviceRunEvaluateService { if (dueTime == 0) { return new BigDecimal(0); } - return NumberUtil.round(Math.min(realTime * 100 / dueTime, 100), 2); + return NumberUtil.round(Math.min(realTime * 100.0 / dueTime, 100), 2); } else { return new BigDecimal(0); }