Merge remote-tracking branch 'origin/master'

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;

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;

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;

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 BigDecimal previousReading;
-
-    /**
-     * 用量
-     */
-    private Long consumption;
 
     /**
      * 抄表方式(1手动 2自动 3用户上报)
@@ -71,7 +74,7 @@ public class TbMeterRecordBo extends BaseEntity {
     /**
      * 抄表照片
      */
-    private Long imgOssid;
+    private Long imgOssId;
 
 
 }

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;

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.*;

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.*;

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.*;

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;
 
 
 }

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.*;

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;
-
 
 
 /**

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;

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;

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;
 
 
 }

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;

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;
 

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;
 

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;
 

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<TbMeterRecord, TbMeterRecordVo> {
 
 }

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;
 

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;

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;
 

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;
 

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<TbMeterRecord> 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;
     }
 

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;