xiaoguangbin/AnalysisSystemForRadionuclide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：bug

Browse Source
This commit is contained in:
nieziyan 2023-11-21 19:15:29 +08:00
parent 5ab82f8883
commit 0de89da6f6
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/NumUtil.java
View File

@ -82,14 +82,14 @@ public class NumUtil {
.doubleValue()); .doubleValue());
} }
public static boolean compare(Number current, Number threshold, String op){ public static boolean compare(Number current, Double threshold, String op){
boolean cNull = ObjectUtil.isNull(current); boolean cNull = ObjectUtil.isNull(current);
boolean tNull = ObjectUtil.isNull(threshold); boolean tNull = ObjectUtil.isNull(threshold);
if (cNull || tNull) return false; if (cNull || tNull) return false;
if (current instanceof Double && threshold instanceof Double){ if (current instanceof Double){
double currentV = (double) current; double currentV = (double) current;
double thresholdV = (double) threshold; double thresholdV = threshold;
if (EQ.getOp().equals(op)){ if (EQ.getOp().equals(op)){
return currentV == thresholdV; return currentV == thresholdV;
@ -104,9 +104,9 @@ public class NumUtil {
}else { }else {
return false; return false;
} }
} else if (current instanceof Integer && threshold instanceof Double) { } else if (current instanceof Integer) {
int currentV = (int) current; int currentV = (int) current;
int thresholdV = (int) threshold; int thresholdV = threshold.intValue();
if (EQ.getOp().equals(op)){ if (EQ.getOp().equals(op)){
return currentV == thresholdV; return currentV == thresholdV;

2
jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/Rule.java
View File

@ -12,7 +12,7 @@ public class Rule implements Serializable {
private String operator; // 比较符 private String operator; // 比较符
private Number threshold; // 阈值 private Double threshold; // 阈值
private String units; // 单位 private String units; // 单位
} }

2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/job/DatabaseJob.java
View File

@ -90,7 +90,7 @@ public class DatabaseJob extends Monitor implements Job{
ObjectMapper mapper = new ObjectMapper(); ObjectMapper mapper = new ObjectMapper();
Rule rule = mapper.readValue(operator, Rule.class); Rule rule = mapper.readValue(operator, Rule.class);
String op = rule.getOperator(); String op = rule.getOperator();
Number threshold = rule.getThreshold(); Double threshold = rule.getThreshold();
boolean needWarn = NumUtil.compare(current, threshold, op); boolean needWarn = NumUtil.compare(current, threshold, op);
if (needWarn){ if (needWarn){
// 记录报警日志 // 记录报警日志

2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/job/ServerJob.java
View File

@ -85,7 +85,7 @@ public class ServerJob extends Monitor implements Job {
ObjectMapper mapper = new ObjectMapper(); ObjectMapper mapper = new ObjectMapper();
Rule rule = mapper.readValue(operator, Rule.class); Rule rule = mapper.readValue(operator, Rule.class);
String op = rule.getOperator(); String op = rule.getOperator();
Number threshold = rule.getThreshold(); Double threshold = rule.getThreshold();
boolean needWarn = NumUtil.compare(current, threshold, op); boolean needWarn = NumUtil.compare(current, threshold, op);
if (needWarn){ if (needWarn){
// 记录报警日志 // 记录报警日志