diff --git a/.gitignore b/.gitignore index 9eaf8181..2f03118b 100755 --- a/.gitignore +++ b/.gitignore @@ -23,7 +23,6 @@ hs_err_pid* .idea target *.iml -log data/elasticsearch .init *.db diff --git a/iot-common/iot-common-core/src/main/java/cc/iotkit/common/api/RequestEmpty.java b/iot-common/iot-common-core/src/main/java/cc/iotkit/common/api/RequestEmpty.java index ee919b4b..3a0c167f 100644 --- a/iot-common/iot-common-core/src/main/java/cc/iotkit/common/api/RequestEmpty.java +++ b/iot-common/iot-common-core/src/main/java/cc/iotkit/common/api/RequestEmpty.java @@ -14,9 +14,6 @@ import java.util.UUID; @Data public class RequestEmpty implements Serializable { - private String language; - - @Deprecated private String requestId; public static RequestEmpty of() { diff --git a/iot-common/iot-common-core/src/main/java/cc/iotkit/common/undefined/PagedDataVo.java b/iot-common/iot-common-core/src/main/java/cc/iotkit/common/undefined/PagedDataVo.java deleted file mode 100644 index 8dd4d521..00000000 --- a/iot-common/iot-common-core/src/main/java/cc/iotkit/common/undefined/PagedDataVo.java +++ /dev/null @@ -1,25 +0,0 @@ -package cc.iotkit.common.undefined; - -import lombok.Data; - -import java.util.List; - -/** - * 分页数据包装类 - * @author sjg - */ -@Data -public class PagedDataVo { - - /** - * 总记录数 - */ - private long total; - - /** - * 列表数据 - */ - private List rows; - - -} diff --git a/iot-common/iot-common-core/src/main/java/cc/iotkit/common/ComponentClassLoader.java b/iot-common/iot-common-core/src/main/java/cc/iotkit/common/utils/ComponentClassLoader.java similarity index 99% rename from iot-common/iot-common-core/src/main/java/cc/iotkit/common/ComponentClassLoader.java rename to iot-common/iot-common-core/src/main/java/cc/iotkit/common/utils/ComponentClassLoader.java index c2e7bad1..4412b892 100644 --- a/iot-common/iot-common-core/src/main/java/cc/iotkit/common/ComponentClassLoader.java +++ b/iot-common/iot-common-core/src/main/java/cc/iotkit/common/utils/ComponentClassLoader.java @@ -7,7 +7,7 @@ * | Author: xw2sy@163.com * +---------------------------------------------------------------------- */ -package cc.iotkit.common; +package cc.iotkit.common.utils; import cc.iotkit.common.enums.ErrCode; import cc.iotkit.common.exception.BizException; diff --git a/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/BaseEntity.java b/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/BaseModel.java similarity index 91% rename from iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/BaseEntity.java rename to iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/BaseModel.java index 5255f1ab..c2276f10 100644 --- a/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/BaseEntity.java +++ b/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/BaseModel.java @@ -12,7 +12,7 @@ import java.util.Date; */ @Data -public class BaseEntity implements Serializable { +public class BaseModel implements Serializable { private static final long serialVersionUID = 1L; /** diff --git a/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/TenantEntity.java b/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/TenantModel.java similarity index 83% rename from iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/TenantEntity.java rename to iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/TenantModel.java index 508812b9..55980249 100644 --- a/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/TenantEntity.java +++ b/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/TenantModel.java @@ -10,7 +10,7 @@ import lombok.EqualsAndHashCode; */ @Data @EqualsAndHashCode(callSuper = true) -public class TenantEntity extends BaseEntity { +public class TenantModel extends BaseModel { /** * 租户编号 diff --git a/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysConfig.java b/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysConfig.java index b0df9a51..cf38958c 100644 --- a/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysConfig.java +++ b/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysConfig.java @@ -1,8 +1,7 @@ package cc.iotkit.model.system; import cc.iotkit.model.Id; -import cc.iotkit.model.TenantEntity; -import io.github.linpeilie.annotations.AutoMapper; +import cc.iotkit.model.TenantModel; import lombok.Data; import lombok.EqualsAndHashCode; @@ -17,7 +16,7 @@ import java.util.Date; */ @EqualsAndHashCode(callSuper = true) @Data -public class SysConfig extends TenantEntity implements Id, Serializable { +public class SysConfig extends TenantModel implements Id, Serializable { private static final long serialVersionUID = 1L; /** diff --git a/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysDept.java b/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysDept.java index 23cc20ad..1b3a626b 100644 --- a/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysDept.java +++ b/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysDept.java @@ -1,7 +1,7 @@ package cc.iotkit.model.system; import cc.iotkit.model.Id; -import cc.iotkit.model.TenantEntity; +import cc.iotkit.model.TenantModel; import lombok.Data; import lombok.EqualsAndHashCode; @@ -15,7 +15,7 @@ import java.util.Date; */ @EqualsAndHashCode(callSuper = true) @Data -public class SysDept extends TenantEntity implements Id, Serializable { +public class SysDept extends TenantModel implements Id, Serializable { private static final long serialVersionUID = 1L; /** diff --git a/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysDictData.java b/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysDictData.java index f9741c81..9759c6ef 100644 --- a/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysDictData.java +++ b/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysDictData.java @@ -1,7 +1,7 @@ package cc.iotkit.model.system; import cc.iotkit.model.Id; -import cc.iotkit.model.TenantEntity; +import cc.iotkit.model.TenantModel; import lombok.Data; import lombok.EqualsAndHashCode; @@ -16,7 +16,7 @@ import java.util.Date; */ @EqualsAndHashCode(callSuper = true) @Data -public class SysDictData extends TenantEntity implements Id,Serializable { +public class SysDictData extends TenantModel implements Id,Serializable { private static final long serialVersionUID = 1L; /** diff --git a/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysDictType.java b/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysDictType.java index 288989c0..5c3ae6ae 100644 --- a/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysDictType.java +++ b/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysDictType.java @@ -1,7 +1,7 @@ package cc.iotkit.model.system; import cc.iotkit.model.Id; -import cc.iotkit.model.TenantEntity; +import cc.iotkit.model.TenantModel; import lombok.Data; import lombok.EqualsAndHashCode; @@ -16,7 +16,7 @@ import java.util.Date; */ @EqualsAndHashCode(callSuper = true) @Data -public class SysDictType extends TenantEntity implements Id,Serializable { +public class SysDictType extends TenantModel implements Id,Serializable { private static final long serialVersionUID = 1L; /** diff --git a/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysMenu.java b/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysMenu.java index 597f6bcf..ff55eac2 100644 --- a/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysMenu.java +++ b/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysMenu.java @@ -1,6 +1,6 @@ package cc.iotkit.model.system; -import cc.iotkit.model.BaseEntity; +import cc.iotkit.model.BaseModel; import cc.iotkit.model.Id; import lombok.Data; import lombok.EqualsAndHashCode; @@ -18,7 +18,7 @@ import java.util.List; */ @EqualsAndHashCode(callSuper = true) @Data -public class SysMenu extends BaseEntity implements Id,Serializable { +public class SysMenu extends BaseModel implements Id,Serializable { private static final long serialVersionUID = 1L; /** diff --git a/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysNotice.java b/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysNotice.java index 387852bc..8ad7a0ee 100644 --- a/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysNotice.java +++ b/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysNotice.java @@ -1,7 +1,7 @@ package cc.iotkit.model.system; import cc.iotkit.model.Id; -import cc.iotkit.model.TenantEntity; +import cc.iotkit.model.TenantModel; import lombok.Data; import lombok.EqualsAndHashCode; @@ -16,7 +16,7 @@ import java.util.Date; */ @EqualsAndHashCode(callSuper = true) @Data -public class SysNotice extends TenantEntity implements Id, Serializable { +public class SysNotice extends TenantModel implements Id, Serializable { private static final long serialVersionUID = 1L; /** diff --git a/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysOss.java b/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysOss.java index 6e85ab80..e3181de8 100644 --- a/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysOss.java +++ b/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysOss.java @@ -1,7 +1,7 @@ package cc.iotkit.model.system; import cc.iotkit.model.Id; -import cc.iotkit.model.TenantEntity; +import cc.iotkit.model.TenantModel; import lombok.Data; import lombok.EqualsAndHashCode; @@ -15,7 +15,7 @@ import java.util.Date; */ @EqualsAndHashCode(callSuper = true) @Data -public class SysOss extends TenantEntity implements Id,Serializable { +public class SysOss extends TenantModel implements Id,Serializable { private static final long serialVersionUID = 1L; /** diff --git a/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysOssConfig.java b/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysOssConfig.java index 1946fa83..0e8cc71c 100644 --- a/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysOssConfig.java +++ b/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysOssConfig.java @@ -1,7 +1,7 @@ package cc.iotkit.model.system; import cc.iotkit.model.Id; -import cc.iotkit.model.TenantEntity; +import cc.iotkit.model.TenantModel; import lombok.Data; import lombok.EqualsAndHashCode; @@ -17,7 +17,7 @@ import java.io.Serializable; */ @EqualsAndHashCode(callSuper = true) @Data -public class SysOssConfig extends TenantEntity implements Id, Serializable { +public class SysOssConfig extends TenantModel implements Id, Serializable { private static final long serialVersionUID = 1L; /** diff --git a/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysPost.java b/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysPost.java index 7668d38b..4696d8aa 100644 --- a/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysPost.java +++ b/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysPost.java @@ -1,7 +1,7 @@ package cc.iotkit.model.system; import cc.iotkit.model.Id; -import cc.iotkit.model.TenantEntity; +import cc.iotkit.model.TenantModel; import lombok.Data; import lombok.EqualsAndHashCode; @@ -16,7 +16,7 @@ import java.util.Date; */ @EqualsAndHashCode(callSuper = true) @Data -public class SysPost extends TenantEntity implements Id,Serializable { +public class SysPost extends TenantModel implements Id,Serializable { private static final long serialVersionUID = 1L; /** diff --git a/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysRole.java b/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysRole.java index dd6f4c95..b92c7573 100644 --- a/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysRole.java +++ b/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysRole.java @@ -2,7 +2,7 @@ package cc.iotkit.model.system; import cc.iotkit.common.constant.UserConstants; import cc.iotkit.model.Id; -import cc.iotkit.model.TenantEntity; +import cc.iotkit.model.TenantModel; import lombok.Data; import lombok.EqualsAndHashCode; @@ -16,7 +16,7 @@ import java.util.Date; */ @EqualsAndHashCode(callSuper = true) @Data -public class SysRole extends TenantEntity implements Id,Serializable { +public class SysRole extends TenantModel implements Id,Serializable { private static final long serialVersionUID = 1L; /** diff --git a/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysTenant.java b/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysTenant.java index 3ba0c482..d48f98c7 100644 --- a/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysTenant.java +++ b/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysTenant.java @@ -1,6 +1,6 @@ package cc.iotkit.model.system; -import cc.iotkit.model.BaseEntity; +import cc.iotkit.model.BaseModel; import cc.iotkit.model.Id; import lombok.Data; import lombok.EqualsAndHashCode; @@ -16,7 +16,7 @@ import java.util.Date; */ @EqualsAndHashCode(callSuper = true) @Data -public class SysTenant extends BaseEntity implements Id,Serializable { +public class SysTenant extends BaseModel implements Id,Serializable { private static final long serialVersionUID = 1L; /** diff --git a/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysTenantPackage.java b/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysTenantPackage.java index f335bf2c..541a8a7b 100644 --- a/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysTenantPackage.java +++ b/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysTenantPackage.java @@ -1,6 +1,6 @@ package cc.iotkit.model.system; -import cc.iotkit.model.BaseEntity; +import cc.iotkit.model.BaseModel; import cc.iotkit.model.Id; import lombok.Data; import lombok.EqualsAndHashCode; @@ -15,7 +15,7 @@ import java.io.Serializable; */ @EqualsAndHashCode(callSuper = true) @Data -public class SysTenantPackage extends BaseEntity implements Id, Serializable { +public class SysTenantPackage extends BaseModel implements Id, Serializable { private static final long serialVersionUID = 1L; /** diff --git a/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysUser.java b/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysUser.java index 6e47dac7..7e0ff446 100644 --- a/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysUser.java +++ b/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysUser.java @@ -1,7 +1,7 @@ package cc.iotkit.model.system; import cc.iotkit.model.Id; -import cc.iotkit.model.TenantEntity; +import cc.iotkit.model.TenantModel; import lombok.Data; import lombok.EqualsAndHashCode; @@ -17,7 +17,7 @@ import java.util.List; */ @EqualsAndHashCode(callSuper = true) @Data -public class SysUser extends TenantEntity implements Id, Serializable { +public class SysUser extends TenantModel implements Id, Serializable { private static final long serialVersionUID = 1L; /** diff --git a/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysUserPost.java b/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysUserPost.java index b7ed5114..d5c551ad 100644 --- a/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysUserPost.java +++ b/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysUserPost.java @@ -1,6 +1,6 @@ package cc.iotkit.model.system; -import cc.iotkit.model.BaseEntity; +import cc.iotkit.model.BaseModel; import cc.iotkit.model.Id; import java.io.Serializable; import lombok.Data; @@ -14,7 +14,7 @@ import lombok.EqualsAndHashCode; */ @EqualsAndHashCode(callSuper = true) @Data -public class SysUserPost extends BaseEntity implements Id, Serializable { +public class SysUserPost extends BaseModel implements Id, Serializable { private static final long serialVersionUID = 1L; private Long id; diff --git a/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysUserRole.java b/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysUserRole.java index cb5d6161..44ed3071 100644 --- a/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysUserRole.java +++ b/iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysUserRole.java @@ -1,6 +1,6 @@ package cc.iotkit.model.system; -import cc.iotkit.model.BaseEntity; +import cc.iotkit.model.BaseModel; import cc.iotkit.model.Id; import java.io.Serializable; import lombok.Data; @@ -14,7 +14,7 @@ import lombok.EqualsAndHashCode; */ @EqualsAndHashCode(callSuper = true) @Data -public class SysUserRole extends BaseEntity implements Id, Serializable { +public class SysUserRole extends BaseModel implements Id, Serializable { private static final long serialVersionUID = 1L; private Long id; diff --git a/iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysConfigData.java b/iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysConfigData.java index 2b62bcb8..85aeee11 100644 --- a/iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysConfigData.java +++ b/iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysConfigData.java @@ -1,5 +1,6 @@ package cc.iotkit.data.system; +import cc.iotkit.common.api.Paging; import cc.iotkit.data.manager.ICommonData; import cc.iotkit.model.system.SysConfig; @@ -10,6 +11,5 @@ import cc.iotkit.model.system.SysConfig; */ public interface ISysConfigData extends ICommonData { - - + SysConfig selectPageConfigList(SysConfig query); } diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/system/SysConfigRepository.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/SysConfigRepository.java similarity index 95% rename from iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/system/SysConfigRepository.java rename to iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/SysConfigRepository.java index d9fe69bb..381b0b28 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/system/SysConfigRepository.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/SysConfigRepository.java @@ -7,7 +7,7 @@ * | Author: xw2sy@163.com * +---------------------------------------------------------------------- */ -package cc.iotkit.data.dao.system; +package cc.iotkit.data.dao; import cc.iotkit.data.model.TbSysConfig; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/system/SysDeptRepository.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/SysDeptRepository.java similarity index 95% rename from iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/system/SysDeptRepository.java rename to iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/SysDeptRepository.java index c5601ab9..24c4dce8 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/system/SysDeptRepository.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/SysDeptRepository.java @@ -7,7 +7,7 @@ * | Author: xw2sy@163.com * +---------------------------------------------------------------------- */ -package cc.iotkit.data.dao.system; +package cc.iotkit.data.dao; import cc.iotkit.data.model.TbSysDept; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/system/SysDictDataRepository.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/SysDictDataRepository.java similarity index 95% rename from iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/system/SysDictDataRepository.java rename to iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/SysDictDataRepository.java index 90b713f3..625d388d 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/system/SysDictDataRepository.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/SysDictDataRepository.java @@ -7,7 +7,7 @@ * | Author: xw2sy@163.com * +---------------------------------------------------------------------- */ -package cc.iotkit.data.dao.system; +package cc.iotkit.data.dao; import cc.iotkit.data.model.TbSysDictData; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/system/SysDictTypeRepository.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/SysDictTypeRepository.java similarity index 95% rename from iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/system/SysDictTypeRepository.java rename to iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/SysDictTypeRepository.java index a32ef5e1..05a5a3cd 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/system/SysDictTypeRepository.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/SysDictTypeRepository.java @@ -7,7 +7,7 @@ * | Author: xw2sy@163.com * +---------------------------------------------------------------------- */ -package cc.iotkit.data.dao.system; +package cc.iotkit.data.dao; import cc.iotkit.data.model.TbSysDictType; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/system/SysLogininforRepository.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/SysLogininforRepository.java similarity index 95% rename from iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/system/SysLogininforRepository.java rename to iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/SysLogininforRepository.java index ca28de58..14de1f57 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/system/SysLogininforRepository.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/SysLogininforRepository.java @@ -7,7 +7,7 @@ * | Author: xw2sy@163.com * +---------------------------------------------------------------------- */ -package cc.iotkit.data.dao.system; +package cc.iotkit.data.dao; import cc.iotkit.data.model.TbSysLogininfor; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/system/SysMenuRepository.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/SysMenuRepository.java similarity index 95% rename from iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/system/SysMenuRepository.java rename to iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/SysMenuRepository.java index 6530cb24..8ac6e926 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/system/SysMenuRepository.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/SysMenuRepository.java @@ -7,7 +7,7 @@ * | Author: xw2sy@163.com * +---------------------------------------------------------------------- */ -package cc.iotkit.data.dao.system; +package cc.iotkit.data.dao; import cc.iotkit.data.model.TbSysMenu; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/system/SysNoticRepository.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/SysNoticRepository.java similarity index 95% rename from iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/system/SysNoticRepository.java rename to iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/SysNoticRepository.java index a7ec6628..f1e13557 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/system/SysNoticRepository.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/SysNoticRepository.java @@ -7,7 +7,7 @@ * | Author: xw2sy@163.com * +---------------------------------------------------------------------- */ -package cc.iotkit.data.dao.system; +package cc.iotkit.data.dao; import cc.iotkit.data.model.TbSysNotice; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/system/SysOperLogRepository.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/SysOperLogRepository.java similarity index 95% rename from iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/system/SysOperLogRepository.java rename to iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/SysOperLogRepository.java index e71ae02f..41adbe4d 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/system/SysOperLogRepository.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/SysOperLogRepository.java @@ -7,7 +7,7 @@ * | Author: xw2sy@163.com * +---------------------------------------------------------------------- */ -package cc.iotkit.data.dao.system; +package cc.iotkit.data.dao; import cc.iotkit.data.model.TbSysOperLog; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/system/SysOssConfigRepository.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/SysOssConfigRepository.java similarity index 95% rename from iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/system/SysOssConfigRepository.java rename to iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/SysOssConfigRepository.java index 55af6872..1f659be2 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/system/SysOssConfigRepository.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/SysOssConfigRepository.java @@ -7,7 +7,7 @@ * | Author: xw2sy@163.com * +---------------------------------------------------------------------- */ -package cc.iotkit.data.dao.system; +package cc.iotkit.data.dao; import cc.iotkit.data.model.TbSysOssConfig; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/system/SysOssRepository.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/SysOssRepository.java similarity index 95% rename from iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/system/SysOssRepository.java rename to iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/SysOssRepository.java index baa05a46..5a3776aa 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/system/SysOssRepository.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/SysOssRepository.java @@ -7,7 +7,7 @@ * | Author: xw2sy@163.com * +---------------------------------------------------------------------- */ -package cc.iotkit.data.dao.system; +package cc.iotkit.data.dao; import cc.iotkit.data.model.TbSysOss; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/system/SysPostRepository.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/SysPostRepository.java similarity index 95% rename from iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/system/SysPostRepository.java rename to iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/SysPostRepository.java index 888c5695..96f05d77 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/system/SysPostRepository.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/SysPostRepository.java @@ -7,7 +7,7 @@ * | Author: xw2sy@163.com * +---------------------------------------------------------------------- */ -package cc.iotkit.data.dao.system; +package cc.iotkit.data.dao; import cc.iotkit.data.model.TbSysPost; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/system/SysRoleRepository.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/SysRoleRepository.java similarity index 95% rename from iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/system/SysRoleRepository.java rename to iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/SysRoleRepository.java index 61cd3455..ad537765 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/system/SysRoleRepository.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/SysRoleRepository.java @@ -7,7 +7,7 @@ * | Author: xw2sy@163.com * +---------------------------------------------------------------------- */ -package cc.iotkit.data.dao.system; +package cc.iotkit.data.dao; import cc.iotkit.data.model.TbSysRole; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/system/SysTenantPackageRepository.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/SysTenantPackageRepository.java similarity index 95% rename from iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/system/SysTenantPackageRepository.java rename to iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/SysTenantPackageRepository.java index 1970a81d..de195a57 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/system/SysTenantPackageRepository.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/SysTenantPackageRepository.java @@ -7,7 +7,7 @@ * | Author: xw2sy@163.com * +---------------------------------------------------------------------- */ -package cc.iotkit.data.dao.system; +package cc.iotkit.data.dao; import cc.iotkit.data.model.TbSysTenantPackage; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/system/SysTenantRepository.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/SysTenantRepository.java similarity index 95% rename from iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/system/SysTenantRepository.java rename to iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/SysTenantRepository.java index aebf7ef4..8c554a28 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/system/SysTenantRepository.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/SysTenantRepository.java @@ -7,7 +7,7 @@ * | Author: xw2sy@163.com * +---------------------------------------------------------------------- */ -package cc.iotkit.data.dao.system; +package cc.iotkit.data.dao; import cc.iotkit.data.model.TbSysDept; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/system/SysUserPostRepository.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/SysUserPostRepository.java similarity index 95% rename from iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/system/SysUserPostRepository.java rename to iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/SysUserPostRepository.java index 06dd053c..3205326e 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/system/SysUserPostRepository.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/SysUserPostRepository.java @@ -7,7 +7,7 @@ * | Author: xw2sy@163.com * +---------------------------------------------------------------------- */ -package cc.iotkit.data.dao.system; +package cc.iotkit.data.dao; import cc.iotkit.data.model.TbSysUserPost; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/system/SysUserRepository.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/SysUserRepository.java similarity index 95% rename from iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/system/SysUserRepository.java rename to iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/SysUserRepository.java index dd8ccef0..66f78db4 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/system/SysUserRepository.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/SysUserRepository.java @@ -7,7 +7,7 @@ * | Author: xw2sy@163.com * +---------------------------------------------------------------------- */ -package cc.iotkit.data.dao.system; +package cc.iotkit.data.dao; import cc.iotkit.data.model.TbSysDept; import cc.iotkit.data.model.TbSysUser; diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/system/SysUserRoleRepository.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/SysUserRoleRepository.java similarity index 95% rename from iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/system/SysUserRoleRepository.java rename to iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/SysUserRoleRepository.java index 2a1297f0..03a4c2bf 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/system/SysUserRoleRepository.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/SysUserRoleRepository.java @@ -7,7 +7,7 @@ * | Author: xw2sy@163.com * +---------------------------------------------------------------------- */ -package cc.iotkit.data.dao.system; +package cc.iotkit.data.dao; import cc.iotkit.data.model.TbSysUserRole; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysConfigDataImpl.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysConfigDataImpl.java index 7c835fbf..3b6f1b5f 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysConfigDataImpl.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysConfigDataImpl.java @@ -1,6 +1,7 @@ package cc.iotkit.data.service; -import cc.iotkit.data.dao.system.SysConfigRepository; +import cc.iotkit.common.utils.MapstructUtils; +import cc.iotkit.data.dao.SysConfigRepository; import cc.iotkit.data.model.TbSysConfig; import cc.iotkit.data.system.ISysConfigData; import cc.iotkit.common.api.Paging; @@ -19,19 +20,17 @@ public class SysConfigDataImpl implements ISysConfigData { @Autowired private SysConfigRepository alertConfigRepository; - @Autowired - private Converter converter; - @Override public SysConfig findById(Long id) { TbSysConfig tbSysConfig = alertConfigRepository.findById(id).orElseThrow(); - return converter.convert(tbSysConfig,SysConfig.class); + return MapstructUtils.convert(tbSysConfig,SysConfig.class); } @Override public SysConfig save(SysConfig data) { - return null; + alertConfigRepository.save(MapstructUtils.convert(data,TbSysConfig.class)); + return data; } @Override @@ -63,4 +62,10 @@ public class SysConfigDataImpl implements ISysConfigData { public Paging findAll(int page, int size) { return null; } + + + @Override + public SysConfig selectPageConfigList(SysConfig query) { + return null; + } } diff --git a/iot-components/iot-component-server/src/main/java/cc/iotkit/comps/BizComponentManager.java b/iot-components/iot-component-server/src/main/java/cc/iotkit/comps/BizComponentManager.java index 548c3479..57ecfcb6 100755 --- a/iot-components/iot-component-server/src/main/java/cc/iotkit/comps/BizComponentManager.java +++ b/iot-components/iot-component-server/src/main/java/cc/iotkit/comps/BizComponentManager.java @@ -10,7 +10,7 @@ package cc.iotkit.comps; -import cc.iotkit.common.ComponentClassLoader; +import cc.iotkit.common.utils.ComponentClassLoader; import cc.iotkit.common.enums.ErrCode; import cc.iotkit.common.exception.BizException; import cc.iotkit.comp.CompConfig; diff --git a/iot-components/iot-component-server/src/main/java/cc/iotkit/comps/ComponentManager.java b/iot-components/iot-component-server/src/main/java/cc/iotkit/comps/ComponentManager.java index 7d16eaed..15f9f26f 100755 --- a/iot-components/iot-component-server/src/main/java/cc/iotkit/comps/ComponentManager.java +++ b/iot-components/iot-component-server/src/main/java/cc/iotkit/comps/ComponentManager.java @@ -10,7 +10,7 @@ package cc.iotkit.comps; -import cc.iotkit.common.ComponentClassLoader; +import cc.iotkit.common.utils.ComponentClassLoader; import cc.iotkit.model.protocol.ProtocolComponent; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/iot-components/iot-component-server/src/main/java/cc/iotkit/comps/DeviceComponentManager.java b/iot-components/iot-component-server/src/main/java/cc/iotkit/comps/DeviceComponentManager.java index d3bffbf3..876cc891 100755 --- a/iot-components/iot-component-server/src/main/java/cc/iotkit/comps/DeviceComponentManager.java +++ b/iot-components/iot-component-server/src/main/java/cc/iotkit/comps/DeviceComponentManager.java @@ -10,7 +10,7 @@ package cc.iotkit.comps; -import cc.iotkit.common.ComponentClassLoader; +import cc.iotkit.common.utils.ComponentClassLoader; import cc.iotkit.common.enums.ErrCode; import cc.iotkit.common.exception.BizException; import cc.iotkit.common.thing.ThingService; diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysConfigController.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysConfigController.java index 9896744a..71dcdc63 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysConfigController.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysConfigController.java @@ -1,7 +1,9 @@ package cc.iotkit.system.controller; import cc.iotkit.common.api.PageRequest; -import cc.iotkit.common.undefined.PagedDataVo; +import cc.iotkit.common.api.Paging; +import cc.iotkit.common.log.annotation.Log; +import cc.iotkit.common.log.enums.BusinessType; import cc.iotkit.common.excel.utils.ExcelUtil; import cc.iotkit.common.web.core.BaseController; import cc.iotkit.system.dto.bo.SysConfigBo; @@ -33,7 +35,7 @@ public class SysConfigController extends BaseController { */ @SaCheckPermission("system:config:list") @PostMapping("/list") - public PagedDataVo list(@RequestBody @Validated PageRequest query) { + public Paging list(@RequestBody @Validated PageRequest query) { return configService.selectPageConfigList(query); } diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysDictDataController.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysDictDataController.java index 70850817..ae0905c0 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysDictDataController.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysDictDataController.java @@ -1,7 +1,7 @@ package cc.iotkit.system.controller; import cc.iotkit.common.api.PageRequest; -import cc.iotkit.common.undefined.PagedDataVo; +import cc.iotkit.common.api.Paging; import cc.iotkit.common.excel.utils.ExcelUtil; import cc.iotkit.common.log.annotation.Log; import cc.iotkit.common.log.enums.BusinessType; @@ -38,7 +38,7 @@ public class SysDictDataController { */ @SaCheckPermission("system:dict:list") @GetMapping("/list") - public PagedDataVo list(SysDictDataBo dictData, PageRequest query) { + public Paging list(SysDictDataBo dictData, PageRequest query) { return dictDataService.selectPageDictDataList(dictData, query); } diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysDictTypeController.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysDictTypeController.java index 5f2cf52c..502f599d 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysDictTypeController.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysDictTypeController.java @@ -1,7 +1,7 @@ package cc.iotkit.system.controller; import cc.iotkit.common.api.PageRequest; -import cc.iotkit.common.undefined.PagedDataVo; +import cc.iotkit.common.api.Paging; import cc.iotkit.common.excel.utils.ExcelUtil; import cc.iotkit.common.log.annotation.Log; import cc.iotkit.common.log.enums.BusinessType; @@ -35,7 +35,7 @@ public class SysDictTypeController extends BaseController { */ @SaCheckPermission("system:dict:list") @GetMapping("/list") - public PagedDataVo list(SysDictTypeBo dictType, PageRequest query) { + public Paging list(SysDictTypeBo dictType, PageRequest query) { return dictTypeService.selectPageDictTypeList(dictType, query); } diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysNoticeController.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysNoticeController.java index 0ffca793..0c41a6b2 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysNoticeController.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysNoticeController.java @@ -1,7 +1,7 @@ package cc.iotkit.system.controller; import cc.iotkit.common.api.PageRequest; -import cc.iotkit.common.undefined.PagedDataVo; +import cc.iotkit.common.api.Paging; import cc.iotkit.common.log.annotation.Log; import cc.iotkit.common.log.enums.BusinessType; import cc.iotkit.common.web.core.BaseController; @@ -31,7 +31,7 @@ public class SysNoticeController extends BaseController { */ @SaCheckPermission("system:notice:list") @GetMapping("/list") - public PagedDataVo list(SysNoticeBo notice, PageRequest query) { + public Paging list(SysNoticeBo notice, PageRequest query) { return noticeService.selectPageNoticeList(notice, query); } diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysOssConfigController.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysOssConfigController.java index 458f9e11..4bb5e620 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysOssConfigController.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysOssConfigController.java @@ -1,7 +1,7 @@ package cc.iotkit.system.controller; import cc.iotkit.common.api.PageRequest; -import cc.iotkit.common.undefined.PagedDataVo; +import cc.iotkit.common.api.Paging; import cc.iotkit.common.log.annotation.Log; import cc.iotkit.common.log.enums.BusinessType; import cc.iotkit.common.validate.AddGroup; @@ -40,7 +40,7 @@ public class SysOssConfigController extends BaseController { */ @SaCheckPermission("system:oss:list") @GetMapping("/list") - public PagedDataVo list(@Validated(QueryGroup.class) SysOssConfigBo bo, PageRequest query) { + public Paging list(@Validated(QueryGroup.class) SysOssConfigBo bo, PageRequest query) { return ossConfigService.queryPageList(bo, query); } diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysOssController.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysOssController.java index 9ad1dd4e..190fe918 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysOssController.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysOssController.java @@ -2,7 +2,7 @@ package cc.iotkit.system.controller; import cc.iotkit.common.api.PageRequest; -import cc.iotkit.common.undefined.PagedDataVo; +import cc.iotkit.common.api.Paging; import cc.iotkit.common.log.annotation.Log; import cc.iotkit.common.log.enums.BusinessType; import cc.iotkit.common.validate.QueryGroup; @@ -43,7 +43,7 @@ public class SysOssController extends BaseController { */ @SaCheckPermission("system:oss:list") @GetMapping("/list") - public PagedDataVo list(@Validated(QueryGroup.class) SysOssBo bo, PageRequest query) { + public Paging list(@Validated(QueryGroup.class) SysOssBo bo, PageRequest query) { return ossService.queryPageList(bo, query); } diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysPostController.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysPostController.java index c8afaeec..00a8976f 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysPostController.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysPostController.java @@ -1,7 +1,7 @@ package cc.iotkit.system.controller; import cc.iotkit.common.api.PageRequest; -import cc.iotkit.common.undefined.PagedDataVo; +import cc.iotkit.common.api.Paging; import cc.iotkit.common.excel.utils.ExcelUtil; import cc.iotkit.common.log.annotation.Log; import cc.iotkit.common.log.enums.BusinessType; @@ -35,7 +35,7 @@ public class SysPostController extends BaseController { */ @SaCheckPermission("system:post:list") @GetMapping("/list") - public PagedDataVo list(SysPostBo post, PageRequest query) { + public Paging list(SysPostBo post, PageRequest query) { return postService.selectPagePostList(post, query); } diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysRoleController.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysRoleController.java index 0bdb6cf8..89fc349c 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysRoleController.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysRoleController.java @@ -1,7 +1,7 @@ package cc.iotkit.system.controller; import cc.iotkit.common.api.PageRequest; -import cc.iotkit.common.undefined.PagedDataVo; +import cc.iotkit.common.api.Paging; import cc.iotkit.common.excel.utils.ExcelUtil; import cc.iotkit.common.log.annotation.Log; import cc.iotkit.common.log.enums.BusinessType; @@ -44,7 +44,7 @@ public class SysRoleController extends BaseController { */ @SaCheckPermission("system:role:list") @GetMapping("/list") - public PagedDataVo list(SysRoleBo role, PageRequest query) { + public Paging list(SysRoleBo role, PageRequest query) { return roleService.selectPageRoleList(role, query); } @@ -158,7 +158,7 @@ public class SysRoleController extends BaseController { */ @SaCheckPermission("system:role:list") @GetMapping("/authUser/allocatedList") - public PagedDataVo allocatedList(SysUserBo user, PageRequest query) { + public Paging allocatedList(SysUserBo user, PageRequest query) { return userService.selectAllocatedList(user, query); } @@ -167,7 +167,7 @@ public class SysRoleController extends BaseController { */ @SaCheckPermission("system:role:list") @GetMapping("/authUser/unallocatedList") - public PagedDataVo unallocatedList(SysUserBo user, PageRequest query) { + public Paging unallocatedList(SysUserBo user, PageRequest query) { return userService.selectUnallocatedList(user, query); } diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysTenantController.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysTenantController.java index addbd868..4c071a06 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysTenantController.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysTenantController.java @@ -2,7 +2,7 @@ package cc.iotkit.system.controller; import cc.iotkit.common.api.PageRequest; import cc.iotkit.common.constant.TenantConstants; -import cc.iotkit.common.undefined.PagedDataVo; +import cc.iotkit.common.api.Paging; import cc.iotkit.common.excel.utils.ExcelUtil; import cc.iotkit.common.log.annotation.Log; import cc.iotkit.common.log.enums.BusinessType; @@ -52,7 +52,7 @@ public class SysTenantController extends BaseController { @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) @SaCheckPermission("system:tenant:list") @GetMapping("/list") - public PagedDataVo list(SysTenantBo bo, PageRequest query) { + public Paging list(SysTenantBo bo, PageRequest query) { return tenantService.queryPageList(bo, query); } diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysTenantPackageController.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysTenantPackageController.java index 8ba22bfc..477cbc6a 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysTenantPackageController.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysTenantPackageController.java @@ -2,7 +2,7 @@ package cc.iotkit.system.controller; import cc.iotkit.common.api.PageRequest; import cc.iotkit.common.constant.TenantConstants; -import cc.iotkit.common.undefined.PagedDataVo; +import cc.iotkit.common.api.Paging; import cc.iotkit.common.excel.utils.ExcelUtil; import cc.iotkit.common.log.annotation.Log; import cc.iotkit.common.log.enums.BusinessType; @@ -42,7 +42,7 @@ public class SysTenantPackageController extends BaseController { @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) @SaCheckPermission("system:tenantPackage:list") @GetMapping("/list") - public PagedDataVo list(SysTenantPackageBo bo, PageRequest query) { + public Paging list(SysTenantPackageBo bo, PageRequest query) { return tenantPackageService.queryPageList(bo, query); } diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysUserController.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysUserController.java index c713bf05..3ef7c9cd 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysUserController.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysUserController.java @@ -2,7 +2,7 @@ package cc.iotkit.system.controller; import cc.iotkit.common.api.PageRequest; import cc.iotkit.common.undefined.LoginUser; -import cc.iotkit.common.undefined.PagedDataVo; +import cc.iotkit.common.api.Paging; import cc.iotkit.common.excel.core.ExcelResult; import cc.iotkit.common.excel.utils.ExcelUtil; import cc.iotkit.common.log.annotation.Log; @@ -55,7 +55,7 @@ public class SysUserController extends BaseController { */ @SaCheckPermission("system:user:list") @GetMapping("/list") - public PagedDataVo list(SysUserBo user, PageRequest query) { + public Paging list(SysUserBo user, PageRequest query) { return userService.selectPageUserList(user, query); } diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysConfigService.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysConfigService.java index 7dc13011..238233fa 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysConfigService.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysConfigService.java @@ -1,7 +1,7 @@ package cc.iotkit.system.service; import cc.iotkit.common.api.PageRequest; -import cc.iotkit.common.undefined.PagedDataVo; +import cc.iotkit.common.api.Paging; import cc.iotkit.system.dto.bo.SysConfigBo; import cc.iotkit.system.dto.vo.SysConfigVo; @@ -15,7 +15,7 @@ import java.util.List; public interface ISysConfigService { - PagedDataVo selectPageConfigList(SysConfigBo config, PageRequest query); + Paging selectPageConfigList(PageRequest query); /** * 查询参数配置信息 diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysDictDataService.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysDictDataService.java index d19b98ef..2913b9e3 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysDictDataService.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysDictDataService.java @@ -1,7 +1,7 @@ package cc.iotkit.system.service; import cc.iotkit.common.api.PageRequest; -import cc.iotkit.common.undefined.PagedDataVo; +import cc.iotkit.common.api.Paging; import cc.iotkit.system.dto.bo.SysDictDataBo; import cc.iotkit.system.dto.vo.SysDictDataVo; @@ -15,7 +15,7 @@ import java.util.List; public interface ISysDictDataService { - PagedDataVo selectPageDictDataList(SysDictDataBo dictData, PageRequest query); + Paging selectPageDictDataList(SysDictDataBo dictData, PageRequest query); /** * 根据条件分页查询字典数据 diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysDictTypeService.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysDictTypeService.java index 8a0f7420..6b335428 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysDictTypeService.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysDictTypeService.java @@ -1,7 +1,7 @@ package cc.iotkit.system.service; import cc.iotkit.common.api.PageRequest; -import cc.iotkit.common.undefined.PagedDataVo; +import cc.iotkit.common.api.Paging; import cc.iotkit.system.dto.bo.SysDictTypeBo; import cc.iotkit.system.dto.vo.SysDictDataVo; import cc.iotkit.system.dto.vo.SysDictTypeVo; @@ -16,7 +16,7 @@ import java.util.List; public interface ISysDictTypeService { - PagedDataVo selectPageDictTypeList(SysDictTypeBo dictType, PageRequest query); + Paging selectPageDictTypeList(SysDictTypeBo dictType, PageRequest query); /** * 根据条件分页查询字典类型 diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysLogininforService.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysLogininforService.java index 8f6e7de7..ed823ae0 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysLogininforService.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysLogininforService.java @@ -1,7 +1,7 @@ package cc.iotkit.system.service; import cc.iotkit.common.api.PageRequest; -import cc.iotkit.common.undefined.PagedDataVo; +import cc.iotkit.common.api.Paging; import cc.iotkit.system.dto.bo.SysLogininforBo; import cc.iotkit.system.dto.vo.SysLogininforVo; @@ -15,7 +15,7 @@ import java.util.List; public interface ISysLogininforService { - PagedDataVo selectPageLogininforList(SysLogininforBo logininfor, PageRequest query); + Paging selectPageLogininforList(SysLogininforBo logininfor, PageRequest query); /** * 新增系统登录日志 diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysNoticeService.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysNoticeService.java index 67a384d6..fd0a3e6a 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysNoticeService.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysNoticeService.java @@ -1,7 +1,8 @@ package cc.iotkit.system.service; import cc.iotkit.common.api.PageRequest; -import cc.iotkit.common.undefined.PagedDataVo; + +import cc.iotkit.common.api.Paging; import cc.iotkit.system.dto.bo.SysNoticeBo; import cc.iotkit.system.dto.vo.SysNoticeVo; @@ -15,7 +16,7 @@ import java.util.List; public interface ISysNoticeService { - PagedDataVo selectPageNoticeList(SysNoticeBo notice, PageRequest query); + Paging selectPageNoticeList(SysNoticeBo notice, PageRequest query); /** * 查询公告信息 diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysOperLogService.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysOperLogService.java index 51ef245c..a0447680 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysOperLogService.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysOperLogService.java @@ -1,7 +1,7 @@ package cc.iotkit.system.service; import cc.iotkit.common.api.PageRequest; -import cc.iotkit.common.undefined.PagedDataVo; +import cc.iotkit.common.api.Paging; import cc.iotkit.system.dto.bo.SysOperLogBo; import cc.iotkit.system.dto.vo.SysOperLogVo; @@ -14,7 +14,7 @@ import java.util.List; */ public interface ISysOperLogService { - PagedDataVo selectPageOperLogList(SysOperLogBo operLog, PageRequest query); + Paging selectPageOperLogList(SysOperLogBo operLog, PageRequest query); /** * 新增操作日志 diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysOssConfigService.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysOssConfigService.java index 0fc01c1a..0b85b8d7 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysOssConfigService.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysOssConfigService.java @@ -1,7 +1,7 @@ package cc.iotkit.system.service; import cc.iotkit.common.api.PageRequest; -import cc.iotkit.common.undefined.PagedDataVo; +import cc.iotkit.common.api.Paging; import cc.iotkit.system.dto.bo.SysOssConfigBo; import cc.iotkit.system.dto.vo.SysOssConfigVo; @@ -29,7 +29,7 @@ public interface ISysOssConfigService { /** * 查询列表 */ - PagedDataVo queryPageList(SysOssConfigBo bo, PageRequest query); + Paging queryPageList(SysOssConfigBo bo, PageRequest query); /** diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysOssService.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysOssService.java index e6b8522b..6ff7f43e 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysOssService.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysOssService.java @@ -1,7 +1,7 @@ package cc.iotkit.system.service; import cc.iotkit.common.api.PageRequest; -import cc.iotkit.common.undefined.PagedDataVo; +import cc.iotkit.common.api.Paging; import cc.iotkit.system.dto.bo.SysOssBo; import cc.iotkit.system.dto.vo.SysOssVo; import jakarta.servlet.http.HttpServletResponse; @@ -18,7 +18,7 @@ import java.util.List; */ public interface ISysOssService { - PagedDataVo queryPageList(SysOssBo sysOss, PageRequest query); + Paging queryPageList(SysOssBo sysOss, PageRequest query); List listByIds(Collection ossIds); diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysPostService.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysPostService.java index 755dcb0a..72fcae4f 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysPostService.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysPostService.java @@ -1,7 +1,7 @@ package cc.iotkit.system.service; import cc.iotkit.common.api.PageRequest; -import cc.iotkit.common.undefined.PagedDataVo; +import cc.iotkit.common.api.Paging; import cc.iotkit.system.dto.bo.SysPostBo; import cc.iotkit.system.dto.vo.SysPostVo; @@ -15,7 +15,7 @@ import java.util.List; public interface ISysPostService { - PagedDataVo selectPagePostList(SysPostBo post, PageRequest query); + Paging selectPagePostList(SysPostBo post, PageRequest query); /** * 查询岗位信息集合 diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysRoleService.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysRoleService.java index c4e2778c..dc9713c7 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysRoleService.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysRoleService.java @@ -1,7 +1,7 @@ package cc.iotkit.system.service; import cc.iotkit.common.api.PageRequest; -import cc.iotkit.common.undefined.PagedDataVo; +import cc.iotkit.common.api.Paging; import cc.iotkit.system.dto.SysUserRole; import cc.iotkit.system.dto.bo.SysRoleBo; import cc.iotkit.system.dto.vo.SysRoleVo; @@ -17,7 +17,7 @@ import java.util.Set; public interface ISysRoleService { - PagedDataVo selectPageRoleList(SysRoleBo role, PageRequest query); + Paging selectPageRoleList(SysRoleBo role, PageRequest query); /** * 根据条件分页查询角色数据 diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysTenantPackageService.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysTenantPackageService.java index 3d60cd49..6ae92803 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysTenantPackageService.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysTenantPackageService.java @@ -1,7 +1,7 @@ package cc.iotkit.system.service; import cc.iotkit.common.api.PageRequest; -import cc.iotkit.common.undefined.PagedDataVo; +import cc.iotkit.common.api.Paging; import cc.iotkit.system.dto.bo.SysTenantPackageBo; import cc.iotkit.system.dto.vo.SysTenantPackageVo; @@ -23,7 +23,7 @@ public interface ISysTenantPackageService { /** * 查询租户套餐列表 */ - PagedDataVo queryPageList(SysTenantPackageBo bo, PageRequest query); + Paging queryPageList(SysTenantPackageBo bo, PageRequest query); /** * 查询租户套餐已启用列表 diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysTenantService.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysTenantService.java index 5b79e803..d6f2d392 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysTenantService.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysTenantService.java @@ -1,7 +1,7 @@ package cc.iotkit.system.service; import cc.iotkit.common.api.PageRequest; -import cc.iotkit.common.undefined.PagedDataVo; +import cc.iotkit.common.api.Paging; import cc.iotkit.system.dto.bo.SysTenantBo; import cc.iotkit.system.dto.vo.SysTenantVo; @@ -28,7 +28,7 @@ public interface ISysTenantService { /** * 查询租户列表 */ - PagedDataVo queryPageList(SysTenantBo bo, PageRequest query); + Paging queryPageList(SysTenantBo bo, PageRequest query); /** * 查询租户列表 diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysUserService.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysUserService.java index 39759435..235d1502 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysUserService.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysUserService.java @@ -1,7 +1,7 @@ package cc.iotkit.system.service; import cc.iotkit.common.api.PageRequest; -import cc.iotkit.common.undefined.PagedDataVo; +import cc.iotkit.common.api.Paging; import cc.iotkit.system.dto.bo.SysUserBo; import cc.iotkit.system.dto.vo.SysUserVo; @@ -15,7 +15,7 @@ import java.util.List; public interface ISysUserService { - PagedDataVo selectPageUserList(SysUserBo user, PageRequest query); + Paging selectPageUserList(SysUserBo user, PageRequest query); /** * 根据条件分页查询用户列表 @@ -31,7 +31,7 @@ public interface ISysUserService { * @param user 用户信息 * @return 用户信息集合信息 */ - PagedDataVo selectAllocatedList(SysUserBo user, PageRequest query); + Paging selectAllocatedList(SysUserBo user, PageRequest query); /** * 根据条件分页查询未分配用户角色列表 @@ -39,7 +39,7 @@ public interface ISysUserService { * @param user 用户信息 * @return 用户信息集合信息 */ - PagedDataVo selectUnallocatedList(SysUserBo user, PageRequest query); + Paging selectUnallocatedList(SysUserBo user, PageRequest query); /** * 通过用户名查询用户 diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysConfigServiceImpl.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysConfigServiceImpl.java index 8fa60f8d..93961c75 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysConfigServiceImpl.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysConfigServiceImpl.java @@ -2,21 +2,23 @@ package cc.iotkit.system.service.impl; import cc.iotkit.common.api.PageRequest; import cc.iotkit.common.constant.CacheNames; -import cc.iotkit.common.undefined.PagedDataVo; + import cc.iotkit.common.exception.BizException; import cc.iotkit.common.service.ConfigService; import cc.iotkit.common.utils.MapstructUtils; import cc.iotkit.common.utils.SpringUtils; import cc.iotkit.common.utils.StringUtils; +import cc.iotkit.data.system.ISysConfigData; +import cc.iotkit.model.system.SysConfig; import cc.iotkit.system.dto.bo.SysConfigBo; import cc.iotkit.system.dto.vo.SysConfigVo; -import cc.iotkit.system.mapper.SysConfigMapper; + import cn.hutool.core.util.ObjectUtil; -import cc.iotkit.system.dto.SysConfig; import cc.iotkit.system.service.ISysConfigService; import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; - +import cc.iotkit.common.api.Paging; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -30,13 +32,13 @@ import java.util.List; @Service public class SysConfigServiceImpl implements ISysConfigService, ConfigService { + @Autowired + private ISysConfigData sysConfigData; + @Override - public PagedDataVo selectPageConfigList(SysConfigBo config, PageRequest query) { -// LambdaQueryWrapper lqw = buildQueryWrapper(config); -// Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); -// return TableDataInfo.build(page); - return new PagedDataVo(); + public Paging selectPageConfigList(PageRequest query) { + return MapstructUtils.convert(sysConfigData.selectPageConfigList(MapstructUtils.convert(query.getData(), SysConfig.class)),SysConfigVo.class); } /** diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysDictDataServiceImpl.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysDictDataServiceImpl.java index f3154fc7..fa2092fe 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysDictDataServiceImpl.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysDictDataServiceImpl.java @@ -1,8 +1,9 @@ package cc.iotkit.system.service.impl; import cc.iotkit.common.api.PageRequest; +import cc.iotkit.common.api.Paging; import cc.iotkit.common.constant.CacheNames; -import cc.iotkit.common.undefined.PagedDataVo; + import cc.iotkit.common.exception.BizException; import cc.iotkit.common.redis.utils.CacheUtils; import cc.iotkit.common.utils.MapstructUtils; @@ -29,7 +30,7 @@ public class SysDictDataServiceImpl implements ISysDictDataService { private final SysDictDataMapper baseMapper; @Override - public PagedDataVo selectPageDictDataList(SysDictDataBo dictData, PageRequest query) { + public Paging selectPageDictDataList(SysDictDataBo dictData, PageRequest query) { LambdaQueryWrapper lqw = buildQueryWrapper(dictData); Page page = baseMapper.selectVoPage(query.build(), lqw); return TableDataInfo.build(page); diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysDictTypeServiceImpl.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysDictTypeServiceImpl.java index 0fcf8d56..e3e18fbe 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysDictTypeServiceImpl.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysDictTypeServiceImpl.java @@ -3,7 +3,7 @@ package cc.iotkit.system.service.impl; import cc.iotkit.common.api.PageRequest; import cc.iotkit.common.constant.CacheConstants; import cc.iotkit.common.constant.CacheNames; -import cc.iotkit.common.undefined.PagedDataVo; +import cc.iotkit.common.api.Paging; import cc.iotkit.common.exception.BizException; import cc.iotkit.common.redis.utils.CacheUtils; import cc.iotkit.common.service.DictService; @@ -46,7 +46,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService private final SysDictDataMapper dictDataMapper; @Override - public PagedDataVo selectPageDictTypeList(SysDictTypeBo dictType, PageRequest pageQuery) { + public Paging selectPageDictTypeList(SysDictTypeBo dictType, PageRequest pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(dictType); Page page = baseMapper.selectVoPage(query.build(), lqw); return TableDataInfo.build(page); diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysLogininforServiceImpl.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysLogininforServiceImpl.java index 8eff1979..39379811 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysLogininforServiceImpl.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysLogininforServiceImpl.java @@ -2,9 +2,10 @@ package cc.iotkit.system.service.impl; import cc.iotkit.common.api.PageRequest; import cc.iotkit.common.constant.Constants; -import cc.iotkit.common.undefined.PagedDataVo; +import cc.iotkit.common.api.Paging; import cc.iotkit.common.log.event.LogininforEvent; import cc.iotkit.common.utils.MapstructUtils; +import cc.iotkit.common.utils.ServletUtils; import cc.iotkit.common.utils.StringUtils; import cc.iotkit.common.utils.ip.AddressUtils; import cc.iotkit.common.web.utils.UnsignedMathGenerator; @@ -90,7 +91,7 @@ public class SysLogininforServiceImpl implements ISysLogininforService { } @Override - public PagedDataVo selectPageLogininforList(SysLogininforBo logininfor, PageRequest query) { + public Paging selectPageLogininforList(SysLogininforBo logininfor, PageRequest query) { Map params = logininfor.getParams(); LambdaQueryWrapper lqw = new LambdaQueryWrapper() .like(StringUtils.isNotBlank(logininfor.getIpaddr()), SysLogininfor::getIpaddr, logininfor.getIpaddr()) diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysNoticeServiceImpl.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysNoticeServiceImpl.java index 4e770e6a..114341e2 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysNoticeServiceImpl.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysNoticeServiceImpl.java @@ -1,7 +1,7 @@ package cc.iotkit.system.service.impl; import cc.iotkit.common.api.PageRequest; -import cc.iotkit.common.undefined.PagedDataVo; +import cc.iotkit.common.api.Paging; import cc.iotkit.common.utils.MapstructUtils; import cc.iotkit.model.system.SysNotice; import cc.iotkit.system.dto.bo.SysNoticeBo; @@ -29,7 +29,7 @@ public class SysNoticeServiceImpl implements ISysNoticeService { private final SysUserMapper userMapper; @Override - public PagedDataVo selectPageNoticeList(SysNoticeBo notice, PageRequest query) { + public Paging selectPageNoticeList(SysNoticeBo notice, PageRequest query) { LambdaQueryWrapper lqw = buildQueryWrapper(notice); Page page = baseMapper.selectVoPage(query.build(), lqw); return TableDataInfo.build(page); diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysOperLogServiceImpl.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysOperLogServiceImpl.java index 767236eb..c4d36c7b 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysOperLogServiceImpl.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysOperLogServiceImpl.java @@ -1,7 +1,7 @@ package cc.iotkit.system.service.impl; import cc.iotkit.common.api.PageRequest; -import cc.iotkit.common.undefined.PagedDataVo; +import cc.iotkit.common.api.Paging; import cc.iotkit.common.log.event.OperLogEvent; import cc.iotkit.common.utils.MapstructUtils; import cc.iotkit.common.utils.StringUtils; @@ -47,7 +47,7 @@ public class SysOperLogServiceImpl implements ISysOperLogService { } @Override - public PagedDataVo selectPageOperLogList(SysOperLogBo operLog, PageRequest query) { + public Paging selectPageOperLogList(SysOperLogBo operLog, PageRequest query) { Map params = operLog.getParams(); LambdaQueryWrapper lqw = new LambdaQueryWrapper() .like(StringUtils.isNotBlank(operLog.getTitle()), SysOperLog::getTitle, operLog.getTitle()) diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysOssServiceImpl.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysOssServiceImpl.java index 2c491ac8..27a815a3 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysOssServiceImpl.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysOssServiceImpl.java @@ -2,7 +2,7 @@ package cc.iotkit.system.service.impl; import cc.iotkit.common.api.PageRequest; import cc.iotkit.common.constant.CacheNames; -import cc.iotkit.common.undefined.PagedDataVo; +import cc.iotkit.common.api.Paging; import cc.iotkit.common.exception.BizException; import cc.iotkit.common.service.OssService; import cc.iotkit.common.utils.SpringUtils; @@ -39,7 +39,7 @@ public class SysOssServiceImpl implements ISysOssService, OssService { private final SysOssMapper baseMapper; @Override - public PagedDataVo queryPageList(SysOssBo bo, PageRequest query) { + public Paging queryPageList(SysOssBo bo, PageRequest query) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(query.build(), lqw); List filterResult = StreamUtils.toList(result.getRecords(), this::matchingUrl); diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysPostServiceImpl.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysPostServiceImpl.java index 22bbaa6f..08a2b428 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysPostServiceImpl.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysPostServiceImpl.java @@ -1,7 +1,7 @@ package cc.iotkit.system.service.impl; import cc.iotkit.common.api.PageRequest; -import cc.iotkit.common.undefined.PagedDataVo; +import cc.iotkit.common.api.Paging; import cc.iotkit.common.exception.BizException; import cc.iotkit.common.utils.MapstructUtils; import cc.iotkit.model.system.SysPost; @@ -29,7 +29,7 @@ public class SysPostServiceImpl implements ISysPostService { private final SysUserPostMapper userPostMapper; @Override - public PagedDataVo selectPagePostList(SysPostBo post, PageRequest query) { + public Paging selectPagePostList(SysPostBo post, PageRequest query) { LambdaQueryWrapper lqw = buildQueryWrapper(post); Page page = baseMapper.selectVoPage(query.build(), lqw); return TableDataInfo.build(page); diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysRoleServiceImpl.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysRoleServiceImpl.java index cd3d3bae..376143ca 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysRoleServiceImpl.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysRoleServiceImpl.java @@ -2,7 +2,7 @@ package cc.iotkit.system.service.impl; import cc.iotkit.common.api.PageRequest; import cc.iotkit.common.undefined.LoginUser; -import cc.iotkit.common.undefined.PagedDataVo; +import cc.iotkit.common.api.Paging; import cc.iotkit.common.exception.BizException; import cc.iotkit.common.satoken.utils.LoginHelper; import cc.iotkit.common.utils.MapstructUtils; @@ -42,7 +42,7 @@ public class SysRoleServiceImpl implements ISysRoleService { private final SysRoleDeptMapper roleDeptMapper; @Override - public PagedDataVo selectPageRoleList(SysRoleBo role, PageRequest query) { + public Paging selectPageRoleList(SysRoleBo role, PageRequest query) { Page page = baseMapper.selectPageRoleList(query.build(), this.buildQueryWrapper(role)); return TableDataInfo.build(page); } diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysTenantPackageServiceImpl.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysTenantPackageServiceImpl.java index 33e4bb03..8d53ccf4 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysTenantPackageServiceImpl.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysTenantPackageServiceImpl.java @@ -1,7 +1,7 @@ package cc.iotkit.system.service.impl; import cc.iotkit.common.api.PageRequest; -import cc.iotkit.common.undefined.PagedDataVo; +import cc.iotkit.common.api.Paging; import cc.iotkit.common.exception.BizException; import cc.iotkit.common.utils.MapstructUtils; import cc.iotkit.common.utils.StringUtils; @@ -44,7 +44,7 @@ public class SysTenantPackageServiceImpl implements ISysTenantPackageService { * 查询租户套餐列表 */ @Override - public PagedDataVo queryPageList(SysTenantPackageBo bo, PageRequest query) { + public Paging queryPageList(SysTenantPackageBo bo, PageRequest query) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); return TableDataInfo.build(result); diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysTenantServiceImpl.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysTenantServiceImpl.java index e3b3a488..b2ed5938 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysTenantServiceImpl.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysTenantServiceImpl.java @@ -4,7 +4,7 @@ import cc.iotkit.common.api.PageRequest; import cc.iotkit.common.constant.CacheNames; import cc.iotkit.common.constant.Constants; import cc.iotkit.common.constant.TenantConstants; -import cc.iotkit.common.undefined.PagedDataVo; +import cc.iotkit.common.api.Paging; import cc.iotkit.common.exception.BizException; import cc.iotkit.common.utils.MapstructUtils; import cc.iotkit.common.utils.StringUtils; @@ -73,7 +73,7 @@ public class SysTenantServiceImpl implements ISysTenantService { * 查询租户列表 */ @Override - public PagedDataVo queryPageList(SysTenantBo bo, PageRequest query) { + public Paging queryPageList(SysTenantBo bo, PageRequest query) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(query.build(), lqw); return TableDataInfo.build(result); diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysUserServiceImpl.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysUserServiceImpl.java index ecc5d238..b56af093 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysUserServiceImpl.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysUserServiceImpl.java @@ -3,7 +3,7 @@ package cc.iotkit.system.service.impl; import cc.iotkit.common.api.PageRequest; import cc.iotkit.common.constant.CacheNames; import cc.iotkit.common.constant.UserConstants; -import cc.iotkit.common.undefined.PagedDataVo; +import cc.iotkit.common.api.Paging; import cc.iotkit.common.exception.BizException; import cc.iotkit.common.satoken.utils.LoginHelper; import cc.iotkit.common.service.UserService; @@ -50,7 +50,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService { private final SysUserPostMapper userPostMapper; @Override - public PagedDataVo selectPageUserList(SysUserBo user, PageRequest query) { + public Paging selectPageUserList(SysUserBo user, PageRequest query) { Page page = baseMapper.selectPageUserList(query.build(), this.buildQueryWrapper(user)); return TableDataInfo.build(page); } @@ -94,7 +94,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService { * @return 用户信息集合信息 */ @Override - public PagedDataVo selectAllocatedList(SysUserBo user, PageRequest query) { + public Paging selectAllocatedList(SysUserBo user, PageRequest query) { QueryWrapper wrapper = Wrappers.query(); wrapper.eq("u.del_flag", UserConstants.USER_NORMAL) .eq(ObjectUtil.isNotNull(user.getRoleId()), "r.role_id", user.getRoleId()) @@ -112,7 +112,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService { * @return 用户信息集合信息 */ @Override - public PagedDataVo selectUnallocatedList(SysUserBo user, PageRequest query) { + public Paging selectUnallocatedList(SysUserBo user, PageRequest query) { List userIds = userRoleMapper.selectUserIdsByRoleId(user.getRoleId()); QueryWrapper wrapper = Wrappers.query(); wrapper.eq("u.del_flag", UserConstants.USER_NORMAL)