Commit 8bec8930 authored by ZWT's avatar ZWT

feat(零碳): 长庆演示系统新增功能

1.新建油田配置表同时生成相关代码及mapper文件,修改部分第三方数据抽取定时任务,增加针对不同井场开关控制逻辑,同时修改首页页面展示逻辑,通过油田配置功能区分不同首页展示功能;
2.新建定时任务配置表同时生成相关代码及mapper文件,定时任务模块增加mybatis配置,用以操作数据库,修改部分第三方数据抽取定时任务,修改使用方式使其脱离框架方便动态控制;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 34d7ed7a
......@@ -48,8 +48,8 @@ public class BigDecimalUtil {
}
public static BigDecimal parseBigDecimal(Object obj, int num) {
if (obj == null) return BigDecimal.ZERO.setScale(num, BigDecimal.ROUND_HALF_UP);
BigDecimal org = null;
if (obj == null) return BigDecimal.ZERO.setScale(num, RoundingMode.HALF_UP);
BigDecimal org;
if (obj instanceof BigDecimal) {
org = (BigDecimal) obj;
} else {
......@@ -60,7 +60,7 @@ public class BigDecimalUtil {
org = parseObj2BigDecimal(obj);
}
}
return org.setScale(num, BigDecimal.ROUND_HALF_UP);
return org.setScale(num, RoundingMode.HALF_UP);
}
/**
......@@ -87,7 +87,7 @@ public class BigDecimalUtil {
* 去掉数字字符串末尾的0
*/
public static String removeLastZero(String org) {
if (org == null || "".equals(org.trim())) return "0";
if (org == null || org.trim().isEmpty()) return "0";
//String pattern = "(-?([1-9]\\d*\\.?\\d*)|(0\\.\\d*[1-9]))";
//if(!Pattern.matches(pattern,org)) return "0"; //非数字字符串
DecimalFormat format = new DecimalFormat("###############.##########");
......@@ -97,12 +97,11 @@ public class BigDecimalUtil {
public static BigDecimal parseObj2BigDecimal(Object obj) {
if (obj == null) return BigDecimal.ZERO;
String str = String.valueOf(obj).trim();
if (str.length() == 0) return BigDecimal.ZERO;
BigDecimal result = null;
if (str.isEmpty()) return BigDecimal.ZERO;
BigDecimal result;
try {
result = new BigDecimal(str);
} catch (Exception e) {
e.printStackTrace();
result = BigDecimal.ZERO;
}
return result;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment