IOT/MiddlePlatform
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#update

Browse Source
This commit is contained in:
rqian
2026-07-29 13:08:49 +08:00
parent 29ecbf321f
commit 6be6d5d333
59 changed files with 1396 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
maibu-netty-server/src/main/java/com/maibu/utils/CompareUtils.java
View File

@@ -31,38 +31,38 @@ public class CompareUtils {
return !compareValue.equals(targetValue);
case GT:
return isNumeric(compareValue) && isNumeric(targetValue) &&
Double.parseDouble(compareValue) > Double.parseDouble(targetValue);
Double.parseDouble(targetValue) > Double.parseDouble(compareValue);
case LT:
return isNumeric(compareValue) && isNumeric(targetValue) &&
Double.parseDouble(compareValue) < Double.parseDouble(targetValue);
Double.parseDouble(targetValue) < Double.parseDouble(compareValue);
case GTE:
return isNumeric(compareValue) && isNumeric(targetValue) &&
Double.parseDouble(compareValue) >= Double.parseDouble(targetValue);
Double.parseDouble(targetValue) >= Double.parseDouble(compareValue);
case LTE:
return isNumeric(compareValue) && isNumeric(targetValue) &&
Double.parseDouble(compareValue) <= Double.parseDouble(targetValue);
Double.parseDouble(targetValue) <= Double.parseDouble(compareValue);
case BETWEEN:
// 范围值用英文中划线分割
String[] rangeValues = targetValue.split("-");
String[] rangeValues = compareValue.split("-");
if (rangeValues.length != 2) {
return false;
}
return isNumeric(compareValue) && isNumeric(rangeValues[0]) && isNumeric(rangeValues[1]) &&
Double.parseDouble(compareValue) >= Double.parseDouble(rangeValues[0]) &&
Double.parseDouble(compareValue) <= Double.parseDouble(rangeValues[1]);
Double.parseDouble(targetValue) >= Double.parseDouble(rangeValues[0]) &&
Double.parseDouble(targetValue) <= Double.parseDouble(rangeValues[1]);
case NOT_BETWEEN:
// 范围值用英文中划线分割
String[] notRangeValues = targetValue.split("-");
String[] notRangeValues = compareValue.split("-");
if (notRangeValues.length != 2) {
return false;
}
return isNumeric(compareValue) && isNumeric(notRangeValues[0]) && isNumeric(notRangeValues[1]) &&
(Double.parseDouble(compareValue) < Double.parseDouble(notRangeValues[0]) ||
Double.parseDouble(compareValue) > Double.parseDouble(notRangeValues[1]));
(Double.parseDouble(targetValue) < Double.parseDouble(notRangeValues[0]) ||
Double.parseDouble(targetValue) > Double.parseDouble(notRangeValues[1]));
case CONTAIN:
return compareValue.contains(targetValue);
return targetValue.contains(compareValue);
case NOT_CONTAIN:
return !compareValue.contains(targetValue);
return !targetValue.contains(compareValue);
default:
return false;
}

2
maibu-netty-server/src/main/java/com/maibu/utils/DingTalkTemplate.java
View File

@@ -12,6 +12,7 @@ public class DingTalkTemplate {
"告警时间：%s\n\n" +
"设备名称：%s\n\n" +
"设备编号：%s\n\n" +
"当前值：%s\n\n" +
"告警内容：\n%s\n\n" +
"发生位置：\n%s\n\n" +
"处理建议：\n%s\n\n" +
@@ -21,6 +22,7 @@ public class DingTalkTemplate {
alarm.getTime(),
alarm.getDeviceName(),
alarm.getDeviceSn(),
alarm.getTimeValues(),
alarm.getContent(),
alarm.getLocation(),
alarm.getSuggestion(),