From 1181f18e08e62500b72dc5a2953568fc5391f3b1 Mon Sep 17 00:00:00 2001 From: zch Date: Thu, 27 Mar 2025 19:56:27 +0800 Subject: [PATCH] =?UTF-8?q?add(common-core):=20=E6=B7=BB=E5=8A=A0=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E7=AE=A1=E7=90=86=E5=B8=B8=E9=87=8F=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增 DmsConstants 类，定义了设备管理相关的常量 - 包含故障报修、点巡检、保养、润滑等工单状态和类型常量 - 添加了外协信息、工单文件关联类型等常量 - 定义了附件信息类别和设备报警状态常量 --- .../common/core/constant/DmsConstants.java | 89 +++++++++++++++++++ .../IDmsInspectProjectDeviceService.java | 24 ++--- 2 files changed, 101 insertions(+), 12 deletions(-) create mode 100644 ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/DmsConstants.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/DmsConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/DmsConstants.java new file mode 100644 index 0000000..462b7cd --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/DmsConstants.java @@ -0,0 +1,89 @@ +package org.dromara.common.core.constant; + +/** + * @Description: 设备管理常量定义 + * @ClassName: DmsConstants + * @Author : xins + * @Date :2024-03-13 17:26 + * @Version :1.0 + */ +public class DmsConstants { + + + /**故障报修工单状态*/ + public static final String DMS_BILLS_FAULT_INSTANCE_STATUS_TO_REPAIR = "0";//待维修 + public static final String DMS_BILLS_FAULT_INSTANCE_STATUS_REPAIRING = "1";//维修中 + public static final String DMS_BILLS_FAULT_INSTANCE_STATUS_FINISH = "2";//维修完成 + + /**故障报修工单实例状态*/ + public static final String DMS_BILLS_FAULT_INSTANCE_ACTIVITY_HANDLE_STATUS_FINISH = "0";//已结束 + public static final String DMS_BILLS_FAULT_INSTANCE_ACTIVITY_HANDLE_STATUS_EXECUTING = "1";//执行中 + public static final String DMS_BILLS_FAULT_INSTANCE_ACTIVITY_HANDLE_STATUS_TO_PICK = "2";//待接取 + + + /**故障报修工单类型*/ + public static final String DMS_BILLS_FAULT_INSTANCE_TYPE_MAUAL = "1";//手工创建 + + + /**点巡检工单巡检状态*/ + public static final String DMS_BILLS_INSPECT_INSTANCE_INSPECT_STATUS_TO_INSPECT="1";//待巡检 + public static final String DMS_BILLS_INSPECT_INSTANCE_INSPECT_STATUS_INSPECTING="2";//巡检中 + public static final String DMS_BILLS_INSPECT_INSTANCE_INSPECT_STATUS_FINISH="3";//巡检完成 + + /**点巡检项目属性*/ + public static final String DMS_INSPECT_INSTANCE_PROJECT_PROPERTY_QUALITATIVE = "1";//定性 + + + + /**点巡检工单明细状态*/ + public static final String DMS_INSPECT_INSTANCE_DETAIL_STATUS_TO_INSPECT = "1";//待巡检 + public static final String DMS_INSPECT_INSTANCE_DETAIL_STATUS_INSPECTING = "2";//巡检中 + public static final String DMS_INSPECT_INSTANCE_DETAIL_STATUS_FINISH = "3";//巡检完成 + + /**点巡检工单明细检验状态*/ + public static final String DMS_INSPECT_INSTANCE_DETAIL_INSPECT_STATUS_PASS = "1";//正常 + public static final String DMS_INSPECT_INSTANCE_DETAIL_INSPECT_STATUS_FAIL = "0";//异常 + + + /**点巡检工单明细项目信息检验状态*/ + public static final String DMS_INSPECT_INSTANCE_DETAIL_PROJECT_STATUS_PASS = "1";//正常 + public static final String DMS_INSPECT_INSTANCE_DETAIL_PROJECT_STATUS_FAIL = "0";//异常 + + + /**外协信息状态*/ + public static final Long DMS_BASE_OUTSRC_INFO_STATUS_NROMAL = 1L;//启用 + + + /**工单文件关联类型*/ + public static final String DMS_INSTANCE_FILE_TARGET_TYPE_FAULT_INSTANCE_ACTIVITY = "1";//故障报修工单实例节点 + + + + + /**保养工单保养状态*/ + public static final Long DMS_BILLS_MAINT_INSTANCE_STATUS_TO_MAINT=1L;//待保养 + public static final Long DMS_BILLS_MAINT_INSTANCE_STATUS_MAINTING=2L;//保养中 + public static final Long DMS_BILLS_MAINT_INSTANCE_STATUS_COMPLETE=3L;//保养完成 + + + /**润滑工单润滑状态*/ + public static final String DMS_BILLS_LUBE_INSTANCE_STATUS_TO_LUBE="1";//待润滑 + public static final String DMS_BILLS_LUBE_INSTANCE_STATUS_LUBING="2";//润滑中 + public static final String DMS_BILLS_LUBE_INSTANCE_STATUS_COMPLETE="3";//润滑完成 + + + /** 附件信息附件类别*/ + public static final String MES_BASE_ATTACH_INFO_KNOWLEDGELUBE="3";//润滑知识库 + public static final String MES_BASE_ATTACH_INFO_KNOWLEDGEMAINT="4";//保养知识库 + public static final String MES_BASE_ATTACH_INFO_KNOWLEDGEREPAIR="5";//设备知识库 + + /** 设备报警状态（0未处理 1人工已处理 2自动恢复）*/ + public static final String DMS_ALARM_STATUS_UN_HANDLE="0";//0未处理 + public static final String DMS_ALARM_STATUS_ARTIFICIAL_HANDLE="1";//1人工已处理 + public static final String DMS_ALARM_STATUS_AUTO_HANDLE="2";//2自动恢复 + + + /** 保养项目状态（0待保养，1保养完成）*/ + public static final String DMS_MAINT_PROJECT_STATUS_TO_MAINT="0";//0待保养 + public static final String DMS_MAINT_PROJECT_STATUS_COMPLETE="1";//1保养完成 +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsInspectProjectDeviceService.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsInspectProjectDeviceService.java index bf0809a..77e47a9 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsInspectProjectDeviceService.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsInspectProjectDeviceService.java @@ -10,7 +10,7 @@ import java.util.Collection; import java.util.List; /** - * 点巡检项目关联物料信息Service接口 + * 点巡检项目关联设备信息Service接口 * * @author zch * @date 2025-03-24 @@ -18,48 +18,48 @@ import java.util.List; public interface IDmsInspectProjectDeviceService { /** - * 查询点巡检项目关联物料信息 + * 查询点巡检项目关联设备信息 * * @param inspectProjectId 主键 - * @return 点巡检项目关联物料信息 + * @return 点巡检项目关联设备信息 */ DmsInspectProjectDeviceVo queryById(Long inspectProjectId); /** - * 分页查询点巡检项目关联物料信息列表 + * 分页查询点巡检项目关联设备信息列表 * * @param bo 查询条件 * @param pageQuery 分页参数 - * @return 点巡检项目关联物料信息分页列表 + * @return 点巡检项目关联设备信息分页列表 */ TableDataInfo queryPageList(DmsInspectProjectDeviceBo bo, PageQuery pageQuery); /** - * 查询符合条件的点巡检项目关联物料信息列表 + * 查询符合条件的点巡检项目关联设备信息列表 * * @param bo 查询条件 - * @return 点巡检项目关联物料信息列表 + * @return 点巡检项目关联设备信息列表 */ List queryList(DmsInspectProjectDeviceBo bo); /** - * 新增点巡检项目关联物料信息 + * 新增点巡检项目关联设备信息 * - * @param bo 点巡检项目关联物料信息 + * @param bo 点巡检项目关联设备信息 * @return 是否新增成功 */ Boolean insertByBo(DmsInspectProjectDeviceBo bo); /** - * 修改点巡检项目关联物料信息 + * 修改点巡检项目关联设备信息 * - * @param bo 点巡检项目关联物料信息 + * @param bo 点巡检项目关联设备信息 * @return 是否修改成功 */ Boolean updateByBo(DmsInspectProjectDeviceBo bo); /** - * 校验并批量删除点巡检项目关联物料信息信息 + * 校验并批量删除点巡检项目关联设备信息信息 * * @param ids 待删除的主键集合 * @param isValid 是否进行有效性校验