update Dms报警类型维护关联设备大类、设备类型字段

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

@@ -58,5 +58,16 @@ public class BaseAlarmType extends TenantEntity {
      */
     private String remark;
 
+    /**
+     * 设备大类名称
+     */
+    @TableField(exist = false)
+    private String deviceCategoryName;
+
+    /**
+     * 设备类型名称
+     */
+    @TableField(exist = false)
+    private String deviceTypeName;
 
 }

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

@@ -0,0 +1,53 @@
+package org.dromara.dms.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.tenant.core.TenantEntity;
+
+import java.io.Serial;
+
+/**
+ * 设备大类信息对象 base_device_category
+ *
+ * @author xins
+ * @date 2025-02-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("base_device_category")
+public class DmsBaseDeviceCategory extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 大类ID
+     */
+    @TableId(value = "device_category_id", type = IdType.AUTO)
+    private Long deviceCategoryId;
+
+    /**
+     * 大类编号
+     */
+    private String deviceCategoryCode;
+
+    /**
+     * 大类名称
+     */
+    private String deviceCategoryName;
+
+    /**
+     * 激活标识（1是 0否）
+     */
+    private String activeFlag;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

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

@@ -0,0 +1,65 @@
+package org.dromara.dms.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.tenant.core.TenantEntity;
+
+import java.io.Serial;
+
+/**
+ * 设备类型信息对象 base_device_type
+ *
+ * @author xins
+ * @date 2025-02-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("base_device_type")
+public class DmsBaseDeviceType extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 设备类型ID
+     */
+    private Long deviceTypeId;
+
+    /**
+     * 父级标识
+     */
+    private Long parentId;
+
+    /**
+     * 设备类型编号
+     */
+    private String deviceTypeCode;
+
+    /**
+     * 设备类型名称
+     */
+    private String deviceTypeName;
+
+    /**
+     * 祖级列表
+     */
+    private String ancestors;
+
+    /**
+     * 设备大类ID（大类ID（关联base_category表category_type为2的））
+     */
+    private Long deviceCategoryId;
+
+    /**
+     * 激活标识（1是 0否）
+     */
+    private String activeFlag;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

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

@@ -10,8 +10,6 @@ import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.util.Date;
-
 
 
 /**
@@ -71,5 +69,15 @@ public class BaseAlarmTypeVo implements Serializable {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    /**
+     * 设备大类名称
+     */
+    @ExcelProperty(value = "设备大类名称")
+    private String deviceCategoryName;
 
+    /**
+     * 设备类型名称
+     */
+    @ExcelProperty(value = "设备类型名称")
+    private String deviceTypeName;
 }

ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsDeviceCategoryMapper.java

@@ -0,0 +1,14 @@
+package org.dromara.dms.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.dms.domain.DmsBaseDeviceCategory;
+
+/**
+ * 设备大类信息Mapper接口
+ *
+ * @author Yinq
+ * @date 2025-02-21
+ */
+public interface DmsDeviceCategoryMapper extends BaseMapperPlus<DmsBaseDeviceCategory, DmsBaseDeviceCategory> {
+
+}

ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsDeviceTypeMapper.java

@@ -0,0 +1,14 @@
+package org.dromara.dms.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.dms.domain.DmsBaseDeviceType;
+
+/**
+ * 设备大类信息Mapper接口
+ *
+ * @author Yinq
+ * @date 2025-02-21
+ */
+public interface DmsDeviceTypeMapper extends BaseMapperPlus<DmsBaseDeviceType, DmsBaseDeviceType> {
+
+}

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

@@ -9,6 +9,8 @@ import com.github.yulichang.toolkit.JoinWrappers;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
+import org.dromara.dms.domain.DmsBaseDeviceCategory;
+import org.dromara.dms.domain.DmsBaseDeviceType;
 import org.springframework.stereotype.Service;
 import org.dromara.dms.domain.bo.BaseAlarmTypeBo;
 import org.dromara.dms.domain.vo.BaseAlarmTypeVo;
@@ -39,7 +41,7 @@ public class BaseAlarmTypeServiceImpl implements IBaseAlarmTypeService {
      * @return 报警类型
      */
     @Override
-    public BaseAlarmTypeVo queryById(Long alarmTypeId){
+    public BaseAlarmTypeVo queryById(Long alarmTypeId) {
         return baseMapper.selectVoById(alarmTypeId);
     }
 
@@ -72,14 +74,18 @@ public class BaseAlarmTypeServiceImpl implements IBaseAlarmTypeService {
     private MPJLambdaWrapper<BaseAlarmType> buildQueryWrapper(BaseAlarmTypeBo bo) {
         Map<String, Object> params = bo.getParams();
         MPJLambdaWrapper<BaseAlarmType> lqw = JoinWrappers.lambda(BaseAlarmType.class)
-        .selectAll(BaseAlarmType.class)
+            .selectAll(BaseAlarmType.class)
-        .eq(bo.getAlarmTypeId() != null, BaseAlarmType::getAlarmTypeId, bo.getAlarmTypeId())
+            .select(DmsBaseDeviceCategory::getDeviceCategoryName)
-        .eq(StringUtils.isNotBlank(bo.getAlarmTypeCode()), BaseAlarmType::getAlarmTypeCode, bo.getAlarmTypeCode())
+            .select(DmsBaseDeviceType::getDeviceTypeName)
-        .like(StringUtils.isNotBlank(bo.getAlarmTypeName()), BaseAlarmType::getAlarmTypeName, bo.getAlarmTypeName())
+            .leftJoin(DmsBaseDeviceCategory.class, DmsBaseDeviceCategory::getDeviceCategoryId, BaseAlarmType::getDeviceCategoryId)
-        .eq(bo.getDeviceCategoryId() != null, BaseAlarmType::getDeviceCategoryId, bo.getDeviceCategoryId())
+            .leftJoin(DmsBaseDeviceType.class, DmsBaseDeviceType::getDeviceTypeId, BaseAlarmType::getDeviceTypeId)
-        .eq(bo.getDeviceTypeId() != null, BaseAlarmType::getDeviceTypeId, bo.getDeviceTypeId())
+            .eq(bo.getAlarmTypeId() != null, BaseAlarmType::getAlarmTypeId, bo.getAlarmTypeId())
-        .eq(StringUtils.isNotBlank(bo.getTypeStatus()), BaseAlarmType::getTypeStatus, bo.getTypeStatus())
+            .eq(StringUtils.isNotBlank(bo.getAlarmTypeCode()), BaseAlarmType::getAlarmTypeCode, bo.getAlarmTypeCode())
-        .orderByAsc(BaseAlarmType::getCreateTime);
+            .like(StringUtils.isNotBlank(bo.getAlarmTypeName()), BaseAlarmType::getAlarmTypeName, bo.getAlarmTypeName())
+            .eq(bo.getDeviceCategoryId() != null, BaseAlarmType::getDeviceCategoryId, bo.getDeviceCategoryId())
+            .eq(bo.getDeviceTypeId() != null, BaseAlarmType::getDeviceTypeId, bo.getDeviceTypeId())
+            .eq(StringUtils.isNotBlank(bo.getTypeStatus()), BaseAlarmType::getTypeStatus, bo.getTypeStatus())
+            .orderByAsc(BaseAlarmType::getCreateTime);
         return lqw;
     }
 
@@ -116,7 +122,7 @@ public class BaseAlarmTypeServiceImpl implements IBaseAlarmTypeService {
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(BaseAlarmType entity){
+    private void validEntityBeforeSave(BaseAlarmType entity) {
         //TODO 做一些数据校验,如唯一约束
     }
 
@@ -129,7 +135,7 @@ public class BaseAlarmTypeServiceImpl implements IBaseAlarmTypeService {
      */
     @Override
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
+        if (isValid) {
             //TODO 做一些业务上的校验,判断是否需要校验
         }
         return baseMapper.deleteByIds(ids) > 0;