From e1f716c70b3a653d4b4be7a7d9689715a29905c0 Mon Sep 17 00:00:00 2001 From: zcxlsm Date: Thu, 17 Jul 2025 13:12:11 +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 --- .../dromara/property/controller/TbMeterConfigController.java | 2 +- .../org/dromara/property/controller/TbMeterController.java | 2 +- .../dromara/property/controller/TbMeterRoomController.java | 2 +- .../org/dromara/property/controller/TdFactoryController.java | 2 +- .../src/main/java/org/dromara/property/domain/TbFactory.java | 2 +- .../src/main/java/org/dromara/property/domain/TbMeter.java | 2 +- .../main/java/org/dromara/property/domain/TbMeterConfig.java | 2 +- .../main/java/org/dromara/property/domain/TbMeterRoom.java | 2 +- .../java/org/dromara/property/domain/bo/TbFactoryBo.java | 2 +- .../main/java/org/dromara/property/domain/bo/TbMeterBo.java | 3 +-- .../java/org/dromara/property/domain/bo/TbMeterConfigBo.java | 3 +-- .../java/org/dromara/property/domain/bo/TbMeterRoomBo.java | 3 +-- .../java/org/dromara/property/domain/vo/TbFactoryVo.java | 2 +- .../java/org/dromara/property/domain/vo/TbMeterConfigVo.java | 3 +-- .../java/org/dromara/property/domain/vo/TbMeterRoomVo.java | 5 +---- .../main/java/org/dromara/property/domain/vo/TbMeterVo.java | 3 +-- .../java/org/dromara/property/mapper/TbFactoryMapper.java | 2 +- .../org/dromara/property/mapper/TbMeterConfigMapper.java | 4 +++- .../main/java/org/dromara/property/mapper/TbMeterMapper.java | 4 +++- .../java/org/dromara/property/mapper/TbMeterRoomMapper.java | 4 +++- .../java/org/dromara/property/service/ITbFactoryService.java | 2 +- .../org/dromara/property/service/ITbMeterConfigService.java | 3 +-- .../org/dromara/property/service/ITbMeterRoomService.java | 3 +-- .../java/org/dromara/property/service/ITbMeterService.java | 3 +-- .../dromara/property/service/impl/TbFactoryServiceImpl.java | 2 +- .../property/service/impl/TbMeterConfigServiceImpl.java | 3 +-- .../property/service/impl/TbMeterRoomServiceImpl.java | 3 +-- .../dromara/property/service/impl/TbMeterServiceImpl.java | 2 +- .../org/dromara/sis/domain/vo/SisElevatorFloorRefVo.java | 3 --- .../sis/service/impl/SisElevatorFloorRefServiceImpl.java | 3 +-- 30 files changed, 35 insertions(+), 46 deletions(-) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbMeterConfigController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbMeterConfigController.java index a00e63be..3c310884 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbMeterConfigController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbMeterConfigController.java @@ -27,7 +27,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; * 前端访问路由地址为:/property/meterConfig * * @author lsm - * @date 2025-07-17 + * @since 2025-07-17 */ @Validated @RequiredArgsConstructor 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 index f6a5d008..3baffc5e 100644 --- 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 @@ -27,7 +27,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; * 前端访问路由地址为:/property/meter * * @author LionLi - * @date 2025-07-17 + * @since 2025-07-17 */ @Validated @RequiredArgsConstructor 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 index ae58b1f7..47f61157 100644 --- 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 @@ -27,7 +27,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; * 前端访问路由地址为:/property/meterRoom * * @author LionLi - * @date 2025-07-17 + * @since 2025-07-17 */ @Validated @RequiredArgsConstructor 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 b16a193e..d0194de1 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 @@ -27,7 +27,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; * 前端访问路由地址为:/property/factory * * @author mocheng - * @date 2025-06-18 + * @since 2025-06-18 */ @Validated @RequiredArgsConstructor diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbFactory.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbFactory.java index a506078b..3579da60 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbFactory.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbFactory.java @@ -11,7 +11,7 @@ import java.io.Serial; * 厂商管理对象 td_factory * * @author mocheng - * @date 2025-06-18 + * @since 2025-06-18 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbMeter.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbMeter.java index 075f3ce3..76d5cf02 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbMeter.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbMeter.java @@ -11,7 +11,7 @@ import java.io.Serial; * 水电气对象 tb_meter * * @author LionLi - * @date 2025-07-17 + * @since 2025-07-17 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbMeterConfig.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbMeterConfig.java index b6cfda2b..6dc59a9c 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbMeterConfig.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbMeterConfig.java @@ -11,7 +11,7 @@ import java.io.Serial; * 水电气配置对象 tb_meter_config * * @author lsm - * @date 2025-07-17 + * @since 2025-07-17 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbMeterRoom.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbMeterRoom.java index 1226a38b..8cbe4275 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbMeterRoom.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbMeterRoom.java @@ -11,7 +11,7 @@ import java.io.Serial; * 仪房间关联对象 tb_meter_room * * @author LionLi - * @date 2025-07-17 + * @since 2025-07-17 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbFactoryBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbFactoryBo.java index 7e9d187a..ff02c0a4 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbFactoryBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbFactoryBo.java @@ -13,7 +13,7 @@ import jakarta.validation.constraints.*; * 厂商管理业务对象 td_factory * * @author mocheng - * @date 2025-06-18 + * @since 2025-06-18 */ @Data @EqualsAndHashCode(callSuper = true) 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 index 21491775..0e428e47 100644 --- 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 @@ -2,7 +2,6 @@ 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; @@ -13,7 +12,7 @@ import jakarta.validation.constraints.*; * 水电气业务对象 tb_meter * * @author LionLi - * @date 2025-07-17 + * @since 2025-07-17 */ @Data @EqualsAndHashCode(callSuper = true) 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 index 112dfdca..c95382e3 100644 --- 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 @@ -2,7 +2,6 @@ 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; @@ -13,7 +12,7 @@ import jakarta.validation.constraints.*; * 水电气配置业务对象 tb_meter_config * * @author lsm - * @date 2025-07-17 + * @since 2025-07-17 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbMeterRoomBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbMeterRoomBo.java index 1b2e50ac..9c419aa2 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbMeterRoomBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbMeterRoomBo.java @@ -2,7 +2,6 @@ package org.dromara.property.domain.bo; import org.dromara.property.domain.TbMeterRoom; import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; @@ -13,7 +12,7 @@ import jakarta.validation.constraints.*; * 仪房间关联业务对象 tb_meter_room * * @author LionLi - * @date 2025-07-17 + * @since 2025-07-17 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbFactoryVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbFactoryVo.java index 1ff54443..2f43b1fc 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbFactoryVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbFactoryVo.java @@ -14,7 +14,7 @@ import java.io.Serializable; * 厂商管理视图对象 td_factory * * @author mocheng - * @date 2025-06-18 + * @since 2025-06-18 */ @Data @ExcelIgnoreUnannotated diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbMeterConfigVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbMeterConfigVo.java index 40e644f2..1e9473fc 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbMeterConfigVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbMeterConfigVo.java @@ -10,7 +10,6 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; -import java.util.Date; @@ -18,7 +17,7 @@ import java.util.Date; * 水电气配置视图对象 tb_meter_config * * @author lsm - * @date 2025-07-17 + * @since 2025-07-17 */ @Data @ExcelIgnoreUnannotated diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbMeterRoomVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbMeterRoomVo.java index a055255a..54da82d7 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbMeterRoomVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbMeterRoomVo.java @@ -3,14 +3,11 @@ package org.dromara.property.domain.vo; import org.dromara.property.domain.TbMeterRoom; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import java.io.Serial; import java.io.Serializable; -import java.util.Date; @@ -18,7 +15,7 @@ import java.util.Date; * 仪房间关联视图对象 tb_meter_room * * @author LionLi - * @date 2025-07-17 + * @since 2025-07-17 */ @Data @ExcelIgnoreUnannotated diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbMeterVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbMeterVo.java index ecb75eca..4252908d 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbMeterVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbMeterVo.java @@ -10,7 +10,6 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; -import java.util.Date; @@ -18,7 +17,7 @@ import java.util.Date; * 水电气视图对象 tb_meter * * @author LionLi - * @date 2025-07-17 + * @since 2025-07-17 */ @Data @ExcelIgnoreUnannotated diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbFactoryMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbFactoryMapper.java index a6651638..b7e99ad4 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbFactoryMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbFactoryMapper.java @@ -9,7 +9,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * 厂商管理Mapper接口 * * @author mocheng - * @date 2025-06-18 + * @since 2025-06-18 */ @Mapper 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 index d029000b..9b166851 100644 --- 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 @@ -1,5 +1,6 @@ package org.dromara.property.mapper; +import org.apache.ibatis.annotations.Mapper; import org.dromara.property.domain.TbMeterConfig; import org.dromara.property.domain.vo.TbMeterConfigVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -8,8 +9,9 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * 水电气配置Mapper接口 * * @author lsm - * @date 2025-07-17 + * @since 2025-07-17 */ +@Mapper 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 index fcd87aa8..dc4e7977 100644 --- 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 @@ -1,5 +1,6 @@ package org.dromara.property.mapper; +import org.apache.ibatis.annotations.Mapper; import org.dromara.property.domain.TbMeter; import org.dromara.property.domain.vo.TbMeterVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -8,8 +9,9 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * 水电气Mapper接口 * * @author LionLi - * @date 2025-07-17 + * @since 2025-07-17 */ +@Mapper 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 index a19dcbb7..b2c27a7b 100644 --- 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 @@ -1,5 +1,6 @@ package org.dromara.property.mapper; +import org.apache.ibatis.annotations.Mapper; import org.dromara.property.domain.TbMeterRoom; import org.dromara.property.domain.vo.TbMeterRoomVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -8,8 +9,9 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * 仪房间关联Mapper接口 * * @author LionLi - * @date 2025-07-17 + * @since 2025-07-17 */ +@Mapper public interface TbMeterRoomMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbFactoryService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbFactoryService.java index 010b4629..38755648 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbFactoryService.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbFactoryService.java @@ -12,7 +12,7 @@ import java.util.List; * 厂商管理Service接口 * * @author mocheng - * @date 2025-06-18 + * @since 2025-06-18 */ public interface ITbFactoryService { diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbMeterConfigService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbMeterConfigService.java index 57870b11..8a71aa7d 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbMeterConfigService.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbMeterConfigService.java @@ -1,6 +1,5 @@ package org.dromara.property.service; -import org.dromara.property.domain.TbMeterConfig; import org.dromara.property.domain.vo.TbMeterConfigVo; import org.dromara.property.domain.bo.TbMeterConfigBo; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -13,7 +12,7 @@ import java.util.List; * 水电气配置Service接口 * * @author lsm - * @date 2025-07-17 + * @since 2025-07-17 */ public interface ITbMeterConfigService { 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 index 5cd9c368..380f5077 100644 --- 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 @@ -1,6 +1,5 @@ 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; @@ -13,7 +12,7 @@ import java.util.List; * 仪房间关联Service接口 * * @author LionLi - * @date 2025-07-17 + * @since 2025-07-17 */ public interface ITbMeterRoomService { diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbMeterService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbMeterService.java index 556228a1..714c88dd 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbMeterService.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbMeterService.java @@ -1,6 +1,5 @@ package org.dromara.property.service; -import org.dromara.property.domain.TbMeter; import org.dromara.property.domain.vo.TbMeterVo; import org.dromara.property.domain.bo.TbMeterBo; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -13,7 +12,7 @@ import java.util.List; * 水电气Service接口 * * @author LionLi - * @date 2025-07-17 + * @since 2025-07-17 */ public interface ITbMeterService { diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbFactoryServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbFactoryServiceImpl.java index ee603158..a4429539 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbFactoryServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbFactoryServiceImpl.java @@ -24,7 +24,7 @@ import java.util.Collection; * 厂商管理Service业务层处理 * * @author mocheng - * @date 2025-06-18 + * @since 2025-06-18 */ @Slf4j @RequiredArgsConstructor diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbMeterConfigServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbMeterConfigServiceImpl.java index dd279b3c..063f2fa6 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbMeterConfigServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbMeterConfigServiceImpl.java @@ -1,7 +1,6 @@ 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; @@ -24,7 +23,7 @@ import java.util.Collection; * 水电气配置Service业务层处理 * * @author lsm - * @date 2025-07-17 + * @since 2025-07-17 */ @Slf4j @RequiredArgsConstructor diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbMeterRoomServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbMeterRoomServiceImpl.java index 91933caa..18774498 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbMeterRoomServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbMeterRoomServiceImpl.java @@ -1,7 +1,6 @@ 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; @@ -24,7 +23,7 @@ import java.util.Collection; * 仪房间关联Service业务层处理 * * @author LionLi - * @date 2025-07-17 + * @since 2025-07-17 */ @Slf4j @RequiredArgsConstructor 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 index b4f28d1a..38a62246 100644 --- 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 @@ -24,7 +24,7 @@ import java.util.Collection; * 水电气Service业务层处理 * * @author LionLi - * @date 2025-07-17 + * @since 2025-07-17 */ @Slf4j @RequiredArgsConstructor diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisElevatorFloorRefVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisElevatorFloorRefVo.java index 27c95cd1..6b8fd552 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisElevatorFloorRefVo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisElevatorFloorRefVo.java @@ -3,14 +3,11 @@ package org.dromara.sis.domain.vo; import org.dromara.sis.domain.SisElevatorFloorRef; 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; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisElevatorFloorRefServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisElevatorFloorRefServiceImpl.java index eefa029e..68c65050 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisElevatorFloorRefServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisElevatorFloorRefServiceImpl.java @@ -2,7 +2,6 @@ package org.dromara.sis.service.impl; import cn.hutool.core.lang.Assert; 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; @@ -92,7 +91,7 @@ public class SisElevatorFloorRefServiceImpl implements ISisElevatorFloorRefServi boolean flag = false; for (Long num : bo.getFloorNums()){ SisElevatorFloorRef add = new SisElevatorFloorRef(); - add.setLayerNum(num); + add.setFloorNum(num); add.setElevatorId(bo.getElevatorId()); flag = baseMapper.insert(add) > 0; }