From 7852fd6313032a18ff44deb005f0bbc344d41d17 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期二, 09 九月 2025 15:27:47 +0800
Subject: [PATCH] 修复自定义公式除数为0异常
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/util/JexlFormulaCalculator.java | 14 ++++++++------
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/TmpEquipmentAlarm.java | 2 --
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/TmpEquipmentAlarm.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/TmpEquipmentAlarm.java
index ee9eada..8aec58e 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/TmpEquipmentAlarm.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/TmpEquipmentAlarm.java
@@ -1,7 +1,5 @@
package org.jeecg.modules.mdc.entity;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-
import javax.persistence.*;
import java.io.Serializable;
import java.util.Date;
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/util/JexlFormulaCalculator.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/util/JexlFormulaCalculator.java
index 5780824..1a219f5 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/util/JexlFormulaCalculator.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/util/JexlFormulaCalculator.java
@@ -50,12 +50,14 @@
throw new RuntimeException("鍏紡璁＄畻缁撴灉涓嶆槸鏁板瓧");
}
} catch (JexlException e) {
- // 鍏抽敭锛氫笉渚濊禆鍐呴儴绫伙紝鐩存帴閫氳繃寮傚父娑堟伅鍒ゆ柇闄ゆ暟涓�0
- if (e.getMessage() != null && e.getMessage().contains("division by zero")) {
- return BigDecimal.ZERO; // 闄ゆ暟涓�0杩斿洖0
- }
- // 鍏朵粬JEXL寮傚父姝ｅ父鎶涘嚭
- throw new RuntimeException("鍏紡璁＄畻澶辫触: " + formula, e);
+ return BigDecimal.ZERO; // 闄ゆ暟涓�0杩斿洖0
+
+// // 鍏抽敭锛氫笉渚濊禆鍐呴儴绫伙紝鐩存帴閫氳繃寮傚父娑堟伅鍒ゆ柇闄ゆ暟涓�0
+// if (e.getMessage() != null && e.getMessage().contains("division by zero")) {
+//
+// }
+// // 鍏朵粬JEXL寮傚父姝ｅ父鎶涘嚭
+// throw new RuntimeException("鍏紡璁＄畻澶辫触: " + formula, e);
} catch (Exception e) {
throw new RuntimeException("鍏紡璁＄畻澶辫触: " + formula, e);
}
--
Gitblit v1.9.3