From 9fb6e82c2ecb22e4d3ede989d6cf9d3cd4e93b3b Mon Sep 17 00:00:00 2001 From: yinhuaiwei Date: Sun, 12 Apr 2026 15:30:20 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E9=83=A8=E5=88=86?= =?UTF-8?q?=E7=AE=97=E6=B3=95=E3=80=81=E4=BB=BB=E5=8A=A1=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E3=80=81=E4=BB=BB=E5=8A=A1=E7=B1=BB=E5=9E=8B=E7=9A=84=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE=E7=B1=BB;=E6=96=B0=E5=A2=9E=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E4=B8=B2=E8=BD=ACBigDecimal=E5=85=AC=E5=85=B1=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/core/constant/AlgConstants.java | 2 ++ .../inspect/base/core/enums/TaskStatus.java | 29 ++++++++++++++----- .../com/inspect/base/core/enums/TaskType.java | 21 ++++++++++++++ .../base/core/utils/BigDecimalUtil.java | 16 ++++++++++ 4 files changed, 61 insertions(+), 7 deletions(-) create mode 100644 inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/enums/TaskType.java diff --git a/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/constant/AlgConstants.java b/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/constant/AlgConstants.java index 2a1b29c..3270099 100644 --- a/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/constant/AlgConstants.java +++ b/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/constant/AlgConstants.java @@ -13,6 +13,8 @@ public class AlgConstants { public static final String INFRARED = "infrared"; public static final String INFRARED2 = "infrared2"; public static final String XB = "xb"; + // 纠偏算法 + public static final String CORRECTION = "correction"; public static final String ALG_SUBTYPE_CODE = "alg_subtype_code"; diff --git a/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/enums/TaskStatus.java b/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/enums/TaskStatus.java index cbb5230..1fb95b6 100644 --- a/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/enums/TaskStatus.java +++ b/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/enums/TaskStatus.java @@ -4,18 +4,33 @@ import lombok.Getter; @Getter public enum TaskStatus { - DONE("1", "已经执行"), - RUNNING("2", "正在执行"), - PAUSED("3", "暂停执行"), - HALTED("4", "终止执行"), - PENDING("5", "尚未执行"), - EXPIRED("6", "超过期限"); + DONE("1", "已经执行", 5), + RUNNING("2", "正在执行", 3), + PAUSED("3", "暂停执行", 2), + HALTED("4", "终止执行", 0), + PENDING("5", "尚未执行", 4), + EXPIRED("6", "超过期限", 1); private final String code; private final String info; + // 状态优先级 + private final Integer priority; - TaskStatus(String code, String info) { + TaskStatus(String code, String info, Integer priority) { this.code = code; this.info = info; + this.priority = priority; + } + + public static TaskStatus fromCode(String code) { + if (code == null) { + return null; + } + for (TaskStatus s : values()) { + if (s.code.equals(code)) { + return s; + } + } + return null; } } diff --git a/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/enums/TaskType.java b/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/enums/TaskType.java new file mode 100644 index 0000000..6665483 --- /dev/null +++ b/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/enums/TaskType.java @@ -0,0 +1,21 @@ +package com.inspect.base.core.enums; + +import lombok.Getter; + +/** + * 任务类型枚举 + */ +@Getter +public enum TaskType { + ORDINARY("0", "普通任务"), + MAIN("1", "主任务"), + SUB("2", "子任务"); + + private final String code; + private final String value; + + TaskType(String code, String value) { + this.code = code; + this.value = value; + } +} diff --git a/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/utils/BigDecimalUtil.java b/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/utils/BigDecimalUtil.java index f6c622a..feef0b9 100644 --- a/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/utils/BigDecimalUtil.java +++ b/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/utils/BigDecimalUtil.java @@ -18,4 +18,20 @@ public class BigDecimalUtil { return Double.valueOf(s); } + + /** + * 字符串转BigDecimal + */ + public static BigDecimal toBigDecimal(String str) { + if (str == null || str.isEmpty()) { + return BigDecimal.ZERO; + } + + try { + String cleanStr = str.replace("%", "").trim(); + return new BigDecimal(cleanStr); + } catch (Exception e) { + return BigDecimal.ZERO; + } + } }