From 98fb035a972ad70634489bb771bbe80f63ad1534 Mon Sep 17 00:00:00 2001 From: zcxlsm Date: Sat, 19 Jul 2025 16:21:55 +0800 Subject: [PATCH] =?UTF-8?q?refactor(property):=20meter=5Ftype=E5=AD=97?= =?UTF-8?q?=E5=85=B8=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/dromara/property/domain/TbMeterInfo.java | 2 +- .../org/dromara/property/domain/bo/TbMeterInfoBo.java | 4 ++-- .../org/dromara/property/domain/vo/TbMeterInfoVo.java | 10 +++++++--- .../property/service/impl/TbMeterInfoServiceImpl.java | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbMeterInfo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbMeterInfo.java index 29073a3..6c748a1 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbMeterInfo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbMeterInfo.java @@ -50,7 +50,7 @@ public class TbMeterInfo extends TenantEntity { /** * 计量单位(1-度，2-吨，3-立方米) */ - private String meterUnit; + private Long meterUnit; /** * 安装位置 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbMeterInfoBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbMeterInfoBo.java index 8b21103..4730a12 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbMeterInfoBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbMeterInfoBo.java @@ -50,8 +50,8 @@ public class TbMeterInfoBo extends BaseEntity { /** * 计量单位(1-度，2-吨，3-立方米) */ - @NotBlank(message = "计量单位(1-度，2-吨，3-立方米)不能为空", groups = { AddGroup.class, EditGroup.class }) - private String meterUnit; + @NotNull(message = "计量单位(1-度，2-吨，3-立方米)不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long meterUnit; /** * 安装位置 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbMeterInfoVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbMeterInfoVo.java index 2b1be40..525bbe8 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbMeterInfoVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbMeterInfoVo.java @@ -1,5 +1,7 @@ package org.dromara.property.domain.vo; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; import org.dromara.property.domain.TbMeterInfo; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; @@ -52,14 +54,16 @@ public class TbMeterInfoVo implements Serializable { /** * 设备类型(1-电表，2-水表，3-气表) */ - @ExcelProperty(value = "设备类型(1-电表，2-水表，3-气表)") + @ExcelProperty(value = "设备类型(1-电表，2-水表，3-气表)" ,converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "meter_type") private Long meterType; /** * 计量单位(1-度，2-吨，3-立方米) */ - @ExcelProperty(value = "计量单位(1-度，2-吨，3-立方米)") - private String meterUnit; + @ExcelProperty(value = "计量单位(1-度，2-吨，3-立方米)", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "meter_unit") + private Long meterUnit; /** * 安装位置 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbMeterInfoServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbMeterInfoServiceImpl.java index 49999de..060996a 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbMeterInfoServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbMeterInfoServiceImpl.java @@ -78,7 +78,7 @@ public class TbMeterInfoServiceImpl implements ITbMeterInfoService { lqw.eq(StringUtils.isNotBlank(bo.getMeterCode()), TbMeterInfo::getMeterCode, bo.getMeterCode()); lqw.eq(StringUtils.isNotBlank(bo.getFactoryNo()), TbMeterInfo::getFactoryNo, bo.getFactoryNo()); lqw.eq(bo.getMeterType() != null, TbMeterInfo::getMeterType, bo.getMeterType()); - lqw.eq(StringUtils.isNotBlank(bo.getMeterUnit()), TbMeterInfo::getMeterUnit, bo.getMeterUnit()); + lqw.eq(bo.getMeterUnit() != null, TbMeterInfo::getMeterUnit, bo.getMeterUnit()); lqw.eq(StringUtils.isNotBlank(bo.getInstallLocation()), TbMeterInfo::getInstallLocation, bo.getInstallLocation()); lqw.eq(bo.getInitReading() != null, TbMeterInfo::getInitReading, bo.getInitReading()); lqw.eq(bo.getMaxRang() != null, TbMeterInfo::getMaxRang, bo.getMaxRang());