From e6463e3aad65706d4540235e30941717532f9f18 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 13 Jul 2021 15:48:42 +0800
Subject: [PATCH] screen-manage 完成实时界面单位转换功能
---
screen-common/src/main/java/com/moral/util/UnitConvertUtils.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/screen-common/src/main/java/com/moral/util/UnitConvertUtils.java b/screen-common/src/main/java/com/moral/util/UnitConvertUtils.java
index e86291d..5bdf91f 100644
--- a/screen-common/src/main/java/com/moral/util/UnitConvertUtils.java
+++ b/screen-common/src/main/java/com/moral/util/UnitConvertUtils.java
@@ -1,5 +1,7 @@
package com.moral.util;
+import org.springframework.util.ObjectUtils;
+
import javax.script.ScriptEngine;
import javax.script.ScriptEngineManager;
import javax.script.ScriptException;
@@ -28,6 +30,8 @@
* @Date: 2021/7/5
*/
public static String calculate(String value, String formula) {
+ if(ObjectUtils.isEmpty(formula))
+ return value;
ScriptEngine jse = new ScriptEngineManager().getEngineByName("JavaScript");
formula = formula.replaceAll("\\{0\\}", value);
Double result = null;
--
Gitblit v1.8.0