|
|
@ -90,7 +90,7 @@ public class DataProcessServiceImpl implements IDataProcessService { |
|
|
|
|
|
|
|
|
private static Logger log= LoggerFactory.getLogger(DataProcessServiceImpl.class); |
|
|
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
|
|
|
// @Autowired
|
|
|
// @Qualifier("sysMqttClient")
|
|
|
// @Qualifier("sysMqttClient")
|
|
|
@ -718,7 +718,7 @@ public class DataProcessServiceImpl implements IDataProcessService { |
|
|
DeviceAttrCode.MEASURE_HUMIDITY); |
|
|
DeviceAttrCode.MEASURE_HUMIDITY); |
|
|
} else { |
|
|
} else { |
|
|
String uploadValue = uploadValueList.get(0);//这里只取第一个元素
|
|
|
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())) { |
|
|
if (categoryIdAccumulate.contains(baseTransDataEntity.getCategoryId())) { |
|
|
storageAccumulate(DeviceAttrCode.COMMON, uploadValue, baseTransDataEntity); |
|
|
storageAccumulate(DeviceAttrCode.COMMON, uploadValue, baseTransDataEntity); |
|
|
} |
|
|
} |
|
|
|