From a6408e61e2573b1ab4e87db3af9b0c781dcdc74a Mon Sep 17 00:00:00 2001 From: zch Date: Tue, 25 Mar 2025 10:42:46 +0800 Subject: [PATCH] =?UTF-8?q?refactor(dms):=20=E5=B0=86=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=AE=9E=E4=BD=93=E7=B1=BB=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=20Long=20=E7=B1=BB=E5=9E=8B=E6=9B=BF=E6=8D=A2=E4=B8=BA=20BigDe?= =?UTF-8?q?cimal,=E4=B8=BADmsBaseDeviceType=E5=AE=9E=E4=BD=93=E7=B1=BB?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=20@TableId=20=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将这些实体类中的 Long 类型字段改为 BigDecimal 类型 - 相应地修改了对应的 BO 和 VO 类 - 为DmsBaseDeviceType实体类添加了 @TableId 注解 --- .../org/dromara/dms/domain/DmsBaseDeviceBom.java | 3 ++- .../dromara/dms/domain/DmsBaseDeviceSupplies.java | 3 ++- .../org/dromara/dms/domain/DmsBaseDeviceType.java | 3 +++ .../dromara/dms/domain/DmsDeviceModeFunction.java | 8 +++++--- .../dms/domain/DmsDeviceModeParameter.java | 9 +++++---- .../dromara/dms/domain/bo/DmsBaseDeviceBomBo.java | 11 +++++------ .../dms/domain/bo/DmsBaseDeviceSuppliesBo.java | 15 +++++++++------ .../dms/domain/bo/DmsDeviceModeFunctionBo.java | 13 +++++++------ .../dms/domain/bo/DmsDeviceModeParameterBo.java | 14 ++++++++------ .../dromara/dms/domain/vo/DmsBaseDeviceBomVo.java | 10 +++++----- .../dms/domain/vo/DmsBaseDeviceSuppliesVo.java | 10 +++++----- .../dms/domain/vo/DmsDeviceModeFunctionVo.java | 10 +++++----- .../dms/domain/vo/DmsDeviceModeParameterVo.java | 10 +++++----- 13 files changed, 66 insertions(+), 53 deletions(-) diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceBom.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceBom.java index 11677845..939ffeb7 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceBom.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceBom.java @@ -6,6 +6,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serial; +import java.math.BigDecimal; /** * 设备BOM信息对象 dms_base_device_bom @@ -40,7 +41,7 @@ public class DmsBaseDeviceBom extends TenantEntity { /** * BOM数量 */ - private Long bomAmount; + private BigDecimal bomAmount; /** * 祖级列表 diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceSupplies.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceSupplies.java index 477971ad..eb469e2d 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceSupplies.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceSupplies.java @@ -6,6 +6,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serial; +import java.math.BigDecimal; /** * 设备配套信息对象 dms_base_device_supplies @@ -45,7 +46,7 @@ public class DmsBaseDeviceSupplies extends TenantEntity { /** * 需要数量 */ - private Long requireAmount; + private BigDecimal requireAmount; /** * 备注 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 index eb0d6ea5..e4d21d91 100644 --- 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 @@ -1,5 +1,7 @@ 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; @@ -24,6 +26,7 @@ public class DmsBaseDeviceType extends TenantEntity { /** * 设备类型ID */ + @TableId(value = "device_type_id", type = IdType.AUTO) private Long deviceTypeId; /** diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsDeviceModeFunction.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsDeviceModeFunction.java index c3eb829d..0b699bc7 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsDeviceModeFunction.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsDeviceModeFunction.java @@ -1,10 +1,12 @@ package org.dromara.dms.domain; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.io.Serial; +import java.math.BigDecimal; /** * 设备模型功能对象 dms_device_mode_function @@ -118,7 +120,7 @@ public class DmsDeviceModeFunction { /** * 预留字段，步长 */ - private Long propertyStep; + private BigDecimal propertyStep; /** * 预留字段 diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsDeviceModeParameter.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsDeviceModeParameter.java index a472f4c4..b16f3d76 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsDeviceModeParameter.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsDeviceModeParameter.java @@ -1,11 +1,12 @@ package org.dromara.dms.domain; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import com.baomidou.mybatisplus.annotation.*; +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 java.io.Serial; +import java.math.BigDecimal; /** * 设备参数对象 dms_device_mode_parameter @@ -69,7 +70,7 @@ public class DmsDeviceModeParameter { /** * 预留字段，步长 */ - private Long propertyStep; + private BigDecimal propertyStep; } diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseDeviceBomBo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseDeviceBomBo.java index 62347e1d..19ccf373 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseDeviceBomBo.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseDeviceBomBo.java @@ -1,13 +1,12 @@ package org.dromara.dms.domain.bo; -import org.dromara.dms.domain.DmsBaseDeviceBom; -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.DmsBaseDeviceBom; + +import java.math.BigDecimal; /** * 设备BOM信息业务对象 dms_base_device_bom @@ -38,7 +37,7 @@ public class DmsBaseDeviceBomBo extends BaseEntity { /** * BOM数量 */ - private Long bomAmount; + private BigDecimal bomAmount; /** * 祖级列表 diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseDeviceSuppliesBo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseDeviceSuppliesBo.java index 07834027..272cf45a 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseDeviceSuppliesBo.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseDeviceSuppliesBo.java @@ -1,13 +1,16 @@ package org.dromara.dms.domain.bo; -import org.dromara.dms.domain.DmsBaseDeviceSupplies; -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 jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; -import jakarta.validation.constraints.*; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.dms.domain.DmsBaseDeviceSupplies; + +import java.math.BigDecimal; /** * 设备配套信息业务对象 dms_base_device_supplies @@ -45,7 +48,7 @@ public class DmsBaseDeviceSuppliesBo extends BaseEntity { /** * 需要数量 */ - private Long requireAmount; + private BigDecimal requireAmount; /** * 备注 diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsDeviceModeFunctionBo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsDeviceModeFunctionBo.java index 6c8032df..46482255 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsDeviceModeFunctionBo.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsDeviceModeFunctionBo.java @@ -1,15 +1,16 @@ package org.dromara.dms.domain.bo; -import org.dromara.dms.domain.DmsDeviceModeFunction; -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 jakarta.validation.constraints.NotBlank; import lombok.Data; import lombok.EqualsAndHashCode; -import jakarta.validation.constraints.*; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.dms.domain.DmsDeviceModeFunction; import org.dromara.dms.domain.DmsDeviceModeParameter; +import java.math.BigDecimal; import java.util.List; /** @@ -123,7 +124,7 @@ public class DmsDeviceModeFunctionBo extends BaseEntity { /** * 预留字段，步长 */ - private Long propertyStep; + private BigDecimal propertyStep; /** * 预留字段 diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsDeviceModeParameterBo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsDeviceModeParameterBo.java index 2583de03..df637ed6 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsDeviceModeParameterBo.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsDeviceModeParameterBo.java @@ -1,13 +1,15 @@ package org.dromara.dms.domain.bo; -import org.dromara.dms.domain.DmsDeviceModeParameter; -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 jakarta.validation.constraints.NotBlank; import lombok.Data; import lombok.EqualsAndHashCode; -import jakarta.validation.constraints.*; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.dms.domain.DmsDeviceModeParameter; + +import java.math.BigDecimal; /** * 设备参数业务对象 dms_device_mode_parameter @@ -71,7 +73,7 @@ public class DmsDeviceModeParameterBo extends BaseEntity { /** * 预留字段，步长 */ - private Long propertyStep; + private BigDecimal propertyStep; } diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDeviceBomVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDeviceBomVo.java index bb8f9e0f..a889461d 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDeviceBomVo.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDeviceBomVo.java @@ -1,16 +1,16 @@ package org.dromara.dms.domain.vo; -import org.dromara.dms.domain.DmsBaseDeviceBom; 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.DmsBaseDeviceBom; import java.io.Serial; import java.io.Serializable; -import java.util.Date; +import java.math.BigDecimal; @@ -50,7 +50,7 @@ public class DmsBaseDeviceBomVo implements Serializable { * BOM数量 */ @ExcelProperty(value = "BOM数量") - private Long bomAmount; + private BigDecimal bomAmount; /** * 祖级列表 diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDeviceSuppliesVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDeviceSuppliesVo.java index 6f9e3d0a..5d82beae 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDeviceSuppliesVo.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDeviceSuppliesVo.java @@ -1,16 +1,16 @@ package org.dromara.dms.domain.vo; -import org.dromara.dms.domain.DmsBaseDeviceSupplies; 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.DmsBaseDeviceSupplies; import java.io.Serial; import java.io.Serializable; -import java.util.Date; +import java.math.BigDecimal; @@ -57,7 +57,7 @@ public class DmsBaseDeviceSuppliesVo implements Serializable { * 需要数量 */ @ExcelProperty(value = "需要数量") - private Long requireAmount; + private BigDecimal requireAmount; /** * 备注 diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsDeviceModeFunctionVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsDeviceModeFunctionVo.java index 225ad239..f90d6ff0 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsDeviceModeFunctionVo.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsDeviceModeFunctionVo.java @@ -1,17 +1,17 @@ package org.dromara.dms.domain.vo; -import org.dromara.dms.domain.DmsDeviceModeFunction; 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.DmsDeviceModeFunction; import org.dromara.dms.domain.DmsDeviceModeParameter; import java.io.Serial; import java.io.Serializable; -import java.util.Date; +import java.math.BigDecimal; import java.util.List; @@ -157,7 +157,7 @@ public class DmsDeviceModeFunctionVo implements Serializable { * 预留字段，步长 */ @ExcelProperty(value = "预留字段，步长") - private Long propertyStep; + private BigDecimal propertyStep; /** * 预留字段 diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsDeviceModeParameterVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsDeviceModeParameterVo.java index e18a3f88..aa43fc1a 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsDeviceModeParameterVo.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsDeviceModeParameterVo.java @@ -1,16 +1,16 @@ package org.dromara.dms.domain.vo; -import org.dromara.dms.domain.DmsDeviceModeParameter; 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.DmsDeviceModeParameter; import java.io.Serial; import java.io.Serializable; -import java.util.Date; +import java.math.BigDecimal; @@ -89,7 +89,7 @@ public class DmsDeviceModeParameterVo implements Serializable { * 预留字段，步长 */ @ExcelProperty(value = "预留字段，步长") - private Long propertyStep; + private BigDecimal propertyStep; }