From 96be54e30eab095ac28c2fbdb04a3ae31e1dd5f4 Mon Sep 17 00:00:00 2001 From: "review512jwy@163.com" <“review512jwy@163.com”> Date: Tue, 27 Jan 2026 12:13:54 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8C=B9=E9=85=8D=E5=A4=9A=E4=B8=AA?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=90=8E=E7=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sender/service/impl/DataProcessServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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..6252ce9 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 @@ -90,6 +90,8 @@ public class DataProcessServiceImpl implements IDataProcessService { private static Logger log= LoggerFactory.getLogger(DataProcessServiceImpl.class); + String[] suffixes = { "_85", "_85_9003", "_111", "_111_9003", "_S", "_s", "_131_5" }; + // @Autowired // @Qualifier("sysMqttClient") // private MqttClient sysMqttClient; @@ -716,7 +718,7 @@ public class DataProcessServiceImpl implements IDataProcessService { DeviceAttrCode.MEASURE_HUMIDITY); } else { String uploadValue = uploadValueList.get(0);//这里只取第一个元素 - if (baseTransDataEntity.getDeviceId().endsWith("_85")){ + if (Arrays.stream(suffixes).anyMatch(baseTransDataEntity.getDeviceId()::endsWith)){ if (categoryIdAccumulate.contains(baseTransDataEntity.getCategoryId())) { storageAccumulate(DeviceAttrCode.COMMON, uploadValue, baseTransDataEntity); } From 40db5be9b3b6cddedfa9e65faf1e0a70e2d2feb9 Mon Sep 17 00:00:00 2001 From: "review512jwy@163.com" <“review512jwy@163.com”> Date: Tue, 27 Jan 2026 12:14:33 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8C=B9=E9=85=8D=E5=A4=9A=E4=B8=AA?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=90=8E=E7=BC=80?= 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 6252ce9..1563955 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 @@ -90,7 +90,7 @@ public class DataProcessServiceImpl implements IDataProcessService { private static Logger log= LoggerFactory.getLogger(DataProcessServiceImpl.class); - String[] suffixes = { "_85", "_85_9003", "_111", "_111_9003", "_S", "_s", "_131_5" }; + String[] DASHBOARD_SUFFIXES = { "_85", "_85_9003", "_111", "_111_9003", "_S", "_s", "_131_5" }; // @Autowired // @Qualifier("sysMqttClient") @@ -718,7 +718,7 @@ public class DataProcessServiceImpl implements IDataProcessService { DeviceAttrCode.MEASURE_HUMIDITY); } else { String uploadValue = uploadValueList.get(0);//这里只取第一个元素 - if (Arrays.stream(suffixes).anyMatch(baseTransDataEntity.getDeviceId()::endsWith)){ + if (Arrays.stream(DASHBOARD_SUFFIXES).anyMatch(baseTransDataEntity.getDeviceId()::endsWith)){ if (categoryIdAccumulate.contains(baseTransDataEntity.getCategoryId())) { storageAccumulate(DeviceAttrCode.COMMON, uploadValue, baseTransDataEntity); }