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); }