by2025/SmartParks
9
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

refactor(property): 1
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
Details

Browse Source
This commit is contained in:
zcxlsm 2025-07-19 13:52:02 +08:00
parent 5a88e94c23
commit eb5efd9a6c
4 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbMeterInfo.java
View File

@ -11,7 +11,7 @@ import java.io.Serial;
* 水电气对象 tb_meter_info * 水电气对象 tb_meter_info
* *
* @author lsm * @author lsm
* @date 2025-07-19 * @since 2025-07-19
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ -50,7 +50,7 @@ public class TbMeterInfo extends TenantEntity {
/** /**
* 计量单位(1-度，2-吨，3-立方米) * 计量单位(1-度，2-吨，3-立方米)
*/ */
private String metetUnit; private String meterUnit;
/** /**
* 安装位置 * 安装位置

4
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbMeterInfoBo.java
View File

@ -13,7 +13,7 @@ import jakarta.validation.constraints.*;
* 水电气业务对象 tb_meter_info * 水电气业务对象 tb_meter_info
* *
* @author lsm * @author lsm
* @date 2025-07-19 * @since 2025-07-19
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ -51,7 +51,7 @@ public class TbMeterInfoBo extends BaseEntity {
* 计量单位(1-度，2-吨，3-立方米) * 计量单位(1-度，2-吨，3-立方米)
*/ */
@NotBlank(message = "计量单位(1-度，2-吨，3-立方米)不能为空", groups = { AddGroup.class, EditGroup.class }) @NotBlank(message = "计量单位(1-度，2-吨，3-立方米)不能为空", groups = { AddGroup.class, EditGroup.class })
private String metetUnit; private String meterUnit;
/** /**
* 安装位置 * 安装位置

7
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbMeterInfoVo.java
View File

@ -3,14 +3,11 @@ package org.dromara.property.domain.vo;
import org.dromara.property.domain.TbMeterInfo; import org.dromara.property.domain.TbMeterInfo;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty; import cn.idev.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date;
@ -18,7 +15,7 @@ import java.util.Date;
* 水电气视图对象 tb_meter_info * 水电气视图对象 tb_meter_info
* *
* @author lsm * @author lsm
* @date 2025-07-19 * @since 2025-07-19
*/ */
@Data @Data
@ExcelIgnoreUnannotated @ExcelIgnoreUnannotated
@ -62,7 +59,7 @@ public class TbMeterInfoVo implements Serializable {
* 计量单位(1-度，2-吨，3-立方米) * 计量单位(1-度，2-吨，3-立方米)
*/ */
@ExcelProperty(value = "计量单位(1-度，2-吨，3-立方米)") @ExcelProperty(value = "计量单位(1-度，2-吨，3-立方米)")
private String metetUnit; private String meterUnit;
/** /**
* 安装位置 * 安装位置

4
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbMeterInfoServiceImpl.java
View File

@ -24,7 +24,7 @@ import java.util.Collection;
* 水电气Service业务层处理 * 水电气Service业务层处理
* *
* @author lsm * @author lsm
* @date 2025-07-19 * @since 2025-07-19
*/ */
@Slf4j @Slf4j
@RequiredArgsConstructor @RequiredArgsConstructor
@ -78,7 +78,7 @@ public class TbMeterInfoServiceImpl implements ITbMeterInfoService {
lqw.eq(StringUtils.isNotBlank(bo.getMeterCode()), TbMeterInfo::getMeterCode, bo.getMeterCode()); lqw.eq(StringUtils.isNotBlank(bo.getMeterCode()), TbMeterInfo::getMeterCode, bo.getMeterCode());
lqw.eq(StringUtils.isNotBlank(bo.getFactoryNo()), TbMeterInfo::getFactoryNo, bo.getFactoryNo()); lqw.eq(StringUtils.isNotBlank(bo.getFactoryNo()), TbMeterInfo::getFactoryNo, bo.getFactoryNo());
lqw.eq(bo.getMeterType() != null, TbMeterInfo::getMeterType, bo.getMeterType()); lqw.eq(bo.getMeterType() != null, TbMeterInfo::getMeterType, bo.getMeterType());
lqw.eq(StringUtils.isNotBlank(bo.getMetetUnit()), TbMeterInfo::getMetetUnit, bo.getMetetUnit()); lqw.eq(StringUtils.isNotBlank(bo.getMeterUnit()), TbMeterInfo::getMeterUnit, bo.getMeterUnit());
lqw.eq(StringUtils.isNotBlank(bo.getInstallLocation()), TbMeterInfo::getInstallLocation, bo.getInstallLocation()); lqw.eq(StringUtils.isNotBlank(bo.getInstallLocation()), TbMeterInfo::getInstallLocation, bo.getInstallLocation());
lqw.eq(bo.getInitReading() != null, TbMeterInfo::getInitReading, bo.getInitReading()); lqw.eq(bo.getInitReading() != null, TbMeterInfo::getInitReading, bo.getInitReading());
lqw.eq(bo.getMaxRang() != null, TbMeterInfo::getMaxRang, bo.getMaxRang()); lqw.eq(bo.getMaxRang() != null, TbMeterInfo::getMaxRang, bo.getMaxRang());