From 3f97caad425559b224a4529e5cd1638eed9bd9bc Mon Sep 17 00:00:00 2001 From: zcxlsm Date: Thu, 17 Jul 2025 12:38:58 +0800 Subject: [PATCH] =?UTF-8?q?refactor(property):=20-=20=E6=B0=B4=E7=94=B5?= =?UTF-8?q?=E6=B0=94=E8=A1=A8=E4=B8=9A=E5=8A=A1=E3=80=81=E5=8E=82=E5=95=86?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=A7=BB=E5=8A=A8=E8=87=B3=E7=89=A9=E4=B8=9A?= =?UTF-8?q?=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TbMeterConfigController.java} | 54 ++--- .../controller/TbMeterController.java | 106 ++++++++++ .../controller/TbMeterRoomController.java | 106 ++++++++++ .../controller/TdFactoryController.java | 22 +-- .../domain/{TdFactory.java => TbFactory.java} | 2 +- .../org/dromara/property/domain/TbMeter.java} | 36 ++-- .../property/domain/TbMeterConfig.java} | 24 +-- .../dromara/property/domain/TbMeterRoom.java} | 15 +- .../bo/{TdFactoryBo.java => TbFactoryBo.java} | 6 +- .../dromara/property/domain/bo/TbMeterBo.java | 100 ++++++++++ .../property/domain/bo/TbMeterConfigBo.java | 60 ++++++ .../property/domain/bo/TbMeterRoomBo.java} | 16 +- .../vo/{TdFactoryVo.java => TbFactoryVo.java} | 10 +- .../property/domain/vo/TbMeterConfigVo.java} | 34 ++-- .../property/domain/vo/TbMeterRoomVo.java} | 16 +- .../property/domain/vo/TbMeterVo.java} | 49 +++-- ...actoryMapper.java => TbFactoryMapper.java} | 6 +- .../property/mapper/TbMeterConfigMapper.java | 15 ++ .../property/mapper/TbMeterMapper.java | 15 ++ .../property/mapper/TbMeterRoomMapper.java | 15 ++ ...oryService.java => ITbFactoryService.java} | 17 +- .../service/ITbMeterConfigService.java} | 25 +-- .../property/service/ITbMeterRoomService.java | 69 +++++++ .../property/service/ITbMeterService.java} | 32 ++- ...iceImpl.java => TbFactoryServiceImpl.java} | 48 ++--- .../impl/TbMeterConfigServiceImpl.java} | 59 +++--- .../service/impl/TbMeterRoomServiceImpl.java} | 76 +++---- .../service/impl/TbMeterServiceImpl.java | 144 ++++++++++++++ ...dFactoryMapper.xml => TbFactoryMapper.xml} | 2 +- .../sis/controller/TdFactoryController.java | 106 ---------- .../sis/controller/TdMeterController.java | 121 ------------ .../sis/controller/TdMeterRoomController.java | 107 ---------- .../org/dromara/sis/domain/TdFactory.java | 47 ----- .../dromara/sis/domain/bo/TdFactoryBo.java | 46 ----- .../org/dromara/sis/domain/bo/TdMeterBo.java | 96 --------- .../sis/domain/bo/TdMeterConfigBo.java | 64 ------ .../dromara/sis/domain/vo/TdFactoryVo.java | 51 ----- .../dromara/sis/mapper/TdFactoryMapper.java | 15 -- .../sis/mapper/TdMeterConfigMapper.java | 15 -- .../org/dromara/sis/mapper/TdMeterMapper.java | 15 -- .../dromara/sis/mapper/TdMeterRoomMapper.java | 15 -- .../sis/service/ITdFactoryService.java | 68 ------- .../sis/service/ITdMeterRoomService.java | 85 -------- .../service/impl/TdMeterRoomServiceImpl.java | 147 -------------- .../sis/service/impl/TdMeterServiceImpl.java | 186 ------------------ .../src/main/resources/application.properties | 4 +- 46 files changed, 905 insertions(+), 1462 deletions(-) rename ruoyi-modules/{Sis/src/main/java/org/dromara/sis/controller/TdMeterConfigController.java => Property/src/main/java/org/dromara/property/controller/TbMeterConfigController.java} (61%) create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbMeterController.java create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbMeterRoomController.java rename ruoyi-modules/Property/src/main/java/org/dromara/property/domain/{TdFactory.java => TbFactory.java} (93%) rename ruoyi-modules/{Sis/src/main/java/org/dromara/sis/domain/TdMeter.java => Property/src/main/java/org/dromara/property/domain/TbMeter.java} (65%) rename ruoyi-modules/{Sis/src/main/java/org/dromara/sis/domain/TdMeterConfig.java => Property/src/main/java/org/dromara/property/domain/TbMeterConfig.java} (63%) rename ruoyi-modules/{Sis/src/main/java/org/dromara/sis/domain/TdMeterRoom.java => Property/src/main/java/org/dromara/property/domain/TbMeterRoom.java} (66%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/{TdFactoryBo.java => TbFactoryBo.java} (86%) create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbMeterBo.java create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbMeterConfigBo.java rename ruoyi-modules/{Sis/src/main/java/org/dromara/sis/domain/bo/TdMeterRoomBo.java => Property/src/main/java/org/dromara/property/domain/bo/TbMeterRoomBo.java} (59%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/{TdFactoryVo.java => TbFactoryVo.java} (75%) rename ruoyi-modules/{Sis/src/main/java/org/dromara/sis/domain/vo/TdMeterConfigVo.java => Property/src/main/java/org/dromara/property/domain/vo/TbMeterConfigVo.java} (69%) rename ruoyi-modules/{Sis/src/main/java/org/dromara/sis/domain/vo/TdMeterRoomVo.java => Property/src/main/java/org/dromara/property/domain/vo/TbMeterRoomVo.java} (65%) rename ruoyi-modules/{Sis/src/main/java/org/dromara/sis/domain/vo/TdMeterVo.java => Property/src/main/java/org/dromara/property/domain/vo/TbMeterVo.java} (60%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/{TdFactoryMapper.java => TbFactoryMapper.java} (56%) create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbMeterConfigMapper.java create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbMeterMapper.java create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbMeterRoomMapper.java rename ruoyi-modules/Property/src/main/java/org/dromara/property/service/{ITdFactoryService.java => ITbFactoryService.java} (74%) rename ruoyi-modules/{Sis/src/main/java/org/dromara/sis/service/ITdMeterConfigService.java => Property/src/main/java/org/dromara/property/service/ITbMeterConfigService.java} (69%) create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbMeterRoomService.java rename ruoyi-modules/{Sis/src/main/java/org/dromara/sis/service/ITdMeterService.java => Property/src/main/java/org/dromara/property/service/ITbMeterService.java} (64%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/{TdFactoryServiceImpl.java => TbFactoryServiceImpl.java} (67%) rename ruoyi-modules/{Sis/src/main/java/org/dromara/sis/service/impl/TdMeterConfigServiceImpl.java => Property/src/main/java/org/dromara/property/service/impl/TbMeterConfigServiceImpl.java} (61%) rename ruoyi-modules/{Sis/src/main/java/org/dromara/sis/service/impl/TdFactoryServiceImpl.java => Property/src/main/java/org/dromara/property/service/impl/TbMeterRoomServiceImpl.java} (50%) create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbMeterServiceImpl.java rename ruoyi-modules/Property/src/main/resources/mapper/Property/{TdFactoryMapper.xml => TbFactoryMapper.xml} (71%) delete mode 100644 ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/TdFactoryController.java delete mode 100644 ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/TdMeterController.java delete mode 100644 ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/TdMeterRoomController.java delete mode 100644 ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TdFactory.java delete mode 100644 ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TdFactoryBo.java delete mode 100644 ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TdMeterBo.java delete mode 100644 ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TdMeterConfigBo.java delete mode 100644 ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TdFactoryVo.java delete mode 100644 ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TdFactoryMapper.java delete mode 100644 ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TdMeterConfigMapper.java delete mode 100644 ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TdMeterMapper.java delete mode 100644 ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TdMeterRoomMapper.java delete mode 100644 ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ITdFactoryService.java delete mode 100644 ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ITdMeterRoomService.java delete mode 100644 ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TdMeterRoomServiceImpl.java delete mode 100644 ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TdMeterServiceImpl.java diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/TdMeterConfigController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbMeterConfigController.java similarity index 61% rename from ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/TdMeterConfigController.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbMeterConfigController.java index acab525d..a00e63be 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/TdMeterConfigController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbMeterConfigController.java @@ -1,4 +1,4 @@ -package org.dromara.sis.controller; +package org.dromara.property.controller; import java.util.List; @@ -17,44 +17,44 @@ 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.sis.domain.vo.TdMeterConfigVo; -import org.dromara.sis.domain.bo.TdMeterConfigBo; -import org.dromara.sis.service.ITdMeterConfigService; +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; /** * 水电气配置 - * 前端访问路由地址为:/iot/meterConfig + * 前端访问路由地址为:/property/meterConfig * - * @author lxj - * @date 2025-06-18 + * @author lsm + * @date 2025-07-17 */ @Validated @RequiredArgsConstructor @RestController @RequestMapping("/meterConfig") -public class TdMeterConfigController extends BaseController { +public class TbMeterConfigController extends BaseController { - private final ITdMeterConfigService tdMeterConfigService; + private final ITbMeterConfigService tbMeterConfigService; /** * 查询水电气配置列表 */ - @SaCheckPermission("system:meterConfig:list") + @SaCheckPermission("property:meterConfig:list") @GetMapping("/list") - public TableDataInfo list(TdMeterConfigBo bo, PageQuery pageQuery) { - return tdMeterConfigService.queryPageList(bo, pageQuery); + public TableDataInfo list(TbMeterConfigBo bo, PageQuery pageQuery) { + return tbMeterConfigService.queryPageList(bo, pageQuery); } /** * 导出水电气配置列表 */ - @SaCheckPermission("system:meterConfig:export") + @SaCheckPermission("property:meterConfig:export") @Log(title = "水电气配置", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(TdMeterConfigBo bo, HttpServletResponse response) { - List list = tdMeterConfigService.queryList(bo); - ExcelUtil.exportExcel(list, "水电气配置", TdMeterConfigVo.class, response); + public void export(TbMeterConfigBo bo, HttpServletResponse response) { + List list = tbMeterConfigService.queryList(bo); + ExcelUtil.exportExcel(list, "水电气配置", TbMeterConfigVo.class, response); } /** @@ -62,33 +62,33 @@ public class TdMeterConfigController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("system:meterConfig:query") + @SaCheckPermission("property:meterConfig:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { - return R.ok(tdMeterConfigService.queryById(id)); + return R.ok(tbMeterConfigService.queryById(id)); } /** * 新增水电气配置 */ - @SaCheckPermission("system:meterConfig:add") + @SaCheckPermission("property:meterConfig:add") @Log(title = "水电气配置", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody TdMeterConfigBo bo) { - return toAjax(tdMeterConfigService.insertByBo(bo)); + public R add(@Validated(AddGroup.class) @RequestBody TbMeterConfigBo bo) { + return toAjax(tbMeterConfigService.insertByBo(bo)); } /** * 修改水电气配置 */ - @SaCheckPermission("system:meterConfig:edit") + @SaCheckPermission("property:meterConfig:edit") @Log(title = "水电气配置", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody TdMeterConfigBo bo) { - return toAjax(tdMeterConfigService.updateByBo(bo)); + public R edit(@Validated(EditGroup.class) @RequestBody TbMeterConfigBo bo) { + return toAjax(tbMeterConfigService.updateByBo(bo)); } /** @@ -96,11 +96,11 @@ public class TdMeterConfigController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("system:meterConfig:remove") + @SaCheckPermission("property:meterConfig:remove") @Log(title = "水电气配置", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { - return toAjax(tdMeterConfigService.deleteWithValidByIds(List.of(ids), true)); + return toAjax(tbMeterConfigService.deleteWithValidByIds(List.of(ids), true)); } } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbMeterController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbMeterController.java new file mode 100644 index 00000000..f6a5d008 --- /dev/null +++ b/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 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 list = tbMeterService.queryList(bo); + ExcelUtil.exportExcel(list, "水电气", TbMeterVo.class, response); + } + + /** + * 获取水电气详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("property:meter:query") + @GetMapping("/{id}") + public R 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 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 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 remove(@NotEmpty(message = "主键不能为空") + @PathVariable("ids") Long[] ids) { + return toAjax(tbMeterService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbMeterRoomController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbMeterRoomController.java new file mode 100644 index 00000000..ae58b1f7 --- /dev/null +++ b/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 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 list = tbMeterRoomService.queryList(bo); + ExcelUtil.exportExcel(list, "仪房间关联", TbMeterRoomVo.class, response); + } + + /** + * 获取仪房间关联详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("property:meterRoom:query") + @GetMapping("/{id}") + public R 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 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 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 remove(@NotEmpty(message = "主键不能为空") + @PathVariable("ids") Long[] ids) { + return toAjax(tbMeterRoomService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TdFactoryController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TdFactoryController.java index b80d3a54..b16a193e 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TdFactoryController.java +++ b/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 list(TdFactoryBo bo, PageQuery pageQuery) { + public TableDataInfo 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 list = tdFactoryService.queryList(bo); - ExcelUtil.exportExcel(list, "厂商管理", TdFactoryVo.class, response); + public void export(TbFactoryBo bo, HttpServletResponse response) { + List 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 getInfo(@NotNull(message = "主键不能为空") + public R 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 add(@Validated(AddGroup.class) @RequestBody TdFactoryBo bo) { + public R 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 edit(@Validated(EditGroup.class) @RequestBody TdFactoryBo bo) { + public R edit(@Validated(EditGroup.class) @RequestBody TbFactoryBo bo) { return toAjax(tdFactoryService.updateByBo(bo)); } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TdFactory.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbFactory.java similarity index 93% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TdFactory.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbFactory.java index 776989fc..a506078b 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TdFactory.java +++ b/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; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TdMeter.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbMeter.java similarity index 65% rename from ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TdMeter.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbMeter.java index 45618bfc..075f3ce3 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TdMeter.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbMeter.java @@ -1,23 +1,22 @@ -package org.dromara.sis.domain; +package org.dromara.property.domain; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.mybatis.core.domain.BaseEntity; import java.io.Serial; /** - * 水电气对象 td_meter + * 水电气对象 tb_meter * * @author LionLi - * @date 2025-06-19 + * @date 2025-07-17 */ @Data @EqualsAndHashCode(callSuper = true) -@TableName("td_meter") -public class TdMeter extends BaseEntity { +@TableName("tb_meter") +public class TbMeter extends BaseEntity { @Serial private static final long serialVersionUID = 1L; @@ -46,27 +45,22 @@ public class TdMeter extends BaseEntity { /** * 设备类型(1-电表，2-水表，3-气表) */ - private Integer meterType; + private Long meterType; /** * 表用途(1-分表，2-总表，3-公摊表) */ - private Integer meterPurpose; + private Long meterPurpose; /** - * 分摊类型 - * 1-不公摊 - * 2-按分表用量 - * 3-按租客面积 - * 4-按房源数量 - * 5-按固定比例 + * 分摊类型（1-不公摊，2-按分表用量，3-按租客面积，4-按房源数量，5-按固定比例） */ - private Integer shareType; + private Long shareType; /** * 付费类型(1-先付费，2-后付费) */ - private Integer payType; + private Long payType; /** * 当前表显示读数 @@ -81,7 +75,7 @@ public class TdMeter extends BaseEntity { /** * 计费倍率 */ - private Float billingRate; + private Long billingRate; /** * 剩余量 @@ -91,12 +85,12 @@ public class TdMeter extends BaseEntity { /** * 通信状态 */ - private Integer communicationState; + private Long communicationState; /** * 运行状态 */ - private Integer runningState; + private Long runningState; /** * 备注 diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TdMeterConfig.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbMeterConfig.java similarity index 63% rename from ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TdMeterConfig.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbMeterConfig.java index 221f0be7..b6cfda2b 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TdMeterConfig.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbMeterConfig.java @@ -1,4 +1,4 @@ -package org.dromara.sis.domain; +package org.dromara.property.domain; import org.dromara.common.mybatis.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.*; @@ -8,15 +8,15 @@ import lombok.EqualsAndHashCode; import java.io.Serial; /** - * 水电气配置对象 td_meter_config + * 水电气配置对象 tb_meter_config * - * @author LionLi - * @date 2025-06-18 + * @author lsm + * @date 2025-07-17 */ @Data @EqualsAndHashCode(callSuper = true) -@TableName("td_meter_config") -public class TdMeterConfig extends BaseEntity { +@TableName("tb_meter_config") +public class TbMeterConfig extends BaseEntity { @Serial private static final long serialVersionUID = 1L; @@ -30,27 +30,27 @@ public class TdMeterConfig extends BaseEntity { /** * 设备类型(1-电表，2-水表，3-气表) */ - private Integer meterType; + private Long meterType; /** * 付费类型(1-先付费，2-后付费) */ - private Integer payType; + private Long payType; /** * 欠费是否断电/水/气(0-是，1-否) */ - private Integer arrearsOutage; + private Long arrearsOutage; /** * 后付费模式下是否自动断电/水/气（0-是，1-否） */ - private Integer autoOutage; + private Long autoOutage; /** - * 当auto_outage=0的时候生效，逾期多少天自动断水/电/气 + * 当auto_outage=0时生效，逾期天数 */ - private Integer overdueDay; + private Long overdueDay; /** * 备注 diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TdMeterRoom.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbMeterRoom.java similarity index 66% rename from ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TdMeterRoom.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbMeterRoom.java index ff13e5e3..1226a38b 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TdMeterRoom.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbMeterRoom.java @@ -1,23 +1,22 @@ -package org.dromara.sis.domain; +package org.dromara.property.domain; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.mybatis.core.domain.BaseEntity; import java.io.Serial; /** - * 和房间的关联对象 td_meter_room + * 仪房间关联对象 tb_meter_room * * @author LionLi - * @date 2025-06-18 + * @date 2025-07-17 */ @Data @EqualsAndHashCode(callSuper = true) -@TableName("td_meter_room") -public class TdMeterRoom extends BaseEntity { +@TableName("tb_meter_room") +public class TbMeterRoom extends BaseEntity { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TdFactoryBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbFactoryBo.java similarity index 86% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TdFactoryBo.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbFactoryBo.java index daf5704f..7e9d187a 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TdFactoryBo.java +++ b/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 { /** * diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbMeterBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbMeterBo.java new file mode 100644 index 00000000..21491775 --- /dev/null +++ b/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; + + +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbMeterConfigBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbMeterConfigBo.java new file mode 100644 index 00000000..112dfdca --- /dev/null +++ b/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; + + +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TdMeterRoomBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbMeterRoomBo.java similarity index 59% rename from ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TdMeterRoomBo.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbMeterRoomBo.java index 39f83065..1b2e50ac 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TdMeterRoomBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbMeterRoomBo.java @@ -1,6 +1,6 @@ -package org.dromara.sis.domain.bo; +package org.dromara.property.domain.bo; -import org.dromara.sis.domain.TdMeterRoom; +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; @@ -10,15 +10,15 @@ import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; /** - * 和房间的关联业务对象 td_meter_room + * 仪房间关联业务对象 tb_meter_room * - * @author lxj - * @date 2025-06-18 + * @author LionLi + * @date 2025-07-17 */ @Data @EqualsAndHashCode(callSuper = true) -@AutoMapper(target = TdMeterRoom.class, reverseConvertGenerate = false) -public class TdMeterRoomBo extends BaseEntity { +@AutoMapper(target = TbMeterRoom.class, reverseConvertGenerate = false) +public class TbMeterRoomBo extends BaseEntity { /** * 主键id @@ -29,13 +29,11 @@ public class TdMeterRoomBo extends BaseEntity { /** * 表id */ - @NotNull(message = "表id不能为空", groups = { AddGroup.class, EditGroup.class }) private Long meterId; /** * 房间id */ - @NotNull(message = "房间id不能为空", groups = { AddGroup.class, EditGroup.class }) private Long roomId; /** diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TdFactoryVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbFactoryVo.java similarity index 75% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TdFactoryVo.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbFactoryVo.java index 2ad4ae35..1ff54443 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TdFactoryVo.java +++ b/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; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TdMeterConfigVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbMeterConfigVo.java similarity index 69% rename from ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TdMeterConfigVo.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbMeterConfigVo.java index 4a44e605..40e644f2 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TdMeterConfigVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbMeterConfigVo.java @@ -1,27 +1,29 @@ -package org.dromara.sis.domain.vo; +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 io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.sis.domain.TdMeterConfig; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; import java.io.Serial; import java.io.Serializable; +import java.util.Date; + /** - * 水电气配置视图对象 td_meter_config + * 水电气配置视图对象 tb_meter_config * - * @author lxj - * @date 2025-06-18 + * @author lsm + * @date 2025-07-17 */ @Data @ExcelIgnoreUnannotated -@AutoMapper(target = TdMeterConfig.class) -public class TdMeterConfigVo implements Serializable { +@AutoMapper(target = TbMeterConfig.class) +public class TbMeterConfigVo implements Serializable { @Serial private static final long serialVersionUID = 1L; @@ -36,32 +38,32 @@ public class TdMeterConfigVo implements Serializable { * 设备类型(1-电表，2-水表，3-气表) */ @ExcelProperty(value = "设备类型(1-电表，2-水表，3-气表)") - private Integer meterType; + private Long meterType; /** * 付费类型(1-先付费，2-后付费) */ @ExcelProperty(value = "付费类型(1-先付费，2-后付费)") - private Integer payType; + private Long payType; /** * 欠费是否断电/水/气(0-是，1-否) */ @ExcelProperty(value = "欠费是否断电/水/气(0-是，1-否)") - private Integer arrearsOutage; + private Long arrearsOutage; /** * 后付费模式下是否自动断电/水/气（0-是，1-否） */ @ExcelProperty(value = "后付费模式下是否自动断电/水/气", converter = ExcelDictConvert.class) @ExcelDictFormat(readConverterExp = "0=-是，1-否") - private Integer autoOutage; + private Long autoOutage; /** - * 当auto_outage=0的时候生效，逾期多少天自动断水/电/气 + * 当auto_outage=0时生效，逾期天数 */ - @ExcelProperty(value = "当auto_outage=0的时候生效，逾期多少天自动断水/电/气") - private Integer overdueDay; + @ExcelProperty(value = "当auto_outage=0时生效，逾期天数") + private Long overdueDay; /** * 备注 diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TdMeterRoomVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbMeterRoomVo.java similarity index 65% rename from ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TdMeterRoomVo.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbMeterRoomVo.java index 90169336..a055255a 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TdMeterRoomVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbMeterRoomVo.java @@ -1,25 +1,29 @@ -package org.dromara.sis.domain.vo; +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 org.dromara.sis.domain.TdMeterRoom; import java.io.Serial; import java.io.Serializable; +import java.util.Date; + /** - * 和房间的关联视图对象 td_meter_room + * 仪房间关联视图对象 tb_meter_room * * @author LionLi - * @date 2025-06-18 + * @date 2025-07-17 */ @Data @ExcelIgnoreUnannotated -@AutoMapper(target = TdMeterRoom.class) -public class TdMeterRoomVo implements Serializable { +@AutoMapper(target = TbMeterRoom.class) +public class TbMeterRoomVo implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TdMeterVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbMeterVo.java similarity index 60% rename from ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TdMeterVo.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbMeterVo.java index dcb2a9aa..ecb75eca 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TdMeterVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbMeterVo.java @@ -1,26 +1,29 @@ -package org.dromara.sis.domain.vo; +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 org.dromara.sis.domain.TdMeter; import java.io.Serial; import java.io.Serializable; +import java.util.Date; /** - * 水电气视图对象 td_meter + * 水电气视图对象 tb_meter * * @author LionLi - * @date 2025-06-19 + * @date 2025-07-17 */ @Data @ExcelIgnoreUnannotated -@AutoMapper(target = TdMeter.class) -public class TdMeterVo implements Serializable { +@AutoMapper(target = TbMeter.class) +public class TbMeterVo implements Serializable { @Serial private static final long serialVersionUID = 1L; @@ -53,30 +56,26 @@ public class TdMeterVo implements Serializable { * 设备类型(1-电表，2-水表，3-气表) */ @ExcelProperty(value = "设备类型(1-电表，2-水表，3-气表)") - private Integer meterType; + private Long meterType; /** * 表用途(1-分表，2-总表，3-公摊表) */ @ExcelProperty(value = "表用途(1-分表，2-总表，3-公摊表)") - private Integer meterPurpose; + private Long meterPurpose; /** - * 分摊类型 - * 1-不公摊 - * 2-按分表用量 - * 3-按租客面积 - * 4-按房源数量 - * 5-按固定比例 + * 分摊类型（1-不公摊，2-按分表用量，3-按租客面积，4-按房源数量，5-按固定比例） */ - @ExcelProperty(value = "分摊类型 1-不公摊 2-按分表用量 3-按租客面积 4-按房源数量 5-按固定比例") - private Integer shareType; + @ExcelProperty(value = "分摊类型", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "1=-不公摊，2-按分表用量，3-按租客面积，4-按房源数量，5-按固定比例") + private Long shareType; /** * 付费类型(1-先付费，2-后付费) */ @ExcelProperty(value = "付费类型(1-先付费，2-后付费)") - private Integer payType; + private Long payType; /** * 当前表显示读数 @@ -84,6 +83,18 @@ public class TdMeterVo implements Serializable { @ExcelProperty(value = "当前表显示读数") private Long display; + /** + * 最大表显读数(超过归0) + */ + @ExcelProperty(value = "最大表显读数(超过归0)") + private Long maxDisplay; + + /** + * 计费倍率 + */ + @ExcelProperty(value = "计费倍率") + private Long billingRate; + /** * 剩余量 */ @@ -94,13 +105,13 @@ public class TdMeterVo implements Serializable { * 通信状态 */ @ExcelProperty(value = "通信状态") - private Integer communicationState; + private Long communicationState; /** * 运行状态 */ @ExcelProperty(value = "运行状态") - private Integer runningState; + private Long runningState; /** * 备注 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TdFactoryMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbFactoryMapper.java similarity index 56% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TdFactoryMapper.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbFactoryMapper.java index 0f85b762..a6651638 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TdFactoryMapper.java +++ b/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 { +public interface TbFactoryMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbMeterConfigMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbMeterConfigMapper.java new file mode 100644 index 00000000..d029000b --- /dev/null +++ b/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 { + +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbMeterMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbMeterMapper.java new file mode 100644 index 00000000..fcd87aa8 --- /dev/null +++ b/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 { + +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbMeterRoomMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbMeterRoomMapper.java new file mode 100644 index 00000000..a19dcbb7 --- /dev/null +++ b/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 { + +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITdFactoryService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbFactoryService.java similarity index 74% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITdFactoryService.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbFactoryService.java index d8a03566..010b4629 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITdFactoryService.java +++ b/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 queryPageList(TdFactoryBo bo, PageQuery pageQuery); + TableDataInfo queryPageList(TbFactoryBo bo, PageQuery pageQuery); /** * 查询符合条件的厂商管理列表 @@ -40,7 +39,7 @@ public interface ITdFactoryService { * @param bo 查询条件 * @return 厂商管理列表 */ - List queryList(TdFactoryBo bo); + List 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); /** * 校验并批量删除厂商管理信息 diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ITdMeterConfigService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbMeterConfigService.java similarity index 69% rename from ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ITdMeterConfigService.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbMeterConfigService.java index f2766b0f..57870b11 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ITdMeterConfigService.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbMeterConfigService.java @@ -1,9 +1,10 @@ -package org.dromara.sis.service; +package org.dromara.property.service; -import org.dromara.common.mybatis.core.page.PageQuery; +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.sis.domain.bo.TdMeterConfigBo; -import org.dromara.sis.domain.vo.TdMeterConfigVo; +import org.dromara.common.mybatis.core.page.PageQuery; import java.util.Collection; import java.util.List; @@ -11,10 +12,10 @@ import java.util.List; /** * 水电气配置Service接口 * - * @author LionLi - * @date 2025-06-18 + * @author lsm + * @date 2025-07-17 */ -public interface ITdMeterConfigService { +public interface ITbMeterConfigService { /** * 查询水电气配置 @@ -22,7 +23,7 @@ public interface ITdMeterConfigService { * @param id 主键 * @return 水电气配置 */ - TdMeterConfigVo queryById(Long id); + TbMeterConfigVo queryById(Long id); /** * 分页查询水电气配置列表 @@ -31,7 +32,7 @@ public interface ITdMeterConfigService { * @param pageQuery 分页参数 * @return 水电气配置分页列表 */ - TableDataInfo queryPageList(TdMeterConfigBo bo, PageQuery pageQuery); + TableDataInfo queryPageList(TbMeterConfigBo bo, PageQuery pageQuery); /** * 查询符合条件的水电气配置列表 @@ -39,7 +40,7 @@ public interface ITdMeterConfigService { * @param bo 查询条件 * @return 水电气配置列表 */ - List queryList(TdMeterConfigBo bo); + List queryList(TbMeterConfigBo bo); /** * 新增水电气配置 @@ -47,7 +48,7 @@ public interface ITdMeterConfigService { * @param bo 水电气配置 * @return 是否新增成功 */ - Boolean insertByBo(TdMeterConfigBo bo); + Boolean insertByBo(TbMeterConfigBo bo); /** * 修改水电气配置 @@ -55,7 +56,7 @@ public interface ITdMeterConfigService { * @param bo 水电气配置 * @return 是否修改成功 */ - Boolean updateByBo(TdMeterConfigBo bo); + Boolean updateByBo(TbMeterConfigBo bo); /** * 校验并批量删除水电气配置信息 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbMeterRoomService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbMeterRoomService.java new file mode 100644 index 00000000..5cd9c368 --- /dev/null +++ b/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 queryPageList(TbMeterRoomBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的仪房间关联列表 + * + * @param bo 查询条件 + * @return 仪房间关联列表 + */ + List 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 ids, Boolean isValid); +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ITdMeterService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbMeterService.java similarity index 64% rename from ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ITdMeterService.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbMeterService.java index ba2f4da0..556228a1 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ITdMeterService.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbMeterService.java @@ -1,9 +1,10 @@ -package org.dromara.sis.service; +package org.dromara.property.service; -import org.dromara.common.mybatis.core.page.PageQuery; +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.sis.domain.bo.TdMeterBo; -import org.dromara.sis.domain.vo.TdMeterVo; +import org.dromara.common.mybatis.core.page.PageQuery; import java.util.Collection; import java.util.List; @@ -12,9 +13,9 @@ import java.util.List; * 水电气Service接口 * * @author LionLi - * @date 2025-06-19 + * @date 2025-07-17 */ -public interface ITdMeterService { +public interface ITbMeterService { /** * 查询水电气 @@ -22,7 +23,7 @@ public interface ITdMeterService { * @param id 主键 * @return 水电气 */ - TdMeterVo queryById(Long id); + TbMeterVo queryById(Long id); /** * 分页查询水电气列表 @@ -31,7 +32,7 @@ public interface ITdMeterService { * @param pageQuery 分页参数 * @return 水电气分页列表 */ - TableDataInfo queryPageList(TdMeterBo bo, PageQuery pageQuery); + TableDataInfo queryPageList(TbMeterBo bo, PageQuery pageQuery); /** * 查询符合条件的水电气列表 @@ -39,7 +40,7 @@ public interface ITdMeterService { * @param bo 查询条件 * @return 水电气列表 */ - List queryList(TdMeterBo bo); + List queryList(TbMeterBo bo); /** * 新增水电气 @@ -47,7 +48,7 @@ public interface ITdMeterService { * @param bo 水电气 * @return 是否新增成功 */ - Boolean insertByBo(TdMeterBo bo); + Boolean insertByBo(TbMeterBo bo); /** * 修改水电气 @@ -55,7 +56,7 @@ public interface ITdMeterService { * @param bo 水电气 * @return 是否修改成功 */ - Boolean updateByBo(TdMeterBo bo); + Boolean updateByBo(TbMeterBo bo); /** * 校验并批量删除水电气信息 @@ -65,13 +66,4 @@ public interface ITdMeterService { * @return 是否删除成功 */ Boolean deleteWithValidByIds(Collection ids, Boolean isValid); - - /** - * 打开或关闭表 - * - * @param meterId 智能表编码 - * @param onOff 0: 打开，2：关闭 - * @return 是否操作成功 - */ - Boolean operate(Long meterId, Integer onOff); } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TdFactoryServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbFactoryServiceImpl.java similarity index 67% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TdFactoryServiceImpl.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbFactoryServiceImpl.java index 6cd40a47..ee603158 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TdFactoryServiceImpl.java +++ b/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 queryPageList(TdFactoryBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + public TableDataInfo queryPageList(TbFactoryBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); return TableDataInfo.build(result); } @@ -65,18 +65,18 @@ public class TdFactoryServiceImpl implements ITdFactoryService { * @return 厂商管理列表 */ @Override - public List queryList(TdFactoryBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); + public List queryList(TbFactoryBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); return baseMapper.selectVoList(lqw); } - private LambdaQueryWrapper buildQueryWrapper(TdFactoryBo bo) { + private LambdaQueryWrapper buildQueryWrapper(TbFactoryBo bo) { Map params = bo.getParams(); - LambdaQueryWrapper 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 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 做一些数据校验,如唯一约束 } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TdMeterConfigServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbMeterConfigServiceImpl.java similarity index 61% rename from ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TdMeterConfigServiceImpl.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbMeterConfigServiceImpl.java index ea2621a9..dd279b3c 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TdMeterConfigServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbMeterConfigServiceImpl.java @@ -1,6 +1,7 @@ -package org.dromara.sis.service.impl; +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; @@ -9,11 +10,11 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import org.dromara.sis.domain.bo.TdMeterConfigBo; -import org.dromara.sis.domain.vo.TdMeterConfigVo; -import org.dromara.sis.domain.TdMeterConfig; -import org.dromara.sis.mapper.TdMeterConfigMapper; -import org.dromara.sis.service.ITdMeterConfigService; +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; @@ -22,15 +23,15 @@ import java.util.Collection; /** * 水电气配置Service业务层处理 * - * @author LionLi - * @date 2025-06-18 + * @author lsm + * @date 2025-07-17 */ @Slf4j @RequiredArgsConstructor @Service -public class TdMeterConfigServiceImpl implements ITdMeterConfigService { +public class TbMeterConfigServiceImpl implements ITbMeterConfigService { - private final TdMeterConfigMapper baseMapper; + private final TbMeterConfigMapper baseMapper; /** * 查询水电气配置 @@ -39,7 +40,7 @@ public class TdMeterConfigServiceImpl implements ITdMeterConfigService { * @return 水电气配置 */ @Override - public TdMeterConfigVo queryById(Long id){ + public TbMeterConfigVo queryById(Long id){ return baseMapper.selectVoById(id); } @@ -51,9 +52,9 @@ public class TdMeterConfigServiceImpl implements ITdMeterConfigService { * @return 水电气配置分页列表 */ @Override - public TableDataInfo queryPageList(TdMeterConfigBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + public TableDataInfo queryPageList(TbMeterConfigBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); return TableDataInfo.build(result); } @@ -64,20 +65,20 @@ public class TdMeterConfigServiceImpl implements ITdMeterConfigService { * @return 水电气配置列表 */ @Override - public List queryList(TdMeterConfigBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); + public List queryList(TbMeterConfigBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); return baseMapper.selectVoList(lqw); } - private LambdaQueryWrapper buildQueryWrapper(TdMeterConfigBo bo) { + private LambdaQueryWrapper buildQueryWrapper(TbMeterConfigBo bo) { Map params = bo.getParams(); - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(TdMeterConfig::getId); - lqw.eq(bo.getMeterType() != null, TdMeterConfig::getMeterType, bo.getMeterType()); - lqw.eq(bo.getPayType() != null, TdMeterConfig::getPayType, bo.getPayType()); - lqw.eq(bo.getArrearsOutage() != null, TdMeterConfig::getArrearsOutage, bo.getArrearsOutage()); - lqw.eq(bo.getAutoOutage() != null, TdMeterConfig::getAutoOutage, bo.getAutoOutage()); - lqw.eq(bo.getOverdueDay() != null, TdMeterConfig::getOverdueDay, bo.getOverdueDay()); + LambdaQueryWrapper 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; } @@ -88,8 +89,8 @@ public class TdMeterConfigServiceImpl implements ITdMeterConfigService { * @return 是否新增成功 */ @Override - public Boolean insertByBo(TdMeterConfigBo bo) { - TdMeterConfig add = MapstructUtils.convert(bo, TdMeterConfig.class); + public Boolean insertByBo(TbMeterConfigBo bo) { + TbMeterConfig add = MapstructUtils.convert(bo, TbMeterConfig.class); validEntityBeforeSave(add); boolean flag = baseMapper.insert(add) > 0; if (flag) { @@ -105,8 +106,8 @@ public class TdMeterConfigServiceImpl implements ITdMeterConfigService { * @return 是否修改成功 */ @Override - public Boolean updateByBo(TdMeterConfigBo bo) { - TdMeterConfig update = MapstructUtils.convert(bo, TdMeterConfig.class); + public Boolean updateByBo(TbMeterConfigBo bo) { + TbMeterConfig update = MapstructUtils.convert(bo, TbMeterConfig.class); validEntityBeforeSave(update); return baseMapper.updateById(update) > 0; } @@ -114,7 +115,7 @@ public class TdMeterConfigServiceImpl implements ITdMeterConfigService { /** * 保存前的数据校验 */ - private void validEntityBeforeSave(TdMeterConfig entity){ + private void validEntityBeforeSave(TbMeterConfig entity){ //TODO 做一些数据校验,如唯一约束 } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TdFactoryServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbMeterRoomServiceImpl.java similarity index 50% rename from ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TdFactoryServiceImpl.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbMeterRoomServiceImpl.java index c070bf48..91933caa 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TdFactoryServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbMeterRoomServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.sis.service.impl; +package org.dromara.property.service.impl; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; @@ -10,84 +10,84 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import org.dromara.sis.domain.bo.TdFactoryBo; -import org.dromara.sis.domain.vo.TdFactoryVo; -import org.dromara.sis.domain.TdFactory; -import org.dromara.sis.mapper.TdFactoryMapper; -import org.dromara.sis.service.ITdFactoryService; +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业务层处理 + * 仪房间关联Service业务层处理 * - * @author mocheng - * @date 2025-06-17 + * @author LionLi + * @date 2025-07-17 */ @Slf4j @RequiredArgsConstructor @Service -public class TdFactoryServiceImpl implements ITdFactoryService { +public class TbMeterRoomServiceImpl implements ITbMeterRoomService { - private final TdFactoryMapper baseMapper; + private final TbMeterRoomMapper baseMapper; /** - * 查询厂商管理 + * 查询仪房间关联 * * @param id 主键 - * @return 厂商管理 + * @return 仪房间关联 */ @Override - public TdFactoryVo queryById(Long id){ + public TbMeterRoomVo queryById(Long id){ return baseMapper.selectVoById(id); } /** - * 分页查询厂商管理列表 + * 分页查询仪房间关联列表 * * @param bo 查询条件 * @param pageQuery 分页参数 - * @return 厂商管理分页列表 + * @return 仪房间关联分页列表 */ @Override - public TableDataInfo queryPageList(TdFactoryBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + public TableDataInfo queryPageList(TbMeterRoomBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); return TableDataInfo.build(result); } /** - * 查询符合条件的厂商管理列表 + * 查询符合条件的仪房间关联列表 * * @param bo 查询条件 - * @return 厂商管理列表 + * @return 仪房间关联列表 */ @Override - public List queryList(TdFactoryBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); + public List queryList(TbMeterRoomBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); return baseMapper.selectVoList(lqw); } - private LambdaQueryWrapper buildQueryWrapper(TdFactoryBo bo) { + private LambdaQueryWrapper buildQueryWrapper(TbMeterRoomBo bo) { Map params = bo.getParams(); - LambdaQueryWrapper 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()); + LambdaQueryWrapper 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 厂商管理 + * @param bo 仪房间关联 * @return 是否新增成功 */ @Override - public Boolean insertByBo(TdFactoryBo bo) { - TdFactory add = MapstructUtils.convert(bo, TdFactory.class); + public Boolean insertByBo(TbMeterRoomBo bo) { + TbMeterRoom add = MapstructUtils.convert(bo, TbMeterRoom.class); validEntityBeforeSave(add); boolean flag = baseMapper.insert(add) > 0; if (flag) { @@ -97,14 +97,14 @@ public class TdFactoryServiceImpl implements ITdFactoryService { } /** - * 修改厂商管理 + * 修改仪房间关联 * - * @param bo 厂商管理 + * @param bo 仪房间关联 * @return 是否修改成功 */ @Override - public Boolean updateByBo(TdFactoryBo bo) { - TdFactory update = MapstructUtils.convert(bo, TdFactory.class); + public Boolean updateByBo(TbMeterRoomBo bo) { + TbMeterRoom update = MapstructUtils.convert(bo, TbMeterRoom.class); validEntityBeforeSave(update); return baseMapper.updateById(update) > 0; } @@ -112,12 +112,12 @@ public class TdFactoryServiceImpl implements ITdFactoryService { /** * 保存前的数据校验 */ - private void validEntityBeforeSave(TdFactory entity){ + private void validEntityBeforeSave(TbMeterRoom entity){ //TODO 做一些数据校验,如唯一约束 } /** - * 校验并批量删除厂商管理信息 + * 校验并批量删除仪房间关联信息 * * @param ids 待删除的主键集合 * @param isValid 是否进行有效性校验 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbMeterServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbMeterServiceImpl.java new file mode 100644 index 00000000..b4f28d1a --- /dev/null +++ b/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 queryPageList(TbMeterBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的水电气列表 + * + * @param bo 查询条件 + * @return 水电气列表 + */ + @Override + public List queryList(TbMeterBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TbMeterBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper 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 ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/Property/src/main/resources/mapper/Property/TdFactoryMapper.xml b/ruoyi-modules/Property/src/main/resources/mapper/Property/TbFactoryMapper.xml similarity index 71% rename from ruoyi-modules/Property/src/main/resources/mapper/Property/TdFactoryMapper.xml rename to ruoyi-modules/Property/src/main/resources/mapper/Property/TbFactoryMapper.xml index e5f1557a..f4dde3ba 100644 --- a/ruoyi-modules/Property/src/main/resources/mapper/Property/TdFactoryMapper.xml +++ b/ruoyi-modules/Property/src/main/resources/mapper/Property/TbFactoryMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/TdFactoryController.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/TdFactoryController.java deleted file mode 100644 index 48bd0079..00000000 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/TdFactoryController.java +++ /dev/null @@ -1,106 +0,0 @@ -package org.dromara.sis.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.sis.domain.vo.TdFactoryVo; -import org.dromara.sis.domain.bo.TdFactoryBo; -import org.dromara.sis.service.ITdFactoryService; -import org.dromara.common.mybatis.core.page.TableDataInfo; - -/** - * 厂商管理 - * 前端访问路由地址为:/iot/factory - * - * @author lxj - * @date 2025-06-17 - */ -@Validated -@RequiredArgsConstructor -@RestController -@RequestMapping("/factory") -public class TdFactoryController extends BaseController { - - private final ITdFactoryService tdFactoryService; - - /** - * 查询厂商管理列表 - */ - @SaCheckPermission("property:factory:list") - @GetMapping("/list") - public TableDataInfo list(TdFactoryBo bo, PageQuery pageQuery) { - return tdFactoryService.queryPageList(bo, pageQuery); - } - - /** - * 导出厂商管理列表 - */ - @SaCheckPermission("property:factory:export") - @Log(title = "厂商管理", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(TdFactoryBo bo, HttpServletResponse response) { - List list = tdFactoryService.queryList(bo); - ExcelUtil.exportExcel(list, "厂商管理", TdFactoryVo.class, response); - } - - /** - * 获取厂商管理详细信息 - * - * @param id 主键 - */ - @SaCheckPermission("property:factory:query") - @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable("id") Long id) { - return R.ok(tdFactoryService.queryById(id)); - } - - /** - * 新增厂商管理 - */ - @SaCheckPermission("property:factory:add") - @Log(title = "厂商管理", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody TdFactoryBo bo) { - return toAjax(tdFactoryService.insertByBo(bo)); - } - - /** - * 修改厂商管理 - */ - @SaCheckPermission("property:factory:edit") - @Log(title = "厂商管理", businessType = BusinessType.UPDATE) - @RepeatSubmit() - @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody TdFactoryBo bo) { - return toAjax(tdFactoryService.updateByBo(bo)); - } - - /** - * 删除厂商管理 - * - * @param ids 主键串 - */ - @SaCheckPermission("property:factory:remove") - @Log(title = "厂商管理", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable("ids") Long[] ids) { - return toAjax(tdFactoryService.deleteWithValidByIds(List.of(ids), true)); - } -} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/TdMeterController.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/TdMeterController.java deleted file mode 100644 index 51cdf575..00000000 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/TdMeterController.java +++ /dev/null @@ -1,121 +0,0 @@ -package org.dromara.sis.controller; - -import cn.dev33.satoken.annotation.SaCheckPermission; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; -import lombok.RequiredArgsConstructor; -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.excel.utils.ExcelUtil; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.web.core.BaseController; -import org.dromara.sis.domain.bo.TdMeterBo; -import org.dromara.sis.domain.vo.TdMeterVo; -import org.dromara.sis.service.ITdMeterService; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * 水电气 - * 前端访问路由地址为:/iot/meter - * - * @author LionLi - * @date 2025-06-19 - */ -@Validated -@RequiredArgsConstructor -@RestController -@RequestMapping("/meter") -public class TdMeterController extends BaseController { - - private final ITdMeterService tdMeterService; - - /** - * 查询水电气列表 - */ - @SaCheckPermission("iot:meter:list") - @GetMapping("/list") - public TableDataInfo list(TdMeterBo bo, PageQuery pageQuery) { - return tdMeterService.queryPageList(bo, pageQuery); - } - - /** - * 打开或关闭表 - * - * @param meterId 智能表id - * @param onOff 0: 打开，2：关闭 - * @return 是否操作成功 - */ - @SaCheckPermission("iot:meter:operate") - @Log(title = "开/关智能表", businessType = BusinessType.OTHER) - @GetMapping("/operate/{meterId}/{onOff}") - public R operate(@PathVariable("meterId") Long meterId, @PathVariable("onOff") Integer onOff) { - return R.ok(tdMeterService.operate(meterId, onOff)); - } - - /** - * 导出水电气列表 - */ - @SaCheckPermission("iot:meter:export") - @Log(title = "导出智能表信息", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(TdMeterBo bo, HttpServletResponse response) { - List list = tdMeterService.queryList(bo); - ExcelUtil.exportExcel(list, "水电气", TdMeterVo.class, response); - } - - /** - * 获取水电气详细信息 - * - * @param id 主键 - */ - @SaCheckPermission("iot:meter:query") - @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable("id") Long id) { - return R.ok(tdMeterService.queryById(id)); - } - - /** - * 新增水电气 - */ - @SaCheckPermission("iot:meter:add") - @Log(title = "添加智能表信息", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody TdMeterBo bo) { - return toAjax(tdMeterService.insertByBo(bo)); - } - - /** - * 修改水电气 - */ - @SaCheckPermission("iot:meter:edit") - @Log(title = "修改智能表信息", businessType = BusinessType.UPDATE) - @RepeatSubmit() - @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody TdMeterBo bo) { - return toAjax(tdMeterService.updateByBo(bo)); - } - - /** - * 删除水电气 - * - * @param ids 主键串 - */ - @SaCheckPermission("iot:meter:remove") - @Log(title = "删除智能表信息", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable("ids") Long[] ids) { - return toAjax(tdMeterService.deleteWithValidByIds(List.of(ids), true)); - } -} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/TdMeterRoomController.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/TdMeterRoomController.java deleted file mode 100644 index 7d36e472..00000000 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/TdMeterRoomController.java +++ /dev/null @@ -1,107 +0,0 @@ -package org.dromara.sis.controller; - -import cn.dev33.satoken.annotation.SaCheckPermission; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; -import lombok.RequiredArgsConstructor; -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.excel.utils.ExcelUtil; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.web.core.BaseController; -import org.dromara.sis.domain.bo.TdMeterRoomBo; -import org.dromara.sis.domain.vo.TdMeterRoomVo; -import org.dromara.sis.service.ITdMeterRoomService; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * 和房间的关联 - * 前端访问路由地址为:/iot/meterRoom - * - * @author lxj - * @date 2025-06-18 - */ -@Validated -@RequiredArgsConstructor -@RestController -@RequestMapping("/meterRoom") -public class TdMeterRoomController extends BaseController { - - private final ITdMeterRoomService tdMeterRoomService; - - /** - * 查询和房间的关联列表 - */ - @SaCheckPermission("system:meterRoom:list") - @GetMapping("/list") - public TableDataInfo list(TdMeterRoomBo bo, PageQuery pageQuery) { - return tdMeterRoomService.queryPageList(bo, pageQuery); - } - - /** - * 导出和房间的关联列表 - */ - @SaCheckPermission("system:meterRoom:export") - @Log(title = "和房间的关联", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(TdMeterRoomBo bo, HttpServletResponse response) { - List list = tdMeterRoomService.queryList(bo); - ExcelUtil.exportExcel(list, "和房间的关联", TdMeterRoomVo.class, response); - } - - /** - * 获取和房间的关联详细信息 - * - * @param id 主键 - */ - @SaCheckPermission("system:meterRoom:query") - @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable("id") Long id) { - return R.ok(tdMeterRoomService.queryById(id)); - } - - /** - * 新增和房间的关联 - */ - @SaCheckPermission("system:meterRoom:add") - @Log(title = "和房间的关联", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody TdMeterRoomBo bo) { - return toAjax(tdMeterRoomService.insertByBo(bo)); - } - - /** - * 修改和房间的关联 - */ - @SaCheckPermission("system:meterRoom:edit") - @Log(title = "和房间的关联", businessType = BusinessType.UPDATE) - @RepeatSubmit() - @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody TdMeterRoomBo bo) { - return toAjax(tdMeterRoomService.updateByBo(bo)); - } - - /** - * 删除和房间的关联 - * - * @param ids 主键串 - */ - @SaCheckPermission("system:meterRoom:remove") - @Log(title = "和房间的关联", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable("ids") Long[] ids) { - return toAjax(tdMeterRoomService.deleteWithValidByIds(List.of(ids), true)); - } -} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TdFactory.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TdFactory.java deleted file mode 100644 index e72a2927..00000000 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TdFactory.java +++ /dev/null @@ -1,47 +0,0 @@ -package org.dromara.sis.domain; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.dromara.common.mybatis.core.domain.BaseEntity; - -import java.io.Serial; - -/** - * 厂商管理对象 td_factory - * - * @author mocheng - * @date 2025-06-17 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@TableName("td_factory") -public class TdFactory extends BaseEntity { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 数据库id - */ - @TableId(value = "id") - private Long id; - - /** - * 厂商编码 - */ - private String factoryNo; - - /** - * 设备厂商名称 - */ - private String factoryName; - - /** - * 备注 - */ - private String remark; - - -} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TdFactoryBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TdFactoryBo.java deleted file mode 100644 index c26c2304..00000000 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TdFactoryBo.java +++ /dev/null @@ -1,46 +0,0 @@ -package org.dromara.sis.domain.bo; - -import io.github.linpeilie.annotations.AutoMapper; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.sis.domain.TdFactory; - -/** - * 厂商管理业务对象 td_factory - * - * @author lxj - * @date 2025-06-17 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@AutoMapper(target = TdFactory.class, reverseConvertGenerate = false) -public class TdFactoryBo extends BaseEntity { - - /** - * 数据库id - */ - @NotNull(message = "数据库id不能为空", groups = {EditGroup.class}) - private Long id; - - /** - * 厂商编码 - */ - @NotBlank(message = "厂商编码不能为空", groups = {AddGroup.class, EditGroup.class}) - private String factoryNo; - - /** - * 设备厂商名称 - */ - @NotBlank(message = "设备厂商名称不能为空", groups = {AddGroup.class, EditGroup.class}) - private String factoryName; - - /** - * 备注 - */ - private String remark; -} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TdMeterBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TdMeterBo.java deleted file mode 100644 index fba940f0..00000000 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TdMeterBo.java +++ /dev/null @@ -1,96 +0,0 @@ -package org.dromara.sis.domain.bo; - -import io.github.linpeilie.annotations.AutoMapper; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.sis.domain.TdMeter; - -import java.util.List; - -/** - * 水电气业务对象 td_meter - * - * @author LionLi - * @date 2025-06-19 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@AutoMapper(target = TdMeter.class, reverseConvertGenerate = false) -public class TdMeterBo extends BaseEntity { - - /** - * 主键id - */ - @NotNull(message = "主键id不能为空", groups = {EditGroup.class}) - private Long id; - - /** - * 水表名称 - */ - @NotBlank(message = "水表名称不能为空", groups = {AddGroup.class, EditGroup.class}) - private String meterName; - - /** - * 设备编码 - */ - private String meterCode; - - /** - * 设备厂商 - */ - @NotBlank(message = "设备厂商不能为空", groups = {AddGroup.class, EditGroup.class}) - private String factoryNo; - - /** - * 设备类型(1-电表，2-水表，3-气表) - */ - private Integer meterType; - - /** - * 表用途(1-分表，2-总表，3-公摊表) - */ - private Integer meterPurpose; - - /** - * 分摊类型 - * 1-不公摊 - * 2-按分表用量 - * 3-按租客面积 - * 4-按房源数量 - * 5-按固定比例 - */ - private Integer shareType; - - /** - * 付费类型(1-先付费，2-后付费) - */ - private Integer payType; - - /** - * 最大表显读数(超过归0) - */ - private Integer maxDisplay; - - /** - * 计费倍率 - */ - private Float billingRate; - - /** - * 备注 - */ - private String remark; - - - /** - * 设备厂商 - */ - @NotBlank(message = "表绑定的房间不能为空", groups = {AddGroup.class}) - private List roomIds; - -} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TdMeterConfigBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TdMeterConfigBo.java deleted file mode 100644 index 5c12b794..00000000 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TdMeterConfigBo.java +++ /dev/null @@ -1,64 +0,0 @@ -package org.dromara.sis.domain.bo; - -import org.dromara.sis.domain.TdMeterConfig; -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.*; - -/** - * 水电气配置业务对象 td_meter_config - * - * @author lxj - * @date 2025-06-18 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@AutoMapper(target = TdMeterConfig.class, reverseConvertGenerate = false) -public class TdMeterConfigBo extends BaseEntity { - - /** - * 主键id - */ - @NotNull(message = "主键id不能为空", groups = { EditGroup.class }) - private Long id; - - /** - * 设备类型(1-电表，2-水表，3-气表) - */ - private Integer meterType; - - /** - * 付费类型(1-先付费，2-后付费) - */ - @NotNull(message = "付费类型(1-先付费，2-后付费)不能为空", groups = { AddGroup.class, EditGroup.class }) - private Integer payType; - - /** - * 欠费是否断电/水/气(0-是，1-否) - */ - @NotNull(message = "欠费是否断电/水/气(0-是，1-否)不能为空", groups = { AddGroup.class, EditGroup.class }) - private Integer arrearsOutage; - - /** - * 后付费模式下是否自动断电/水/气（0-是，1-否） - */ - @NotNull(message = "后付费模式下是否自动断电/水/气（0-是，1-否）不能为空", groups = { AddGroup.class, EditGroup.class }) - private Integer autoOutage; - - /** - * 当auto_outage=0的时候生效，逾期多少天自动断水/电/气 - */ - @NotNull(message = "当auto_outage=0的时候生效，逾期多少天自动断水/电/气不能为空", groups = { AddGroup.class, EditGroup.class }) - private Integer overdueDay; - - /** - * 备注 - */ - private String remark; - - -} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TdFactoryVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TdFactoryVo.java deleted file mode 100644 index 1e59c43b..00000000 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TdFactoryVo.java +++ /dev/null @@ -1,51 +0,0 @@ -package org.dromara.sis.domain.vo; - -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; -import cn.idev.excel.annotation.ExcelProperty; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; -import org.dromara.sis.domain.TdFactory; - -import java.io.Serial; -import java.io.Serializable; - - -/** - * 厂商管理视图对象 td_factory - * - * @author lxj - * @date 2025-06-17 - */ -@Data -@ExcelIgnoreUnannotated -@AutoMapper(target = TdFactory.class) -public class TdFactoryVo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 数据库id - */ - @ExcelProperty(value = "数据库id") - private Long id; - - /** - * 厂商编码 - */ - @ExcelProperty(value = "厂商编码") - private String factoryNo; - - /** - * 设备厂商名称 - */ - @ExcelProperty(value = "设备厂商名称") - private String factoryName; - - /** - * 备注 - */ - @ExcelProperty(value = "备注") - private String remark; - -} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TdFactoryMapper.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TdFactoryMapper.java deleted file mode 100644 index fb24b531..00000000 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TdFactoryMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.dromara.sis.mapper; - -import org.dromara.sis.domain.TdFactory; -import org.dromara.sis.domain.vo.TdFactoryVo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; - -/** - * 厂商管理Mapper接口 - * - * @author mocheng - * @date 2025-06-17 - */ -public interface TdFactoryMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TdMeterConfigMapper.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TdMeterConfigMapper.java deleted file mode 100644 index 376a1082..00000000 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TdMeterConfigMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.dromara.sis.mapper; - -import org.dromara.sis.domain.TdMeterConfig; -import org.dromara.sis.domain.vo.TdMeterConfigVo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; - -/** - * 水电气配置Mapper接口 - * - * @author LionLi - * @date 2025-06-18 - */ -public interface TdMeterConfigMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TdMeterMapper.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TdMeterMapper.java deleted file mode 100644 index dbf0b209..00000000 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TdMeterMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.dromara.sis.mapper; - -import org.dromara.sis.domain.TdMeter; -import org.dromara.sis.domain.vo.TdMeterVo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; - -/** - * 水电气Mapper接口 - * - * @author LionLi - * @date 2025-06-19 - */ -public interface TdMeterMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TdMeterRoomMapper.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TdMeterRoomMapper.java deleted file mode 100644 index 4cd678c3..00000000 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TdMeterRoomMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.dromara.sis.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.sis.domain.TdMeterRoom; -import org.dromara.sis.domain.vo.TdMeterRoomVo; - -/** - * 和房间的关联Mapper接口 - * - * @author LionLi - * @date 2025-06-18 - */ -public interface TdMeterRoomMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ITdFactoryService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ITdFactoryService.java deleted file mode 100644 index e29940b3..00000000 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ITdFactoryService.java +++ /dev/null @@ -1,68 +0,0 @@ -package org.dromara.sis.service; - -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.sis.domain.bo.TdFactoryBo; -import org.dromara.sis.domain.vo.TdFactoryVo; - -import java.util.Collection; -import java.util.List; - -/** - * 厂商管理Service接口 - * - * @author mocheng - * @date 2025-06-17 - */ -public interface ITdFactoryService { - - /** - * 查询厂商管理 - * - * @param id 主键 - * @return 厂商管理 - */ - TdFactoryVo queryById(Long id); - - /** - * 分页查询厂商管理列表 - * - * @param bo 查询条件 - * @param pageQuery 分页参数 - * @return 厂商管理分页列表 - */ - TableDataInfo queryPageList(TdFactoryBo bo, PageQuery pageQuery); - - /** - * 查询符合条件的厂商管理列表 - * - * @param bo 查询条件 - * @return 厂商管理列表 - */ - List queryList(TdFactoryBo bo); - - /** - * 新增厂商管理 - * - * @param bo 厂商管理 - * @return 是否新增成功 - */ - Boolean insertByBo(TdFactoryBo bo); - - /** - * 修改厂商管理 - * - * @param bo 厂商管理 - * @return 是否修改成功 - */ - Boolean updateByBo(TdFactoryBo bo); - - /** - * 校验并批量删除厂商管理信息 - * - * @param ids 待删除的主键集合 - * @param isValid 是否进行有效性校验 - * @return 是否删除成功 - */ - Boolean deleteWithValidByIds(Collection ids, Boolean isValid); -} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ITdMeterRoomService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ITdMeterRoomService.java deleted file mode 100644 index ab3e9374..00000000 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ITdMeterRoomService.java +++ /dev/null @@ -1,85 +0,0 @@ -package org.dromara.sis.service; - -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.sis.domain.TdMeterRoom; -import org.dromara.sis.domain.bo.TdMeterRoomBo; -import org.dromara.sis.domain.vo.TdMeterRoomVo; - -import java.util.Collection; -import java.util.List; - -/** - * 和房间的关联Service接口 - * - * @author LionLi - * @date 2025-06-18 - */ -public interface ITdMeterRoomService { - - /** - * 查询和房间的关联 - * - * @param id 主键 - * @return 和房间的关联 - */ - TdMeterRoomVo queryById(Long id); - - /** - * 分页查询和房间的关联列表 - * - * @param bo 查询条件 - * @param pageQuery 分页参数 - * @return 和房间的关联分页列表 - */ - TableDataInfo queryPageList(TdMeterRoomBo bo, PageQuery pageQuery); - - /** - * 查询符合条件的和房间的关联列表 - * - * @param bo 查询条件 - * @return 和房间的关联列表 - */ - List queryList(TdMeterRoomBo bo); - - /** - * 新增和房间的关联 - * - * @param bo 和房间的关联 - * @return 是否新增成功 - */ - Boolean insertByBo(TdMeterRoomBo bo); - - /** - * 修改和房间的关联 - * - * @param bo 和房间的关联 - * @return 是否修改成功 - */ - Boolean updateByBo(TdMeterRoomBo bo); - - /** - * 校验并批量删除和房间的关联信息 - * - * @param ids 待删除的主键集合 - * @param isValid 是否进行有效性校验 - * @return 是否删除成功 - */ - Boolean deleteWithValidByIds(Collection ids, Boolean isValid); - - /** - * 批量写入表和房间的关联关系 - * - * @param rels 写入数据 - * @return 是否写入成功 - */ - Boolean insertBatch(List rels); - - /** - * 根据表id删除关联数据 - * @param meterId 表id - * @return 是否删除成功 - */ - Integer deleteByMeterId(Long meterId); - -} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TdMeterRoomServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TdMeterRoomServiceImpl.java deleted file mode 100644 index ef2323a1..00000000 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TdMeterRoomServiceImpl.java +++ /dev/null @@ -1,147 +0,0 @@ -package org.dromara.sis.service.impl; - -import cn.hutool.core.lang.Assert; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.sis.domain.TdMeterRoom; -import org.dromara.sis.domain.bo.TdMeterRoomBo; -import org.dromara.sis.domain.vo.TdMeterRoomVo; -import org.dromara.sis.mapper.TdMeterRoomMapper; -import org.dromara.sis.service.ITdMeterRoomService; -import org.springframework.stereotype.Service; - -import java.util.Collection; -import java.util.List; -import java.util.Map; - -/** - * 和房间的关联Service业务层处理 - * - * @author LionLi - * @date 2025-06-18 - */ -@Slf4j -@RequiredArgsConstructor -@Service -public class TdMeterRoomServiceImpl implements ITdMeterRoomService { - - private final TdMeterRoomMapper baseMapper; - - /** - * 查询和房间的关联 - * - * @param id 主键 - * @return 和房间的关联 - */ - @Override - public TdMeterRoomVo queryById(Long id){ - return baseMapper.selectVoById(id); - } - - /** - * 分页查询和房间的关联列表 - * - * @param bo 查询条件 - * @param pageQuery 分页参数 - * @return 和房间的关联分页列表 - */ - @Override - public TableDataInfo queryPageList(TdMeterRoomBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); - return TableDataInfo.build(result); - } - - /** - * 查询符合条件的和房间的关联列表 - * - * @param bo 查询条件 - * @return 和房间的关联列表 - */ - @Override - public List queryList(TdMeterRoomBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - return baseMapper.selectVoList(lqw); - } - - private LambdaQueryWrapper buildQueryWrapper(TdMeterRoomBo bo) { - Map params = bo.getParams(); - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(TdMeterRoom::getId); - lqw.eq(bo.getMeterId() != null, TdMeterRoom::getMeterId, bo.getMeterId()); - lqw.eq(bo.getRoomId() != null, TdMeterRoom::getRoomId, bo.getRoomId()); - return lqw; - } - - /** - * 新增和房间的关联 - * - * @param bo 和房间的关联 - * @return 是否新增成功 - */ - @Override - public Boolean insertByBo(TdMeterRoomBo bo) { - TdMeterRoom add = MapstructUtils.convert(bo, TdMeterRoom.class); - validEntityBeforeSave(add); - boolean flag = baseMapper.insert(add) > 0; - if (flag) { - bo.setId(add.getId()); - } - return flag; - } - - /** - * 修改和房间的关联 - * - * @param bo 和房间的关联 - * @return 是否修改成功 - */ - @Override - public Boolean updateByBo(TdMeterRoomBo bo) { - TdMeterRoom update = MapstructUtils.convert(bo, TdMeterRoom.class); - validEntityBeforeSave(update); - return baseMapper.updateById(update) > 0; - } - - /** - * 保存前的数据校验 - */ - private void validEntityBeforeSave(TdMeterRoom entity){ - //TODO 做一些数据校验,如唯一约束 - } - - /** - * 校验并批量删除和房间的关联信息 - * - * @param ids 待删除的主键集合 - * @param isValid 是否进行有效性校验 - * @return 是否删除成功 - */ - @Override - public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { - if(isValid){ - //TODO 做一些业务上的校验,判断是否需要校验 - } - return baseMapper.deleteByIds(ids) > 0; - } - - @Override - public Boolean insertBatch(List rels) { - return baseMapper.insertBatch(rels); - } - - @Override - public Integer deleteByMeterId(Long meterId) { - Assert.notNull(meterId, "表id不能为null"); - LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.eq(TdMeterRoom::getMeterId, meterId); - return baseMapper.delete(updateWrapper); - } -} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TdMeterServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TdMeterServiceImpl.java deleted file mode 100644 index 6e6cd403..00000000 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TdMeterServiceImpl.java +++ /dev/null @@ -1,186 +0,0 @@ -package org.dromara.sis.service.impl; - -import cn.hutool.core.collection.CollUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.sis.domain.TdMeter; -import org.dromara.sis.domain.TdMeterRoom; -import org.dromara.sis.domain.bo.TdMeterBo; -import org.dromara.sis.domain.vo.TdMeterVo; -import org.dromara.sis.mapper.TdMeterMapper; -import org.dromara.sis.service.ITdMeterRoomService; -import org.dromara.sis.service.ITdMeterService; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -/** - * 水电气Service业务层处理 - * - * @author LionLi - * @date 2025-06-19 - */ -@Slf4j -@RequiredArgsConstructor -@Service -public class TdMeterServiceImpl implements ITdMeterService { - - private final TdMeterMapper baseMapper; - - private final ITdMeterRoomService meterRoomService; - - /** - * 查询水电气 - * - * @param id 主键 - * @return 水电气 - */ - @Override - public TdMeterVo queryById(Long id){ - return baseMapper.selectVoById(id); - } - - /** - * 分页查询水电气列表 - * - * @param bo 查询条件 - * @param pageQuery 分页参数 - * @return 水电气分页列表 - */ - @Override - public TableDataInfo queryPageList(TdMeterBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); - return TableDataInfo.build(result); - } - - /** - * 查询符合条件的水电气列表 - * - * @param bo 查询条件 - * @return 水电气列表 - */ - @Override - public List queryList(TdMeterBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - return baseMapper.selectVoList(lqw); - } - - private LambdaQueryWrapper buildQueryWrapper(TdMeterBo bo) { - Map params = bo.getParams(); - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(TdMeter::getId); - lqw.like(StringUtils.isNotBlank(bo.getMeterName()), TdMeter::getMeterName, bo.getMeterName()); - lqw.eq(StringUtils.isNotBlank(bo.getMeterCode()), TdMeter::getMeterCode, bo.getMeterCode()); - lqw.eq(StringUtils.isNotBlank(bo.getFactoryNo()), TdMeter::getFactoryNo, bo.getFactoryNo()); - lqw.eq(bo.getMeterType() != null, TdMeter::getMeterType, bo.getMeterType()); - lqw.eq(bo.getMeterPurpose() != null, TdMeter::getMeterPurpose, bo.getMeterPurpose()); - lqw.eq(bo.getShareType() != null, TdMeter::getShareType, bo.getShareType()); - lqw.eq(bo.getPayType() != null, TdMeter::getPayType, bo.getPayType()); - return lqw; - } - - /** - * 新增水电气 - * - * @param bo 水电气 - * @return 是否新增成功 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean insertByBo(TdMeterBo bo) { - TdMeter add = MapstructUtils.convert(bo, TdMeter.class); - validEntityBeforeSave(add); - // 写入表信息 - boolean flag = baseMapper.insert(add) > 0; - if (flag) { - bo.setId(add.getId()); - } - // 写入表和房间的关联信息 - List collect = bo.getRoomIds().stream().map(item -> { - TdMeterRoom rel = new TdMeterRoom(); - rel.setMeterId(bo.getId()); - rel.setRoomId(item); - return rel; - }).collect(Collectors.toList()); - return meterRoomService.insertBatch(collect); - } - - /** - * 修改水电气 - * - * @param bo 水电气 - * @return 是否修改成功 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean updateByBo(TdMeterBo bo) { - TdMeter update = MapstructUtils.convert(bo, TdMeter.class); - validEntityBeforeSave(update); - boolean b = baseMapper.updateById(update) > 0; - // 如果关联的房间列表没有发生变化，则不修改 - if (b && CollUtil.isNotEmpty(bo.getRoomIds())) { - // 删除已有的关联关系 - int num = meterRoomService.deleteByMeterId(bo.getId()); - log.info("删除智能表和房间关联数据条数: {}", num); - // 建立新的关系 - // 写入表和房间的关联信息 - List collect = bo.getRoomIds().stream().map(item -> { - TdMeterRoom rel = new TdMeterRoom(); - rel.setMeterId(bo.getId()); - rel.setRoomId(item); - return rel; - }).collect(Collectors.toList()); - Boolean b1 = meterRoomService.insertBatch(collect); - log.info("批量写入智能表和房间的关联关系，result={}", b1); - } - return b; - } - - /** - * 保存前的数据校验 - */ - private void validEntityBeforeSave(TdMeter entity){ - //TODO 做一些数据校验,如唯一约束 - } - - /** - * 校验并批量删除水电气信息 - * - * @param ids 待删除的主键集合 - * @param isValid 是否进行有效性校验 - * @return 是否删除成功 - */ - @Override - public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { - if(isValid){ - //TODO 做一些业务上的校验,判断是否需要校验 - } - return baseMapper.deleteByIds(ids) > 0; - } - - @Override - public Boolean operate(Long meterId, Integer onOff) { - // 校验当前表是否存在 - TdMeterVo tdMeterVo = queryById(meterId); - if (tdMeterVo == null) { - throw new ServiceException("只能表不存在"); - } - // todo 下发表操作 - - // todo 如果同步的情况下还需要更新表信息 - return true; - } -} diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/application.properties b/ruoyi-visual/ruoyi-nacos/src/main/resources/application.properties index a76b51da..7793dd73 100644 --- a/ruoyi-visual/ruoyi-nacos/src/main/resources/application.properties +++ b/ruoyi-visual/ruoyi-nacos/src/main/resources/application.properties @@ -40,8 +40,8 @@ spring.sql.init.platform=mysql db.num=1 ### Connect URL of DB: -db.url.0=jdbc:mysql://192.168.24.98:3306/ry-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true -db.user.0=root +db.url.0=jdbc:mysql://47.109.37.87:3002/ry-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true +db.user.0=by db.password.0=123456 ### the maximum retry times for push