|
@@ -82,7 +82,7 @@ public class AlarmHandleServiceImpl implements AlarmHandleService {
|
|
|
if (StrUtil.isBlank(msg)) {
|
|
|
return;
|
|
|
}
|
|
|
- String[] split = msg.split(";");
|
|
|
+ String[] split = msg.split(";", -1);
|
|
|
if (split.length % 4 != 0) {
|
|
|
return;
|
|
|
}
|
|
@@ -93,7 +93,7 @@ public class AlarmHandleServiceImpl implements AlarmHandleService {
|
|
|
String meterId = split[i * 4 + 1];
|
|
|
String funcId = split[i * 4 + 2];
|
|
|
String valueStr = split[i * 4 + 3];
|
|
|
- if (StrUtil.isNotBlank(valueStr)) {
|
|
|
+ if (StrUtil.isNotBlank(valueStr) || "null".equalsIgnoreCase(valueStr)) {
|
|
|
double value = Double.parseDouble(valueStr);
|
|
|
if (AlarmInfoCache.hasKey(meterId, funcId)) {
|
|
|
validIotData(dateTime, meterId, funcId, value);
|