From c514c8ecea887c4bf245d41b934b8e1b2571dbe8 Mon Sep 17 00:00:00 2001 From: 15683799673 Date: Wed, 18 Jun 2025 21:50:37 +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 --- .../org/dromara/iot/controller/TdFactoryController.java | 2 +- .../java/org/dromara/iot/controller/TdMeterController.java | 2 +- .../java/org/dromara/iot/domain/bo/TdMeterConfigBo.java | 2 +- .../java/org/dromara/iot/domain/vo/TdMeterConfigVo.java | 2 +- .../org/dromara/iot/service/ITbAccessControlService.java | 7 +++---- .../java/org/dromara/iot/service/ITdFactoryService.java | 7 +++---- .../org/dromara/iot/service/ITdMeterConfigService.java | 7 +++---- .../java/org/dromara/iot/service/ITdMeterRoomService.java | 7 +++---- .../main/java/org/dromara/iot/service/ITdMeterService.java | 7 +++---- 9 files changed, 19 insertions(+), 24 deletions(-) diff --git a/ruoyi-modules/Iot/src/main/java/org/dromara/iot/controller/TdFactoryController.java b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/controller/TdFactoryController.java index 4c2edd8..e5bfaea 100644 --- a/ruoyi-modules/Iot/src/main/java/org/dromara/iot/controller/TdFactoryController.java +++ b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/controller/TdFactoryController.java @@ -19,7 +19,7 @@ import org.dromara.common.log.enums.BusinessType; import org.dromara.common.excel.utils.ExcelUtil; import org.dromara.iot.domain.vo.TdFactoryVo; import org.dromara.iot.domain.bo.TdFactoryBo; -import org.dromara.property.service.ITdFactoryService; +import org.dromara.iot.service.ITdFactoryService; import org.dromara.common.mybatis.core.page.TableDataInfo; /** 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 index 131da54..81834bb 100644 --- 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 @@ -19,7 +19,7 @@ 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.iot.service.ITdMeterService; import org.dromara.common.mybatis.core.page.TableDataInfo; /** 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 index 3741006..0f0aeb3 100644 --- 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 @@ -1,6 +1,6 @@ package org.dromara.iot.domain.bo; -import org.dromara.system.domain.TdMeterConfig; +import org.dromara.iot.domain.TdMeterConfig; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; 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 index 75c0ff5..24b145d 100644 --- 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 @@ -6,7 +6,7 @@ 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 org.dromara.iot.domain.TdMeterConfig; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/Iot/src/main/java/org/dromara/iot/service/ITbAccessControlService.java b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/service/ITbAccessControlService.java index 46fcb90..a2c7ee9 100644 --- a/ruoyi-modules/Iot/src/main/java/org/dromara/iot/service/ITbAccessControlService.java +++ b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/service/ITbAccessControlService.java @@ -1,10 +1,9 @@ package org.dromara.iot.service; -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; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.iot.domain.bo.TbAccessControlBo; +import org.dromara.iot.domain.vo.TbAccessControlVo; import java.util.Collection; import java.util.List; diff --git a/ruoyi-modules/Iot/src/main/java/org/dromara/iot/service/ITdFactoryService.java b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/service/ITdFactoryService.java index 04afcba..ecfafd4 100644 --- a/ruoyi-modules/Iot/src/main/java/org/dromara/iot/service/ITdFactoryService.java +++ b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/service/ITdFactoryService.java @@ -1,10 +1,9 @@ package org.dromara.iot.service; -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; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.iot.domain.bo.TdFactoryBo; +import org.dromara.iot.domain.vo.TdFactoryVo; import java.util.Collection; import java.util.List; 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 index d5c9a0a..5eac778 100644 --- 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 @@ -1,10 +1,9 @@ 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 org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.iot.domain.bo.TdMeterConfigBo; +import org.dromara.iot.domain.vo.TdMeterConfigVo; import java.util.Collection; import java.util.List; 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 index 7fc0264..57a3c3c 100644 --- 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 @@ -1,10 +1,9 @@ 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 org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.iot.domain.bo.TdMeterRoomBo; +import org.dromara.iot.domain.vo.TdMeterRoomVo; import java.util.Collection; import java.util.List; 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 index b48e6c2..7331f9d 100644 --- 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 @@ -1,10 +1,9 @@ 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 org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.iot.domain.bo.TdMeterBo; +import org.dromara.iot.domain.vo.TdMeterVo; import java.util.Collection; import java.util.List;