|
@@ -342,10 +342,10 @@ public class AlarmConditionServiceImpl extends ServiceImpl<AlarmConditionMapper,
|
|
|
expression = expression.replaceAll(" ", "");
|
|
|
// 连续运算符处理
|
|
|
if (expression.split("[\\+\\-\\*\\/]{2,}").length > 1) {
|
|
|
- return ResultHelper.failure(ResponseCode.C0134.getCode(), expression + "公式不合法,包含连续运算符");
|
|
|
+ return ResultHelper.failure(ResponseCode.C0134.getCode(), "公式不合法");
|
|
|
}
|
|
|
if (org.apache.commons.lang3.StringUtils.contains(expression, "()")) {
|
|
|
- return ResultHelper.failure(ResponseCode.C0134.getCode(), expression + "公式不合法,包含空括号");
|
|
|
+ return ResultHelper.failure(ResponseCode.C0134.getCode(), "公式不合法");
|
|
|
}
|
|
|
// expression = expression.replaceAll("\\)\\(", "\\)*\\(");
|
|
|
// expression = expression.replaceAll("\\(\\-", "\\(0-");
|
|
@@ -357,7 +357,7 @@ public class AlarmConditionServiceImpl extends ServiceImpl<AlarmConditionMapper,
|
|
|
continue;
|
|
|
}
|
|
|
if (!variable.equals(split)) {
|
|
|
- return ResultHelper.failure(ResponseCode.C0134.getCode(), expression + "公式不合法,包含非法变量或字符");
|
|
|
+ return ResultHelper.failure(ResponseCode.C0134.getCode(), "公式不合法");
|
|
|
}
|
|
|
}
|
|
|
// 校验括号
|
|
@@ -368,7 +368,7 @@ public class AlarmConditionServiceImpl extends ServiceImpl<AlarmConditionMapper,
|
|
|
char currChar = expression.charAt(i);
|
|
|
if (i == 0) {
|
|
|
if (Pattern.matches("\\*|\\/", String.valueOf(currChar))) {
|
|
|
- return ResultHelper.failure(ResponseCode.C0134.getCode(), expression + "公式不合法,以错误运算符开头");
|
|
|
+ return ResultHelper.failure(ResponseCode.C0134.getCode(), "公式不合法");
|
|
|
}
|
|
|
if (currChar == '+') {
|
|
|
resultExpression = expression.substring(1);
|
|
@@ -383,24 +383,24 @@ public class AlarmConditionServiceImpl extends ServiceImpl<AlarmConditionMapper,
|
|
|
if (stack.size() > 0) {
|
|
|
stack.pop();
|
|
|
} else {
|
|
|
- return ResultHelper.failure(ResponseCode.C0134.getCode(), expression + "公式不合法,括号不配对");
|
|
|
+ return ResultHelper.failure(ResponseCode.C0134.getCode(), "公式不合法");
|
|
|
}
|
|
|
}
|
|
|
if (preChar != null && preChar == '(' && Pattern.matches("[\\+\\-\\*\\/]+", String.valueOf(currChar))) {
|
|
|
- return ResultHelper.failure(ResponseCode.C0134.getCode(), expression + "公式不合法,左括号后是运算符");
|
|
|
+ return ResultHelper.failure(ResponseCode.C0134.getCode(), "公式不合法");
|
|
|
}
|
|
|
if (preChar != null && preChar == ')' && !Pattern.matches("[\\+\\-\\*\\/]+", String.valueOf(currChar))) {
|
|
|
- return ResultHelper.failure(ResponseCode.C0134.getCode(), expression + "公式不合法,右括号后面不是运算符");
|
|
|
+ return ResultHelper.failure(ResponseCode.C0134.getCode(), "公式不合法");
|
|
|
}
|
|
|
if (i == expression.length() - 1) {
|
|
|
if (Pattern.matches("\\+|\\-|\\*|\\/", String.valueOf(currChar))) {
|
|
|
- return ResultHelper.failure(ResponseCode.C0134.getCode(), expression + "公式不合法,以运算符结尾");
|
|
|
+ return ResultHelper.failure(ResponseCode.C0134.getCode(), "公式不合法");
|
|
|
}
|
|
|
}
|
|
|
preChar = currChar;
|
|
|
}
|
|
|
if (stack.size() > 0) {
|
|
|
- return ResultHelper.failure(ResponseCode.C0134.getCode(), expression + "公式不合法,括号不配对");
|
|
|
+ return ResultHelper.failure(ResponseCode.C0134.getCode(), "公式不合法");
|
|
|
}
|
|
|
return ResultHelper.success();
|
|
|
}
|