From 79bff94d1a8d125ad716cdfc8c9645a126a9ad44 Mon Sep 17 00:00:00 2001
From: "zangch@mesnac.com" <zangch@mesnac.com>
Date: Fri, 23 Jan 2026 11:09:32 +0800
Subject: [PATCH] =?UTF-8?q?fix(device):=20=E4=BC=98=E5=8C=96=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=8F=82=E6=95=B0=E6=9F=A5=E8=AF=A2=E9=98=B2=E6=AD=A2?=
 =?UTF-8?q?=E5=85=A8=E8=A1=A8=E6=89=AB=E6=8F=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 集成DateUtils工具类并简化导入包
- 添加默认24小时时间范围限制避免全表扫描
- 更新设备状态统计字段注释说明
- 新增alarmCount字段用于统计设备报警数量
---
 .../impl/BaseDeviceParamValServiceImpl.java   | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/aucma-base/src/main/java/com/aucma/base/service/impl/BaseDeviceParamValServiceImpl.java b/aucma-base/src/main/java/com/aucma/base/service/impl/BaseDeviceParamValServiceImpl.java
index b5fa116..c918579 100644
--- a/aucma-base/src/main/java/com/aucma/base/service/impl/BaseDeviceParamValServiceImpl.java
+++ b/aucma-base/src/main/java/com/aucma/base/service/impl/BaseDeviceParamValServiceImpl.java
@@ -1,10 +1,8 @@
 package com.aucma.base.service.impl;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+
+import com.aucma.common.utils.DateUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,7 +18,7 @@ import com.aucma.base.service.IBaseDeviceParamValService;
  * @date 2025-10-15
  */
 @Service
-public class BaseDeviceParamValServiceImpl implements IBaseDeviceParamValService 
+public class BaseDeviceParamValServiceImpl implements IBaseDeviceParamValService
 {
     private static final Logger log = LoggerFactory.getLogger(BaseDeviceParamValServiceImpl.class);
 
@@ -64,6 +62,13 @@ public class BaseDeviceParamValServiceImpl implements IBaseDeviceParamValService
             if (baseDeviceParamVal == null) {
                 baseDeviceParamVal = new BaseDeviceParamVal();
             }
+            // 防止全表扫描：若未指定时间范围，默认查询最近24小时
+            if (baseDeviceParamVal.getBeginTime() == null && baseDeviceParamVal.getEndTime() == null) {
+                Date end = new Date();
+                Date begin = DateUtils.addHours(end, -24);
+                baseDeviceParamVal.setBeginTime(begin);
+                baseDeviceParamVal.setEndTime(end);
+            }
             List<BaseDeviceParamVal> list = baseDeviceParamValMapper.selectLatestBaseDeviceParamValList(baseDeviceParamVal);
             return list != null ? list : Collections.emptyList();
         } catch (Exception e) {
@@ -132,11 +137,12 @@ public class BaseDeviceParamValServiceImpl implements IBaseDeviceParamValService
             Map<String, Object> result = baseDeviceParamValMapper.selectDeviceStatusStatistics();
             if (result == null) {
                 result = new HashMap<>();
-                result.put("totalCount", 0);
-                result.put("runningCount", 0);
-                result.put("stoppedCount", 0);
-                result.put("standbyCount", 0);
-                result.put("notStartedCount", 0);
+                result.put("totalCount", 0);//从base_deviceledger中获取is_flag = 1
+                result.put("runningCount", 0);//机台状态-三色灯机器运行
+                result.put("stoppedCount", 0);//三色灯机器暂停
+                result.put("standbyCount", 0);//三色灯机器待机
+                result.put("alarmCount", 0);//三色灯机器报警
+                result.put("notStartedCount", 0);//t.totalCount - s.runningCount - s.stoppedCount - s.standbyCount - s.alarmCount AS notStartedCount
                 result.put("runningRate", "0%");
                 return result;
             }