Browse Source

feat: 新增部分算法、任务状态、任务类型的枚举类;新增字符串转BigDecimal公共方法

master
yinhuaiwei 4 weeks ago
parent
commit
9fb6e82c2e
4 changed files with 61 additions and 7 deletions
  1. +2
    -0
      inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/constant/AlgConstants.java
  2. +22
    -7
      inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/enums/TaskStatus.java
  3. +21
    -0
      inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/enums/TaskType.java
  4. +16
    -0
      inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/utils/BigDecimalUtil.java

+ 2
- 0
inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/constant/AlgConstants.java View File

@ -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";


+ 22
- 7
inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/enums/TaskStatus.java View File

@ -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;
}
}

+ 21
- 0
inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/enums/TaskType.java View File

@ -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;
}
}

+ 16
- 0
inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/utils/BigDecimalUtil.java View File

@ -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;
}
}
}

Loading…
Cancel
Save