refactor: dao实现

.gitignore

@@ -23,7 +23,6 @@ hs_err_pid*
 .idea
 target
 *.iml
-log
 data/elasticsearch
 .init
 *.db

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() {

iot-common/iot-common-core/src/main/java/cc/iotkit/common/undefined/PagedDataVo.java

@@ -1,25 +0,0 @@
-package cc.iotkit.common.undefined;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * 分页数据包装类
- * @author sjg
- */
-@Data
-public class PagedDataVo<T> {
-
-    /**
-     * 总记录数
-     */
-    private long total;
-
-    /**
-     * 列表数据
-     */
-    private List<T> rows;
-
-
-}

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;

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;
 
     /**

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 {
 
     /**
      * 租户编号

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 cc.iotkit.model.TenantModel;
-import io.github.linpeilie.annotations.AutoMapper;
 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<Long>, Serializable {
+public class SysConfig extends TenantModel implements Id<Long>, Serializable {
     private static final long serialVersionUID = 1L;
 
     /**

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<Long>, Serializable {
+public class SysDept extends TenantModel implements Id<Long>, Serializable {
     private static final long serialVersionUID = 1L;
 
     /**

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<Long>,Serializable {
+public class SysDictData extends TenantModel implements Id<Long>,Serializable {
     private static final long serialVersionUID = 1L;
 
     /**

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<Long>,Serializable {
+public class SysDictType extends TenantModel implements Id<Long>,Serializable {
     private static final long serialVersionUID = 1L;
 
     /**

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<Long>,Serializable {
+public class SysMenu extends BaseModel implements Id<Long>,Serializable {
     private static final long serialVersionUID = 1L;
 
     /**

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<Long>, Serializable {
+public class SysNotice extends TenantModel implements Id<Long>, Serializable {
     private static final long serialVersionUID = 1L;
 
     /**

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<Long>,Serializable {
+public class SysOss  extends TenantModel implements Id<Long>,Serializable {
     private static final long serialVersionUID = 1L;
 
     /**

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<Long>, Serializable {
+public class SysOssConfig extends TenantModel implements Id<Long>, Serializable {
     private static final long serialVersionUID = 1L;
 
     /**

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<Long>,Serializable {
+public class SysPost extends TenantModel implements Id<Long>,Serializable {
     private static final long serialVersionUID = 1L;
 
     /**

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<Long>,Serializable {
+public class SysRole extends TenantModel implements Id<Long>,Serializable {
     private static final long serialVersionUID = 1L;
 
     /**

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<Long>,Serializable {
+public class SysTenant extends BaseModel implements Id<Long>,Serializable {
     private static final long serialVersionUID = 1L;
 
     /**

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<Long>, Serializable {
+public class SysTenantPackage extends BaseModel implements Id<Long>, Serializable {
     private static final long serialVersionUID = 1L;
 
     /**

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<Long>, Serializable {
+public class SysUser extends TenantModel implements Id<Long>, Serializable {
     private static final long serialVersionUID = 1L;
 
     /**

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<Long>, Serializable {
+public class SysUserPost extends BaseModel implements Id<Long>, Serializable {
     private static final long serialVersionUID = 1L;
 
     private Long id;

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<Long>, Serializable {
+public class SysUserRole extends BaseModel implements Id<Long>, Serializable {
     private static final long serialVersionUID = 1L;
 
     private Long id;

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, Long> {
 
-
+    SysConfig selectPageConfigList(SysConfig query);
-
 }

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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<SysConfig> findAll(int page, int size) {
         return null;
     }
+
+
+    @Override
+    public SysConfig selectPageConfigList(SysConfig query) {
+        return null;
+    }
 }

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;

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;

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;

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<SysConfigVo> list(@RequestBody @Validated PageRequest<SysConfigBo> query) {
+    public Paging<SysConfigVo> list(@RequestBody @Validated PageRequest<SysConfigBo> query) {
         return configService.selectPageConfigList(query);
     }
 

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<SysDictDataVo> list(SysDictDataBo dictData, PageRequest<?> query) {
+    public Paging<SysDictDataVo> list(SysDictDataBo dictData, PageRequest<?> query) {
         return dictDataService.selectPageDictDataList(dictData, query);
     }
 

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<SysDictTypeVo> list(SysDictTypeBo dictType, PageRequest<?> query) {
+    public Paging<SysDictTypeVo> list(SysDictTypeBo dictType, PageRequest<?> query) {
         return dictTypeService.selectPageDictTypeList(dictType, query);
     }
 

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<SysNoticeVo> list(SysNoticeBo notice, PageRequest<?> query) {
+    public Paging<SysNoticeVo> list(SysNoticeBo notice, PageRequest<?> query) {
         return noticeService.selectPageNoticeList(notice, query);
     }
 

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<SysOssConfigVo> list(@Validated(QueryGroup.class) SysOssConfigBo bo, PageRequest<?> query) {
+    public Paging<SysOssConfigVo> list(@Validated(QueryGroup.class) SysOssConfigBo bo, PageRequest<?> query) {
         return ossConfigService.queryPageList(bo, query);
     }
 

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<SysOssVo> list(@Validated(QueryGroup.class) SysOssBo bo, PageRequest<?> query) {
+    public Paging<SysOssVo> list(@Validated(QueryGroup.class) SysOssBo bo, PageRequest<?> query) {
         return ossService.queryPageList(bo, query);
     }
 

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<SysPostVo> list(SysPostBo post, PageRequest<?> query) {
+    public Paging<SysPostVo> list(SysPostBo post, PageRequest<?> query) {
         return postService.selectPagePostList(post, query);
     }
 

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<SysRoleVo> list(SysRoleBo role, PageRequest<?> query) {
+    public Paging<SysRoleVo> 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<SysUserVo> allocatedList(SysUserBo user, PageRequest<?> query) {
+    public Paging<SysUserVo> 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<SysUserVo> unallocatedList(SysUserBo user, PageRequest<?> query) {
+    public Paging<SysUserVo> unallocatedList(SysUserBo user, PageRequest<?> query) {
         return userService.selectUnallocatedList(user, query);
     }
 

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<SysTenantVo> list(SysTenantBo bo, PageRequest<?> query) {
+    public Paging<SysTenantVo> list(SysTenantBo bo, PageRequest<?> query) {
         return tenantService.queryPageList(bo, query);
     }
 

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<SysTenantPackageVo> list(SysTenantPackageBo bo, PageRequest<?> query) {
+    public Paging<SysTenantPackageVo> list(SysTenantPackageBo bo, PageRequest<?> query) {
         return tenantPackageService.queryPageList(bo, query);
     }
 

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<SysUserVo> list(SysUserBo user, PageRequest<?> query) {
+    public Paging<SysUserVo> list(SysUserBo user, PageRequest<?> query) {
         return userService.selectPageUserList(user, query);
     }
 

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<SysConfigVo> selectPageConfigList(SysConfigBo config, PageRequest<?> query);
+    Paging<SysConfigVo> selectPageConfigList(PageRequest<SysConfigBo> query);
 
     /**
      * 查询参数配置信息

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<SysDictDataVo> selectPageDictDataList(SysDictDataBo dictData, PageRequest<?> query);
+    Paging<SysDictDataVo> selectPageDictDataList(SysDictDataBo dictData, PageRequest<?> query);
 
     /**
      * 根据条件分页查询字典数据

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<SysDictTypeVo> selectPageDictTypeList(SysDictTypeBo dictType, PageRequest<?> query);
+    Paging<SysDictTypeVo> selectPageDictTypeList(SysDictTypeBo dictType, PageRequest<?> query);
 
     /**
      * 根据条件分页查询字典类型

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<SysLogininforVo> selectPageLogininforList(SysLogininforBo logininfor, PageRequest<?> query);
+    Paging<SysLogininforVo> selectPageLogininforList(SysLogininforBo logininfor, PageRequest<?> query);
 
     /**
      * 新增系统登录日志

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<SysNoticeVo> selectPageNoticeList(SysNoticeBo notice, PageRequest<?> query);
+    Paging<SysNoticeVo> selectPageNoticeList(SysNoticeBo notice, PageRequest<?> query);
 
     /**
      * 查询公告信息

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<SysOperLogVo> selectPageOperLogList(SysOperLogBo operLog, PageRequest<?> query);
+    Paging<SysOperLogVo> selectPageOperLogList(SysOperLogBo operLog, PageRequest<?> query);
 
     /**
      * 新增操作日志

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<SysOssConfigVo> queryPageList(SysOssConfigBo bo, PageRequest<?> query);
+    Paging<SysOssConfigVo> queryPageList(SysOssConfigBo bo, PageRequest<?> query);
 
 
     /**

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<SysOssVo> queryPageList(SysOssBo sysOss, PageRequest<?> query);
+    Paging<SysOssVo> queryPageList(SysOssBo sysOss, PageRequest<?> query);
 
     List<SysOssVo> listByIds(Collection<Long> ossIds);
 

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<SysPostVo> selectPagePostList(SysPostBo post, PageRequest<?> query);
+    Paging<SysPostVo> selectPagePostList(SysPostBo post, PageRequest<?> query);
 
     /**
      * 查询岗位信息集合

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<SysRoleVo> selectPageRoleList(SysRoleBo role, PageRequest<?> query);
+    Paging<SysRoleVo> selectPageRoleList(SysRoleBo role, PageRequest<?> query);
 
     /**
      * 根据条件分页查询角色数据

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<SysTenantPackageVo> queryPageList(SysTenantPackageBo bo, PageRequest<?> query);
+    Paging<SysTenantPackageVo> queryPageList(SysTenantPackageBo bo, PageRequest<?> query);
 
     /**
      * 查询租户套餐已启用列表

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<SysTenantVo> queryPageList(SysTenantBo bo, PageRequest<?> query);
+    Paging<SysTenantVo> queryPageList(SysTenantBo bo, PageRequest<?> query);
 
     /**
      * 查询租户列表

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<SysUserVo> selectPageUserList(SysUserBo user, PageRequest<?> query);
+    Paging<SysUserVo> selectPageUserList(SysUserBo user, PageRequest<?> query);
 
     /**
      * 根据条件分页查询用户列表
@@ -31,7 +31,7 @@ public interface ISysUserService {
      * @param user 用户信息
      * @return 用户信息集合信息
      */
-    PagedDataVo<SysUserVo> selectAllocatedList(SysUserBo user, PageRequest<?> query);
+    Paging<SysUserVo> selectAllocatedList(SysUserBo user, PageRequest<?> query);
 
     /**
      * 根据条件分页查询未分配用户角色列表
@@ -39,7 +39,7 @@ public interface ISysUserService {
      * @param user 用户信息
      * @return 用户信息集合信息
      */
-    PagedDataVo<SysUserVo> selectUnallocatedList(SysUserBo user, PageRequest<?> query);
+    Paging<SysUserVo> selectUnallocatedList(SysUserBo user, PageRequest<?> query);
 
     /**
      * 通过用户名查询用户

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<SysConfigVo> selectPageConfigList(SysConfigBo config, PageRequest<?> query) {
+    public Paging<SysConfigVo> selectPageConfigList(PageRequest<SysConfigBo> query) {
-//        LambdaQueryWrapper<SysConfig> lqw = buildQueryWrapper(config);
+        return MapstructUtils.convert(sysConfigData.selectPageConfigList(MapstructUtils.convert(query.getData(), SysConfig.class)),SysConfigVo.class);
-//        Page<SysConfigVo> page = baseMapper.selectVoPage(pageQuery.build(), lqw);
-//        return TableDataInfo.build(page);
-        return new PagedDataVo<SysConfigVo>();
     }
 
     /**

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<SysDictDataVo> selectPageDictDataList(SysDictDataBo dictData, PageRequest<?> query) {
+    public Paging<SysDictDataVo> selectPageDictDataList(SysDictDataBo dictData, PageRequest<?> query) {
         LambdaQueryWrapper<SysDictData> lqw = buildQueryWrapper(dictData);
         Page<SysDictDataVo> page = baseMapper.selectVoPage(query.build(), lqw);
         return TableDataInfo.build(page);

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<SysDictTypeVo> selectPageDictTypeList(SysDictTypeBo dictType, PageRequest<?> pageQuery) {
+    public Paging<SysDictTypeVo> selectPageDictTypeList(SysDictTypeBo dictType, PageRequest<?> pageQuery) {
         LambdaQueryWrapper<SysDictType> lqw = buildQueryWrapper(dictType);
         Page<SysDictTypeVo> page = baseMapper.selectVoPage(query.build(), lqw);
         return TableDataInfo.build(page);

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<SysLogininforVo> selectPageLogininforList(SysLogininforBo logininfor, PageRequest<?> query) {
+    public Paging<SysLogininforVo> selectPageLogininforList(SysLogininforBo logininfor, PageRequest<?> query) {
         Map<String, Object> params = logininfor.getParams();
         LambdaQueryWrapper<SysLogininfor> lqw = new LambdaQueryWrapper<SysLogininfor>()
             .like(StringUtils.isNotBlank(logininfor.getIpaddr()), SysLogininfor::getIpaddr, logininfor.getIpaddr())

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<SysNoticeVo> selectPageNoticeList(SysNoticeBo notice, PageRequest<?> query) {
+    public Paging<SysNoticeVo> selectPageNoticeList(SysNoticeBo notice, PageRequest<?> query) {
         LambdaQueryWrapper<SysNotice> lqw = buildQueryWrapper(notice);
         Page<SysNoticeVo> page = baseMapper.selectVoPage(query.build(), lqw);
         return TableDataInfo.build(page);

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<SysOperLogVo> selectPageOperLogList(SysOperLogBo operLog, PageRequest<?> query) {
+    public Paging<SysOperLogVo> selectPageOperLogList(SysOperLogBo operLog, PageRequest<?> query) {
         Map<String, Object> params = operLog.getParams();
         LambdaQueryWrapper<SysOperLog> lqw = new LambdaQueryWrapper<SysOperLog>()
             .like(StringUtils.isNotBlank(operLog.getTitle()), SysOperLog::getTitle, operLog.getTitle())

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<SysOssVo> queryPageList(SysOssBo bo, PageRequest<?> query) {
+    public Paging<SysOssVo> queryPageList(SysOssBo bo, PageRequest<?> query) {
         LambdaQueryWrapper<SysOss> lqw = buildQueryWrapper(bo);
         Page<SysOssVo> result = baseMapper.selectVoPage(query.build(), lqw);
         List<SysOssVo> filterResult = StreamUtils.toList(result.getRecords(), this::matchingUrl);

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<SysPostVo> selectPagePostList(SysPostBo post, PageRequest<?> query) {
+    public Paging<SysPostVo> selectPagePostList(SysPostBo post, PageRequest<?> query) {
         LambdaQueryWrapper<SysPost> lqw = buildQueryWrapper(post);
         Page<SysPostVo> page = baseMapper.selectVoPage(query.build(), lqw);
         return TableDataInfo.build(page);

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<SysRoleVo> selectPageRoleList(SysRoleBo role, PageRequest<?> query) {
+    public Paging<SysRoleVo> selectPageRoleList(SysRoleBo role, PageRequest<?> query) {
         Page<SysRoleVo> page = baseMapper.selectPageRoleList(query.build(), this.buildQueryWrapper(role));
         return TableDataInfo.build(page);
     }

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<SysTenantPackageVo> queryPageList(SysTenantPackageBo bo, PageRequest<?> query) {
+    public Paging<SysTenantPackageVo> queryPageList(SysTenantPackageBo bo, PageRequest<?> query) {
         LambdaQueryWrapper<SysTenantPackage> lqw = buildQueryWrapper(bo);
         Page<SysTenantPackageVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
         return TableDataInfo.build(result);

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<SysTenantVo> queryPageList(SysTenantBo bo, PageRequest<?> query) {
+    public Paging<SysTenantVo> queryPageList(SysTenantBo bo, PageRequest<?> query) {
         LambdaQueryWrapper<SysTenant> lqw = buildQueryWrapper(bo);
         Page<SysTenantVo> result = baseMapper.selectVoPage(query.build(), lqw);
         return TableDataInfo.build(result);

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<SysUserVo> selectPageUserList(SysUserBo user, PageRequest<?> query) {
+    public Paging<SysUserVo> selectPageUserList(SysUserBo user, PageRequest<?> query) {
         Page<SysUserVo> 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<SysUserVo> selectAllocatedList(SysUserBo user, PageRequest<?> query) {
+    public Paging<SysUserVo> selectAllocatedList(SysUserBo user, PageRequest<?> query) {
         QueryWrapper<SysUser> 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<SysUserVo> selectUnallocatedList(SysUserBo user, PageRequest<?> query) {
+    public Paging<SysUserVo> selectUnallocatedList(SysUserBo user, PageRequest<?> query) {
         List<Long> userIds = userRoleMapper.selectUserIdsByRoleId(user.getRoleId());
         QueryWrapper<SysUser> wrapper = Wrappers.query();
         wrapper.eq("u.del_flag", UserConstants.USER_NORMAL)