From 2da6576ce17cb18f042f561648230736945ec4c1 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 10 四月 2024 19:35:16 +0800
Subject: [PATCH] 大屏数据配置接口

---
 ruoyi-common/src/main/java/com/ruoyi/common/utils/CalculateUtil.java |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/CalculateUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/CalculateUtil.java
index 300eb79..369136a 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/CalculateUtil.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/CalculateUtil.java
@@ -12,7 +12,7 @@
  * @date 2024/3/27
  */
 public class CalculateUtil {
-    public static Map<String,Integer> getFieldsAndValue(String rule) {
+    public static Map<String, Integer> getFieldsAndValue(String rule) {
         // 正则表达式模式,匹配形如 "fieldName:value" 的字符串
         Pattern pattern = Pattern.compile("\\b(\\w+)_(\\d+)\\b");
         Matcher matcher = pattern.matcher(rule);
@@ -21,11 +21,12 @@
         while (matcher.find()) {
             String fieldName = matcher.group(1);
             int value = Integer.parseInt(matcher.group(2));
-            map.put(fieldName+"_"+value, value);
+            map.put(fieldName + "_" + value, value);
         }
         return map;
     }
-    public static double calculate(String expression,Map<String,Object> value) {
+
+    public static double calculate(String expression, Map<String, Object> value) {
         expression = formatExpression(expression);
         // 创建 JEXL 引擎
         JexlEngine jexl = new JexlBuilder().create();
@@ -35,7 +36,7 @@
         // 创建上下文
         JexlContext context = new MapContext();
         for (Map.Entry<String, Object> stringObjectEntry : value.entrySet()) {
-            context.set(stringObjectEntry.getKey(),stringObjectEntry.getValue());
+            context.set(stringObjectEntry.getKey(), stringObjectEntry.getValue());
         }
         // 执行计算
         Object result = exp.evaluate(context);
@@ -51,7 +52,7 @@
                 .replaceAll("÷", "/")
                 .replaceAll("(", "(")
                 .replaceAll(")", ")")
-                .replaceAll("+","+")
+                .replaceAll("+", "+")
                 .replaceAll("-", "-");
     }
 }

--
Gitblit v1.7.1