优化序列化标识

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/District.java

@@ -3,15 +3,29 @@ package org.hswebframework.web.organizational.authorization;
 import java.io.Serializable;
 
 /**
+ * 行政区域
+ *
  * @author zhouhao
  * @since 3.0
  */
 public interface District extends Serializable {
+    /**
+     * @return 行政区域ID
+     */
     String getId();
 
+    /**
+     * @return 行政区域名称, 如:江津区
+     */
     String getName();
 
+    /**
+     * @return 行政区域全名, 如:重庆市江津区
+     */
     String getFullName();
 
+    /**
+     * @return 行政区域代码, 如: 500116
+     */
     String getCode();
 }

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/Organization.java

@@ -3,17 +3,34 @@ package org.hswebframework.web.organizational.authorization;
 import java.io.Serializable;
 
 /**
+ * 组织,机构,公司
+ *
  * @author zhouhao
  * @since 3.0
  */
 public interface Organization extends Serializable {
+    /**
+     * @return 组织ID, 唯一
+     */
     String getId();
 
+    /**
+     * @return 组织名称, 如: xxx公司
+     */
     String getName();
 
+    /**
+     * @return 组织全称, 如: 重庆市xxxx公司
+     */
     String getFullName();
 
+    /**
+     * @return 组织代码
+     */
     String getCode();
 
+    /**
+     * @return 所在行政区, 如果未关联将返回<code>null</code>
+     */
     District getDistrict();
 }

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/TreeNode.java

@@ -14,6 +14,7 @@ import java.util.function.Predicate;
  * @since 3.0
  */
 public class TreeNode<V> implements Serializable {
+    private static final long serialVersionUID = 1_0;
 
     /**
      * 父节点,根节点为{@code null}

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/relation/Relation.java

@@ -48,8 +48,9 @@ public interface Relation extends Serializable {
 
     /**
      * @return 关系目标对象，用于获取建立关系对象完整信息，返回值的类型可能随着{@link this#getType()}的不同而变化
+     * @see RelationTargetSupplier
      */
-    Object getTargetObject();
+    Serializable getTargetObject();
 
     /**
      * @return 关系名称，与{@link this#getType()} 对应，如: 经理,员工

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/relation/SimpleRelation.java

@@ -1,18 +1,20 @@
 package org.hswebframework.web.organizational.authorization.relation;
 
+import java.io.Serializable;
+
 /**
- * TODO 完成注释
  *
  * @author zhouhao
  */
 public class SimpleRelation implements Relation {
+    private static final long serialVersionUID = 1_0;
     private String type;
 
     private String relation;
 
     private String target;
 
-    private Object targetObject;
+    private Serializable targetObject;
 
     private String name;
 
@@ -46,11 +48,11 @@ public class SimpleRelation implements Relation {
     }
 
     @Override
-    public Object getTargetObject() {
+    public Serializable getTargetObject() {
         return targetObject;
     }
 
-    public void setTargetObject(Object targetObject) {
+    public void setTargetObject(Serializable targetObject) {
         this.targetObject = targetObject;
     }
 

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/relation/SimpleRelations.java

@@ -8,8 +8,8 @@ import java.util.Objects;
  * @author zhouhao
  */
 public class SimpleRelations implements Relations {
+    private static final long serialVersionUID = 1_0;
     private List<Relation> all;
-
     @Override
     public List<Relation> getAll() {
         if (null == all) {

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/CustomScope.java

@@ -9,7 +9,7 @@ import java.util.Set;
  * @author zhouhao
  */
 public class CustomScope implements Serializable {
-
+    private static final long serialVersionUID = 1_0;
     private String type;
 
     private Set<String> ids;

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/CustomScopeDataAccessConfigConvert.java

@@ -11,8 +11,6 @@ import java.util.List;
 import static org.hswebframework.web.organizational.authorization.access.DataAccessType.*;
 
 /**
- * TODO 完成注释
- *
  * @author zhouhao
  */
 public class CustomScopeDataAccessConfigConvert implements DataAccessConfigConvert {

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/ScopeDataAccessConfigConvert.java

@@ -10,8 +10,6 @@ import java.util.List;
 import static org.hswebframework.web.organizational.authorization.access.DataAccessType.*;
 
 /**
- * TODO 完成注释
- *
  * @author zhouhao
  */
 public class ScopeDataAccessConfigConvert implements DataAccessConfigConvert {

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/SimpleCustomScopeDataAccessConfig.java

@@ -11,6 +11,7 @@ import java.util.Set;
  * @author zhouhao
  */
 public class SimpleCustomScopeDataAccessConfig extends AbstractDataAccessConfig {
+    private static final long serialVersionUID = 1_0;
     private Set<CustomScope> scope;
 
     @Override

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/SimpleDepartment.java

@@ -16,6 +16,7 @@ import org.hswebframework.web.organizational.authorization.Organization;
 @NoArgsConstructor
 @AllArgsConstructor
 public class SimpleDepartment implements Department {
+    private static final long serialVersionUID = 1_0;
     private String id;
     private String name;
     private String code;

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/SimpleDistrict.java

@@ -15,6 +15,7 @@ import org.hswebframework.web.organizational.authorization.District;
 @AllArgsConstructor
 @Builder
 public class SimpleDistrict implements District {
+    private static final long serialVersionUID = 1_0;
     private String id;
     private String name;
     private String fullName;

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/SimpleOrganization.java

@@ -16,13 +16,10 @@ import org.hswebframework.web.organizational.authorization.Organization;
 @AllArgsConstructor
 @Builder
 public class SimpleOrganization implements Organization {
+    private static final long serialVersionUID = 1_0;
     private String id;
-
     private String name;
-
     private String fullName;
-
     private String code;
-
     private District district;
 }

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/SimplePersonnel.java

@@ -1,61 +1,21 @@
 package org.hswebframework.web.organizational.authorization.simple;
 
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.hswebframework.web.organizational.authorization.Personnel;
 
 /**
- * TODO 完成注释
- *
  * @author zhouhao
  */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class SimplePersonnel implements Personnel {
+    private static final long serialVersionUID = 1_0;
     private String id;
     private String name;
     private String phone;
     private String photo;
     private String email;
-
-    @Override
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @Override
-    public String getPhone() {
-        return phone;
-    }
-
-    public void setPhone(String phone) {
-        this.phone = phone;
-    }
-
-    @Override
-    public String getPhoto() {
-        return photo;
-    }
-
-    public void setPhoto(String photo) {
-        this.photo = photo;
-    }
-
-    @Override
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
 }

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/SimplePersonnelAuthorization.java

@@ -13,6 +13,7 @@ import java.util.Set;
  * @author zhouhao
  */
 public class SimplePersonnelAuthorization implements PersonnelAuthorization {
+    private static final long serialVersionUID = 1_0;
     private Personnel             personnel;
     private Set<TreeNode<String>> districtIds;
     private Set<TreeNode<String>> orgIds;

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/SimplePosition.java

@@ -16,6 +16,7 @@ import org.hswebframework.web.organizational.authorization.Position;
 @AllArgsConstructor
 @Builder
 public class SimplePosition implements Position {
+    private static final long serialVersionUID = 1_0;
     private String id;
 
     private String name;

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/SimpleScopeDataAccessConfig.java

@@ -7,11 +7,11 @@ import org.hswebframework.web.authorization.access.ScopeDataAccessConfig;
 import java.util.Set;
 
 /**
- * TODO 完成注释
- *
  * @author zhouhao
+ * @since 3.0
  */
 public class SimpleScopeDataAccessConfig extends AbstractDataAccessConfig implements ScopeDataAccessConfig {
+    private static final long serialVersionUID = 1_0;
     private String      scopeType;
     private Set<Object> scope;
     private String      type;