add lombok

hsweb-commons/hsweb-commons-entity/pom.xml

@@ -56,7 +56,6 @@
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-dao/hsweb-system-authorization-dao-mybatis/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/authorization/AuthorizationSettingDetailMapper.xml

@@ -19,7 +19,7 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://www.mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.hswebframework.web.dao.authorization.AuthorizationSettingDetailDao">
-    <resultMap id="AuthorizationSettingDetailResultMap" type="org.hswebframework.web.entity.authorization.SimpleAuthorizationSettingDetailEntity">
+    <resultMap id="AuthorizationSettingDetailResultMap" type="org.hswebframework.web.entity.authorization.AuthorizationSettingDetailEntity">
         <id property="id" column="u_id" javaType="string" jdbcType="VARCHAR"/>
         <result property="permissionId" column="permission_id" javaType="String" jdbcType="VARCHAR"/>
         <result property="settingId" column="setting_id" javaType="String" jdbcType="VARCHAR"/>
@@ -36,7 +36,7 @@
         <bind name="tableName" value="'s_autz_detail'"/>
     </sql>
 
-    <insert id="insert" parameterType="org.hswebframework.web.entity.authorization.SimpleAuthorizationSettingDetailEntity">
+    <insert id="insert" parameterType="org.hswebframework.web.entity.authorization.AuthorizationSettingDetailEntity">
         <include refid="config"/>
         <include refid="BasicMapper.buildInsertSql"/>
     </insert>

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-entity/src/main/java/org/hswebframework/web/entity/authorization/ActionEntity.java

@@ -1,11 +1,17 @@
 package org.hswebframework.web.entity.authorization;
 
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
 import org.hswebframework.web.commons.entity.CloneableEntity;
 
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
+@Getter
+@Setter
+@NoArgsConstructor
 public class ActionEntity implements CloneableEntity {
 
     private String action;
@@ -14,37 +20,10 @@ public class ActionEntity implements CloneableEntity {
 
     private boolean defaultCheck;
 
-    public ActionEntity() {
-    }
-
     public ActionEntity(String action) {
         this.action = action;
     }
 
-    public String getAction() {
-        return action;
-    }
-
-    public void setAction(String action) {
-        this.action = action;
-    }
-
-    public String getDescribe() {
-        return describe;
-    }
-
-    public void setDescribe(String describe) {
-        this.describe = describe;
-    }
-
-    public boolean isDefaultCheck() {
-        return defaultCheck;
-    }
-
-    public void setDefaultCheck(boolean defaultCheck) {
-        this.defaultCheck = defaultCheck;
-    }
-
     @Override
     public ActionEntity clone() {
         try {

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-entity/src/main/java/org/hswebframework/web/entity/authorization/AuthorizationSettingDetailEntity.java

@@ -112,7 +112,7 @@ public interface AuthorizationSettingDetailEntity extends GenericEntity<String>,
 
     void setPriority(Long priority);
 
-    Boolean isMerge();
+    Boolean getMerge();
 
     void setMerge(Boolean merge);
 

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-entity/src/main/java/org/hswebframework/web/entity/authorization/MenuGroupEntity.java

@@ -85,7 +85,7 @@ public interface MenuGroupEntity extends TreeSortSupportEntity<String> {
     /**
      * @return 是否默认
      */
-    Boolean isDefaultGroup();
+    Boolean getDefaultGroup();
 
     /**
      * 设置 是否默认

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-entity/src/main/java/org/hswebframework/web/entity/authorization/SimpleAuthorizationSettingDetailEntity.java

@@ -16,6 +16,9 @@
  */
 package org.hswebframework.web.entity.authorization;
 
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
 import org.hswebframework.web.commons.entity.SimpleGenericEntity;
 
 import java.util.List;
@@ -26,7 +29,11 @@ import java.util.Set;
  *
  * @author hsweb-generator-online
  */
+@Getter
+@Setter
+@NoArgsConstructor
 public class SimpleAuthorizationSettingDetailEntity extends SimpleGenericEntity<String> implements AuthorizationSettingDetailEntity {
+    private static final long serialVersionUID = -4284551748747749521L;
     //权限id
     private String                 permissionId;
     //设置id
@@ -41,104 +48,4 @@ public class SimpleAuthorizationSettingDetailEntity extends SimpleGenericEntity<
     private Long                   priority;
     //是否合并
     private Boolean                merge;
-
-    /**
-     * @return 权限id
-     */
-    @Override
-    public String getPermissionId() {
-        return this.permissionId;
-    }
-
-    /**
-     * 设置 权限id
-     */
-    @Override
-    public void setPermissionId(String permissionId) {
-        this.permissionId = permissionId;
-    }
-
-    /**
-     * @return 设置id
-     */
-    @Override
-    public String getSettingId() {
-        return this.settingId;
-    }
-
-    /**
-     * 设置 设置id
-     */
-    @Override
-    public void setSettingId(String settingId) {
-        this.settingId = settingId;
-    }
-
-    /**
-     * @return 可操作类型
-     */
-    @Override
-    public Set<String> getActions() {
-        return this.actions;
-    }
-
-    /**
-     * 设置 可操作类型
-     */
-    @Override
-    public void setActions(Set<String> actions) {
-        this.actions = actions;
-    }
-
-    /**
-     * @return 数据权限控制
-     */
-    @Override
-    public List<DataAccessEntity> getDataAccesses() {
-        return this.dataAccesses;
-    }
-
-    /**
-     * 设置 数据权限控制
-     */
-    @Override
-    public void setDataAccesses(List<DataAccessEntity> dataAccesses) {
-        this.dataAccesses = dataAccesses;
-    }
-
-    /**
-     * @return 状态
-     */
-    @Override
-    public Byte getStatus() {
-        return this.status;
-    }
-
-    /**
-     * 设置 状态
-     */
-    @Override
-    public void setStatus(Byte status) {
-        this.status = status;
-    }
-
-    @Override
-    public Long getPriority() {
-        return priority;
-    }
-
-    @Override
-    public void setPriority(Long priority) {
-        this.priority = priority;
-    }
-
-    @Override
-    public Boolean isMerge() {
-        return merge;
-    }
-
-    @Override
-    public void setMerge(Boolean merge) {
-        this.merge = merge;
-    }
 }

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-entity/src/main/java/org/hswebframework/web/entity/authorization/SimpleAuthorizationSettingEntity.java

@@ -16,6 +16,9 @@
  */
 package org.hswebframework.web.entity.authorization;
 
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
 import org.hswebframework.web.commons.entity.SimpleGenericEntity;
 
 import java.util.List;
@@ -25,7 +28,11 @@ import java.util.List;
  *
  * @author hsweb-generator-online
  */
+@Getter
+@Setter
+@NoArgsConstructor
 public class SimpleAuthorizationSettingEntity extends SimpleGenericEntity<String> implements AuthorizationSettingEntity {
+    private static final long serialVersionUID = -6036823477895044483L;
     //类型
     private String type;
     //设置给谁
@@ -39,87 +46,5 @@ public class SimpleAuthorizationSettingEntity extends SimpleGenericEntity<String
 
     private List<AuthorizationSettingDetailEntity> details;
 
-    @Override
-    public List<AuthorizationSettingDetailEntity> getDetails() {
-        return details;
-    }
 
-    @Override
-    public void setDetails(List<AuthorizationSettingDetailEntity> details) {
-        this.details = details;
-    }
-
-    @Override
-    public List<AuthorizationSettingMenuEntity> getMenus() {
-        return menus;
-    }
-
-    @Override
-    public void setMenus(List<AuthorizationSettingMenuEntity> menus) {
-        this.menus = menus;
-    }
-
-    /**
-     * @return 类型
-     */
-    @Override
-    public String getType() {
-        return this.type;
-    }
-
-    /**
-     * 设置 类型
-     */
-    @Override
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    /**
-     * @return 设置给谁
-     */
-    @Override
-    public String getSettingFor() {
-        return this.settingFor;
-    }
-
-    /**
-     * 设置 设置给谁
-     */
-    @Override
-    public void setSettingFor(String settingFor) {
-        this.settingFor = settingFor;
-    }
-
-    /**
-     * @return 状态
-     */
-    @Override
-    public Byte getStatus() {
-        return this.status;
-    }
-
-    /**
-     * 设置 状态
-     */
-    @Override
-    public void setStatus(Byte status) {
-        this.status = status;
-    }
-
-    /**
-     * @return 备注
-     */
-    @Override
-    public String getDescribe() {
-        return this.describe;
-    }
-
-    /**
-     * 设置 备注
-     */
-    @Override
-    public void setDescribe(String describe) {
-        this.describe = describe;
-    }
 }

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-entity/src/main/java/org/hswebframework/web/entity/authorization/SimpleAuthorizationSettingMenuEntity.java

@@ -16,6 +16,9 @@
  */
 package org.hswebframework.web.entity.authorization;
 
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
 import org.hswebframework.web.commons.entity.SimpleTreeSortSupportEntity;
 
 import java.util.List;
@@ -25,7 +28,11 @@ import java.util.List;
  *
  * @author hsweb-generator-online
  */
+@Getter
+@Setter
+@NoArgsConstructor
 public class SimpleAuthorizationSettingMenuEntity extends SimpleTreeSortSupportEntity<String> implements AuthorizationSettingMenuEntity {
+    private static final long serialVersionUID = 4311480526446922229L;
     //菜单id
     private String menuId;
     //设置id
@@ -34,81 +41,6 @@ public class SimpleAuthorizationSettingMenuEntity extends SimpleTreeSortSupportE
     private Byte   status;
     //其他配置内容
     private String config;
-
     private List<AuthorizationSettingMenuEntity> children;
 
-    /**
-     * @return 菜单id
-     */
-    @Override
-    public String getMenuId() {
-        return this.menuId;
-    }
-
-    /**
-     * 设置 菜单id
-     */
-    @Override
-    public void setMenuId(String menuId) {
-        this.menuId = menuId;
-    }
-
-    /**
-     * @return 设置id
-     */
-    @Override
-    public String getSettingId() {
-        return this.settingId;
-    }
-
-    /**
-     * 设置 设置id
-     */
-    @Override
-    public void setSettingId(String settingId) {
-        this.settingId = settingId;
-    }
-
-
-    /**
-     * @return 状态
-     */
-    @Override
-    public Byte getStatus() {
-        return this.status;
-    }
-
-    /**
-     * 设置 状态
-     */
-    @Override
-    public void setStatus(Byte status) {
-        this.status = status;
-    }
-
-    /**
-     * @return 其他配置内容
-     */
-    @Override
-    public String getConfig() {
-        return this.config;
-    }
-
-    /**
-     * 设置 其他配置内容
-     */
-    @Override
-    public void setConfig(String config) {
-        this.config = config;
-    }
-
-    @Override
-    public List<AuthorizationSettingMenuEntity> getChildren() {
-        return children;
-    }
-
-    @Override
-    public void setChildren(List<AuthorizationSettingMenuEntity> children) {
-        this.children = children;
-    }
 }

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-entity/src/main/java/org/hswebframework/web/entity/authorization/SimpleMenuEntity.java

@@ -18,6 +18,9 @@
 
 package org.hswebframework.web.entity.authorization;
 
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
 import org.hswebframework.web.commons.entity.SimpleTreeSortSupportEntity;
 
 import java.util.ArrayList;
@@ -30,10 +33,13 @@ import java.util.stream.Collectors;
  * @author zhouhao
  * @since 3.0
  */
-@SuppressWarnings("unchecked")
+@Getter
+@Setter
+@NoArgsConstructor
 public class SimpleMenuEntity extends SimpleTreeSortSupportEntity<String>
         implements MenuEntity {
 
+    private static final long serialVersionUID = 6942822850955576468L;
     //菜单名称
     private String name;
 
@@ -55,76 +61,6 @@ public class SimpleMenuEntity extends SimpleTreeSortSupportEntity<String>
     //子菜单
     private List<MenuEntity> children;
 
-    @Override
-    public List<MenuEntity> getChildren() {
-        return children;
-    }
-
-    @Override
-    public void setChildren(List<MenuEntity> children) {
-        this.children = children;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @Override
-    public String getDescribe() {
-        return describe;
-    }
-
-    @Override
-    public void setDescribe(String describe) {
-        this.describe = describe;
-    }
-
-    @Override
-    public String getPermissionId() {
-        return permissionId;
-    }
-
-    @Override
-    public void setPermissionId(String permissionId) {
-        this.permissionId = permissionId;
-    }
-
-    @Override
-    public String getUrl() {
-        return url;
-    }
-
-    @Override
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
-    @Override
-    public String getIcon() {
-        return icon;
-    }
-
-    @Override
-    public void setIcon(String icon) {
-        this.icon = icon;
-    }
-
-    @Override
-    public Byte getStatus() {
-        return status;
-    }
-
-    @Override
-    public void setStatus(Byte status) {
-        this.status = status;
-    }
-
     @Override
     public SimpleMenuEntity clone() {
         SimpleMenuEntity target = (SimpleMenuEntity) super.clone();

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-entity/src/main/java/org/hswebframework/web/entity/authorization/SimpleMenuGroupBindEntity.java

@@ -16,6 +16,9 @@
  */
 package org.hswebframework.web.entity.authorization;
 
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
 import org.hswebframework.web.commons.entity.SimpleTreeSortSupportEntity;
 
 import java.util.ArrayList;
@@ -26,7 +29,11 @@ import java.util.List;
  *
  * @author hsweb-generator-online
  */
+@Getter
+@Setter
+@NoArgsConstructor
 public class SimpleMenuGroupBindEntity extends SimpleTreeSortSupportEntity<String> implements MenuGroupBindEntity {
+    private static final long serialVersionUID = -8671671135008425741L;
     //状态
     private Byte                      status;
     //菜单id
@@ -35,57 +42,4 @@ public class SimpleMenuGroupBindEntity extends SimpleTreeSortSupportEntity<Strin
     private String                    groupId;
     //子节点
     private List<MenuGroupBindEntity> children;
-
-    @Override
-    public Byte getStatus() {
-        return status;
-    }
-
-    @Override
-    public void setStatus(Byte status) {
-        this.status = status;
-    }
-
-    /**
-     * @return 菜单id
-     */
-    @Override
-    public String getMenuId() {
-        return this.menuId;
-    }
-
-    /**
-     * 设置 菜单id
-     */
-    @Override
-    public void setMenuId(String menuId) {
-        this.menuId = menuId;
-    }
-
-    /**
-     * @return 分组id
-     */
-    @Override
-    public String getGroupId() {
-        return this.groupId;
-    }
-
-    /**
-     * 设置 分组id
-     */
-    @Override
-    public void setGroupId(String groupId) {
-        this.groupId = groupId;
-    }
-
-
-    @Override
-    public List<MenuGroupBindEntity> getChildren() {
-        return children;
-    }
-
-    @Override
-    public void setChildren(List<MenuGroupBindEntity> children) {
-        this.children = children;
-    }
 }

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-entity/src/main/java/org/hswebframework/web/entity/authorization/SimpleMenuGroupEntity.java

@@ -16,6 +16,9 @@
  */
 package org.hswebframework.web.entity.authorization;
 
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
 import org.hswebframework.web.commons.entity.SimpleTreeSortSupportEntity;
 
 import java.util.Collections;
@@ -27,7 +30,11 @@ import java.util.List;
  *
  * @author hsweb-generator-online
  */
+@Getter
+@Setter
+@NoArgsConstructor
 public class SimpleMenuGroupEntity extends SimpleTreeSortSupportEntity<String> implements MenuGroupEntity {
+    private static final long serialVersionUID = 349586524046467254L;
     //分组名称
     private String  name;
     //分组描述
@@ -37,87 +44,7 @@ public class SimpleMenuGroupEntity extends SimpleTreeSortSupportEntity<String> i
     //状态
     private Byte    status;
 
-    private List<SimpleMenuGroupEntity> children;
+    private List<MenuGroupEntity> children;
 
-    private List<SimpleMenuGroupBindEntity> bindInfo;
-
-    /**
-     * @return 分组名称
-     */
-    @Override
-    public String getName() {
-        return this.name;
-    }
-
-    /**
-     * 设置 分组名称
-     */
-    @Override
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    /**
-     * @return 分组描述
-     */
-    @Override
-    public String getDescribe() {
-        return this.describe;
-    }
-
-    /**
-     * 设置 分组描述
-     */
-    @Override
-    public void setDescribe(String describe) {
-        this.describe = describe;
-    }
-
-    /**
-     * @return 是否默认
-     */
-    @Override
-    public Boolean isDefaultGroup() {
-        return this.defaultGroup;
-    }
-
-    /**
-     * 设置 是否默认
-     */
-    @Override
-    public void setDefaultGroup(Boolean defaultGroup) {
-        this.defaultGroup = defaultGroup;
-    }
-
-    @Override
-    public List<SimpleMenuGroupEntity> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<SimpleMenuGroupEntity> children) {
-        this.children = children;
-    }
-
-    @Override
-    public List<MenuGroupBindEntity> getBindInfo() {
-        if (bindInfo == null) {
-            return Collections.emptyList();
-        }
-        return new LinkedList<>(bindInfo);
-    }
-
-    @Override
-    public void setBindInfo(List<MenuGroupBindEntity> bindInfo) {
-        this.bindInfo = new LinkedList(bindInfo);
-    }
-
-    @Override
-    public Byte getStatus() {
-        return status;
-    }
-
-    @Override
-    public void setStatus(Byte status) {
-        this.status = status;
-    }
+    private List<MenuGroupBindEntity> bindInfo;
 }

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-entity/src/main/java/org/hswebframework/web/entity/authorization/SimplePermissionEntity.java

@@ -1,5 +1,8 @@
 package org.hswebframework.web.entity.authorization;
 
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
 import org.hibernate.validator.constraints.NotBlank;
 import org.hswebframework.web.commons.entity.SimpleGenericEntity;
 
@@ -8,11 +11,13 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 /**
- * TODO 完成注释
- *
  * @author zhouhao
  */
+@Getter
+@Setter
+@NoArgsConstructor
 public class SimplePermissionEntity extends SimpleGenericEntity<String> implements PermissionEntity {
+    private static final long serialVersionUID = -5505339187716888516L;
     @NotBlank
     private String name;
 
@@ -30,56 +35,6 @@ public class SimplePermissionEntity extends SimpleGenericEntity<String> implemen
 
     private List<OptionalField> optionalFields;
 
-    @Override
-    public String getName() {
-        return this.name;
-    }
-
-    @Override
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @Override
-    public String getDescribe() {
-        return describe;
-    }
-
-    @Override
-    public void setDescribe(String describe) {
-        this.describe = describe;
-    }
-
-    @Override
-    public Byte getStatus() {
-        return status;
-    }
-
-    @Override
-    public void setStatus(Byte status) {
-        this.status = status;
-    }
-
-    @Override
-    public List<ActionEntity> getActions() {
-        return actions;
-    }
-
-    @Override
-    public void setActions(List<ActionEntity> actions) {
-        this.actions = actions;
-    }
-
-    @Override
-    public void setOptionalFields(List<OptionalField> optionalFields) {
-        this.optionalFields = optionalFields;
-    }
-
-    @Override
-    public List<OptionalField> getOptionalFields() {
-        return optionalFields;
-    }
-
     @Override
     public SimplePermissionEntity clone() {
         SimplePermissionEntity target = (SimplePermissionEntity) super.clone();
@@ -95,23 +50,4 @@ public class SimplePermissionEntity extends SimpleGenericEntity<String> implemen
         return target;
     }
 
-    @Override
-    public String getType() {
-        return type;
-    }
-
-    @Override
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    @Override
-    public List<String> getSupportDataAccessTypes() {
-        return supportDataAccessTypes;
-    }
-
-    @Override
-    public void setSupportDataAccessTypes(List<String> supportDataAccessTypes) {
-        this.supportDataAccessTypes = supportDataAccessTypes;
-    }
 }

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-entity/src/main/java/org/hswebframework/web/entity/authorization/SimpleRoleEntity.java

@@ -1,52 +1,26 @@
 package org.hswebframework.web.entity.authorization;
 
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
 import org.hswebframework.web.commons.entity.SimpleGenericEntity;
 
 /**
- * TODO 完成注释
- *
  * @author zhouhao
  */
+@Getter
+@Setter
+@NoArgsConstructor
 public class SimpleRoleEntity extends SimpleGenericEntity<String> implements RoleEntity {
+    private static final long serialVersionUID = -2857131363164004807L;
     private String name;
 
     private String describe;
 
     private Byte status;
 
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @Override
-    public String getDescribe() {
-        return describe;
-    }
-
-    @Override
-    public void setDescribe(String describe) {
-        this.describe = describe;
-    }
-
-    @Override
-    public Byte getStatus() {
-        return status;
-    }
-
-    @Override
-    public void setStatus(Byte status) {
-        this.status = status;
-    }
-
     @Override
     public SimpleRoleEntity clone() {
-        SimpleRoleEntity target = ((SimpleRoleEntity) super.clone());
-        return target;
+        return ((SimpleRoleEntity) super.clone());
     }
 }

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-entity/src/main/java/org/hswebframework/web/entity/authorization/SimpleUserEntity.java

@@ -1,13 +1,19 @@
 package org.hswebframework.web.entity.authorization;
 
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
 import org.hswebframework.web.commons.entity.SimpleGenericEntity;
 
 /**
- * TODO 完成注释
- *
  * @author zhouhao
  */
+@Getter
+@Setter
+@NoArgsConstructor
 public class SimpleUserEntity extends SimpleGenericEntity<String> implements UserEntity {
+    private static final long serialVersionUID = -2625681326256009807L;
+
     private String name;
 
     private String username;
@@ -22,76 +28,6 @@ public class SimpleUserEntity extends SimpleGenericEntity<String> implements Use
 
     private Byte status;
 
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @Override
-    public String getUsername() {
-        return username;
-    }
-
-    @Override
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    @Override
-    public String getPassword() {
-        return password;
-    }
-
-    @Override
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    @Override
-    public String getSalt() {
-        return salt;
-    }
-
-    @Override
-    public void setSalt(String salt) {
-        this.salt = salt;
-    }
-
-    @Override
-    public Long getCreateTime() {
-        return createTime;
-    }
-
-    @Override
-    public void setCreateTime(Long createTime) {
-        this.createTime = createTime;
-    }
-
-    @Override
-    public String getCreatorId() {
-        return creatorId;
-    }
-
-    @Override
-    public void setCreatorId(String creatorId) {
-        this.creatorId = creatorId;
-    }
-
-    @Override
-    public Byte getStatus() {
-        return status;
-    }
-
-    @Override
-    public void setStatus(Byte status) {
-        this.status = status;
-    }
-
     @Override
     public SimpleUserEntity clone() {
         return ((SimpleUserEntity) super.clone());

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-entity/src/main/java/org/hswebframework/web/entity/authorization/SimpleUserRoleEntity.java

@@ -1,36 +1,23 @@
 package org.hswebframework.web.entity.authorization;
 
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
 /**
- * TODO 完成注释
- *
  * @author zhouhao
  */
+@Getter
+@Setter
+@NoArgsConstructor
 public class SimpleUserRoleEntity implements UserRoleEntity {
 
+    private static final long serialVersionUID = -8831232608833695774L;
+
     private String userId;
 
     private String roleId;
 
-    @Override
-    public String getUserId() {
-        return userId;
-    }
-
-    @Override
-    public void setUserId(String userId) {
-        this.userId = userId;
-    }
-
-    @Override
-    public String getRoleId() {
-        return roleId;
-    }
-
-    @Override
-    public void setRoleId(String roleId) {
-        this.roleId = roleId;
-    }
-
     @Override
     public SimpleUserRoleEntity clone() {
         SimpleUserRoleEntity target = new SimpleUserRoleEntity();

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-entity/src/main/java/org/hswebframework/web/entity/authorization/UserMenuEntity.java

@@ -1,16 +1,22 @@
 package org.hswebframework.web.entity.authorization;
 
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
 import org.hswebframework.web.commons.entity.SimpleTreeSortSupportEntity;
 
 import java.util.List;
 
 /**
- * TODO 完成注释
- *
  * @author zhouhao
  */
+@Getter
+@Setter
+@NoArgsConstructor
 public class UserMenuEntity extends SimpleTreeSortSupportEntity<String> {
 
+    private static final long serialVersionUID = 7839545362972442294L;
+
     private String menuId;
 
     //菜单名称
@@ -30,60 +36,4 @@ public class UserMenuEntity extends SimpleTreeSortSupportEntity<String> {
 
     private List<UserMenuEntity> children;
 
-    public String getMenuId() {
-        return menuId;
-    }
-
-    public void setMenuId(String menuId) {
-        this.menuId = menuId;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getDescribe() {
-        return describe;
-    }
-
-    public void setDescribe(String describe) {
-        this.describe = describe;
-    }
-
-    public String getPermissionId() {
-        return permissionId;
-    }
-
-    public void setPermissionId(String permissionId) {
-        this.permissionId = permissionId;
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
-    public String getIcon() {
-        return icon;
-    }
-
-    public void setIcon(String icon) {
-        this.icon = icon;
-    }
-
-    @Override
-    public List<UserMenuEntity> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<UserMenuEntity> children) {
-        this.children = children;
-    }
 }

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-entity/src/main/java/org/hswebframework/web/entity/authorization/bind/BindRoleUserEntity.java

@@ -5,8 +5,6 @@ import org.hswebframework.web.entity.authorization.UserEntity;
 import java.util.List;
 
 /**
- * TODO 完成注释
- *
  * @author zhouhao
  */
 public interface BindRoleUserEntity extends UserEntity {

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-entity/src/main/java/org/hswebframework/web/entity/authorization/bind/SimpleBindRoleUserEntity.java

@@ -1,5 +1,8 @@
 package org.hswebframework.web.entity.authorization.bind;
 
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
 import org.hswebframework.web.entity.authorization.SimpleUserEntity;
 
 import java.util.ArrayList;
@@ -7,24 +10,15 @@ import java.util.HashMap;
 import java.util.List;
 
 /**
- * TODO 完成注释
- *
  * @author zhouhao
  */
+@Getter
+@Setter
+@NoArgsConstructor
 public class SimpleBindRoleUserEntity extends SimpleUserEntity implements BindRoleUserEntity {
 
     private List<String> roles;
 
-    @Override
-    public List<String> getRoles() {
-        return roles;
-    }
-
-    @Override
-    public void setRoles(List<String> roles) {
-        this.roles = roles;
-    }
-
     @Override
     public SimpleBindRoleUserEntity clone() {
         SimpleBindRoleUserEntity target = ((SimpleBindRoleUserEntity) super.clone());

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-service/hsweb-system-authorization-service-simple/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleAuthorizationSettingService.java

@@ -358,7 +358,7 @@ public class SimpleAuthorizationSettingService extends GenericEntityService<Auth
             Collections.sort(details);
             for (AuthorizationSettingDetailEntity detail : details) {
                 //如果指定不合并相同的配置,则清空之前的配置
-                if (!Boolean.TRUE.equals(detail.isMerge())) {
+                if (!Boolean.TRUE.equals(detail.getMerge())) {
                     actions.clear();
                     dataAccessConfigs.clear();
                 }

pom.xml

@@ -331,6 +331,11 @@
     </build>
 
     <dependencies>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>