公式处理

yzg-util-base/src/main/java/com/yanzuoguang/util/helper/CalcHelper.java

@@ -103,6 +103,7 @@ public class CalcHelper {
      * @return
      */
     private static double calcProc(String formula, Map<String, Double> varValues) {
+        double ret = 0;
         if (formula.matches(REGEX_QUOT)) {
             // 获取第一个括号和最后一个括号
             Pattern p = Pattern.compile(REGEX_QUOT);
@@ -110,23 +111,9 @@ public class CalcHelper {
             if(!matcher.find()){
                 throw new RuntimeException("正则表达式错误");
             }
-            String left = matcher.group(1);
-            String quot = matcher.group(2);
-            String right = matcher.group(3);
-            double quotResult = calcProc(quot, varValues);
-            if (!StringHelper.isEmpty(left)) {
-                // 左边的值
-                double leftResult = calcProc(StringHelper.left(left, left.length() - 1), varValues);
-                // 左边和括号中的值计算
-                quotResult = calcItem(StringHelper.right(left, 1), leftResult, quotResult);
-            }
-            if (!StringHelper.isEmpty(right)) {
-                // 右边的值
-                double rightResult = calcProc(StringHelper.right(right, left.length() - 1), varValues);
-                // 左边和括号中的值计算
-                quotResult = calcItem(StringHelper.left(right, 1), quotResult, rightResult);
-            }
-            return quotResult;
+            double quotResult = calcProc(matcher.group(2), varValues);
+            String formulaTo = matcher.group(1) + quotResult + matcher.group(3);
+            ret =  calcProc(formulaTo,varValues);
         } else if (formula.matches(REGEX_CALC_ADD_PLUS)) {
             // 判断是否包含+-运算符号
             Pattern p = Pattern.compile(REGEX_CALC_ADD_PLUS);
@@ -136,7 +123,7 @@ public class CalcHelper {
             }
             double leftResult = calcProc(matcher.group(1),varValues);
             double rightResult = calcProc(matcher.group(3),varValues);
-            return calcItem(matcher.group(2), leftResult,rightResult);
+            ret = calcItem(matcher.group(2), leftResult,rightResult);
         } else if (formula.matches(REGEX_CALC_MULTIPLY_MOD)) {
             // 判断是否包含*/运算符号
             Pattern p = Pattern.compile(REGEX_CALC_MULTIPLY_MOD);
@@ -146,12 +133,14 @@ public class CalcHelper {
             }
             double leftResult = calcProc(matcher.group(1),varValues);
             double rightResult = calcProc(matcher.group(3),varValues);
-            return calcItem(matcher.group(2), leftResult,rightResult);
+            ret = calcItem(matcher.group(2), leftResult,rightResult);
         } else if (formula.matches(REGEX_DOUBLE)) {
-            return StringHelper.toDouble(formula);
+            ret = StringHelper.toDouble(formula);
         } else {
-            return varValues.get(formula);
+            ret = varValues.get(formula);
         }
+        System.out.println("公式: " + formula + " 值" + ret);
+        return ret;
     }
 
     private static double calcItem(String flag, double a, double b) {