From d417e53c7876b446823a59859971431943d03ba2 Mon Sep 17 00:00:00 2001 From: yinq Date: Mon, 17 Mar 2025 13:38:33 +0800 Subject: [PATCH] =?UTF-8?q?update=20Dms=E6=8A=A5=E8=AD=A6=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E7=BB=B4=E6=8A=A4=E5=85=B3=E8=81=94=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=A4=A7=E7=B1=BB=E3=80=81=E8=AE=BE=E5=A4=87=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/dms/domain/BaseAlarmType.java | 11 ++++ .../dms/domain/DmsBaseDeviceCategory.java | 53 +++++++++++++++ .../dromara/dms/domain/DmsBaseDeviceType.java | 65 +++++++++++++++++++ .../dms/domain/vo/BaseAlarmTypeVo.java | 12 +++- .../dms/mapper/DmsDeviceCategoryMapper.java | 14 ++++ .../dms/mapper/DmsDeviceTypeMapper.java | 14 ++++ .../impl/BaseAlarmTypeServiceImpl.java | 28 ++++---- 7 files changed, 184 insertions(+), 13 deletions(-) create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceCategory.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceType.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsDeviceCategoryMapper.java create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsDeviceTypeMapper.java diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/BaseAlarmType.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/BaseAlarmType.java index 157c7f12..af4d97f7 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/BaseAlarmType.java +++ b/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; } diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceCategory.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceCategory.java new file mode 100644 index 00000000..01e3b97a --- /dev/null +++ b/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; + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceType.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceType.java new file mode 100644 index 00000000..eb0d6ea5 --- /dev/null +++ b/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; + + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/BaseAlarmTypeVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/BaseAlarmTypeVo.java index 057325eb..665f5809 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/BaseAlarmTypeVo.java +++ b/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; } diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsDeviceCategoryMapper.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsDeviceCategoryMapper.java new file mode 100644 index 00000000..9189f2ad --- /dev/null +++ b/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 { + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsDeviceTypeMapper.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsDeviceTypeMapper.java new file mode 100644 index 00000000..01282a75 --- /dev/null +++ b/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 { + +} diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/BaseAlarmTypeServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/BaseAlarmTypeServiceImpl.java index a2f78b46..dc632b60 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/BaseAlarmTypeServiceImpl.java +++ b/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 buildQueryWrapper(BaseAlarmTypeBo bo) { Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(BaseAlarmType.class) - .selectAll(BaseAlarmType.class) - .eq(bo.getAlarmTypeId() != null, BaseAlarmType::getAlarmTypeId, bo.getAlarmTypeId()) - .eq(StringUtils.isNotBlank(bo.getAlarmTypeCode()), BaseAlarmType::getAlarmTypeCode, bo.getAlarmTypeCode()) - .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); + .selectAll(BaseAlarmType.class) + .select(DmsBaseDeviceCategory::getDeviceCategoryName) + .select(DmsBaseDeviceType::getDeviceTypeName) + .leftJoin(DmsBaseDeviceCategory.class, DmsBaseDeviceCategory::getDeviceCategoryId, BaseAlarmType::getDeviceCategoryId) + .leftJoin(DmsBaseDeviceType.class, DmsBaseDeviceType::getDeviceTypeId, BaseAlarmType::getDeviceTypeId) + .eq(bo.getAlarmTypeId() != null, BaseAlarmType::getAlarmTypeId, bo.getAlarmTypeId()) + .eq(StringUtils.isNotBlank(bo.getAlarmTypeCode()), BaseAlarmType::getAlarmTypeCode, bo.getAlarmTypeCode()) + .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 ids, Boolean isValid) { - if(isValid){ + if (isValid) { //TODO 做一些业务上的校验,判断是否需要校验 } return baseMapper.deleteByIds(ids) > 0;