refactor(property):

- 水电气表业务、厂商业务移动至物业模块

ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbMeterConfigController.java

@@ -0,0 +1,106 @@
+package org.dromara.property.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.property.domain.vo.TbMeterConfigVo;
+import org.dromara.property.domain.bo.TbMeterConfigBo;
+import org.dromara.property.service.ITbMeterConfigService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 水电气配置
+ * 前端访问路由地址为:/property/meterConfig
+ *
+ * @author lsm
+ * @date 2025-07-17
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/meterConfig")
+public class TbMeterConfigController extends BaseController {
+
+    private final ITbMeterConfigService tbMeterConfigService;
+
+    /**
+     * 查询水电气配置列表
+     */
+    @SaCheckPermission("property:meterConfig:list")
+    @GetMapping("/list")
+    public TableDataInfo<TbMeterConfigVo> list(TbMeterConfigBo bo, PageQuery pageQuery) {
+        return tbMeterConfigService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出水电气配置列表
+     */
+    @SaCheckPermission("property:meterConfig:export")
+    @Log(title = "水电气配置", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(TbMeterConfigBo bo, HttpServletResponse response) {
+        List<TbMeterConfigVo> list = tbMeterConfigService.queryList(bo);
+        ExcelUtil.exportExcel(list, "水电气配置", TbMeterConfigVo.class, response);
+    }
+
+    /**
+     * 获取水电气配置详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("property:meterConfig:query")
+    @GetMapping("/{id}")
+    public R<TbMeterConfigVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable("id") Long id) {
+        return R.ok(tbMeterConfigService.queryById(id));
+    }
+
+    /**
+     * 新增水电气配置
+     */
+    @SaCheckPermission("property:meterConfig:add")
+    @Log(title = "水电气配置", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody TbMeterConfigBo bo) {
+        return toAjax(tbMeterConfigService.insertByBo(bo));
+    }
+
+    /**
+     * 修改水电气配置
+     */
+    @SaCheckPermission("property:meterConfig:edit")
+    @Log(title = "水电气配置", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody TbMeterConfigBo bo) {
+        return toAjax(tbMeterConfigService.updateByBo(bo));
+    }
+
+    /**
+     * 删除水电气配置
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("property:meterConfig:remove")
+    @Log(title = "水电气配置", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable("ids") Long[] ids) {
+        return toAjax(tbMeterConfigService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbMeterController.java

@@ -0,0 +1,106 @@
+package org.dromara.property.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.property.domain.vo.TbMeterVo;
+import org.dromara.property.domain.bo.TbMeterBo;
+import org.dromara.property.service.ITbMeterService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 水电气
+ * 前端访问路由地址为:/property/meter
+ *
+ * @author LionLi
+ * @date 2025-07-17
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/meter")
+public class TbMeterController extends BaseController {
+
+    private final ITbMeterService tbMeterService;
+
+    /**
+     * 查询水电气列表
+     */
+    @SaCheckPermission("property:meter:list")
+    @GetMapping("/list")
+    public TableDataInfo<TbMeterVo> list(TbMeterBo bo, PageQuery pageQuery) {
+        return tbMeterService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出水电气列表
+     */
+    @SaCheckPermission("property:meter:export")
+    @Log(title = "水电气", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(TbMeterBo bo, HttpServletResponse response) {
+        List<TbMeterVo> list = tbMeterService.queryList(bo);
+        ExcelUtil.exportExcel(list, "水电气", TbMeterVo.class, response);
+    }
+
+    /**
+     * 获取水电气详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("property:meter:query")
+    @GetMapping("/{id}")
+    public R<TbMeterVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable("id") Long id) {
+        return R.ok(tbMeterService.queryById(id));
+    }
+
+    /**
+     * 新增水电气
+     */
+    @SaCheckPermission("property:meter:add")
+    @Log(title = "水电气", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody TbMeterBo bo) {
+        return toAjax(tbMeterService.insertByBo(bo));
+    }
+
+    /**
+     * 修改水电气
+     */
+    @SaCheckPermission("property:meter:edit")
+    @Log(title = "水电气", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody TbMeterBo bo) {
+        return toAjax(tbMeterService.updateByBo(bo));
+    }
+
+    /**
+     * 删除水电气
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("property:meter:remove")
+    @Log(title = "水电气", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable("ids") Long[] ids) {
+        return toAjax(tbMeterService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbMeterRoomController.java

@@ -0,0 +1,106 @@
+package org.dromara.property.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.property.domain.vo.TbMeterRoomVo;
+import org.dromara.property.domain.bo.TbMeterRoomBo;
+import org.dromara.property.service.ITbMeterRoomService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 仪房间关联
+ * 前端访问路由地址为:/property/meterRoom
+ *
+ * @author LionLi
+ * @date 2025-07-17
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/meterRoom")
+public class TbMeterRoomController extends BaseController {
+
+    private final ITbMeterRoomService tbMeterRoomService;
+
+    /**
+     * 查询仪房间关联列表
+     */
+    @SaCheckPermission("property:meterRoom:list")
+    @GetMapping("/list")
+    public TableDataInfo<TbMeterRoomVo> list(TbMeterRoomBo bo, PageQuery pageQuery) {
+        return tbMeterRoomService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出仪房间关联列表
+     */
+    @SaCheckPermission("property:meterRoom:export")
+    @Log(title = "仪房间关联", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(TbMeterRoomBo bo, HttpServletResponse response) {
+        List<TbMeterRoomVo> list = tbMeterRoomService.queryList(bo);
+        ExcelUtil.exportExcel(list, "仪房间关联", TbMeterRoomVo.class, response);
+    }
+
+    /**
+     * 获取仪房间关联详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("property:meterRoom:query")
+    @GetMapping("/{id}")
+    public R<TbMeterRoomVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable("id") Long id) {
+        return R.ok(tbMeterRoomService.queryById(id));
+    }
+
+    /**
+     * 新增仪房间关联
+     */
+    @SaCheckPermission("property:meterRoom:add")
+    @Log(title = "仪房间关联", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody TbMeterRoomBo bo) {
+        return toAjax(tbMeterRoomService.insertByBo(bo));
+    }
+
+    /**
+     * 修改仪房间关联
+     */
+    @SaCheckPermission("property:meterRoom:edit")
+    @Log(title = "仪房间关联", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody TbMeterRoomBo bo) {
+        return toAjax(tbMeterRoomService.updateByBo(bo));
+    }
+
+    /**
+     * 删除仪房间关联
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("property:meterRoom:remove")
+    @Log(title = "仪房间关联", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable("ids") Long[] ids) {
+        return toAjax(tbMeterRoomService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TdFactoryController.java

@@ -6,6 +6,7 @@ import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.dromara.property.domain.bo.TbFactoryBo;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
@@ -17,9 +18,8 @@ import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.excel.utils.ExcelUtil;
-import org.dromara.property.domain.vo.TdFactoryVo;
-import org.dromara.property.domain.bo.TdFactoryBo;
-import org.dromara.property.service.ITdFactoryService;
+import org.dromara.property.domain.vo.TbFactoryVo;
+import org.dromara.property.service.ITbFactoryService;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 
 /**
@@ -35,14 +35,14 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 @RequestMapping("/factory")
 public class TdFactoryController extends BaseController {
 
-    private final ITdFactoryService tdFactoryService;
+    private final ITbFactoryService tdFactoryService;
 
     /**
      * 查询厂商管理列表
      */
     @SaCheckPermission("property:factory:list")
     @GetMapping("/list")
-    public TableDataInfo<TdFactoryVo> list(TdFactoryBo bo, PageQuery pageQuery) {
+    public TableDataInfo<TbFactoryVo> list(TbFactoryBo bo, PageQuery pageQuery) {
         return tdFactoryService.queryPageList(bo, pageQuery);
     }
 
@@ -52,9 +52,9 @@ public class TdFactoryController extends BaseController {
     @SaCheckPermission("property:factory:export")
     @Log(title = "厂商管理", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(TdFactoryBo bo, HttpServletResponse response) {
-        List<TdFactoryVo> list = tdFactoryService.queryList(bo);
-        ExcelUtil.exportExcel(list, "厂商管理", TdFactoryVo.class, response);
+    public void export(TbFactoryBo bo, HttpServletResponse response) {
+        List<TbFactoryVo> list = tdFactoryService.queryList(bo);
+        ExcelUtil.exportExcel(list, "厂商管理", TbFactoryVo.class, response);
     }
 
     /**
@@ -64,7 +64,7 @@ public class TdFactoryController extends BaseController {
      */
     @SaCheckPermission("property:factory:query")
     @GetMapping("/{id}")
-    public R<TdFactoryVo> getInfo(@NotNull(message = "主键不能为空")
+    public R<TbFactoryVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable("id") Long id) {
         return R.ok(tdFactoryService.queryById(id));
     }
@@ -76,7 +76,7 @@ public class TdFactoryController extends BaseController {
     @Log(title = "厂商管理", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody TdFactoryBo bo) {
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody TbFactoryBo bo) {
         return toAjax(tdFactoryService.insertByBo(bo));
     }
 
@@ -87,7 +87,7 @@ public class TdFactoryController extends BaseController {
     @Log(title = "厂商管理", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody TdFactoryBo bo) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody TbFactoryBo bo) {
         return toAjax(tdFactoryService.updateByBo(bo));
     }
 

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbFactory.java

@@ -16,7 +16,7 @@ import java.io.Serial;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName("td_factory")
-public class TdFactory extends TenantEntity {
+public class TbFactory extends TenantEntity {
 
     @Serial
     private static final long serialVersionUID = 1L;

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbMeter.java

@@ -0,0 +1,101 @@
+package org.dromara.property.domain;
+
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 水电气对象 tb_meter
+ *
+ * @author LionLi
+ * @date 2025-07-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("tb_meter")
+public class TbMeter extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 水表名称
+     */
+    private String meterName;
+
+    /**
+     * 设备编码
+     */
+    private String meterCode;
+
+    /**
+     * 设备厂商
+     */
+    private String factoryNo;
+
+    /**
+     * 设备类型(1-电表，2-水表，3-气表)
+     */
+    private Long meterType;
+
+    /**
+     * 表用途(1-分表，2-总表，3-公摊表)
+     */
+    private Long meterPurpose;
+
+    /**
+     * 分摊类型（1-不公摊，2-按分表用量，3-按租客面积，4-按房源数量，5-按固定比例）
+     */
+    private Long shareType;
+
+    /**
+     * 付费类型(1-先付费，2-后付费)
+     */
+    private Long payType;
+
+    /**
+     * 当前表显示读数
+     */
+    private Long display;
+
+    /**
+     * 最大表显读数(超过归0)
+     */
+    private Long maxDisplay;
+
+    /**
+     * 计费倍率
+     */
+    private Long billingRate;
+
+    /**
+     * 剩余量
+     */
+    private Long surplus;
+
+    /**
+     * 通信状态
+     */
+    private Long communicationState;
+
+    /**
+     * 运行状态
+     */
+    private Long runningState;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbMeterConfig.java

@@ -0,0 +1,61 @@
+package org.dromara.property.domain;
+
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 水电气配置对象 tb_meter_config
+ *
+ * @author lsm
+ * @date 2025-07-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("tb_meter_config")
+public class TbMeterConfig extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 设备类型(1-电表，2-水表，3-气表)
+     */
+    private Long meterType;
+
+    /**
+     * 付费类型(1-先付费，2-后付费)
+     */
+    private Long payType;
+
+    /**
+     * 欠费是否断电/水/气(0-是，1-否)
+     */
+    private Long arrearsOutage;
+
+    /**
+     * 后付费模式下是否自动断电/水/气（0-是，1-否）
+     */
+    private Long autoOutage;
+
+    /**
+     * 当auto_outage=0时生效，逾期天数
+     */
+    private Long overdueDay;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbMeterRoom.java

@@ -0,0 +1,46 @@
+package org.dromara.property.domain;
+
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 仪房间关联对象 tb_meter_room
+ *
+ * @author LionLi
+ * @date 2025-07-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("tb_meter_room")
+public class TbMeterRoom extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 表id
+     */
+    private Long meterId;
+
+    /**
+     * 房间id
+     */
+    private Long roomId;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbFactoryBo.java

@@ -1,6 +1,6 @@
 package org.dromara.property.domain.bo;
 
-import org.dromara.property.domain.TdFactory;
+import org.dromara.property.domain.TbFactory;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
@@ -17,8 +17,8 @@ import jakarta.validation.constraints.*;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@AutoMapper(target = TdFactory.class, reverseConvertGenerate = false)
-public class TdFactoryBo extends BaseEntity {
+@AutoMapper(target = TbFactory.class, reverseConvertGenerate = false)
+public class TbFactoryBo extends BaseEntity {
 
     /**
      *

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbMeterBo.java

@@ -0,0 +1,100 @@
+package org.dromara.property.domain.bo;
+
+import org.dromara.property.domain.TbMeter;
+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.*;
+
+/**
+ * 水电气业务对象 tb_meter
+ *
+ * @author LionLi
+ * @date 2025-07-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = TbMeter.class, reverseConvertGenerate = false)
+public class TbMeterBo extends BaseEntity {
+
+    /**
+     * 主键id
+     */
+    @NotNull(message = "主键id不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 水表名称
+     */
+    private String meterName;
+
+    /**
+     * 设备编码
+     */
+    private String meterCode;
+
+    /**
+     * 设备厂商
+     */
+    private String factoryNo;
+
+    /**
+     * 设备类型(1-电表，2-水表，3-气表)
+     */
+    private Long meterType;
+
+    /**
+     * 表用途(1-分表，2-总表，3-公摊表)
+     */
+    private Long meterPurpose;
+
+    /**
+     * 分摊类型（1-不公摊，2-按分表用量，3-按租客面积，4-按房源数量，5-按固定比例）
+     */
+    private Long shareType;
+
+    /**
+     * 付费类型(1-先付费，2-后付费)
+     */
+    private Long payType;
+
+    /**
+     * 当前表显示读数
+     */
+    private Long display;
+
+    /**
+     * 最大表显读数(超过归0)
+     */
+    private Long maxDisplay;
+
+    /**
+     * 计费倍率
+     */
+    private Long billingRate;
+
+    /**
+     * 剩余量
+     */
+    private Long surplus;
+
+    /**
+     * 通信状态
+     */
+    private Long communicationState;
+
+    /**
+     * 运行状态
+     */
+    private Long runningState;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbMeterConfigBo.java

@@ -0,0 +1,60 @@
+package org.dromara.property.domain.bo;
+
+import org.dromara.property.domain.TbMeterConfig;
+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.*;
+
+/**
+ * 水电气配置业务对象 tb_meter_config
+ *
+ * @author lsm
+ * @date 2025-07-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = TbMeterConfig.class, reverseConvertGenerate = false)
+public class TbMeterConfigBo extends BaseEntity {
+
+    /**
+     * 主键id
+     */
+    @NotNull(message = "主键id不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 设备类型(1-电表，2-水表，3-气表)
+     */
+    private Long meterType;
+
+    /**
+     * 付费类型(1-先付费，2-后付费)
+     */
+    private Long payType;
+
+    /**
+     * 欠费是否断电/水/气(0-是，1-否)
+     */
+    private Long arrearsOutage;
+
+    /**
+     * 后付费模式下是否自动断电/水/气（0-是，1-否）
+     */
+    private Long autoOutage;
+
+    /**
+     * 当auto_outage=0时生效，逾期天数
+     */
+    private Long overdueDay;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbMeterRoomBo.java

@@ -0,0 +1,45 @@
+package org.dromara.property.domain.bo;
+
+import org.dromara.property.domain.TbMeterRoom;
+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.*;
+
+/**
+ * 仪房间关联业务对象 tb_meter_room
+ *
+ * @author LionLi
+ * @date 2025-07-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = TbMeterRoom.class, reverseConvertGenerate = false)
+public class TbMeterRoomBo extends BaseEntity {
+
+    /**
+     * 主键id
+     */
+    @NotNull(message = "主键id不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 表id
+     */
+    private Long meterId;
+
+    /**
+     * 房间id
+     */
+    private Long roomId;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbFactoryVo.java

@@ -1,17 +1,13 @@
 package org.dromara.property.domain.vo;
 
-import org.dromara.property.domain.TdFactory;
+import org.dromara.property.domain.TbFactory;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 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 lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.util.Date;
-
 
 
 /**
@@ -22,8 +18,8 @@ import java.util.Date;
  */
 @Data
 @ExcelIgnoreUnannotated
-@AutoMapper(target = TdFactory.class)
-public class TdFactoryVo implements Serializable {
+@AutoMapper(target = TbFactory.class)
+public class TbFactoryVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbMeterConfigVo.java

@@ -0,0 +1,75 @@
+package org.dromara.property.domain.vo;
+
+import org.dromara.property.domain.TbMeterConfig;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+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 lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 水电气配置视图对象 tb_meter_config
+ *
+ * @author lsm
+ * @date 2025-07-17
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = TbMeterConfig.class)
+public class TbMeterConfigVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @ExcelProperty(value = "主键id")
+    private Long id;
+
+    /**
+     * 设备类型(1-电表，2-水表，3-气表)
+     */
+    @ExcelProperty(value = "设备类型(1-电表，2-水表，3-气表)")
+    private Long meterType;
+
+    /**
+     * 付费类型(1-先付费，2-后付费)
+     */
+    @ExcelProperty(value = "付费类型(1-先付费，2-后付费)")
+    private Long payType;
+
+    /**
+     * 欠费是否断电/水/气(0-是，1-否)
+     */
+    @ExcelProperty(value = "欠费是否断电/水/气(0-是，1-否)")
+    private Long arrearsOutage;
+
+    /**
+     * 后付费模式下是否自动断电/水/气（0-是，1-否）
+     */
+    @ExcelProperty(value = "后付费模式下是否自动断电/水/气", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "0=-是，1-否")
+    private Long autoOutage;
+
+    /**
+     * 当auto_outage=0时生效，逾期天数
+     */
+    @ExcelProperty(value = "当auto_outage=0时生效，逾期天数")
+    private Long overdueDay;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbMeterRoomVo.java

@@ -0,0 +1,56 @@
+package org.dromara.property.domain.vo;
+
+import org.dromara.property.domain.TbMeterRoom;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+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 lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 仪房间关联视图对象 tb_meter_room
+ *
+ * @author LionLi
+ * @date 2025-07-17
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = TbMeterRoom.class)
+public class TbMeterRoomVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @ExcelProperty(value = "主键id")
+    private Long id;
+
+    /**
+     * 表id
+     */
+    @ExcelProperty(value = "表id")
+    private Long meterId;
+
+    /**
+     * 房间id
+     */
+    @ExcelProperty(value = "房间id")
+    private Long roomId;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbMeterVo.java

@@ -0,0 +1,123 @@
+package org.dromara.property.domain.vo;
+
+import org.dromara.property.domain.TbMeter;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+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 lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 水电气视图对象 tb_meter
+ *
+ * @author LionLi
+ * @date 2025-07-17
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = TbMeter.class)
+public class TbMeterVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @ExcelProperty(value = "主键id")
+    private Long id;
+
+    /**
+     * 水表名称
+     */
+    @ExcelProperty(value = "水表名称")
+    private String meterName;
+
+    /**
+     * 设备编码
+     */
+    @ExcelProperty(value = "设备编码")
+    private String meterCode;
+
+    /**
+     * 设备厂商
+     */
+    @ExcelProperty(value = "设备厂商")
+    private String factoryNo;
+
+    /**
+     * 设备类型(1-电表，2-水表，3-气表)
+     */
+    @ExcelProperty(value = "设备类型(1-电表，2-水表，3-气表)")
+    private Long meterType;
+
+    /**
+     * 表用途(1-分表，2-总表，3-公摊表)
+     */
+    @ExcelProperty(value = "表用途(1-分表，2-总表，3-公摊表)")
+    private Long meterPurpose;
+
+    /**
+     * 分摊类型（1-不公摊，2-按分表用量，3-按租客面积，4-按房源数量，5-按固定比例）
+     */
+    @ExcelProperty(value = "分摊类型", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "1=-不公摊，2-按分表用量，3-按租客面积，4-按房源数量，5-按固定比例")
+    private Long shareType;
+
+    /**
+     * 付费类型(1-先付费，2-后付费)
+     */
+    @ExcelProperty(value = "付费类型(1-先付费，2-后付费)")
+    private Long payType;
+
+    /**
+     * 当前表显示读数
+     */
+    @ExcelProperty(value = "当前表显示读数")
+    private Long display;
+
+    /**
+     * 最大表显读数(超过归0)
+     */
+    @ExcelProperty(value = "最大表显读数(超过归0)")
+    private Long maxDisplay;
+
+    /**
+     * 计费倍率
+     */
+    @ExcelProperty(value = "计费倍率")
+    private Long billingRate;
+
+    /**
+     * 剩余量
+     */
+    @ExcelProperty(value = "剩余量")
+    private Long surplus;
+
+    /**
+     * 通信状态
+     */
+    @ExcelProperty(value = "通信状态")
+    private Long communicationState;
+
+    /**
+     * 运行状态
+     */
+    @ExcelProperty(value = "运行状态")
+    private Long runningState;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbFactoryMapper.java

@@ -1,8 +1,8 @@
 package org.dromara.property.mapper;
 
 import org.apache.ibatis.annotations.Mapper;
-import org.dromara.property.domain.TdFactory;
-import org.dromara.property.domain.vo.TdFactoryVo;
+import org.dromara.property.domain.TbFactory;
+import org.dromara.property.domain.vo.TbFactoryVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
 /**
@@ -12,6 +12,6 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
  * @date 2025-06-18
  */
 @Mapper
-public interface TdFactoryMapper extends BaseMapperPlus<TdFactory, TdFactoryVo> {
+public interface TbFactoryMapper extends BaseMapperPlus<TbFactory, TbFactoryVo> {
 
 }

ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbMeterConfigMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.property.mapper;
+
+import org.dromara.property.domain.TbMeterConfig;
+import org.dromara.property.domain.vo.TbMeterConfigVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 水电气配置Mapper接口
+ *
+ * @author lsm
+ * @date 2025-07-17
+ */
+public interface TbMeterConfigMapper extends BaseMapperPlus<TbMeterConfig, TbMeterConfigVo> {
+
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbMeterMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.property.mapper;
+
+import org.dromara.property.domain.TbMeter;
+import org.dromara.property.domain.vo.TbMeterVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 水电气Mapper接口
+ *
+ * @author LionLi
+ * @date 2025-07-17
+ */
+public interface TbMeterMapper extends BaseMapperPlus<TbMeter, TbMeterVo> {
+
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbMeterRoomMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.property.mapper;
+
+import org.dromara.property.domain.TbMeterRoom;
+import org.dromara.property.domain.vo.TbMeterRoomVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 仪房间关联Mapper接口
+ *
+ * @author LionLi
+ * @date 2025-07-17
+ */
+public interface TbMeterRoomMapper extends BaseMapperPlus<TbMeterRoom, TbMeterRoomVo> {
+
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbFactoryService.java

@@ -1,8 +1,7 @@
 package org.dromara.property.service;
 
-import org.dromara.property.domain.TdFactory;
-import org.dromara.property.domain.vo.TdFactoryVo;
-import org.dromara.property.domain.bo.TdFactoryBo;
+import org.dromara.property.domain.bo.TbFactoryBo;
+import org.dromara.property.domain.vo.TbFactoryVo;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.mybatis.core.page.PageQuery;
 
@@ -15,7 +14,7 @@ import java.util.List;
  * @author mocheng
  * @date 2025-06-18
  */
-public interface ITdFactoryService {
+public interface ITbFactoryService {
 
     /**
      * 查询厂商管理
@@ -23,7 +22,7 @@ public interface ITdFactoryService {
      * @param id 主键
      * @return 厂商管理
      */
-    TdFactoryVo queryById(Long id);
+    TbFactoryVo queryById(Long id);
 
     /**
      * 分页查询厂商管理列表
@@ -32,7 +31,7 @@ public interface ITdFactoryService {
      * @param pageQuery 分页参数
      * @return 厂商管理分页列表
      */
-    TableDataInfo<TdFactoryVo> queryPageList(TdFactoryBo bo, PageQuery pageQuery);
+    TableDataInfo<TbFactoryVo> queryPageList(TbFactoryBo bo, PageQuery pageQuery);
 
     /**
      * 查询符合条件的厂商管理列表
@@ -40,7 +39,7 @@ public interface ITdFactoryService {
      * @param bo 查询条件
      * @return 厂商管理列表
      */
-    List<TdFactoryVo> queryList(TdFactoryBo bo);
+    List<TbFactoryVo> queryList(TbFactoryBo bo);
 
     /**
      * 新增厂商管理
@@ -48,7 +47,7 @@ public interface ITdFactoryService {
      * @param bo 厂商管理
      * @return 是否新增成功
      */
-    Boolean insertByBo(TdFactoryBo bo);
+    Boolean insertByBo(TbFactoryBo bo);
 
     /**
      * 修改厂商管理
@@ -56,7 +55,7 @@ public interface ITdFactoryService {
      * @param bo 厂商管理
      * @return 是否修改成功
      */
-    Boolean updateByBo(TdFactoryBo bo);
+    Boolean updateByBo(TbFactoryBo bo);
 
     /**
      * 校验并批量删除厂商管理信息

ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbMeterConfigService.java

@@ -0,0 +1,69 @@
+package org.dromara.property.service;
+
+import org.dromara.property.domain.TbMeterConfig;
+import org.dromara.property.domain.vo.TbMeterConfigVo;
+import org.dromara.property.domain.bo.TbMeterConfigBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 水电气配置Service接口
+ *
+ * @author lsm
+ * @date 2025-07-17
+ */
+public interface ITbMeterConfigService {
+
+    /**
+     * 查询水电气配置
+     *
+     * @param id 主键
+     * @return 水电气配置
+     */
+    TbMeterConfigVo queryById(Long id);
+
+    /**
+     * 分页查询水电气配置列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 水电气配置分页列表
+     */
+    TableDataInfo<TbMeterConfigVo> queryPageList(TbMeterConfigBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的水电气配置列表
+     *
+     * @param bo 查询条件
+     * @return 水电气配置列表
+     */
+    List<TbMeterConfigVo> queryList(TbMeterConfigBo bo);
+
+    /**
+     * 新增水电气配置
+     *
+     * @param bo 水电气配置
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(TbMeterConfigBo bo);
+
+    /**
+     * 修改水电气配置
+     *
+     * @param bo 水电气配置
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(TbMeterConfigBo bo);
+
+    /**
+     * 校验并批量删除水电气配置信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbMeterRoomService.java

@@ -0,0 +1,69 @@
+package org.dromara.property.service;
+
+import org.dromara.property.domain.TbMeterRoom;
+import org.dromara.property.domain.vo.TbMeterRoomVo;
+import org.dromara.property.domain.bo.TbMeterRoomBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 仪房间关联Service接口
+ *
+ * @author LionLi
+ * @date 2025-07-17
+ */
+public interface ITbMeterRoomService {
+
+    /**
+     * 查询仪房间关联
+     *
+     * @param id 主键
+     * @return 仪房间关联
+     */
+    TbMeterRoomVo queryById(Long id);
+
+    /**
+     * 分页查询仪房间关联列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 仪房间关联分页列表
+     */
+    TableDataInfo<TbMeterRoomVo> queryPageList(TbMeterRoomBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的仪房间关联列表
+     *
+     * @param bo 查询条件
+     * @return 仪房间关联列表
+     */
+    List<TbMeterRoomVo> queryList(TbMeterRoomBo bo);
+
+    /**
+     * 新增仪房间关联
+     *
+     * @param bo 仪房间关联
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(TbMeterRoomBo bo);
+
+    /**
+     * 修改仪房间关联
+     *
+     * @param bo 仪房间关联
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(TbMeterRoomBo bo);
+
+    /**
+     * 校验并批量删除仪房间关联信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbMeterService.java

@@ -0,0 +1,69 @@
+package org.dromara.property.service;
+
+import org.dromara.property.domain.TbMeter;
+import org.dromara.property.domain.vo.TbMeterVo;
+import org.dromara.property.domain.bo.TbMeterBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 水电气Service接口
+ *
+ * @author LionLi
+ * @date 2025-07-17
+ */
+public interface ITbMeterService {
+
+    /**
+     * 查询水电气
+     *
+     * @param id 主键
+     * @return 水电气
+     */
+    TbMeterVo queryById(Long id);
+
+    /**
+     * 分页查询水电气列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 水电气分页列表
+     */
+    TableDataInfo<TbMeterVo> queryPageList(TbMeterBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的水电气列表
+     *
+     * @param bo 查询条件
+     * @return 水电气列表
+     */
+    List<TbMeterVo> queryList(TbMeterBo bo);
+
+    /**
+     * 新增水电气
+     *
+     * @param bo 水电气
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(TbMeterBo bo);
+
+    /**
+     * 修改水电气
+     *
+     * @param bo 水电气
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(TbMeterBo bo);
+
+    /**
+     * 校验并批量删除水电气信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbFactoryServiceImpl.java

@@ -9,12 +9,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.property.domain.TbFactory;
+import org.dromara.property.domain.bo.TbFactoryBo;
+import org.dromara.property.domain.vo.TbFactoryVo;
 import org.springframework.stereotype.Service;
-import org.dromara.property.domain.bo.TdFactoryBo;
-import org.dromara.property.domain.vo.TdFactoryVo;
-import org.dromara.property.domain.TdFactory;
-import org.dromara.property.mapper.TdFactoryMapper;
-import org.dromara.property.service.ITdFactoryService;
+import org.dromara.property.mapper.TbFactoryMapper;
+import org.dromara.property.service.ITbFactoryService;
 
 import java.util.List;
 import java.util.Map;
@@ -29,9 +29,9 @@ import java.util.Collection;
 @Slf4j
 @RequiredArgsConstructor
 @Service
-public class TdFactoryServiceImpl implements ITdFactoryService {
+public class TbFactoryServiceImpl implements ITbFactoryService {
 
-    private final TdFactoryMapper baseMapper;
+    private final TbFactoryMapper baseMapper;
 
     /**
      * 查询厂商管理
@@ -40,7 +40,7 @@ public class TdFactoryServiceImpl implements ITdFactoryService {
      * @return 厂商管理
      */
     @Override
-    public TdFactoryVo queryById(Long id){
+    public TbFactoryVo queryById(Long id){
         return baseMapper.selectVoById(id);
     }
 
@@ -52,9 +52,9 @@ public class TdFactoryServiceImpl implements ITdFactoryService {
      * @return 厂商管理分页列表
      */
     @Override
-    public TableDataInfo<TdFactoryVo> queryPageList(TdFactoryBo bo, PageQuery pageQuery) {
-        LambdaQueryWrapper<TdFactory> lqw = buildQueryWrapper(bo);
-        Page<TdFactoryVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+    public TableDataInfo<TbFactoryVo> queryPageList(TbFactoryBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<TbFactory> lqw = buildQueryWrapper(bo);
+        Page<TbFactoryVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }
 
@@ -65,18 +65,18 @@ public class TdFactoryServiceImpl implements ITdFactoryService {
      * @return 厂商管理列表
      */
     @Override
-    public List<TdFactoryVo> queryList(TdFactoryBo bo) {
-        LambdaQueryWrapper<TdFactory> lqw = buildQueryWrapper(bo);
+    public List<TbFactoryVo> queryList(TbFactoryBo bo) {
+        LambdaQueryWrapper<TbFactory> lqw = buildQueryWrapper(bo);
         return baseMapper.selectVoList(lqw);
     }
 
-    private LambdaQueryWrapper<TdFactory> buildQueryWrapper(TdFactoryBo bo) {
+    private LambdaQueryWrapper<TbFactory> buildQueryWrapper(TbFactoryBo bo) {
         Map<String, Object> params = bo.getParams();
-        LambdaQueryWrapper<TdFactory> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(TdFactory::getId);
-        lqw.eq(StringUtils.isNotBlank(bo.getFactoryNo()), TdFactory::getFactoryNo, bo.getFactoryNo());
-        lqw.like(StringUtils.isNotBlank(bo.getFactoryName()), TdFactory::getFactoryName, bo.getFactoryName());
-        lqw.eq(StringUtils.isNotBlank(bo.getSearchValue()), TdFactory::getSearchValue, bo.getSearchValue());
+        LambdaQueryWrapper<TbFactory> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(TbFactory::getId);
+        lqw.eq(StringUtils.isNotBlank(bo.getFactoryNo()), TbFactory::getFactoryNo, bo.getFactoryNo());
+        lqw.like(StringUtils.isNotBlank(bo.getFactoryName()), TbFactory::getFactoryName, bo.getFactoryName());
+        lqw.eq(StringUtils.isNotBlank(bo.getSearchValue()), TbFactory::getSearchValue, bo.getSearchValue());
         return lqw;
     }
 
@@ -87,8 +87,8 @@ public class TdFactoryServiceImpl implements ITdFactoryService {
      * @return 是否新增成功
      */
     @Override
-    public Boolean insertByBo(TdFactoryBo bo) {
-        TdFactory add = MapstructUtils.convert(bo, TdFactory.class);
+    public Boolean insertByBo(TbFactoryBo bo) {
+        TbFactory add = MapstructUtils.convert(bo, TbFactory.class);
         validEntityBeforeSave(add);
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
@@ -104,8 +104,8 @@ public class TdFactoryServiceImpl implements ITdFactoryService {
      * @return 是否修改成功
      */
     @Override
-    public Boolean updateByBo(TdFactoryBo bo) {
-        TdFactory update = MapstructUtils.convert(bo, TdFactory.class);
+    public Boolean updateByBo(TbFactoryBo bo) {
+        TbFactory update = MapstructUtils.convert(bo, TbFactory.class);
         validEntityBeforeSave(update);
         return baseMapper.updateById(update) > 0;
     }
@@ -113,7 +113,7 @@ public class TdFactoryServiceImpl implements ITdFactoryService {
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(TdFactory entity){
+    private void validEntityBeforeSave(TbFactory entity){
         //TODO 做一些数据校验,如唯一约束
     }
 

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbMeterConfigServiceImpl.java

@@ -0,0 +1,136 @@
+package org.dromara.property.service.impl;
+
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.dromara.property.domain.bo.TbMeterConfigBo;
+import org.dromara.property.domain.vo.TbMeterConfigVo;
+import org.dromara.property.domain.TbMeterConfig;
+import org.dromara.property.mapper.TbMeterConfigMapper;
+import org.dromara.property.service.ITbMeterConfigService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 水电气配置Service业务层处理
+ *
+ * @author lsm
+ * @date 2025-07-17
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class TbMeterConfigServiceImpl implements ITbMeterConfigService {
+
+    private final TbMeterConfigMapper baseMapper;
+
+    /**
+     * 查询水电气配置
+     *
+     * @param id 主键
+     * @return 水电气配置
+     */
+    @Override
+    public TbMeterConfigVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询水电气配置列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 水电气配置分页列表
+     */
+    @Override
+    public TableDataInfo<TbMeterConfigVo> queryPageList(TbMeterConfigBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<TbMeterConfig> lqw = buildQueryWrapper(bo);
+        Page<TbMeterConfigVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的水电气配置列表
+     *
+     * @param bo 查询条件
+     * @return 水电气配置列表
+     */
+    @Override
+    public List<TbMeterConfigVo> queryList(TbMeterConfigBo bo) {
+        LambdaQueryWrapper<TbMeterConfig> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<TbMeterConfig> buildQueryWrapper(TbMeterConfigBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<TbMeterConfig> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(TbMeterConfig::getId);
+        lqw.eq(bo.getMeterType() != null, TbMeterConfig::getMeterType, bo.getMeterType());
+        lqw.eq(bo.getPayType() != null, TbMeterConfig::getPayType, bo.getPayType());
+        lqw.eq(bo.getArrearsOutage() != null, TbMeterConfig::getArrearsOutage, bo.getArrearsOutage());
+        lqw.eq(bo.getAutoOutage() != null, TbMeterConfig::getAutoOutage, bo.getAutoOutage());
+        lqw.eq(bo.getOverdueDay() != null, TbMeterConfig::getOverdueDay, bo.getOverdueDay());
+        return lqw;
+    }
+
+    /**
+     * 新增水电气配置
+     *
+     * @param bo 水电气配置
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(TbMeterConfigBo bo) {
+        TbMeterConfig add = MapstructUtils.convert(bo, TbMeterConfig.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改水电气配置
+     *
+     * @param bo 水电气配置
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(TbMeterConfigBo bo) {
+        TbMeterConfig update = MapstructUtils.convert(bo, TbMeterConfig.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(TbMeterConfig entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除水电气配置信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbMeterRoomServiceImpl.java

@@ -0,0 +1,133 @@
+package org.dromara.property.service.impl;
+
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.dromara.property.domain.bo.TbMeterRoomBo;
+import org.dromara.property.domain.vo.TbMeterRoomVo;
+import org.dromara.property.domain.TbMeterRoom;
+import org.dromara.property.mapper.TbMeterRoomMapper;
+import org.dromara.property.service.ITbMeterRoomService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 仪房间关联Service业务层处理
+ *
+ * @author LionLi
+ * @date 2025-07-17
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class TbMeterRoomServiceImpl implements ITbMeterRoomService {
+
+    private final TbMeterRoomMapper baseMapper;
+
+    /**
+     * 查询仪房间关联
+     *
+     * @param id 主键
+     * @return 仪房间关联
+     */
+    @Override
+    public TbMeterRoomVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询仪房间关联列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 仪房间关联分页列表
+     */
+    @Override
+    public TableDataInfo<TbMeterRoomVo> queryPageList(TbMeterRoomBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<TbMeterRoom> lqw = buildQueryWrapper(bo);
+        Page<TbMeterRoomVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的仪房间关联列表
+     *
+     * @param bo 查询条件
+     * @return 仪房间关联列表
+     */
+    @Override
+    public List<TbMeterRoomVo> queryList(TbMeterRoomBo bo) {
+        LambdaQueryWrapper<TbMeterRoom> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<TbMeterRoom> buildQueryWrapper(TbMeterRoomBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<TbMeterRoom> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(TbMeterRoom::getId);
+        lqw.eq(bo.getMeterId() != null, TbMeterRoom::getMeterId, bo.getMeterId());
+        lqw.eq(bo.getRoomId() != null, TbMeterRoom::getRoomId, bo.getRoomId());
+        return lqw;
+    }
+
+    /**
+     * 新增仪房间关联
+     *
+     * @param bo 仪房间关联
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(TbMeterRoomBo bo) {
+        TbMeterRoom add = MapstructUtils.convert(bo, TbMeterRoom.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改仪房间关联
+     *
+     * @param bo 仪房间关联
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(TbMeterRoomBo bo) {
+        TbMeterRoom update = MapstructUtils.convert(bo, TbMeterRoom.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(TbMeterRoom entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除仪房间关联信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbMeterServiceImpl.java

@@ -0,0 +1,144 @@
+package org.dromara.property.service.impl;
+
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.dromara.property.domain.bo.TbMeterBo;
+import org.dromara.property.domain.vo.TbMeterVo;
+import org.dromara.property.domain.TbMeter;
+import org.dromara.property.mapper.TbMeterMapper;
+import org.dromara.property.service.ITbMeterService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 水电气Service业务层处理
+ *
+ * @author LionLi
+ * @date 2025-07-17
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class TbMeterServiceImpl implements ITbMeterService {
+
+    private final TbMeterMapper baseMapper;
+
+    /**
+     * 查询水电气
+     *
+     * @param id 主键
+     * @return 水电气
+     */
+    @Override
+    public TbMeterVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询水电气列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 水电气分页列表
+     */
+    @Override
+    public TableDataInfo<TbMeterVo> queryPageList(TbMeterBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<TbMeter> lqw = buildQueryWrapper(bo);
+        Page<TbMeterVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的水电气列表
+     *
+     * @param bo 查询条件
+     * @return 水电气列表
+     */
+    @Override
+    public List<TbMeterVo> queryList(TbMeterBo bo) {
+        LambdaQueryWrapper<TbMeter> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<TbMeter> buildQueryWrapper(TbMeterBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<TbMeter> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(TbMeter::getId);
+        lqw.like(StringUtils.isNotBlank(bo.getMeterName()), TbMeter::getMeterName, bo.getMeterName());
+        lqw.eq(StringUtils.isNotBlank(bo.getMeterCode()), TbMeter::getMeterCode, bo.getMeterCode());
+        lqw.eq(StringUtils.isNotBlank(bo.getFactoryNo()), TbMeter::getFactoryNo, bo.getFactoryNo());
+        lqw.eq(bo.getMeterType() != null, TbMeter::getMeterType, bo.getMeterType());
+        lqw.eq(bo.getMeterPurpose() != null, TbMeter::getMeterPurpose, bo.getMeterPurpose());
+        lqw.eq(bo.getShareType() != null, TbMeter::getShareType, bo.getShareType());
+        lqw.eq(bo.getPayType() != null, TbMeter::getPayType, bo.getPayType());
+        lqw.eq(bo.getDisplay() != null, TbMeter::getDisplay, bo.getDisplay());
+        lqw.eq(bo.getMaxDisplay() != null, TbMeter::getMaxDisplay, bo.getMaxDisplay());
+        lqw.eq(bo.getBillingRate() != null, TbMeter::getBillingRate, bo.getBillingRate());
+        lqw.eq(bo.getSurplus() != null, TbMeter::getSurplus, bo.getSurplus());
+        lqw.eq(bo.getCommunicationState() != null, TbMeter::getCommunicationState, bo.getCommunicationState());
+        lqw.eq(bo.getRunningState() != null, TbMeter::getRunningState, bo.getRunningState());
+        return lqw;
+    }
+
+    /**
+     * 新增水电气
+     *
+     * @param bo 水电气
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(TbMeterBo bo) {
+        TbMeter add = MapstructUtils.convert(bo, TbMeter.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改水电气
+     *
+     * @param bo 水电气
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(TbMeterBo bo) {
+        TbMeter update = MapstructUtils.convert(bo, TbMeter.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(TbMeter entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除水电气信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

ruoyi-modules/Property/src/main/resources/mapper/Property/TbFactoryMapper.xml

@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.property.mapper.TdFactoryMapper">
+<mapper namespace="org.dromara.property.mapper.TbFactoryMapper">
 
 </mapper>