From 2283f6e4c97c27ea03b89b457e7b63fb0dc63af0 Mon Sep 17 00:00:00 2001 From: "review512jwy@163.com" <“review512jwy@163.com”> Date: Fri, 23 Jan 2026 14:06:27 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=B4=AF=E7=A7=AF=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=EF=BC=8CcategoryId=E5=A2=9E=E5=8A=A01006?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-dev.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 82dfb33..2e57279 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -106,7 +106,7 @@ category.id.alarm=1001 # 计测类设备类型ID category.id.measure=1003 # 累积类设备类型ID -category.id.accumulate=1002 +category.id.accumulate=1002,1006 # 状态类设备类型ID category.id.status=1004 From 5cc95636404e7bf453632f533415e64d5d0e6e43 Mon Sep 17 00:00:00 2001 From: "review512jwy@163.com" <“review512jwy@163.com”> Date: Tue, 27 Jan 2026 09:34:12 +0800 Subject: [PATCH 2/2] =?UTF-8?q?dashboard=E5=91=8A=E8=AD=A6=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E5=85=A8=E9=83=A8=E8=AE=BE=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sender/service/impl/DataProcessServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/techsor/datacenter/sender/service/impl/DataProcessServiceImpl.java b/src/main/java/com/techsor/datacenter/sender/service/impl/DataProcessServiceImpl.java index 3939de2..5e5c4c7 100644 --- a/src/main/java/com/techsor/datacenter/sender/service/impl/DataProcessServiceImpl.java +++ b/src/main/java/com/techsor/datacenter/sender/service/impl/DataProcessServiceImpl.java @@ -915,7 +915,7 @@ public class DataProcessServiceImpl implements IDataProcessService { } //告警历史处理 - if (categoryIdAlarm.contains(baseTransDataEntity.getCategoryId())) { +// if (categoryIdAlarm.contains(baseTransDataEntity.getCategoryId())) { String status = baseTransDataEntity.getStatus(); if (null == redisOldStatusObj) { if ("alert".equals(status)) { @@ -931,7 +931,7 @@ public class DataProcessServiceImpl implements IDataProcessService { } } } - } +// } } /**