feat(dms): 添加设备名称字段并优化报警信息关联逻辑-

在 BaseAlarmInfo 实体中新增 deviceName 字段用于- 更新展示设备名称 BaseAlarmInfoBo 和 BaseAlarmInfoVo 类以支持 deviceName 展示
- 修改 BaseAlarmInfoServiceImpl 中的查询逻辑，将机器名称映射为设备名称
- 调整实体类导入顺序及注解使用，提升代码可读性与一致性

ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/BaseAlarmInfo.java

@@ -1,15 +1,13 @@
 package org.dromara.dms.domain;
 
+import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
-import org.dromara.common.mybatis.core.domain.BaseEntity;
-import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 
 import java.io.Serial;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -138,4 +136,6 @@ public class BaseAlarmInfo   {
     @TableField(exist = false)
     private String releateadContent;//join映射字段,预留字段
 
+    @TableField(exist = false)
+    private String  deviceName;
 }

ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/BaseAlarmInfoBo.java

@@ -1,15 +1,12 @@
 package org.dromara.dms.domain.bo;
 
-import org.dromara.dms.domain.BaseAlarmInfo;
-import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.common.core.validate.AddGroup;
-import org.dromara.common.core.validate.EditGroup;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import jakarta.validation.constraints.*;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.dms.domain.BaseAlarmInfo;
+
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 
 /**
  * 报警信息业务对象 base_alarm_info
@@ -94,5 +91,6 @@ public class BaseAlarmInfoBo extends BaseEntity {
     //  @NotNull(message = "人工处理时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date handleTime;
 
+    private String  deviceName;
 
 }

ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/BaseAlarmInfoVo.java

@@ -1,14 +1,12 @@
 package org.dromara.dms.domain.vo;
 
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.dromara.dms.domain.BaseAlarmInfo;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import org.dromara.common.excel.annotation.ExcelDictFormat;
-import org.dromara.common.excel.convert.ExcelDictConvert;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import org.dromara.dms.domain.BaseAlarmInfo;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -118,4 +116,6 @@ public class BaseAlarmInfoVo implements Serializable {
     private String alarmLevelName;//join映射字段
 
 
+    private String  deviceName;
+
 }

ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/BaseAlarmInfoServiceImpl.java

@@ -104,7 +104,7 @@ public class BaseAlarmInfoServiceImpl implements IBaseAlarmInfoService {
             .leftJoin(BaseAlarmType.class,BaseAlarmType::getAlarmTypeId, BaseAlarmInfo::getAlarmTypeId)
 
             //报警设备ID，关联hw_device表的device_id字段
-            .select(DmsBaseMachineInfo::getMachineName)
+            .selectAs(DmsBaseMachineInfo::getMachineName, BaseAlarmInfo::getDeviceName)
             .leftJoin(DmsBaseMachineInfo.class,DmsBaseMachineInfo::getMachineId, BaseAlarmInfo::getDeviceId)
 
             // 根据alarmInfoType动态关联相关规则表,使用CASE和子查询处理不同类型的规则关联