refactor:数据接口修改

iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/ICommonData.java

@@ -39,6 +39,11 @@ public interface ICommonData<T extends Id<ID>, ID> {
      */
     void deleteById(ID id);
 
+    /**
+     * 按id批量删除
+     */
+    void deleteByIds(ID[] ids);
+
     /**
      * 总数统计
      */

iot-data/iot-data-service/src/main/java/cc/iotkit/data/system/ISysConfigData.java

@@ -1,8 +1,28 @@
 package cc.iotkit.data.system;
 
+import cc.iotkit.data.manager.ICommonData;
+import cc.iotkit.model.Paging;
+import cc.iotkit.model.system.SysConfig;
+
 /**
  * 系统配置数据接口
+ *
  * @author sjg
  */
-public interface ISysConfigData {
+public interface ISysConfigData extends ICommonData<SysConfig, Long> {
+
+    /**
+     * 按条件分页查询
+     */
+    Paging<SysConfig> findByConditions(String configKey, String configName,
+                                       int page, int size);
+
+    /**
+     * 根据键名查询参数配置信息
+     *
+     * @param configKey 参数键名
+     * @return 参数键值
+     */
+    SysConfig findByConfigKey(String configKey);
+
 }

iot-data/iot-data-service/src/main/java/cc/iotkit/data/system/ISysDeptData.java

@@ -1,10 +1,39 @@
 package cc.iotkit.data.system;
 
 
+import cc.iotkit.data.manager.ICommonData;
+import cc.iotkit.model.Paging;
+import cc.iotkit.model.system.SysDept;
+
+import java.util.List;
+
 /**
  * 部门数据接口
  *
  * @author sjg
  */
-public interface ISysDeptData {
+public interface ISysDeptData extends ICommonData<SysDept, Long> {
+
+    /**
+     * 按条件分页查询
+     */
+    Paging<SysDept> findByConditions(Long parentId, String deptName,
+                                     String status, int page, int size);
+
+    /**
+     * 根据角色ID查询部门树信息
+     *
+     * @param roleId 角色ID
+     * @return 选中部门列表
+     */
+    List<SysDept> findByRoleId(Long roleId);
+
+    /**
+     * 根据ID查询所有子部门数（正常状态）
+     *
+     * @param parentId 部门ID
+     * @return 子部门数
+     */
+    long countByParentId(Long parentId);
+
 }

iot-data/iot-data-service/src/main/java/cc/iotkit/data/system/ISysDictData.java

@@ -1,9 +1,40 @@
 package cc.iotkit.data.system;
 
+import cc.iotkit.data.manager.ICommonData;
+import cc.iotkit.model.Paging;
+import cc.iotkit.model.system.SysDictData;
+import cc.iotkit.model.system.SysDictType;
+
+import java.util.List;
+
 /**
  * 字典数据接口
  *
  * @author sjg
  */
-public interface ISysDictData {
+public interface ISysDictData extends ICommonData<SysDictData, Long> {
+
+    /**
+     * 按条件分页查询
+     */
+    Paging<SysDictData> findByConditions(String dictType, String dictValue,
+                                         String status, int page, int size);
+
+    /**
+     * 根据字典类型和字典键值查询字典数据信息
+     *
+     * @param dictType  字典类型
+     * @param dictValue 字典键值
+     * @return 字典标签
+     */
+    SysDictData findByDictTypeAndDictValue(String dictType, String dictValue);
+
+    /**
+     * 根据字典类型查询字典数据
+     *
+     * @param dictType 字典类型
+     * @return 字典数据集合信息
+     */
+    List<SysDictType> findByDicType(String dictType);
+
 }

iot-data/iot-data-service/src/main/java/cc/iotkit/data/system/ISysDictTypeData.java

@@ -1,9 +1,31 @@
 package cc.iotkit.data.system;
 
+import cc.iotkit.data.manager.ICommonData;
+import cc.iotkit.model.Paging;
+import cc.iotkit.model.system.SysDictData;
+import cc.iotkit.model.system.SysDictType;
+
+import java.util.List;
+
 /**
  * 字典类型数据接口
  *
  * @author sjg
  */
-public interface ISysDictTypeData {
+public interface ISysDictTypeData extends ICommonData<SysDictType, Long> {
+
+    /**
+     * 按条件分页查询
+     */
+    Paging<SysDictType> findByConditions(String dictName, String dictType,
+                                         String status, int page, int size);
+
+    /**
+     * 根据字典类型查询信息
+     *
+     * @param dictType 字典类型
+     * @return 字典类型
+     */
+    SysDictType findByDicType(String dictType);
+
 }

iot-data/iot-data-service/src/main/java/cc/iotkit/data/system/ISysLogininforData.java

@@ -1,9 +1,27 @@
 package cc.iotkit.data.system;
 
+import cc.iotkit.data.manager.ICommonData;
+import cc.iotkit.model.Paging;
+import cc.iotkit.model.system.SysLogininfor;
+
 /**
  * 登录记录数据接口
  *
  * @author sjg
  */
-public interface ISysLogininforData {
+public interface ISysLogininforData extends ICommonData<SysLogininfor, Long> {
+
+    /**
+     * 按条件分页查询
+     */
+    Paging<SysLogininfor> findByConditions(String tenantId, String userName,
+                                           String status, int page, int size);
+
+    /**
+     * 按租户清除登录日志
+     *
+     * @param tenantId 租户id
+     */
+    void deleteByTenantId(String tenantId);
+
 }

iot-data/iot-data-service/src/main/java/cc/iotkit/data/system/ISysMenuData.java

@@ -1,9 +1,23 @@
 package cc.iotkit.data.system;
 
+import cc.iotkit.data.manager.ICommonData;
+import cc.iotkit.model.system.SysMenu;
+
+import java.util.List;
+
 /**
  * 菜单数据接口
  *
  * @author sjg
  */
-public interface ISysMenuData {
+public interface ISysMenuData extends ICommonData<SysMenu, Long> {
+
+    /**
+     * 根据用户查询系统菜单列表
+     *
+     * @param userId 用户ID
+     * @return 菜单列表
+     */
+    List<SysMenu> findByUserId(Long userId);
+
 }

iot-data/iot-data-service/src/main/java/cc/iotkit/data/system/ISysNoticeData.java

@@ -1,9 +1,20 @@
 package cc.iotkit.data.system;
 
+import cc.iotkit.data.manager.ICommonData;
+import cc.iotkit.model.Paging;
+import cc.iotkit.model.system.SysNotice;
+
 /**
  * 通知数据接口
  *
  * @author sjg
  */
-public interface ISysNoticeData {
+public interface ISysNoticeData extends ICommonData<SysNotice, Long> {
+
+    /**
+     * 按条件分页查询
+     */
+    Paging<SysNotice> findByConditions(String noticeTitle, String noticeType,
+                                       String status, int page, int size);
+
 }

iot-data/iot-data-service/src/main/java/cc/iotkit/data/system/ISysOperLogData.java

@@ -1,9 +1,26 @@
 package cc.iotkit.data.system;
 
+import cc.iotkit.data.manager.ICommonData;
+import cc.iotkit.model.Paging;
+import cc.iotkit.model.system.SysOperLog;
+
 /**
  * 操作日志数据接口
  *
  * @author sjg
  */
-public interface ISysOperLogData {
+public interface ISysOperLogData extends ICommonData<SysOperLog, Long> {
+
+    /**
+     * 按条件分页查询
+     */
+    Paging<SysOperLog> findByConditions(String tenantId, String title, Integer businessType,
+                                        Integer status, int page, int size);
+
+    /**
+     * 按租户清除日志
+     *
+     * @param tenantId 租户id
+     */
+    void deleteByTenantId(String tenantId);
 }

iot-data/iot-model/src/main/java/cc/iotkit/model/BaseEntity.java

@@ -0,0 +1,43 @@
+package cc.iotkit.model;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * Entity基类
+ *
+ * @author Lion Li
+ */
+
+@Data
+public class BaseEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 创建部门
+     */
+    private Long createDept;
+
+    /**
+     * 创建者
+     */
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+}

iot-data/iot-model/src/main/java/cc/iotkit/model/TenantEntity.java

@@ -0,0 +1,20 @@
+package cc.iotkit.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 租户基类
+ *
+ * @author Michelle.Chung
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class TenantEntity extends BaseEntity {
+
+    /**
+     * 租户编号
+     */
+    private String tenantId;
+
+}

iot-data/iot-model/src/main/java/cc/iotkit/model/system/SysConfig.java

@@ -1,7 +1,9 @@
 package cc.iotkit.model.system;
 
 import cc.iotkit.model.Id;
+import cc.iotkit.model.TenantEntity;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -12,8 +14,9 @@ import java.util.Date;
  *
  * @author Michelle.Chung
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
-public class SysConfig implements Id<Long>, Serializable {
+public class SysConfig extends TenantEntity implements Id<Long>, Serializable {
     private static final long serialVersionUID = 1L;
 
     /**

iot-data/iot-model/src/main/java/cc/iotkit/model/system/SysDept.java

@@ -1,7 +1,9 @@
 package cc.iotkit.model.system;
 
 import cc.iotkit.model.Id;
+import cc.iotkit.model.TenantEntity;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -11,8 +13,9 @@ import java.util.Date;
  *
  * @author Michelle.Chung
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
-public class SysDept implements Id<Long>, Serializable {
+public class SysDept extends TenantEntity implements Id<Long>, Serializable {
     private static final long serialVersionUID = 1L;
 
     /**

iot-data/iot-model/src/main/java/cc/iotkit/model/system/SysDictData.java

@@ -1,7 +1,10 @@
 package cc.iotkit.model.system;
 
 import cc.iotkit.model.Id;
+import cc.iotkit.model.TenantEntity;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -11,8 +14,9 @@ import java.util.Date;
  *
  * @author Michelle.Chung
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
-public class SysDictData implements Id<Long>,Serializable {
+public class SysDictData extends TenantEntity implements Id<Long>,Serializable {
     private static final long serialVersionUID = 1L;
 
     /**

iot-data/iot-model/src/main/java/cc/iotkit/model/system/SysDictType.java

@@ -1,7 +1,10 @@
 package cc.iotkit.model.system;
 
 import cc.iotkit.model.Id;
+import cc.iotkit.model.TenantEntity;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -11,8 +14,9 @@ import java.util.Date;
  *
  * @author Michelle.Chung
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
-public class SysDictType implements Id<Long>,Serializable {
+public class SysDictType extends TenantEntity implements Id<Long>,Serializable {
     private static final long serialVersionUID = 1L;
 
     /**

iot-data/iot-model/src/main/java/cc/iotkit/model/system/SysLogininfor.java

@@ -14,7 +14,6 @@ import java.util.Date;
  * @date 2023-02-07
  */
 @Data
-@AutoMapper(target = SysLogininfor.class)
 public class SysLogininfor implements Id<Long>,Serializable {
     private static final long serialVersionUID = 1L;
 

iot-data/iot-model/src/main/java/cc/iotkit/model/system/SysMenu.java

@@ -1,7 +1,9 @@
 package cc.iotkit.model.system;
 
+import cc.iotkit.model.BaseEntity;
 import cc.iotkit.model.Id;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -14,8 +16,9 @@ import java.util.List;
  *
  * @author Michelle.Chung
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
-public class SysMenu implements Id<Long>,Serializable {
+public class SysMenu extends BaseEntity implements Id<Long>,Serializable {
     private static final long serialVersionUID = 1L;
 
     /**

iot-data/iot-model/src/main/java/cc/iotkit/model/system/SysNotice.java

@@ -1,7 +1,10 @@
 package cc.iotkit.model.system;
 
 import cc.iotkit.model.Id;
+import cc.iotkit.model.TenantEntity;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -11,8 +14,9 @@ import java.util.Date;
  *
  * @author Michelle.Chung
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
-public class SysNotice implements Id<Long>,Serializable {
+public class SysNotice extends TenantEntity implements Id<Long>, Serializable {
     private static final long serialVersionUID = 1L;
 
     /**

iot-data/iot-model/src/main/java/cc/iotkit/model/system/SysOss.java

@@ -1,7 +1,9 @@
 package cc.iotkit.model.system;
 
 import cc.iotkit.model.Id;
+import cc.iotkit.model.TenantEntity;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -11,8 +13,9 @@ import java.util.Date;
  *
  * @author Lion Li
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
-public class SysOss implements Id<Long>,Serializable {
+public class SysOss  extends TenantEntity implements Id<Long>,Serializable {
     private static final long serialVersionUID = 1L;
 
     /**

iot-data/iot-model/src/main/java/cc/iotkit/model/system/SysOssConfig.java

@@ -1,7 +1,9 @@
 package cc.iotkit.model.system;
 
 import cc.iotkit.model.Id;
+import cc.iotkit.model.TenantEntity;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 
@@ -13,8 +15,9 @@ import java.io.Serializable;
  * @author 孤舟烟雨
  * @date 2021-08-13
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
-public class SysOssConfig implements Id<Long>,Serializable {
+public class SysOssConfig extends TenantEntity implements Id<Long>, Serializable {
     private static final long serialVersionUID = 1L;
 
     /**

iot-data/iot-model/src/main/java/cc/iotkit/model/system/SysPost.java

@@ -1,7 +1,9 @@
 package cc.iotkit.model.system;
 
 import cc.iotkit.model.Id;
+import cc.iotkit.model.TenantEntity;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -12,8 +14,9 @@ import java.util.Date;
  *
  * @author Michelle.Chung
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
-public class SysPost implements Id<Long>,Serializable {
+public class SysPost extends TenantEntity implements Id<Long>,Serializable {
     private static final long serialVersionUID = 1L;
 
     /**

iot-data/iot-model/src/main/java/cc/iotkit/model/system/SysRole.java

@@ -2,7 +2,9 @@ package cc.iotkit.model.system;
 
 import cc.iotkit.common.constant.UserConstants;
 import cc.iotkit.model.Id;
+import cc.iotkit.model.TenantEntity;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -12,8 +14,9 @@ import java.util.Date;
  *
  * @author Michelle.Chung
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
-public class SysRole implements Id<Long>,Serializable {
+public class SysRole extends TenantEntity implements Id<Long>,Serializable {
     private static final long serialVersionUID = 1L;
 
     /**

iot-data/iot-model/src/main/java/cc/iotkit/model/system/SysTenant.java

@@ -1,7 +1,9 @@
 package cc.iotkit.model.system;
 
+import cc.iotkit.model.BaseEntity;
 import cc.iotkit.model.Id;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -12,8 +14,9 @@ import java.util.Date;
  *
  * @author Michelle.Chung
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
-public class SysTenant implements Id<Long>,Serializable {
+public class SysTenant extends BaseEntity implements Id<Long>,Serializable {
     private static final long serialVersionUID = 1L;
 
     /**

iot-data/iot-model/src/main/java/cc/iotkit/model/system/SysTenantPackage.java

@@ -1,7 +1,9 @@
 package cc.iotkit.model.system;
 
+import cc.iotkit.model.BaseEntity;
 import cc.iotkit.model.Id;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 
@@ -11,8 +13,9 @@ import java.io.Serializable;
  *
  * @author Michelle.Chung
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
-public class SysTenantPackage implements Id<Long>,Serializable {
+public class SysTenantPackage extends BaseEntity implements Id<Long>, Serializable {
     private static final long serialVersionUID = 1L;
 
     /**

iot-data/iot-model/src/main/java/cc/iotkit/model/system/SysUser.java

@@ -1,7 +1,9 @@
 package cc.iotkit.model.system;
 
 import cc.iotkit.model.Id;
+import cc.iotkit.model.TenantEntity;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -13,8 +15,9 @@ import java.util.List;
  *
  * @author Michelle.Chung
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
-public class SysUser implements Id<Long>, Serializable {
+public class SysUser extends TenantEntity implements Id<Long>, Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
@@ -22,11 +25,6 @@ public class SysUser implements Id<Long>, Serializable {
      */
     private Long id;
 
-    /**
-     * 租户ID
-     */
-    private String tenantId;
-
     /**
      * 部门ID
      */

iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysDataScopeService.java

@@ -1,26 +0,0 @@
-package cc.iotkit.system.service;
-
-/**
- * 通用 数据权限 服务
- *
- * @author Lion Li
- */
-public interface ISysDataScopeService {
-
-    /**
-     * 获取角色自定义权限
-     *
-     * @param roleId 角色id
-     * @return 部门id组
-     */
-    String getRoleCustom(Long roleId);
-
-    /**
-     * 获取部门及以下权限
-     *
-     * @param deptId 部门id
-     * @return 部门id组
-     */
-    String getDeptAndChild(Long deptId);
-
-}