From 2839a3d13f02deef8052f2b6627807c7e13b3e76 Mon Sep 17 00:00:00 2001 From: zch Date: Wed, 2 Apr 2025 17:05:43 +0800 Subject: [PATCH] =?UTF-8?q?add(common):=20=E7=A7=BB=E6=A4=8D=E4=BA=AC?= =?UTF-8?q?=E6=BA=90=E6=B7=BB=E5=8A=A0=E5=B8=B8=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 BusinessType 枚举中添加 START 和 COMPLETE 类型 - 添加检修和保养相关的序列类型和业务类型,在 Seq 类中添加检修计划、检修工单、保养计划和保养工单的序列类型和相关标识 - 更新 getDmsId 方法以支持新的序列类型 --- .../dromara/common/core/utils/uuid/Seq.java | 50 +++++++++++++++++++ .../common/log/enums/BusinessType.java | 12 +++++ 2 files changed, 62 insertions(+) diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/uuid/Seq.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/uuid/Seq.java index 26f05f6..35f6587 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/uuid/Seq.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/uuid/Seq.java @@ -54,6 +54,51 @@ public class Seq { public static final String dmsLubeInstanceCode = "LI"; + //检修计划序列类型 + public static final String planRepairSeqType = "PLANREPAIR"; + //检修计划接口序列数 + private static AtomicInteger planRepairSeq = new AtomicInteger(1); + //检修记录标识 + public static final String planRepairCode = "PR"; + //检修工单序列类型 + public static final String repairInstanceSeqTupe = "REPAIRINSTANCE"; + //检修工单接口序列数 + private static AtomicInteger repairInstanceSeq = new AtomicInteger(1); + //检修工单标识 + public static final String repairInstanceCode = "RI"; + + //检修计划序列类型 + public static final String planInspectSeqType = "PLANINSPECT"; + //检修计划接口序列数 + private static AtomicInteger planInspectSeq = new AtomicInteger(1); + //检修记录标识 + public static final String planInspectCode = "PIC"; + //检修工单序列类型 + public static final String InspectInstanceSeqTupe = "INSPECTINSTANCE"; + //检修工单接口序列数 + private static AtomicInteger INSPECTInstanceSeq = new AtomicInteger(1); + //检修工单标识 + public static final String InspectInstanceCode = "IIC"; + + // 保养计划序列类型 + public static final String planMaintSeqType = "PLANMAINT"; + + // 保养计划接口序列数 + private static AtomicInteger planMaintSeq = new AtomicInteger(1); + + // 保养记录标识 + public static final String planMaintCode = "PM"; + + + // 保养工单序列类型 + public static final String maintInstanceSeqType = "MAINTINSTANCE"; + + // 保养工单接口序列数 + private static AtomicInteger maintInstanceSeq = new AtomicInteger(1); + + // 保养工单标识 + public static final String maintInstanceCode = "MI"; + /** * 获取通用序列号 * @@ -122,7 +167,12 @@ public class Seq { atomicInt = dmsPlanLubeSeq; }else if (dmsLubeInstanceSeqType.equals(type)) { atomicInt = dmsLubeInstanceSeq; + }else if (planMaintSeqType.equals(type)) { + atomicInt = planMaintSeq; + }else if(maintInstanceSeqType.equals(type)) { + atomicInt = maintInstanceSeq; } + return getId(atomicInt, 4, code); } diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/BusinessType.java b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/BusinessType.java index 2d25ebb..2cf48cf 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/BusinessType.java +++ b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/BusinessType.java @@ -55,4 +55,16 @@ public enum BusinessType { * 清空数据 */ CLEAN, + + + /** + * 开始 + */ + START, + + /** + * 完成 + */ + COMPLETE, + }