From 891289f6823ef530d595cf90bf2a49a6b21d7e4c Mon Sep 17 00:00:00 2001 From: 15683799673 Date: Wed, 18 Jun 2025 21:48:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B0=B4=E8=A1=A8=E7=94=B5?= =?UTF-8?q?=E8=A1=A8=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-modules/Iot/Dockerfile | 8 +- .../{property => iot}/IotyApplication.java | 4 +- .../controller/TbAccessControlController.java | 37 ++--- .../controller/TdFactoryController.java | 8 +- .../controller/TdMeterConfigController.java | 106 +++++++++++++ .../iot/controller/TdMeterController.java | 106 +++++++++++++ .../iot/controller/TdMeterRoomController.java | 106 +++++++++++++ .../domain/TbAccessControl.java | 2 +- .../{property => iot}/domain/TdFactory.java | 2 +- .../java/org/dromara/iot/domain/TdMeter.java | 81 ++++++++++ .../org/dromara/iot/domain/TdMeterConfig.java | 61 ++++++++ .../org/dromara/iot/domain/TdMeterRoom.java | 46 ++++++ .../domain/bo/TbAccessControlBo.java | 35 +++-- .../domain/bo/TdFactoryBo.java | 25 ++-- .../org/dromara/iot/domain/bo/TdMeterBo.java | 86 +++++++++++ .../iot/domain/bo/TdMeterConfigBo.java | 64 ++++++++ .../dromara/iot/domain/bo/TdMeterRoomBo.java | 47 ++++++ .../domain/vo/TbAccessControlVo.java | 12 +- .../domain/vo/TdFactoryVo.java | 12 +- .../iot/domain/vo/TdMeterConfigVo.java | 73 +++++++++ .../dromara/iot/domain/vo/TdMeterRoomVo.java | 52 +++++++ .../org/dromara/iot/domain/vo/TdMeterVo.java | 94 ++++++++++++ .../mapper/TbAccessControlMapper.java | 6 +- .../mapper/TdFactoryMapper.java | 6 +- .../iot/mapper/TdMeterConfigMapper.java | 15 ++ .../org/dromara/iot/mapper/TdMeterMapper.java | 15 ++ .../dromara/iot/mapper/TdMeterRoomMapper.java | 15 ++ .../service/ITbAccessControlService.java | 8 +- .../service/ITdFactoryService.java | 8 +- .../iot/service/ITdMeterConfigService.java | 69 +++++++++ .../iot/service/ITdMeterRoomService.java | 69 +++++++++ .../dromara/iot/service/ITdMeterService.java | 69 +++++++++ .../impl/TbAccessControlServiceImpl.java | 12 +- .../service/impl/TdFactoryServiceImpl.java | 12 +- .../impl/TdMeterConfigServiceImpl.java | 136 +++++++++++++++++ .../service/impl/TdMeterRoomServiceImpl.java | 133 +++++++++++++++++ .../iot/service/impl/TdMeterServiceImpl.java | 140 ++++++++++++++++++ .../Iot/src/main/resources/application.yml | 2 +- .../mapper/Property/TbBuildingMapper.xml | 7 - .../Property/TbCeremonialServeMapper.xml | 7 - .../TbCeremonialserveRoombookingMapper.xml | 7 - .../mapper/Property/TbCityAreaMapper.xml | 7 - .../mapper/Property/TbConferenceMapper.xml | 7 - .../mapper/Property/TbE8ConfigMapper.xml | 7 - .../mapper/Property/TbFloorMapper.xml | 7 - .../mapper/Property/TbRoomBookingMapper.xml | 7 - .../TbServiceClassificationMapper.xml | 7 - .../Property/TbVisitorManagementMapper.xml | 7 - .../mapper/Property/TdDeviceTypeMapper.xml | 7 - .../mapper/Property/TsConfigMapper.xml | 7 - .../mapper/Property/TsOperationLogMapper.xml | 7 - .../{Property => }/TbAccessControlMapper.xml | 0 .../mapper/{Property => }/TdFactoryMapper.xml | 0 ...nityMapper.xml => TdMeterConfigMapper.xml} | 2 +- .../TsOrgMapper.xml => TdMeterMapper.xml} | 2 +- ...ictDefMapper.xml => TdMeterRoomMapper.xml} | 2 +- .../mapper/system/TbCeremonialServeMapper.xml | 7 - .../TbCeremonialserveRoombookingMapper.xml | 7 - .../mapper/system/TbE8ConfigMapper.xml | 7 - .../system/TbServiceClassificationMapper.xml | 7 - .../mapper/system/TsConfigMapper.xml | 7 - .../resources/mapper/system/TsDictMapper.xml | 7 - .../mapper/system/TsLoginLogMapper.xml | 7 - .../resources/mapper/system/TsMenuMapper.xml | 7 - .../mapper/system/TsOperationLogMapper.xml | 7 - .../resources/mapper/system/TsRoleMapper.xml | 7 - .../mapper/system/TsRoleMenuMapper.xml | 7 - .../resources/mapper/system/TsUserMapper.xml | 7 - .../mapper/system/TsUserRoleMapper.xml | 7 - 69 files changed, 1679 insertions(+), 291 deletions(-) rename ruoyi-modules/Iot/src/main/java/org/dromara/{property => iot}/IotyApplication.java (87%) rename ruoyi-modules/Iot/src/main/java/org/dromara/{property => iot}/controller/TbAccessControlController.java (89%) rename ruoyi-modules/Iot/src/main/java/org/dromara/{property => iot}/controller/TdFactoryController.java (95%) create mode 100644 ruoyi-modules/Iot/src/main/java/org/dromara/iot/controller/TdMeterConfigController.java create mode 100644 ruoyi-modules/Iot/src/main/java/org/dromara/iot/controller/TdMeterController.java create mode 100644 ruoyi-modules/Iot/src/main/java/org/dromara/iot/controller/TdMeterRoomController.java rename ruoyi-modules/Iot/src/main/java/org/dromara/{property => iot}/domain/TbAccessControl.java (97%) rename ruoyi-modules/Iot/src/main/java/org/dromara/{property => iot}/domain/TdFactory.java (96%) create mode 100644 ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/TdMeter.java create mode 100644 ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/TdMeterConfig.java create mode 100644 ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/TdMeterRoom.java rename ruoyi-modules/Iot/src/main/java/org/dromara/{property => iot}/domain/bo/TbAccessControlBo.java (66%) rename ruoyi-modules/Iot/src/main/java/org/dromara/{property => iot}/domain/bo/TdFactoryBo.java (66%) create mode 100644 ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/bo/TdMeterBo.java create mode 100644 ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/bo/TdMeterConfigBo.java create mode 100644 ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/bo/TdMeterRoomBo.java rename ruoyi-modules/Iot/src/main/java/org/dromara/{property => iot}/domain/vo/TbAccessControlVo.java (86%) rename ruoyi-modules/Iot/src/main/java/org/dromara/{property => iot}/domain/vo/TdFactoryVo.java (76%) create mode 100644 ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/vo/TdMeterConfigVo.java create mode 100644 ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/vo/TdMeterRoomVo.java create mode 100644 ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/vo/TdMeterVo.java rename ruoyi-modules/Iot/src/main/java/org/dromara/{property => iot}/mapper/TbAccessControlMapper.java (62%) rename ruoyi-modules/Iot/src/main/java/org/dromara/{property => iot}/mapper/TdFactoryMapper.java (62%) create mode 100644 ruoyi-modules/Iot/src/main/java/org/dromara/iot/mapper/TdMeterConfigMapper.java create mode 100644 ruoyi-modules/Iot/src/main/java/org/dromara/iot/mapper/TdMeterMapper.java create mode 100644 ruoyi-modules/Iot/src/main/java/org/dromara/iot/mapper/TdMeterRoomMapper.java rename ruoyi-modules/Iot/src/main/java/org/dromara/{property => iot}/service/ITbAccessControlService.java (88%) rename ruoyi-modules/Iot/src/main/java/org/dromara/{property => iot}/service/ITdFactoryService.java (88%) create mode 100644 ruoyi-modules/Iot/src/main/java/org/dromara/iot/service/ITdMeterConfigService.java create mode 100644 ruoyi-modules/Iot/src/main/java/org/dromara/iot/service/ITdMeterRoomService.java create mode 100644 ruoyi-modules/Iot/src/main/java/org/dromara/iot/service/ITdMeterService.java rename ruoyi-modules/Iot/src/main/java/org/dromara/{property => iot}/service/impl/TbAccessControlServiceImpl.java (93%) rename ruoyi-modules/Iot/src/main/java/org/dromara/{property => iot}/service/impl/TdFactoryServiceImpl.java (92%) create mode 100644 ruoyi-modules/Iot/src/main/java/org/dromara/iot/service/impl/TdMeterConfigServiceImpl.java create mode 100644 ruoyi-modules/Iot/src/main/java/org/dromara/iot/service/impl/TdMeterRoomServiceImpl.java create mode 100644 ruoyi-modules/Iot/src/main/java/org/dromara/iot/service/impl/TdMeterServiceImpl.java delete mode 100644 ruoyi-modules/Iot/src/main/resources/mapper/Property/TbBuildingMapper.xml delete mode 100644 ruoyi-modules/Iot/src/main/resources/mapper/Property/TbCeremonialServeMapper.xml delete mode 100644 ruoyi-modules/Iot/src/main/resources/mapper/Property/TbCeremonialserveRoombookingMapper.xml delete mode 100644 ruoyi-modules/Iot/src/main/resources/mapper/Property/TbCityAreaMapper.xml delete mode 100644 ruoyi-modules/Iot/src/main/resources/mapper/Property/TbConferenceMapper.xml delete mode 100644 ruoyi-modules/Iot/src/main/resources/mapper/Property/TbE8ConfigMapper.xml delete mode 100644 ruoyi-modules/Iot/src/main/resources/mapper/Property/TbFloorMapper.xml delete mode 100644 ruoyi-modules/Iot/src/main/resources/mapper/Property/TbRoomBookingMapper.xml delete mode 100644 ruoyi-modules/Iot/src/main/resources/mapper/Property/TbServiceClassificationMapper.xml delete mode 100644 ruoyi-modules/Iot/src/main/resources/mapper/Property/TbVisitorManagementMapper.xml delete mode 100644 ruoyi-modules/Iot/src/main/resources/mapper/Property/TdDeviceTypeMapper.xml delete mode 100644 ruoyi-modules/Iot/src/main/resources/mapper/Property/TsConfigMapper.xml delete mode 100644 ruoyi-modules/Iot/src/main/resources/mapper/Property/TsOperationLogMapper.xml rename ruoyi-modules/Iot/src/main/resources/mapper/{Property => }/TbAccessControlMapper.xml (100%) rename ruoyi-modules/Iot/src/main/resources/mapper/{Property => }/TdFactoryMapper.xml (100%) rename ruoyi-modules/Iot/src/main/resources/mapper/{Property/TbCommunityMapper.xml => TdMeterConfigMapper.xml} (71%) rename ruoyi-modules/Iot/src/main/resources/mapper/{system/TsOrgMapper.xml => TdMeterMapper.xml} (72%) rename ruoyi-modules/Iot/src/main/resources/mapper/{system/TsDictDefMapper.xml => TdMeterRoomMapper.xml} (71%) delete mode 100644 ruoyi-modules/Iot/src/main/resources/mapper/system/TbCeremonialServeMapper.xml delete mode 100644 ruoyi-modules/Iot/src/main/resources/mapper/system/TbCeremonialserveRoombookingMapper.xml delete mode 100644 ruoyi-modules/Iot/src/main/resources/mapper/system/TbE8ConfigMapper.xml delete mode 100644 ruoyi-modules/Iot/src/main/resources/mapper/system/TbServiceClassificationMapper.xml delete mode 100644 ruoyi-modules/Iot/src/main/resources/mapper/system/TsConfigMapper.xml delete mode 100644 ruoyi-modules/Iot/src/main/resources/mapper/system/TsDictMapper.xml delete mode 100644 ruoyi-modules/Iot/src/main/resources/mapper/system/TsLoginLogMapper.xml delete mode 100644 ruoyi-modules/Iot/src/main/resources/mapper/system/TsMenuMapper.xml delete mode 100644 ruoyi-modules/Iot/src/main/resources/mapper/system/TsOperationLogMapper.xml delete mode 100644 ruoyi-modules/Iot/src/main/resources/mapper/system/TsRoleMapper.xml delete mode 100644 ruoyi-modules/Iot/src/main/resources/mapper/system/TsRoleMenuMapper.xml delete mode 100644 ruoyi-modules/Iot/src/main/resources/mapper/system/TsUserMapper.xml delete mode 100644 ruoyi-modules/Iot/src/main/resources/mapper/system/TsUserRoleMapper.xml diff --git a/ruoyi-modules/Iot/Dockerfile b/ruoyi-modules/Iot/Dockerfile index e70c56cf..f449eff0 100644 --- a/ruoyi-modules/Iot/Dockerfile +++ b/ruoyi-modules/Iot/Dockerfile @@ -5,9 +5,9 @@ FROM bellsoft/liberica-openjdk-debian:17.0.11-cds LABEL maintainer="Lion Li" -RUN mkdir -p /ruoyi/system/logs \ - /ruoyi/system/temp \ - /ruoyi/skywalking/agent +RUN mkdir -p /smartparks/iot/logs \ + /smartparks/iot/temp \ + /smartparks/iot/agent WORKDIR /ruoyi/system @@ -15,7 +15,7 @@ ENV SERVER_PORT=9201 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="" EXPOSE ${SERVER_PORT} -ADD ./target/ruoyi-system.jar ./iot.jar +ADD ./target/iot.jar ./iot.jar SHELL ["/bin/bash", "-c"] diff --git a/ruoyi-modules/Iot/src/main/java/org/dromara/property/IotyApplication.java b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/IotyApplication.java similarity index 87% rename from ruoyi-modules/Iot/src/main/java/org/dromara/property/IotyApplication.java rename to ruoyi-modules/Iot/src/main/java/org/dromara/iot/IotyApplication.java index c535de57..0038bf6a 100644 --- a/ruoyi-modules/Iot/src/main/java/org/dromara/property/IotyApplication.java +++ b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/IotyApplication.java @@ -1,4 +1,4 @@ -package org.dromara.property; +package org.dromara.iot; import org.apache.dubbo.config.spring.context.annotation.EnableDubbo; import org.springframework.boot.SpringApplication; @@ -17,6 +17,6 @@ public class IotyApplication { SpringApplication application = new SpringApplication(IotyApplication.class); application.setApplicationStartup(new BufferingApplicationStartup(2048)); application.run(args); - System.out.println("(♥◠‿◠)ﾉﾞ 物业模块启动成功 ლ(´ڡ`ლ)ﾞ "); + System.out.println("(♥◠‿◠)ﾉﾞ 设备模块启动成功 ლ(´ڡ`ლ)ﾞ "); } } diff --git a/ruoyi-modules/Iot/src/main/java/org/dromara/property/controller/TbAccessControlController.java b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/controller/TbAccessControlController.java similarity index 89% rename from ruoyi-modules/Iot/src/main/java/org/dromara/property/controller/TbAccessControlController.java rename to ruoyi-modules/Iot/src/main/java/org/dromara/iot/controller/TbAccessControlController.java index 28b840cf..613a4a8a 100644 --- a/ruoyi-modules/Iot/src/main/java/org/dromara/property/controller/TbAccessControlController.java +++ b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/controller/TbAccessControlController.java @@ -1,32 +1,33 @@ -package org.dromara.property.controller; +package org.dromara.iot.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 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.log.enums.BusinessType; import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.property.domain.vo.TbAccessControlVo; -import org.dromara.property.domain.bo.TbAccessControlBo; -import org.dromara.property.service.ITbAccessControlService; +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.iot.domain.bo.TbAccessControlBo; +import org.dromara.iot.domain.vo.TbAccessControlVo; +import org.dromara.iot.service.ITbAccessControlService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 门禁管理 * 前端访问路由地址为:/property/accessControl * - * @author mocheng + * @author lxj * @date 2025-06-17 */ @Validated @@ -65,7 +66,7 @@ public class TbAccessControlController extends BaseController { @SaCheckPermission("property:accessControl:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable("id") Long id) { + @PathVariable("id") Long id) { return R.ok(tbAccessControlService.queryById(id)); } diff --git a/ruoyi-modules/Iot/src/main/java/org/dromara/property/controller/TdFactoryController.java b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/controller/TdFactoryController.java similarity index 95% rename from ruoyi-modules/Iot/src/main/java/org/dromara/property/controller/TdFactoryController.java rename to ruoyi-modules/Iot/src/main/java/org/dromara/iot/controller/TdFactoryController.java index 04f4932e..4c2edd8c 100644 --- a/ruoyi-modules/Iot/src/main/java/org/dromara/property/controller/TdFactoryController.java +++ b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/controller/TdFactoryController.java @@ -1,4 +1,4 @@ -package org.dromara.property.controller; +package org.dromara.iot.controller; import java.util.List; @@ -17,8 +17,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.iot.domain.vo.TdFactoryVo; +import org.dromara.iot.domain.bo.TdFactoryBo; import org.dromara.property.service.ITdFactoryService; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -26,7 +26,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; * 厂商管理 * 前端访问路由地址为:/property/factory * - * @author mocheng + * @author lxj * @date 2025-06-17 */ @Validated diff --git a/ruoyi-modules/Iot/src/main/java/org/dromara/iot/controller/TdMeterConfigController.java b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/controller/TdMeterConfigController.java new file mode 100644 index 00000000..68750545 --- /dev/null +++ b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/controller/TdMeterConfigController.java @@ -0,0 +1,106 @@ +package org.dromara.iot.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.iot.domain.vo.TdMeterConfigVo; +import org.dromara.iot.domain.bo.TdMeterConfigBo; +import org.dromara.iot.service.ITdMeterConfigService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 水电气配置 + * 前端访问路由地址为:/system/meterConfig + * + * @author lxj + * @date 2025-06-18 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/meterConfig") +public class TdMeterConfigController extends BaseController { + + private final ITdMeterConfigService tdMeterConfigService; + + /** + * 查询水电气配置列表 + */ + @SaCheckPermission("system:meterConfig:list") + @GetMapping("/list") + public TableDataInfo list(TdMeterConfigBo bo, PageQuery pageQuery) { + return tdMeterConfigService.queryPageList(bo, pageQuery); + } + + /** + * 导出水电气配置列表 + */ + @SaCheckPermission("system: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); + } + + /** + * 获取水电气配置详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("system:meterConfig:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable("id") Long id) { + return R.ok(tdMeterConfigService.queryById(id)); + } + + /** + * 新增水电气配置 + */ + @SaCheckPermission("system:meterConfig:add") + @Log(title = "水电气配置", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TdMeterConfigBo bo) { + return toAjax(tdMeterConfigService.insertByBo(bo)); + } + + /** + * 修改水电气配置 + */ + @SaCheckPermission("system:meterConfig:edit") + @Log(title = "水电气配置", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TdMeterConfigBo bo) { + return toAjax(tdMeterConfigService.updateByBo(bo)); + } + + /** + * 删除水电气配置 + * + * @param ids 主键串 + */ + @SaCheckPermission("system: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)); + } +} diff --git a/ruoyi-modules/Iot/src/main/java/org/dromara/iot/controller/TdMeterController.java b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/controller/TdMeterController.java new file mode 100644 index 00000000..131da541 --- /dev/null +++ b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/controller/TdMeterController.java @@ -0,0 +1,106 @@ +package org.dromara.iot.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.iot.domain.vo.TdMeterVo; +import org.dromara.iot.domain.bo.TdMeterBo; +import org.dromara.system.service.ITdMeterService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 水电气 + * 前端访问路由地址为:/system/ meter + * + * @author LionLi + * @date 2025-06-18 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/ meter") +public class TdMeterController extends BaseController { + + private final ITdMeterService tdMeterService; + + /** + * 查询水电气列表 + */ + @SaCheckPermission("system: meter:list") + @GetMapping("/list") + public TableDataInfo list(TdMeterBo bo, PageQuery pageQuery) { + return tdMeterService.queryPageList(bo, pageQuery); + } + + /** + * 导出水电气列表 + */ + @SaCheckPermission("system: 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("system: meter:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable("id") Long id) { + return R.ok(tdMeterService.queryById(id)); + } + + /** + * 新增水电气 + */ + @SaCheckPermission("system: meter:add") + @Log(title = "水电气", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TdMeterBo bo) { + return toAjax(tdMeterService.insertByBo(bo)); + } + + /** + * 修改水电气 + */ + @SaCheckPermission("system: 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("system: 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/Iot/src/main/java/org/dromara/iot/controller/TdMeterRoomController.java b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/controller/TdMeterRoomController.java new file mode 100644 index 00000000..f5bf6f60 --- /dev/null +++ b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/controller/TdMeterRoomController.java @@ -0,0 +1,106 @@ +package org.dromara.system.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.iot.domain.vo.TdMeterRoomVo; +import org.dromara.iot.domain.bo.TdMeterRoomBo; +import org.dromara.iot.service.ITdMeterRoomService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 和房间的关联 + * 前端访问路由地址为:/system/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/Iot/src/main/java/org/dromara/property/domain/TbAccessControl.java b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/TbAccessControl.java similarity index 97% rename from ruoyi-modules/Iot/src/main/java/org/dromara/property/domain/TbAccessControl.java rename to ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/TbAccessControl.java index 360bfb83..7cdc1b79 100644 --- a/ruoyi-modules/Iot/src/main/java/org/dromara/property/domain/TbAccessControl.java +++ b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/TbAccessControl.java @@ -1,4 +1,4 @@ -package org.dromara.property.domain; +package org.dromara.iot.domain; import org.dromara.common.mybatis.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.*; diff --git a/ruoyi-modules/Iot/src/main/java/org/dromara/property/domain/TdFactory.java b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/TdFactory.java similarity index 96% rename from ruoyi-modules/Iot/src/main/java/org/dromara/property/domain/TdFactory.java rename to ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/TdFactory.java index 585f888b..ea17cf98 100644 --- a/ruoyi-modules/Iot/src/main/java/org/dromara/property/domain/TdFactory.java +++ b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/TdFactory.java @@ -1,4 +1,4 @@ -package org.dromara.property.domain; +package org.dromara.iot.domain; import org.dromara.common.mybatis.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.*; diff --git a/ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/TdMeter.java b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/TdMeter.java new file mode 100644 index 00000000..ef3fbfb7 --- /dev/null +++ b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/TdMeter.java @@ -0,0 +1,81 @@ +package org.dromara.iot.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 水电气对象 td_ meter + * + * @author LionLi + * @date 2025-06-18 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("td_ meter") +public class TdMeter extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id") + private Long id; + + /** + * 水表名称 + */ + private String meterName; + + /** + * 设备编码 + */ + private String meterCode; + + /** + * 设备厂商 + */ + private String factoryNo; + + /** + * 设备类型(1-电表，2-水表，3-气表) + */ + private Long meterType; + + /** + * 付费类型(1-先付费，2-后付费) + */ + private Long payType; + + /** + * 当前表显示读数 + */ + private Long display; + + /** + * + */ + private Long surplus; + + /** + * 通信状态 + */ + private Long communicationState; + + /** + * 运行状态 + */ + private Long runningState; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/TdMeterConfig.java b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/TdMeterConfig.java new file mode 100644 index 00000000..fe5695fd --- /dev/null +++ b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/TdMeterConfig.java @@ -0,0 +1,61 @@ +package org.dromara.iot.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 水电气配置对象 td_meter_config + * + * @author LionLi + * @date 2025-06-18 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("td_meter_config") +public class TdMeterConfig extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id") + private Long id; + + /** + * 设备类型(1-电表，2-水表，3-气表) + */ + private Long meterType; + + /** + * 付费类型(1-先付费，2-后付费) + */ + private Long payType; + + /** + * 欠费是否断电/水/气(0-是，1-否) + */ + private Long arrearsOutage; + + /** + * 后付费模式下是否自动断电/水/气（0-是，1-否） + */ + private Long autoOutage; + + /** + * 当auto_outage=0的时候生效，逾期多少天自动断水/电/气 + */ + private Long overdueDay; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/TdMeterRoom.java b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/TdMeterRoom.java new file mode 100644 index 00000000..1f8f681f --- /dev/null +++ b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/TdMeterRoom.java @@ -0,0 +1,46 @@ +package org.dromara.iot.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 和房间的关联对象 td_meter_room + * + * @author LionLi + * @date 2025-06-18 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("td_meter_room") +public class TdMeterRoom extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id") + private Long id; + + /** + * 表id + */ + private Long meterId; + + /** + * 房间id + */ + private Long roomId; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/Iot/src/main/java/org/dromara/property/domain/bo/TbAccessControlBo.java b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/bo/TbAccessControlBo.java similarity index 66% rename from ruoyi-modules/Iot/src/main/java/org/dromara/property/domain/bo/TbAccessControlBo.java rename to ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/bo/TbAccessControlBo.java index b19692d6..05976e7c 100644 --- a/ruoyi-modules/Iot/src/main/java/org/dromara/property/domain/bo/TbAccessControlBo.java +++ b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/bo/TbAccessControlBo.java @@ -1,20 +1,19 @@ -package org.dromara.property.domain.bo; +package org.dromara.iot.domain.bo; -import org.dromara.property.domain.TbAccessControl; -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 jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; -import jakarta.validation.constraints.*; -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; +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.iot.domain.TbAccessControl; /** * 门禁管理业务对象 tb_access_control * - * @author mocheng + * @author lxj * @date 2025-06-17 */ @Data @@ -30,25 +29,25 @@ public class TbAccessControlBo extends BaseEntity { /** * 门禁设备编码 */ - @NotBlank(message = "门禁设备编码不能为空", groups = { AddGroup.class, EditGroup.class }) + @NotBlank(message = "门禁设备编码不能为空", groups = {AddGroup.class, EditGroup.class}) private String accessCode; /** * 门禁名称 */ - @NotBlank(message = "门禁名称不能为空", groups = { AddGroup.class, EditGroup.class }) + @NotBlank(message = "门禁名称不能为空", groups = {AddGroup.class, EditGroup.class}) private String accessName; /** * 园区编码 */ - @NotBlank(message = "园区编码不能为空", groups = { AddGroup.class, EditGroup.class }) + @NotBlank(message = "园区编码不能为空", groups = {AddGroup.class, EditGroup.class}) private String communityCode; /** * 建筑编码 */ - @NotBlank(message = "建筑编码不能为空", groups = { AddGroup.class, EditGroup.class }) + @NotBlank(message = "建筑编码不能为空", groups = {AddGroup.class, EditGroup.class}) private String buildingCode; /** @@ -64,19 +63,19 @@ public class TbAccessControlBo extends BaseEntity { /** * 门禁设备类型 */ - @NotNull(message = "门禁设备类型不能为空", groups = { AddGroup.class, EditGroup.class }) + @NotNull(message = "门禁设备类型不能为空", groups = {AddGroup.class, EditGroup.class}) private Long accssType; /** * 工程编号 */ - @NotBlank(message = "工程编号不能为空", groups = { AddGroup.class, EditGroup.class }) + @NotBlank(message = "工程编号不能为空", groups = {AddGroup.class, EditGroup.class}) private String factoryCode; /** * 控制卡类型：1-系统，2-E8 */ - @NotNull(message = "控制卡类型：1-系统，2-E8不能为空", groups = { AddGroup.class, EditGroup.class }) + @NotNull(message = "控制卡类型：1-系统，2-E8不能为空", groups = {AddGroup.class, EditGroup.class}) private Long controlType; /** @@ -92,13 +91,13 @@ public class TbAccessControlBo extends BaseEntity { /** * 组织编码 */ - @NotBlank(message = "组织编码不能为空", groups = { AddGroup.class, EditGroup.class }) + @NotBlank(message = "组织编码不能为空", groups = {AddGroup.class, EditGroup.class}) private String orgCode; /** * 数据状态：1有效，0无效 */ - @NotNull(message = "数据状态：1有效，0无效不能为空", groups = { AddGroup.class, EditGroup.class }) + @NotNull(message = "数据状态：1有效，0无效不能为空", groups = {AddGroup.class, EditGroup.class}) private Long dataState; diff --git a/ruoyi-modules/Iot/src/main/java/org/dromara/property/domain/bo/TdFactoryBo.java b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/bo/TdFactoryBo.java similarity index 66% rename from ruoyi-modules/Iot/src/main/java/org/dromara/property/domain/bo/TdFactoryBo.java rename to ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/bo/TdFactoryBo.java index 7ebf5af4..cea86858 100644 --- a/ruoyi-modules/Iot/src/main/java/org/dromara/property/domain/bo/TdFactoryBo.java +++ b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/bo/TdFactoryBo.java @@ -1,20 +1,19 @@ -package org.dromara.property.domain.bo; +package org.dromara.iot.domain.bo; -import org.dromara.property.domain.TdFactory; -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 jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; -import jakarta.validation.constraints.*; -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; +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.iot.domain.TdFactory; /** * 厂商管理业务对象 td_factory * - * @author mocheng + * @author lxj * @date 2025-06-17 */ @Data @@ -25,19 +24,19 @@ public class TdFactoryBo extends BaseEntity { /** * 数据库id */ - @NotNull(message = "数据库id不能为空", groups = { EditGroup.class }) + @NotNull(message = "数据库id不能为空", groups = {EditGroup.class}) private Long id; /** * 厂商编码 */ - @NotBlank(message = "厂商编码不能为空", groups = { AddGroup.class, EditGroup.class }) + @NotBlank(message = "厂商编码不能为空", groups = {AddGroup.class, EditGroup.class}) private String factoryNo; /** * 设备厂商名称 */ - @NotBlank(message = "设备厂商名称不能为空", groups = { AddGroup.class, EditGroup.class }) + @NotBlank(message = "设备厂商名称不能为空", groups = {AddGroup.class, EditGroup.class}) private String factoryName; /** @@ -48,7 +47,7 @@ public class TdFactoryBo extends BaseEntity { /** * 数据状态：1有效，0无效 */ - @NotNull(message = "数据状态：1有效，0无效不能为空", groups = { AddGroup.class, EditGroup.class }) + @NotNull(message = "数据状态：1有效，0无效不能为空", groups = {AddGroup.class, EditGroup.class}) private Long dataState; diff --git a/ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/bo/TdMeterBo.java b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/bo/TdMeterBo.java new file mode 100644 index 00000000..e2c22cdd --- /dev/null +++ b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/bo/TdMeterBo.java @@ -0,0 +1,86 @@ +package org.dromara.iot.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.iot.domain.TdMeter; + +/** + * 水电气业务对象 td_ meter + * + * @author lxj + * @date 2025-06-18 + */ +@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; + + /** + * 设备编码 + */ + @NotBlank(message = "设备编码不能为空", groups = {AddGroup.class, EditGroup.class}) + private String meterCode; + + /** + * 设备厂商 + */ + @NotBlank(message = "设备厂商不能为空", groups = {AddGroup.class, EditGroup.class}) + private String factoryNo; + + /** + * 设备类型(1-电表，2-水表，3-气表) + */ + @NotNull(message = "设备类型(1-电表，2-水表，3-气表)不能为空", groups = {AddGroup.class, EditGroup.class}) + private Long meterType; + + /** + * 付费类型(1-先付费，2-后付费) + */ + @NotNull(message = "付费类型(1-先付费，2-后付费)不能为空", groups = {AddGroup.class, EditGroup.class}) + private Long payType; + + /** + * 当前表显示读数 + */ + private Long display; + + /** + * + */ + private Long surplus; + + /** + * 通信状态 + */ + private Long communicationState; + + /** + * 运行状态 + */ + private Long runningState; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/bo/TdMeterConfigBo.java b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/bo/TdMeterConfigBo.java new file mode 100644 index 00000000..3741006e --- /dev/null +++ b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/bo/TdMeterConfigBo.java @@ -0,0 +1,64 @@ +package org.dromara.iot.domain.bo; + +import org.dromara.system.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 Long meterType; + + /** + * 付费类型(1-先付费，2-后付费) + */ + @NotNull(message = "付费类型(1-先付费，2-后付费)不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long payType; + + /** + * 欠费是否断电/水/气(0-是，1-否) + */ + @NotNull(message = "欠费是否断电/水/气(0-是，1-否)不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long arrearsOutage; + + /** + * 后付费模式下是否自动断电/水/气（0-是，1-否） + */ + @NotNull(message = "后付费模式下是否自动断电/水/气（0-是，1-否）不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long autoOutage; + + /** + * 当auto_outage=0的时候生效，逾期多少天自动断水/电/气 + */ + @NotNull(message = "当auto_outage=0的时候生效，逾期多少天自动断水/电/气不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long overdueDay; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/bo/TdMeterRoomBo.java b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/bo/TdMeterRoomBo.java new file mode 100644 index 00000000..f874962b --- /dev/null +++ b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/bo/TdMeterRoomBo.java @@ -0,0 +1,47 @@ +package org.dromara.iot.domain.bo; + +import org.dromara.iot.domain.TdMeterRoom; +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_room + * + * @author lxj + * @date 2025-06-18 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TdMeterRoom.class, reverseConvertGenerate = false) +public class TdMeterRoomBo extends BaseEntity { + + /** + * 主键id + */ + @NotNull(message = "主键id不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 表id + */ + @NotNull(message = "表id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long meterId; + + /** + * 房间id + */ + @NotNull(message = "房间id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long roomId; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/Iot/src/main/java/org/dromara/property/domain/vo/TbAccessControlVo.java b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/vo/TbAccessControlVo.java similarity index 86% rename from ruoyi-modules/Iot/src/main/java/org/dromara/property/domain/vo/TbAccessControlVo.java rename to ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/vo/TbAccessControlVo.java index eeefe5c6..bc7c7f5b 100644 --- a/ruoyi-modules/Iot/src/main/java/org/dromara/property/domain/vo/TbAccessControlVo.java +++ b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/vo/TbAccessControlVo.java @@ -1,25 +1,19 @@ -package org.dromara.property.domain.vo; +package org.dromara.iot.domain.vo; -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.dromara.property.domain.TbAccessControl; 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.iot.domain.TbAccessControl; import java.io.Serial; import java.io.Serializable; -import java.util.Date; - /** * 门禁管理视图对象 tb_access_control * - * @author mocheng + * @author lxj * @date 2025-06-17 */ @Data diff --git a/ruoyi-modules/Iot/src/main/java/org/dromara/property/domain/vo/TdFactoryVo.java b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/vo/TdFactoryVo.java similarity index 76% rename from ruoyi-modules/Iot/src/main/java/org/dromara/property/domain/vo/TdFactoryVo.java rename to ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/vo/TdFactoryVo.java index d409b5b4..356b8ec0 100644 --- a/ruoyi-modules/Iot/src/main/java/org/dromara/property/domain/vo/TdFactoryVo.java +++ b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/vo/TdFactoryVo.java @@ -1,25 +1,19 @@ -package org.dromara.property.domain.vo; +package org.dromara.iot.domain.vo; -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.dromara.property.domain.TdFactory; 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.iot.domain.TdFactory; import java.io.Serial; import java.io.Serializable; -import java.util.Date; - /** * 厂商管理视图对象 td_factory * - * @author mocheng + * @author lxj * @date 2025-06-17 */ @Data diff --git a/ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/vo/TdMeterConfigVo.java b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/vo/TdMeterConfigVo.java new file mode 100644 index 00000000..75c0ff5f --- /dev/null +++ b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/vo/TdMeterConfigVo.java @@ -0,0 +1,73 @@ +package org.dromara.iot.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.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import org.dromara.system.domain.TdMeterConfig; + +import java.io.Serial; +import java.io.Serializable; + + +/** + * 水电气配置视图对象 td_meter_config + * + * @author lxj + * @date 2025-06-18 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TdMeterConfig.class) +public class TdMeterConfigVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @ExcelProperty(value = "主键id") + private Long id; + + /** + * 设备类型(1-电表，2-水表，3-气表) + */ + @ExcelProperty(value = "设备类型(1-电表，2-水表，3-气表)") + private Long meterType; + + /** + * 付费类型(1-先付费，2-后付费) + */ + @ExcelProperty(value = "付费类型(1-先付费，2-后付费)") + private Long payType; + + /** + * 欠费是否断电/水/气(0-是，1-否) + */ + @ExcelProperty(value = "欠费是否断电/水/气(0-是，1-否)") + private Long arrearsOutage; + + /** + * 后付费模式下是否自动断电/水/气（0-是，1-否） + */ + @ExcelProperty(value = "后付费模式下是否自动断电/水/气", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "0=-是，1-否") + private Long autoOutage; + + /** + * 当auto_outage=0的时候生效，逾期多少天自动断水/电/气 + */ + @ExcelProperty(value = "当auto_outage=0的时候生效，逾期多少天自动断水/电/气") + private Long overdueDay; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/vo/TdMeterRoomVo.java b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/vo/TdMeterRoomVo.java new file mode 100644 index 00000000..487f6703 --- /dev/null +++ b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/vo/TdMeterRoomVo.java @@ -0,0 +1,52 @@ +package org.dromara.iot.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.iot.domain.TdMeterRoom; + +import java.io.Serial; +import java.io.Serializable; + + +/** + * 和房间的关联视图对象 td_meter_room + * + * @author LionLi + * @date 2025-06-18 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TdMeterRoom.class) +public class TdMeterRoomVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @ExcelProperty(value = "主键id") + private Long id; + + /** + * 表id + */ + @ExcelProperty(value = "表id") + private Long meterId; + + /** + * 房间id + */ + @ExcelProperty(value = "房间id") + private Long roomId; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/vo/TdMeterVo.java b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/vo/TdMeterVo.java new file mode 100644 index 00000000..52cfd406 --- /dev/null +++ b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/domain/vo/TdMeterVo.java @@ -0,0 +1,94 @@ +package org.dromara.iot.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.iot.domain.TdMeter; + +import java.io.Serial; +import java.io.Serializable; + + +/** + * 水电气视图对象 td_ meter + * + * @author lxj + * @date 2025-06-18 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TdMeter.class) +public class TdMeterVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @ExcelProperty(value = "主键id") + private Long id; + + /** + * 水表名称 + */ + @ExcelProperty(value = "水表名称") + private String meterName; + + /** + * 设备编码 + */ + @ExcelProperty(value = "设备编码") + private String meterCode; + + /** + * 设备厂商 + */ + @ExcelProperty(value = "设备厂商") + private String factoryNo; + + /** + * 设备类型(1-电表，2-水表，3-气表) + */ + @ExcelProperty(value = "设备类型(1-电表，2-水表，3-气表)") + private Long meterType; + + /** + * 付费类型(1-先付费，2-后付费) + */ + @ExcelProperty(value = "付费类型(1-先付费，2-后付费)") + private Long payType; + + /** + * 当前表显示读数 + */ + @ExcelProperty(value = "当前表显示读数") + private Long display; + + /** + * + */ + @ExcelProperty(value = "") + private Long surplus; + + /** + * 通信状态 + */ + @ExcelProperty(value = "通信状态") + private Long communicationState; + + /** + * 运行状态 + */ + @ExcelProperty(value = "运行状态") + private Long runningState; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/ruoyi-modules/Iot/src/main/java/org/dromara/property/mapper/TbAccessControlMapper.java b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/mapper/TbAccessControlMapper.java similarity index 62% rename from ruoyi-modules/Iot/src/main/java/org/dromara/property/mapper/TbAccessControlMapper.java rename to ruoyi-modules/Iot/src/main/java/org/dromara/iot/mapper/TbAccessControlMapper.java index 279ea31d..cf104d43 100644 --- a/ruoyi-modules/Iot/src/main/java/org/dromara/property/mapper/TbAccessControlMapper.java +++ b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/mapper/TbAccessControlMapper.java @@ -1,8 +1,8 @@ -package org.dromara.property.mapper; +package org.dromara.iot.mapper; -import org.dromara.property.domain.TbAccessControl; -import org.dromara.property.domain.vo.TbAccessControlVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.iot.domain.TbAccessControl; +import org.dromara.iot.domain.vo.TbAccessControlVo; /** * 门禁管理Mapper接口 diff --git a/ruoyi-modules/Iot/src/main/java/org/dromara/property/mapper/TdFactoryMapper.java b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/mapper/TdFactoryMapper.java similarity index 62% rename from ruoyi-modules/Iot/src/main/java/org/dromara/property/mapper/TdFactoryMapper.java rename to ruoyi-modules/Iot/src/main/java/org/dromara/iot/mapper/TdFactoryMapper.java index fbfa311f..38cbdc14 100644 --- a/ruoyi-modules/Iot/src/main/java/org/dromara/property/mapper/TdFactoryMapper.java +++ b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/mapper/TdFactoryMapper.java @@ -1,7 +1,7 @@ -package org.dromara.property.mapper; +package org.dromara.iot.mapper; -import org.dromara.property.domain.TdFactory; -import org.dromara.property.domain.vo.TdFactoryVo; +import org.dromara.iot.domain.TdFactory; +import org.dromara.iot.domain.vo.TdFactoryVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; /** diff --git a/ruoyi-modules/Iot/src/main/java/org/dromara/iot/mapper/TdMeterConfigMapper.java b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/mapper/TdMeterConfigMapper.java new file mode 100644 index 00000000..c72b1e2b --- /dev/null +++ b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/mapper/TdMeterConfigMapper.java @@ -0,0 +1,15 @@ +package org.dromara.iot.mapper; + +import org.dromara.iot.domain.TdMeterConfig; +import org.dromara.iot.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/Iot/src/main/java/org/dromara/iot/mapper/TdMeterMapper.java b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/mapper/TdMeterMapper.java new file mode 100644 index 00000000..4b0ed255 --- /dev/null +++ b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/mapper/TdMeterMapper.java @@ -0,0 +1,15 @@ +package org.dromara.iot.mapper; + +import org.dromara.iot.domain.TdMeter; +import org.dromara.iot.domain.vo.TdMeterVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 水电气Mapper接口 + * + * @author LionLi + * @date 2025-06-18 + */ +public interface TdMeterMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/Iot/src/main/java/org/dromara/iot/mapper/TdMeterRoomMapper.java b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/mapper/TdMeterRoomMapper.java new file mode 100644 index 00000000..c0a43246 --- /dev/null +++ b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/mapper/TdMeterRoomMapper.java @@ -0,0 +1,15 @@ +package org.dromara.iot.mapper; + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.iot.domain.TdMeterRoom; +import org.dromara.iot.domain.vo.TdMeterRoomVo; + +/** + * 和房间的关联Mapper接口 + * + * @author LionLi + * @date 2025-06-18 + */ +public interface TdMeterRoomMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/Iot/src/main/java/org/dromara/property/service/ITbAccessControlService.java b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/service/ITbAccessControlService.java similarity index 88% rename from ruoyi-modules/Iot/src/main/java/org/dromara/property/service/ITbAccessControlService.java rename to ruoyi-modules/Iot/src/main/java/org/dromara/iot/service/ITbAccessControlService.java index fdde4d26..46fcb906 100644 --- a/ruoyi-modules/Iot/src/main/java/org/dromara/property/service/ITbAccessControlService.java +++ b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/service/ITbAccessControlService.java @@ -1,8 +1,8 @@ -package org.dromara.property.service; +package org.dromara.iot.service; -import org.dromara.property.domain.TbAccessControl; -import org.dromara.property.domain.vo.TbAccessControlVo; -import org.dromara.property.domain.bo.TbAccessControlBo; +import org.dromara.iot.domain.TbAccessControl; +import org.dromara.iot.domain.vo.TbAccessControlVo; +import org.dromara.iot.domain.bo.TbAccessControlBo; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; diff --git a/ruoyi-modules/Iot/src/main/java/org/dromara/property/service/ITdFactoryService.java b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/service/ITdFactoryService.java similarity index 88% rename from ruoyi-modules/Iot/src/main/java/org/dromara/property/service/ITdFactoryService.java rename to ruoyi-modules/Iot/src/main/java/org/dromara/iot/service/ITdFactoryService.java index c907d569..04afcbad 100644 --- a/ruoyi-modules/Iot/src/main/java/org/dromara/property/service/ITdFactoryService.java +++ b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/service/ITdFactoryService.java @@ -1,8 +1,8 @@ -package org.dromara.property.service; +package org.dromara.iot.service; -import org.dromara.property.domain.TdFactory; -import org.dromara.property.domain.vo.TdFactoryVo; -import org.dromara.property.domain.bo.TdFactoryBo; +import org.dromara.iot.domain.TdFactory; +import org.dromara.iot.domain.vo.TdFactoryVo; +import org.dromara.iot.domain.bo.TdFactoryBo; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; diff --git a/ruoyi-modules/Iot/src/main/java/org/dromara/iot/service/ITdMeterConfigService.java b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/service/ITdMeterConfigService.java new file mode 100644 index 00000000..d5c9a0a9 --- /dev/null +++ b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/service/ITdMeterConfigService.java @@ -0,0 +1,69 @@ +package org.dromara.iot.service; + +import org.dromara.iot.domain.TdMeterConfig; +import org.dromara.iot.domain.vo.TdMeterConfigVo; +import org.dromara.iot.domain.bo.TdMeterConfigBo; +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-06-18 + */ +public interface ITdMeterConfigService { + + /** + * 查询水电气配置 + * + * @param id 主键 + * @return 水电气配置 + */ + TdMeterConfigVo queryById(Long id); + + /** + * 分页查询水电气配置列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 水电气配置分页列表 + */ + TableDataInfo queryPageList(TdMeterConfigBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的水电气配置列表 + * + * @param bo 查询条件 + * @return 水电气配置列表 + */ + List queryList(TdMeterConfigBo bo); + + /** + * 新增水电气配置 + * + * @param bo 水电气配置 + * @return 是否新增成功 + */ + Boolean insertByBo(TdMeterConfigBo bo); + + /** + * 修改水电气配置 + * + * @param bo 水电气配置 + * @return 是否修改成功 + */ + Boolean updateByBo(TdMeterConfigBo bo); + + /** + * 校验并批量删除水电气配置信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/Iot/src/main/java/org/dromara/iot/service/ITdMeterRoomService.java b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/service/ITdMeterRoomService.java new file mode 100644 index 00000000..7fc02647 --- /dev/null +++ b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/service/ITdMeterRoomService.java @@ -0,0 +1,69 @@ +package org.dromara.iot.service; + +import org.dromara.iot.domain.TdMeterRoom; +import org.dromara.iot.domain.vo.TdMeterRoomVo; +import org.dromara.iot.domain.bo.TdMeterRoomBo; +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-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); +} diff --git a/ruoyi-modules/Iot/src/main/java/org/dromara/iot/service/ITdMeterService.java b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/service/ITdMeterService.java new file mode 100644 index 00000000..b48e6c2e --- /dev/null +++ b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/service/ITdMeterService.java @@ -0,0 +1,69 @@ +package org.dromara.iot.service; + +import org.dromara.iot.domain.TdMeter; +import org.dromara.iot.domain.vo.TdMeterVo; +import org.dromara.iot.domain.bo.TdMeterBo; +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-06-18 + */ +public interface ITdMeterService { + + /** + * 查询水电气 + * + * @param id 主键 + * @return 水电气 + */ + TdMeterVo queryById(Long id); + + /** + * 分页查询水电气列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 水电气分页列表 + */ + TableDataInfo queryPageList(TdMeterBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的水电气列表 + * + * @param bo 查询条件 + * @return 水电气列表 + */ + List queryList(TdMeterBo bo); + + /** + * 新增水电气 + * + * @param bo 水电气 + * @return 是否新增成功 + */ + Boolean insertByBo(TdMeterBo bo); + + /** + * 修改水电气 + * + * @param bo 水电气 + * @return 是否修改成功 + */ + Boolean updateByBo(TdMeterBo bo); + + /** + * 校验并批量删除水电气信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/Iot/src/main/java/org/dromara/property/service/impl/TbAccessControlServiceImpl.java b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/service/impl/TbAccessControlServiceImpl.java similarity index 93% rename from ruoyi-modules/Iot/src/main/java/org/dromara/property/service/impl/TbAccessControlServiceImpl.java rename to ruoyi-modules/Iot/src/main/java/org/dromara/iot/service/impl/TbAccessControlServiceImpl.java index 00442ba7..9ae63216 100644 --- a/ruoyi-modules/Iot/src/main/java/org/dromara/property/service/impl/TbAccessControlServiceImpl.java +++ b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/service/impl/TbAccessControlServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.property.service.impl; +package org.dromara.iot.service.impl; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; @@ -10,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.property.domain.bo.TbAccessControlBo; -import org.dromara.property.domain.vo.TbAccessControlVo; -import org.dromara.property.domain.TbAccessControl; -import org.dromara.property.mapper.TbAccessControlMapper; -import org.dromara.property.service.ITbAccessControlService; +import org.dromara.iot.domain.bo.TbAccessControlBo; +import org.dromara.iot.domain.vo.TbAccessControlVo; +import org.dromara.iot.domain.TbAccessControl; +import org.dromara.iot.mapper.TbAccessControlMapper; +import org.dromara.iot.service.ITbAccessControlService; import java.util.List; import java.util.Map; diff --git a/ruoyi-modules/Iot/src/main/java/org/dromara/property/service/impl/TdFactoryServiceImpl.java b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/service/impl/TdFactoryServiceImpl.java similarity index 92% rename from ruoyi-modules/Iot/src/main/java/org/dromara/property/service/impl/TdFactoryServiceImpl.java rename to ruoyi-modules/Iot/src/main/java/org/dromara/iot/service/impl/TdFactoryServiceImpl.java index f200e5a4..978dd8d8 100644 --- a/ruoyi-modules/Iot/src/main/java/org/dromara/property/service/impl/TdFactoryServiceImpl.java +++ b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/service/impl/TdFactoryServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.property.service.impl; +package org.dromara.iot.service.impl; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; @@ -10,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.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.iot.domain.bo.TdFactoryBo; +import org.dromara.iot.domain.vo.TdFactoryVo; +import org.dromara.iot.domain.TdFactory; +import org.dromara.iot.mapper.TdFactoryMapper; +import org.dromara.iot.service.ITdFactoryService; import java.util.List; import java.util.Map; diff --git a/ruoyi-modules/Iot/src/main/java/org/dromara/iot/service/impl/TdMeterConfigServiceImpl.java b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/service/impl/TdMeterConfigServiceImpl.java new file mode 100644 index 00000000..b9b13613 --- /dev/null +++ b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/service/impl/TdMeterConfigServiceImpl.java @@ -0,0 +1,136 @@ +package org.dromara.iot.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.iot.domain.bo.TdMeterConfigBo; +import org.dromara.iot.domain.vo.TdMeterConfigVo; +import org.dromara.iot.domain.TdMeterConfig; +import org.dromara.iot.mapper.TdMeterConfigMapper; +import org.dromara.iot.service.ITdMeterConfigService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 水电气配置Service业务层处理 + * + * @author LionLi + * @date 2025-06-18 + */ +@Slf4j +@RequiredArgsConstructor +@Service +public class TdMeterConfigServiceImpl implements ITdMeterConfigService { + + private final TdMeterConfigMapper baseMapper; + + /** + * 查询水电气配置 + * + * @param id 主键 + * @return 水电气配置 + */ + @Override + public TdMeterConfigVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询水电气配置列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 水电气配置分页列表 + */ + @Override + public TableDataInfo queryPageList(TdMeterConfigBo 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(TdMeterConfigBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TdMeterConfigBo 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()); + return lqw; + } + + /** + * 新增水电气配置 + * + * @param bo 水电气配置 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TdMeterConfigBo bo) { + TdMeterConfig add = MapstructUtils.convert(bo, TdMeterConfig.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改水电气配置 + * + * @param bo 水电气配置 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TdMeterConfigBo bo) { + TdMeterConfig update = MapstructUtils.convert(bo, TdMeterConfig.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(TdMeterConfig 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/Iot/src/main/java/org/dromara/iot/service/impl/TdMeterRoomServiceImpl.java b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/service/impl/TdMeterRoomServiceImpl.java new file mode 100644 index 00000000..719839e9 --- /dev/null +++ b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/service/impl/TdMeterRoomServiceImpl.java @@ -0,0 +1,133 @@ +package org.dromara.iot.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.iot.domain.bo.TdMeterRoomBo; +import org.dromara.iot.domain.vo.TdMeterRoomVo; +import org.dromara.iot.domain.TdMeterRoom; +import org.dromara.iot.mapper.TdMeterRoomMapper; +import org.dromara.iot.service.ITdMeterRoomService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 和房间的关联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; + } +} diff --git a/ruoyi-modules/Iot/src/main/java/org/dromara/iot/service/impl/TdMeterServiceImpl.java b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/service/impl/TdMeterServiceImpl.java new file mode 100644 index 00000000..3505e446 --- /dev/null +++ b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/service/impl/TdMeterServiceImpl.java @@ -0,0 +1,140 @@ +package org.dromara.iot.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.iot.domain.bo.TdMeterBo; +import org.dromara.iot.domain.vo.TdMeterVo; +import org.dromara.iot.domain.TdMeter; +import org.dromara.iot.mapper.TdMeterMapper; +import org.dromara.iot.service.ITdMeterService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 水电气Service业务层处理 + * + * @author LionLi + * @date 2025-06-18 + */ +@Slf4j +@RequiredArgsConstructor +@Service +public class TdMeterServiceImpl implements ITdMeterService { + + private final TdMeterMapper baseMapper; + + /** + * 查询水电气 + * + * @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.getPayType() != null, TdMeter::getPayType, bo.getPayType()); + lqw.eq(bo.getDisplay() != null, TdMeter::getDisplay, bo.getDisplay()); + lqw.eq(bo.getSurplus() != null, TdMeter::getSurplus, bo.getSurplus()); + lqw.eq(bo.getCommunicationState() != null, TdMeter::getCommunicationState, bo.getCommunicationState()); + lqw.eq(bo.getRunningState() != null, TdMeter::getRunningState, bo.getRunningState()); + return lqw; + } + + /** + * 新增水电气 + * + * @param bo 水电气 + * @return 是否新增成功 + */ + @Override + 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()); + } + return flag; + } + + /** + * 修改水电气 + * + * @param bo 水电气 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TdMeterBo bo) { + TdMeter update = MapstructUtils.convert(bo, TdMeter.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + 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; + } +} diff --git a/ruoyi-modules/Iot/src/main/resources/application.yml b/ruoyi-modules/Iot/src/main/resources/application.yml index 55dfe652..63b34ac9 100644 --- a/ruoyi-modules/Iot/src/main/resources/application.yml +++ b/ruoyi-modules/Iot/src/main/resources/application.yml @@ -6,7 +6,7 @@ server: spring: application: # 应用名称 - name: Property + name: iot profiles: # 环境配置 active: @profiles.active@ diff --git a/ruoyi-modules/Iot/src/main/resources/mapper/Property/TbBuildingMapper.xml b/ruoyi-modules/Iot/src/main/resources/mapper/Property/TbBuildingMapper.xml deleted file mode 100644 index 432ae650..00000000 --- a/ruoyi-modules/Iot/src/main/resources/mapper/Property/TbBuildingMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/Iot/src/main/resources/mapper/Property/TbCeremonialServeMapper.xml b/ruoyi-modules/Iot/src/main/resources/mapper/Property/TbCeremonialServeMapper.xml deleted file mode 100644 index dbfea2bc..00000000 --- a/ruoyi-modules/Iot/src/main/resources/mapper/Property/TbCeremonialServeMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/Iot/src/main/resources/mapper/Property/TbCeremonialserveRoombookingMapper.xml b/ruoyi-modules/Iot/src/main/resources/mapper/Property/TbCeremonialserveRoombookingMapper.xml deleted file mode 100644 index 67e4136e..00000000 --- a/ruoyi-modules/Iot/src/main/resources/mapper/Property/TbCeremonialserveRoombookingMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/Iot/src/main/resources/mapper/Property/TbCityAreaMapper.xml b/ruoyi-modules/Iot/src/main/resources/mapper/Property/TbCityAreaMapper.xml deleted file mode 100644 index 6ee1cd71..00000000 --- a/ruoyi-modules/Iot/src/main/resources/mapper/Property/TbCityAreaMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/Iot/src/main/resources/mapper/Property/TbConferenceMapper.xml b/ruoyi-modules/Iot/src/main/resources/mapper/Property/TbConferenceMapper.xml deleted file mode 100644 index 75f81151..00000000 --- a/ruoyi-modules/Iot/src/main/resources/mapper/Property/TbConferenceMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/Iot/src/main/resources/mapper/Property/TbE8ConfigMapper.xml b/ruoyi-modules/Iot/src/main/resources/mapper/Property/TbE8ConfigMapper.xml deleted file mode 100644 index 85b5e2a2..00000000 --- a/ruoyi-modules/Iot/src/main/resources/mapper/Property/TbE8ConfigMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/Iot/src/main/resources/mapper/Property/TbFloorMapper.xml b/ruoyi-modules/Iot/src/main/resources/mapper/Property/TbFloorMapper.xml deleted file mode 100644 index 38393a6a..00000000 --- a/ruoyi-modules/Iot/src/main/resources/mapper/Property/TbFloorMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/Iot/src/main/resources/mapper/Property/TbRoomBookingMapper.xml b/ruoyi-modules/Iot/src/main/resources/mapper/Property/TbRoomBookingMapper.xml deleted file mode 100644 index f487e457..00000000 --- a/ruoyi-modules/Iot/src/main/resources/mapper/Property/TbRoomBookingMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/Iot/src/main/resources/mapper/Property/TbServiceClassificationMapper.xml b/ruoyi-modules/Iot/src/main/resources/mapper/Property/TbServiceClassificationMapper.xml deleted file mode 100644 index 3ee8a2af..00000000 --- a/ruoyi-modules/Iot/src/main/resources/mapper/Property/TbServiceClassificationMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/Iot/src/main/resources/mapper/Property/TbVisitorManagementMapper.xml b/ruoyi-modules/Iot/src/main/resources/mapper/Property/TbVisitorManagementMapper.xml deleted file mode 100644 index d8a8b781..00000000 --- a/ruoyi-modules/Iot/src/main/resources/mapper/Property/TbVisitorManagementMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/Iot/src/main/resources/mapper/Property/TdDeviceTypeMapper.xml b/ruoyi-modules/Iot/src/main/resources/mapper/Property/TdDeviceTypeMapper.xml deleted file mode 100644 index 3bb0bb4d..00000000 --- a/ruoyi-modules/Iot/src/main/resources/mapper/Property/TdDeviceTypeMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/Iot/src/main/resources/mapper/Property/TsConfigMapper.xml b/ruoyi-modules/Iot/src/main/resources/mapper/Property/TsConfigMapper.xml deleted file mode 100644 index 8285caac..00000000 --- a/ruoyi-modules/Iot/src/main/resources/mapper/Property/TsConfigMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/Iot/src/main/resources/mapper/Property/TsOperationLogMapper.xml b/ruoyi-modules/Iot/src/main/resources/mapper/Property/TsOperationLogMapper.xml deleted file mode 100644 index 4c36b6f9..00000000 --- a/ruoyi-modules/Iot/src/main/resources/mapper/Property/TsOperationLogMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/Iot/src/main/resources/mapper/Property/TbAccessControlMapper.xml b/ruoyi-modules/Iot/src/main/resources/mapper/TbAccessControlMapper.xml similarity index 100% rename from ruoyi-modules/Iot/src/main/resources/mapper/Property/TbAccessControlMapper.xml rename to ruoyi-modules/Iot/src/main/resources/mapper/TbAccessControlMapper.xml diff --git a/ruoyi-modules/Iot/src/main/resources/mapper/Property/TdFactoryMapper.xml b/ruoyi-modules/Iot/src/main/resources/mapper/TdFactoryMapper.xml similarity index 100% rename from ruoyi-modules/Iot/src/main/resources/mapper/Property/TdFactoryMapper.xml rename to ruoyi-modules/Iot/src/main/resources/mapper/TdFactoryMapper.xml diff --git a/ruoyi-modules/Iot/src/main/resources/mapper/Property/TbCommunityMapper.xml b/ruoyi-modules/Iot/src/main/resources/mapper/TdMeterConfigMapper.xml similarity index 71% rename from ruoyi-modules/Iot/src/main/resources/mapper/Property/TbCommunityMapper.xml rename to ruoyi-modules/Iot/src/main/resources/mapper/TdMeterConfigMapper.xml index e0956de7..1c9e7405 100644 --- a/ruoyi-modules/Iot/src/main/resources/mapper/Property/TbCommunityMapper.xml +++ b/ruoyi-modules/Iot/src/main/resources/mapper/TdMeterConfigMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/Iot/src/main/resources/mapper/system/TsOrgMapper.xml b/ruoyi-modules/Iot/src/main/resources/mapper/TdMeterMapper.xml similarity index 72% rename from ruoyi-modules/Iot/src/main/resources/mapper/system/TsOrgMapper.xml rename to ruoyi-modules/Iot/src/main/resources/mapper/TdMeterMapper.xml index 4eaafc70..d9e5ec5e 100644 --- a/ruoyi-modules/Iot/src/main/resources/mapper/system/TsOrgMapper.xml +++ b/ruoyi-modules/Iot/src/main/resources/mapper/TdMeterMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/Iot/src/main/resources/mapper/system/TsDictDefMapper.xml b/ruoyi-modules/Iot/src/main/resources/mapper/TdMeterRoomMapper.xml similarity index 71% rename from ruoyi-modules/Iot/src/main/resources/mapper/system/TsDictDefMapper.xml rename to ruoyi-modules/Iot/src/main/resources/mapper/TdMeterRoomMapper.xml index aeeeb017..9f175fd4 100644 --- a/ruoyi-modules/Iot/src/main/resources/mapper/system/TsDictDefMapper.xml +++ b/ruoyi-modules/Iot/src/main/resources/mapper/TdMeterRoomMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/Iot/src/main/resources/mapper/system/TbCeremonialServeMapper.xml b/ruoyi-modules/Iot/src/main/resources/mapper/system/TbCeremonialServeMapper.xml deleted file mode 100644 index dbfea2bc..00000000 --- a/ruoyi-modules/Iot/src/main/resources/mapper/system/TbCeremonialServeMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/Iot/src/main/resources/mapper/system/TbCeremonialserveRoombookingMapper.xml b/ruoyi-modules/Iot/src/main/resources/mapper/system/TbCeremonialserveRoombookingMapper.xml deleted file mode 100644 index 67e4136e..00000000 --- a/ruoyi-modules/Iot/src/main/resources/mapper/system/TbCeremonialserveRoombookingMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/Iot/src/main/resources/mapper/system/TbE8ConfigMapper.xml b/ruoyi-modules/Iot/src/main/resources/mapper/system/TbE8ConfigMapper.xml deleted file mode 100644 index 85b5e2a2..00000000 --- a/ruoyi-modules/Iot/src/main/resources/mapper/system/TbE8ConfigMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/Iot/src/main/resources/mapper/system/TbServiceClassificationMapper.xml b/ruoyi-modules/Iot/src/main/resources/mapper/system/TbServiceClassificationMapper.xml deleted file mode 100644 index 3ee8a2af..00000000 --- a/ruoyi-modules/Iot/src/main/resources/mapper/system/TbServiceClassificationMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/Iot/src/main/resources/mapper/system/TsConfigMapper.xml b/ruoyi-modules/Iot/src/main/resources/mapper/system/TsConfigMapper.xml deleted file mode 100644 index 8285caac..00000000 --- a/ruoyi-modules/Iot/src/main/resources/mapper/system/TsConfigMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/Iot/src/main/resources/mapper/system/TsDictMapper.xml b/ruoyi-modules/Iot/src/main/resources/mapper/system/TsDictMapper.xml deleted file mode 100644 index a8a83b94..00000000 --- a/ruoyi-modules/Iot/src/main/resources/mapper/system/TsDictMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/Iot/src/main/resources/mapper/system/TsLoginLogMapper.xml b/ruoyi-modules/Iot/src/main/resources/mapper/system/TsLoginLogMapper.xml deleted file mode 100644 index 4d1a1680..00000000 --- a/ruoyi-modules/Iot/src/main/resources/mapper/system/TsLoginLogMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/Iot/src/main/resources/mapper/system/TsMenuMapper.xml b/ruoyi-modules/Iot/src/main/resources/mapper/system/TsMenuMapper.xml deleted file mode 100644 index 6d5beb10..00000000 --- a/ruoyi-modules/Iot/src/main/resources/mapper/system/TsMenuMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/Iot/src/main/resources/mapper/system/TsOperationLogMapper.xml b/ruoyi-modules/Iot/src/main/resources/mapper/system/TsOperationLogMapper.xml deleted file mode 100644 index 4c36b6f9..00000000 --- a/ruoyi-modules/Iot/src/main/resources/mapper/system/TsOperationLogMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/Iot/src/main/resources/mapper/system/TsRoleMapper.xml b/ruoyi-modules/Iot/src/main/resources/mapper/system/TsRoleMapper.xml deleted file mode 100644 index 6e92ecf7..00000000 --- a/ruoyi-modules/Iot/src/main/resources/mapper/system/TsRoleMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/Iot/src/main/resources/mapper/system/TsRoleMenuMapper.xml b/ruoyi-modules/Iot/src/main/resources/mapper/system/TsRoleMenuMapper.xml deleted file mode 100644 index cedf02f4..00000000 --- a/ruoyi-modules/Iot/src/main/resources/mapper/system/TsRoleMenuMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/Iot/src/main/resources/mapper/system/TsUserMapper.xml b/ruoyi-modules/Iot/src/main/resources/mapper/system/TsUserMapper.xml deleted file mode 100644 index 0c06866d..00000000 --- a/ruoyi-modules/Iot/src/main/resources/mapper/system/TsUserMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/Iot/src/main/resources/mapper/system/TsUserRoleMapper.xml b/ruoyi-modules/Iot/src/main/resources/mapper/system/TsUserRoleMapper.xml deleted file mode 100644 index bf082765..00000000 --- a/ruoyi-modules/Iot/src/main/resources/mapper/system/TsUserRoleMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - -