From 555de9f5aa7abf8425b9a8d0f437c34a43c49100 Mon Sep 17 00:00:00 2001 From: zcxlsm Date: Mon, 25 Aug 2025 18:34:30 +0800 Subject: [PATCH] refactor(property): 1 --- .../bo/smartDevicesBo/TbLightInfoBo.java | 2 +- .../bo/smartDevicesBo/TbMeterConfigBo.java | 2 +- .../bo/smartDevicesBo/TbMeterInfoBo.java | 2 +- .../bo/smartDevicesBo/TbMeterRecordBo.java | 23 +++++++++++-------- .../bo/smartDevicesBo/TbMeterRoomBo.java | 2 +- .../smartDevices}/TbLightInfo.java | 2 +- .../smartDevices}/TbMeterConfig.java | 2 +- .../smartDevices}/TbMeterInfo.java | 2 +- .../smartDevices}/TbMeterRecord.java | 20 ++++++++++------ .../smartDevices}/TbMeterRoom.java | 2 +- .../vo/smartDevicesVo/TbLightInfoVo.java | 4 +--- .../vo/smartDevicesVo/TbMeterConfigVo.java | 2 +- .../vo/smartDevicesVo/TbMeterInfoVo.java | 2 +- .../vo/smartDevicesVo/TbMeterRecordVo.java | 19 ++++++++++----- .../vo/smartDevicesVo/TbMeterRoomVo.java | 2 +- .../smartDevicesMapper/TbLightInfoMapper.java | 2 +- .../TbMeterConfigMapper.java | 2 +- .../smartDevicesMapper/TbMeterInfoMapper.java | 2 +- .../TbMeterRecordMapper.java | 6 +++-- .../smartDevicesMapper/TbMeterRoomMapper.java | 2 +- .../TbLightInfoServiceImpl.java | 2 +- .../TbMeterConfigServiceImpl.java | 2 +- .../TbMeterInfoServiceImpl.java | 2 +- .../TbMeterRecordServiceImpl.java | 6 ++--- .../TbMeterRoomServiceImpl.java | 2 +- 25 files changed, 66 insertions(+), 50 deletions(-) rename ruoyi-modules/Property/src/main/java/org/dromara/property/domain/{ => entity/smartDevices}/TbLightInfo.java (94%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/domain/{ => entity/smartDevices}/TbMeterConfig.java (95%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/domain/{ => entity/smartDevices}/TbMeterInfo.java (95%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/domain/{ => entity/smartDevices}/TbMeterRecord.java (73%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/domain/{ => entity/smartDevices}/TbMeterRoom.java (92%) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/smartDevicesBo/TbLightInfoBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/smartDevicesBo/TbLightInfoBo.java index 93d4461e..6a16cd7f 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/smartDevicesBo/TbLightInfoBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/smartDevicesBo/TbLightInfoBo.java @@ -1,6 +1,6 @@ package org.dromara.property.domain.bo.smartDevicesBo; -import org.dromara.property.domain.TbLightInfo; +import org.dromara.property.domain.entity.smartDevices.TbLightInfo; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/smartDevicesBo/TbMeterConfigBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/smartDevicesBo/TbMeterConfigBo.java index b96d76d0..b7d7a8e5 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/smartDevicesBo/TbMeterConfigBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/smartDevicesBo/TbMeterConfigBo.java @@ -1,6 +1,6 @@ package org.dromara.property.domain.bo.smartDevicesBo; -import org.dromara.property.domain.TbMeterConfig; +import org.dromara.property.domain.entity.smartDevices.TbMeterConfig; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.core.validate.EditGroup; import io.github.linpeilie.annotations.AutoMapper; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/smartDevicesBo/TbMeterInfoBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/smartDevicesBo/TbMeterInfoBo.java index e25ae4fc..aceea63f 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/smartDevicesBo/TbMeterInfoBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/smartDevicesBo/TbMeterInfoBo.java @@ -1,6 +1,6 @@ package org.dromara.property.domain.bo.smartDevicesBo; -import org.dromara.property.domain.TbMeterInfo; +import org.dromara.property.domain.entity.smartDevices.TbMeterInfo; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/smartDevicesBo/TbMeterRecordBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/smartDevicesBo/TbMeterRecordBo.java index a88a08cb..abd989aa 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/smartDevicesBo/TbMeterRecordBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/smartDevicesBo/TbMeterRecordBo.java @@ -1,6 +1,6 @@ package org.dromara.property.domain.bo.smartDevicesBo; -import org.dromara.property.domain.TbMeterRecord; +import org.dromara.property.domain.entity.smartDevices.TbMeterRecord; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; @@ -8,13 +8,15 @@ import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; + +import java.math.BigDecimal; import java.util.Date; /** * 抄记录业务对象 tb_meter_record * * @author lsm - * @date 2025-07-19 + * @since 2025-07-19 */ @Data @EqualsAndHashCode(callSuper = true) @@ -33,6 +35,12 @@ public class TbMeterRecordBo extends BaseEntity { @NotBlank(message = "仪表编号不能为空", groups = { AddGroup.class, EditGroup.class }) private String meterId; + /** + * 设备类型(1-电表，2-水表，3-气表) + */ + @NotNull(message = "仪表类型不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long meterType; + /** * 抄表员ID */ @@ -49,18 +57,13 @@ public class TbMeterRecordBo extends BaseEntity { * 当前读数 */ @NotNull(message = "当前读数不能为空", groups = { AddGroup.class, EditGroup.class }) - private Long currentReading; + private BigDecimal currentReading; /** * 上次读数 */ @NotNull(message = "上次读数不能为空", groups = { AddGroup.class, EditGroup.class }) - private Long previousReading; - - /** - * 用量 - */ - private Long consumption; + private BigDecimal previousReading; /** * 抄表方式(1手动 2自动 3用户上报) @@ -71,7 +74,7 @@ public class TbMeterRecordBo extends BaseEntity { /** * 抄表照片 */ - private Long imgOssid; + private Long imgOssId; } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/smartDevicesBo/TbMeterRoomBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/smartDevicesBo/TbMeterRoomBo.java index 1d986a4b..b5262897 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/smartDevicesBo/TbMeterRoomBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/smartDevicesBo/TbMeterRoomBo.java @@ -1,6 +1,6 @@ package org.dromara.property.domain.bo.smartDevicesBo; -import org.dromara.property.domain.TbMeterRoom; +import org.dromara.property.domain.entity.smartDevices.TbMeterRoom; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.core.validate.EditGroup; import io.github.linpeilie.annotations.AutoMapper; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbLightInfo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/entity/smartDevices/TbLightInfo.java similarity index 94% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbLightInfo.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/domain/entity/smartDevices/TbLightInfo.java index 09a1bcf4..2af8af8d 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbLightInfo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/entity/smartDevices/TbLightInfo.java @@ -1,4 +1,4 @@ -package org.dromara.property.domain; +package org.dromara.property.domain.entity.smartDevices; import org.dromara.common.tenant.core.TenantEntity; import com.baomidou.mybatisplus.annotation.*; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbMeterConfig.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/entity/smartDevices/TbMeterConfig.java similarity index 95% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbMeterConfig.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/domain/entity/smartDevices/TbMeterConfig.java index 6dc59a9c..497e9e1b 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbMeterConfig.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/entity/smartDevices/TbMeterConfig.java @@ -1,4 +1,4 @@ -package org.dromara.property.domain; +package org.dromara.property.domain.entity.smartDevices; import org.dromara.common.mybatis.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.*; 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/entity/smartDevices/TbMeterInfo.java similarity index 95% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbMeterInfo.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/domain/entity/smartDevices/TbMeterInfo.java index 6c748a13..cfdc1ab8 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/entity/smartDevices/TbMeterInfo.java @@ -1,4 +1,4 @@ -package org.dromara.property.domain; +package org.dromara.property.domain.entity.smartDevices; import org.dromara.common.tenant.core.TenantEntity; import com.baomidou.mybatisplus.annotation.*; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbMeterRecord.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/entity/smartDevices/TbMeterRecord.java similarity index 73% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbMeterRecord.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/domain/entity/smartDevices/TbMeterRecord.java index 7d0f6f25..4c3d6296 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbMeterRecord.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/entity/smartDevices/TbMeterRecord.java @@ -1,11 +1,12 @@ -package org.dromara.property.domain; +package org.dromara.property.domain.entity.smartDevices; import org.dromara.common.tenant.core.TenantEntity; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; + +import java.math.BigDecimal; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serial; @@ -13,7 +14,7 @@ import java.io.Serial; * 抄记录对象 tb_meter_record * * @author lsm - * @date 2025-07-19 + * @since 2025-07-19 */ @Data @EqualsAndHashCode(callSuper = true) @@ -34,6 +35,11 @@ public class TbMeterRecord extends TenantEntity { */ private String meterId; + /** + * 设备类型(1-电表，2-水表，3-气表) + */ + private Long meterType; + /** * 抄表员ID */ @@ -47,17 +53,17 @@ public class TbMeterRecord extends TenantEntity { /** * 当前读数 */ - private Long currentReading; + private BigDecimal currentReading; /** * 上次读数 */ - private Long previousReading; + private BigDecimal previousReading; /** * 用量 */ - private Long consumption; + private BigDecimal consumption; /** * 抄表方式(1手动 2自动 3用户上报) @@ -67,7 +73,7 @@ public class TbMeterRecord extends TenantEntity { /** * 抄表照片 */ - private Long imgOssid; + private Long imgOssId; } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbMeterRoom.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/entity/smartDevices/TbMeterRoom.java similarity index 92% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbMeterRoom.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/domain/entity/smartDevices/TbMeterRoom.java index 8cbe4275..c65b8ae5 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbMeterRoom.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/entity/smartDevices/TbMeterRoom.java @@ -1,4 +1,4 @@ -package org.dromara.property.domain; +package org.dromara.property.domain.entity.smartDevices; import org.dromara.common.mybatis.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.*; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/smartDevicesVo/TbLightInfoVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/smartDevicesVo/TbLightInfoVo.java index ad609103..08a6314b 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/smartDevicesVo/TbLightInfoVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/smartDevicesVo/TbLightInfoVo.java @@ -1,6 +1,6 @@ package org.dromara.property.domain.vo.smartDevicesVo; -import org.dromara.property.domain.TbLightInfo; +import org.dromara.property.domain.entity.smartDevices.TbLightInfo; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; import org.dromara.common.excel.annotation.ExcelDictFormat; @@ -10,8 +10,6 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; -import java.util.Date; - /** diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/smartDevicesVo/TbMeterConfigVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/smartDevicesVo/TbMeterConfigVo.java index ba26038e..5904d265 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/smartDevicesVo/TbMeterConfigVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/smartDevicesVo/TbMeterConfigVo.java @@ -1,6 +1,6 @@ package org.dromara.property.domain.vo.smartDevicesVo; -import org.dromara.property.domain.TbMeterConfig; +import org.dromara.property.domain.entity.smartDevices.TbMeterConfig; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; import org.dromara.common.excel.annotation.ExcelDictFormat; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/smartDevicesVo/TbMeterInfoVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/smartDevicesVo/TbMeterInfoVo.java index 5bd428b8..6e26f2f5 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/smartDevicesVo/TbMeterInfoVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/smartDevicesVo/TbMeterInfoVo.java @@ -2,7 +2,7 @@ package org.dromara.property.domain.vo.smartDevicesVo; import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.property.domain.TbMeterInfo; +import org.dromara.property.domain.entity.smartDevices.TbMeterInfo; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; import io.github.linpeilie.annotations.AutoMapper; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/smartDevicesVo/TbMeterRecordVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/smartDevicesVo/TbMeterRecordVo.java index e01494f5..8fbec766 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/smartDevicesVo/TbMeterRecordVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/smartDevicesVo/TbMeterRecordVo.java @@ -1,8 +1,9 @@ package org.dromara.property.domain.vo.smartDevicesVo; +import java.math.BigDecimal; import java.util.Date; -import org.dromara.property.domain.TbMeterRecord; +import org.dromara.property.domain.entity.smartDevices.TbMeterRecord; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; import io.github.linpeilie.annotations.AutoMapper; @@ -16,7 +17,7 @@ import java.io.Serializable; * 抄记录视图对象 tb_meter_record * * @author lsm - * @date 2025-07-19 + * @since 2025-07-19 */ @Data @ExcelIgnoreUnannotated @@ -38,6 +39,12 @@ public class TbMeterRecordVo implements Serializable { @ExcelProperty(value = "仪表编号") private String meterId; + /** + * 设备类型(1-电表，2-水表，3-气表) + */ + @ExcelProperty(value = "仪表类型") + private Long meterType; + /** * 抄表员ID */ @@ -54,19 +61,19 @@ public class TbMeterRecordVo implements Serializable { * 当前读数 */ @ExcelProperty(value = "当前读数") - private Long currentReading; + private BigDecimal currentReading; /** * 上次读数 */ @ExcelProperty(value = "上次读数") - private Long previousReading; + private BigDecimal previousReading; /** * 用量 */ @ExcelProperty(value = "用量") - private Long consumption; + private BigDecimal consumption; /** * 抄表方式(1手动 2自动 3用户上报) @@ -78,7 +85,7 @@ public class TbMeterRecordVo implements Serializable { * 抄表照片 */ @ExcelProperty(value = "抄表照片") - private Long imgOssid; + private Long imgOssId; } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/smartDevicesVo/TbMeterRoomVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/smartDevicesVo/TbMeterRoomVo.java index 47ca9c6c..c273d81d 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/smartDevicesVo/TbMeterRoomVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/smartDevicesVo/TbMeterRoomVo.java @@ -1,6 +1,6 @@ package org.dromara.property.domain.vo.smartDevicesVo; -import org.dromara.property.domain.TbMeterRoom; +import org.dromara.property.domain.entity.smartDevices.TbMeterRoom; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; import io.github.linpeilie.annotations.AutoMapper; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/smartDevicesMapper/TbLightInfoMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/smartDevicesMapper/TbLightInfoMapper.java index d94a0397..57cc3eaf 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/smartDevicesMapper/TbLightInfoMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/smartDevicesMapper/TbLightInfoMapper.java @@ -1,7 +1,7 @@ package org.dromara.property.mapper.smartDevicesMapper; import org.apache.ibatis.annotations.Mapper; -import org.dromara.property.domain.TbLightInfo; +import org.dromara.property.domain.entity.smartDevices.TbLightInfo; import org.dromara.property.domain.vo.smartDevicesVo.TbLightInfoVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/smartDevicesMapper/TbMeterConfigMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/smartDevicesMapper/TbMeterConfigMapper.java index e6f62996..2351ce3b 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/smartDevicesMapper/TbMeterConfigMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/smartDevicesMapper/TbMeterConfigMapper.java @@ -1,7 +1,7 @@ package org.dromara.property.mapper.smartDevicesMapper; import org.apache.ibatis.annotations.Mapper; -import org.dromara.property.domain.TbMeterConfig; +import org.dromara.property.domain.entity.smartDevices.TbMeterConfig; import org.dromara.property.domain.vo.smartDevicesVo.TbMeterConfigVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/smartDevicesMapper/TbMeterInfoMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/smartDevicesMapper/TbMeterInfoMapper.java index d454c792..9088dabd 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/smartDevicesMapper/TbMeterInfoMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/smartDevicesMapper/TbMeterInfoMapper.java @@ -1,6 +1,6 @@ package org.dromara.property.mapper.smartDevicesMapper; -import org.dromara.property.domain.TbMeterInfo; +import org.dromara.property.domain.entity.smartDevices.TbMeterInfo; import org.dromara.property.domain.vo.smartDevicesVo.TbMeterInfoVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/smartDevicesMapper/TbMeterRecordMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/smartDevicesMapper/TbMeterRecordMapper.java index 4c227b72..e82a4650 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/smartDevicesMapper/TbMeterRecordMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/smartDevicesMapper/TbMeterRecordMapper.java @@ -1,6 +1,7 @@ package org.dromara.property.mapper.smartDevicesMapper; -import org.dromara.property.domain.TbMeterRecord; +import org.apache.ibatis.annotations.Mapper; +import org.dromara.property.domain.entity.smartDevices.TbMeterRecord; import org.dromara.property.domain.vo.smartDevicesVo.TbMeterRecordVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -8,8 +9,9 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * 抄记录Mapper接口 * * @author lsm - * @date 2025-07-19 + * @since 2025-07-19 */ +@Mapper public interface TbMeterRecordMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/smartDevicesMapper/TbMeterRoomMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/smartDevicesMapper/TbMeterRoomMapper.java index d25eb64b..fd2d46bc 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/smartDevicesMapper/TbMeterRoomMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/smartDevicesMapper/TbMeterRoomMapper.java @@ -1,7 +1,7 @@ package org.dromara.property.mapper.smartDevicesMapper; import org.apache.ibatis.annotations.Mapper; -import org.dromara.property.domain.TbMeterRoom; +import org.dromara.property.domain.entity.smartDevices.TbMeterRoom; import org.dromara.property.domain.vo.smartDevicesVo.TbMeterRoomVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/smartDevicesImpl/TbLightInfoServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/smartDevicesImpl/TbLightInfoServiceImpl.java index dfc34603..27b80192 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/smartDevicesImpl/TbLightInfoServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/smartDevicesImpl/TbLightInfoServiceImpl.java @@ -15,7 +15,7 @@ import org.dromara.property.service.ITbFloorService; import org.springframework.stereotype.Service; import org.dromara.property.domain.bo.smartDevicesBo.TbLightInfoBo; import org.dromara.property.domain.vo.smartDevicesVo.TbLightInfoVo; -import org.dromara.property.domain.TbLightInfo; +import org.dromara.property.domain.entity.smartDevices.TbLightInfo; import org.dromara.property.mapper.smartDevicesMapper.TbLightInfoMapper; import org.dromara.property.service.smartDevicesService.ITbLightInfoService; import org.springframework.transaction.annotation.Transactional; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/smartDevicesImpl/TbMeterConfigServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/smartDevicesImpl/TbMeterConfigServiceImpl.java index 79cb1773..97e8c93d 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/smartDevicesImpl/TbMeterConfigServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/smartDevicesImpl/TbMeterConfigServiceImpl.java @@ -11,7 +11,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.dromara.property.domain.bo.smartDevicesBo.TbMeterConfigBo; import org.dromara.property.domain.vo.smartDevicesVo.TbMeterConfigVo; -import org.dromara.property.domain.TbMeterConfig; +import org.dromara.property.domain.entity.smartDevices.TbMeterConfig; import org.dromara.property.mapper.smartDevicesMapper.TbMeterConfigMapper; import org.dromara.property.service.smartDevicesService.ITbMeterConfigService; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/smartDevicesImpl/TbMeterInfoServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/smartDevicesImpl/TbMeterInfoServiceImpl.java index 2ee24780..95ad1150 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/smartDevicesImpl/TbMeterInfoServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/smartDevicesImpl/TbMeterInfoServiceImpl.java @@ -12,7 +12,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.dromara.property.domain.bo.smartDevicesBo.TbMeterInfoBo; import org.dromara.property.domain.vo.smartDevicesVo.TbMeterInfoVo; -import org.dromara.property.domain.TbMeterInfo; +import org.dromara.property.domain.entity.smartDevices.TbMeterInfo; import org.dromara.property.mapper.smartDevicesMapper.TbMeterInfoMapper; import org.dromara.property.service.smartDevicesService.ITbMeterInfoService; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/smartDevicesImpl/TbMeterRecordServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/smartDevicesImpl/TbMeterRecordServiceImpl.java index de4d9fd7..cd225632 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/smartDevicesImpl/TbMeterRecordServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/smartDevicesImpl/TbMeterRecordServiceImpl.java @@ -12,7 +12,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.dromara.property.domain.bo.smartDevicesBo.TbMeterRecordBo; import org.dromara.property.domain.vo.smartDevicesVo.TbMeterRecordVo; -import org.dromara.property.domain.TbMeterRecord; +import org.dromara.property.domain.entity.smartDevices.TbMeterRecord; import org.dromara.property.mapper.smartDevicesMapper.TbMeterRecordMapper; import org.dromara.property.service.smartDevicesService.ITbMeterRecordService; @@ -75,13 +75,13 @@ public class TbMeterRecordServiceImpl implements ITbMeterRecordService { LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.orderByAsc(TbMeterRecord::getId); lqw.eq(StringUtils.isNotBlank(bo.getMeterId()), TbMeterRecord::getMeterId, bo.getMeterId()); + lqw.eq(bo.getMeterType() != null, TbMeterRecord::getMeterType, bo.getMeterType()); lqw.eq(bo.getReaderId() != null, TbMeterRecord::getReaderId, bo.getReaderId()); lqw.eq(bo.getReadingTime() != null, TbMeterRecord::getReadingTime, bo.getReadingTime()); lqw.eq(bo.getCurrentReading() != null, TbMeterRecord::getCurrentReading, bo.getCurrentReading()); lqw.eq(bo.getPreviousReading() != null, TbMeterRecord::getPreviousReading, bo.getPreviousReading()); - lqw.eq(bo.getConsumption() != null, TbMeterRecord::getConsumption, bo.getConsumption()); lqw.eq(bo.getReadingMethod() != null, TbMeterRecord::getReadingMethod, bo.getReadingMethod()); - lqw.eq(bo.getImgOssid() != null, TbMeterRecord::getImgOssid, bo.getImgOssid()); + lqw.eq(bo.getImgOssId() != null, TbMeterRecord::getImgOssId, bo.getImgOssId()); return lqw; } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/smartDevicesImpl/TbMeterRoomServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/smartDevicesImpl/TbMeterRoomServiceImpl.java index 2c4ebdda..026720d9 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/smartDevicesImpl/TbMeterRoomServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/smartDevicesImpl/TbMeterRoomServiceImpl.java @@ -11,7 +11,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.dromara.property.domain.bo.smartDevicesBo.TbMeterRoomBo; import org.dromara.property.domain.vo.smartDevicesVo.TbMeterRoomVo; -import org.dromara.property.domain.TbMeterRoom; +import org.dromara.property.domain.entity.smartDevices.TbMeterRoom; import org.dromara.property.mapper.smartDevicesMapper.TbMeterRoomMapper; import org.dromara.property.service.smartDevicesService.ITbMeterRoomService;