update 更新基础包与核心包 lombok 化

5 years ago · 323fe960bd
parent 938ca5c451
commit 323fe960bd
8 changed files with 68 additions and 433 deletions
--- a/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java
@ -1,5 +1,9 @@
 package com.ruoyi.common.config;

+import lombok.Data;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;

@ -8,6 +12,10 @@ import org.springframework.stereotype.Component;
 * 
 * @author ruoyi
 */
+
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
@Component
@ConfigurationProperties(prefix = "ruoyi")
 public class RuoYiConfig
@ -25,66 +33,18 @@ public class RuoYiConfig
    private boolean demoEnabled;

    /** 上传路径 */
+    @Getter
    private static String profile;

    /** 获取地址开关 */
+    @Getter
    private static boolean addressEnabled;

-    public String getName()
-    {
-        return name;
-    }
-
-    public void setName(String name)
-    {
-        this.name = name;
-    }
-
-    public String getVersion()
-    {
-        return version;
-    }
-
-    public void setVersion(String version)
-    {
-        this.version = version;
-    }
-
-    public String getCopyrightYear()
-    {
-        return copyrightYear;
-    }
-
-    public void setCopyrightYear(String copyrightYear)
-    {
-        this.copyrightYear = copyrightYear;
-    }
-
-    public boolean isDemoEnabled()
-    {
-        return demoEnabled;
-    }
-
-    public void setDemoEnabled(boolean demoEnabled)
-    {
-        this.demoEnabled = demoEnabled;
-    }
-
-    public static String getProfile()
-    {
-        return profile;
-    }
-
    public void setProfile(String profile)
    {
        RuoYiConfig.profile = profile;
    }

-    public static boolean isAddressEnabled()
-    {
-        return addressEnabled;
-    }
-
    public void setAddressEnabled(boolean addressEnabled)
    {
        RuoYiConfig.addressEnabled = addressEnabled;
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
@ -1,16 +1,23 @@
 package com.ruoyi.common.core.domain;

+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
 import java.io.Serializable;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonFormat;

 /**
 * Entity基类
 * 
 * @author ruoyi
 */
+
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
 public class BaseEntity implements Serializable
 {
    private static final long serialVersionUID = 1L;
@ -38,77 +45,4 @@ public class BaseEntity implements Serializable
    /** 请求参数 */
    private Map<String, Object> params;

-    public String getSearchValue()
-    {
-        return searchValue;
-    }
-
-    public void setSearchValue(String searchValue)
-    {
-        this.searchValue = searchValue;
-    }
-
-    public String getCreateBy()
-    {
-        return createBy;
-    }
-
-    public void setCreateBy(String createBy)
-    {
-        this.createBy = createBy;
-    }
-
-    public Date getCreateTime()
-    {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime)
-    {
-        this.createTime = createTime;
-    }
-
-    public String getUpdateBy()
-    {
-        return updateBy;
-    }
-
-    public void setUpdateBy(String updateBy)
-    {
-        this.updateBy = updateBy;
-    }
-
-    public Date getUpdateTime()
-    {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime)
-    {
-        this.updateTime = updateTime;
-    }
-
-    public String getRemark()
-    {
-        return remark;
-    }
-
-    public void setRemark(String remark)
-    {
-        this.remark = remark;
-    }
-
-    public Map<String, Object> getParams()
-    {
-        if (params == null)
-        {
-            params = new HashMap<>();
-        }
-        return params;
-    }
-
-    public void setParams(Map<String, Object> params)
-    {
-        this.params = params;
-    }
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java
@ -1,5 +1,8 @@
 package com.ruoyi.common.core.domain;

+import lombok.*;
+import lombok.experimental.Accessors;
+
 import java.util.ArrayList;
 import java.util.List;

@ -8,6 +11,11 @@ import java.util.List;
 * 
 * @author ruoyi
 */
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
 public class TreeEntity extends BaseEntity
 {
    private static final long serialVersionUID = 1L;
@ -27,53 +35,4 @@ public class TreeEntity extends BaseEntity
    /** 子部门 */
    private List<?> children = new ArrayList<>();

-    public String getParentName()
-    {
-        return parentName;
-    }
-
-    public void setParentName(String parentName)
-    {
-        this.parentName = parentName;
-    }
-
-    public Long getParentId()
-    {
-        return parentId;
-    }
-
-    public void setParentId(Long parentId)
-    {
-        this.parentId = parentId;
-    }
-
-    public Integer getOrderNum()
-    {
-        return orderNum;
-    }
-
-    public void setOrderNum(Integer orderNum)
-    {
-        this.orderNum = orderNum;
-    }
-
-    public String getAncestors()
-    {
-        return ancestors;
-    }
-
-    public void setAncestors(String ancestors)
-    {
-        this.ancestors = ancestors;
-    }
-
-    public List<?> getChildren()
-    {
-        return children;
-    }
-
-    public void setChildren(List<?> children)
-    {
-        this.children = children;
-    }
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java
@ -1,17 +1,24 @@
 package com.ruoyi.common.core.domain;

-import java.io.Serializable;
-import java.util.List;
-import java.util.stream.Collectors;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysMenu;
+import lombok.*;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.stream.Collectors;

 /**
 * Treeselect树结构实体类
 * 
 * @author ruoyi
 */
+
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
 public class TreeSelect implements Serializable
 {
    private static final long serialVersionUID = 1L;
@ -26,11 +33,6 @@ public class TreeSelect implements Serializable
    @JsonInclude(JsonInclude.Include.NON_EMPTY)
    private List<TreeSelect> children;

-    public TreeSelect()
-    {
-
-    }
-
    public TreeSelect(SysDept dept)
    {
        this.id = dept.getDeptId();
@ -45,33 +47,4 @@ public class TreeSelect implements Serializable
        this.children = menu.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
    }

-    public Long getId()
-    {
-        return id;
-    }
-
-    public void setId(Long id)
-    {
-        this.id = id;
-    }
-
-    public String getLabel()
-    {
-        return label;
-    }
-
-    public void setLabel(String label)
-    {
-        this.label = label;
-    }
-
-    public List<TreeSelect> getChildren()
-    {
-        return children;
-    }
-
-    public void setChildren(List<TreeSelect> children)
-    {
-        this.children = children;
-    }
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java
@ -1,10 +1,17 @@
 package com.ruoyi.common.core.domain.model;

+import lombok.*;
+import lombok.experimental.Accessors;
+
 /**
 * 用户登录对象
 * 
 * @author ruoyi
 */
+
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
 public class LoginBody
 {
    /**
@ -27,43 +34,4 @@ public class LoginBody
     */
    private String uuid = "";

-    public String getUsername()
-    {
-        return username;
-    }
-
-    public void setUsername(String username)
-    {
-        this.username = username;
-    }
-
-    public String getPassword()
-    {
-        return password;
-    }
-
-    public void setPassword(String password)
-    {
-        this.password = password;
-    }
-
-    public String getCode()
-    {
-        return code;
-    }
-
-    public void setCode(String code)
-    {
-        this.code = code;
-    }
-
-    public String getUuid()
-    {
-        return uuid;
-    }
-
-    public void setUuid(String uuid)
-    {
-        this.uuid = uuid;
-    }
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
@ -1,17 +1,24 @@
 package com.ruoyi.common.core.domain.model;

-import java.util.Collection;
-import java.util.Set;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.ruoyi.common.core.domain.entity.SysUser;
+import lombok.*;
+import lombok.experimental.Accessors;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
+
+import java.util.Collection;
+import java.util.Set;

 /**
 * 登录用户身份权限
 * 
 * @author ruoyi
 */
+
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
 public class LoginUser implements UserDetails
 {
    private static final long serialVersionUID = 1L;
@ -61,20 +68,6 @@ public class LoginUser implements UserDetails
     */
    private SysUser user;

-    public String getToken()
-    {
-        return token;
-    }
-
-    public void setToken(String token)
-    {
-        this.token = token;
-    }
-
-    public LoginUser()
-    {
-    }
-
    public LoginUser(SysUser user, Set<String> permissions)
    {
        this.user = user;
@ -140,86 +133,6 @@ public class LoginUser implements UserDetails
        return true;
    }

-    public Long getLoginTime()
-    {
-        return loginTime;
-    }
-
-    public void setLoginTime(Long loginTime)
-    {
-        this.loginTime = loginTime;
-    }
-
-    public String getIpaddr()
-    {
-        return ipaddr;
-    }
-
-    public void setIpaddr(String ipaddr)
-    {
-        this.ipaddr = ipaddr;
-    }
-
-    public String getLoginLocation()
-    {
-        return loginLocation;
-    }
-
-    public void setLoginLocation(String loginLocation)
-    {
-        this.loginLocation = loginLocation;
-    }
-
-    public String getBrowser()
-    {
-        return browser;
-    }
-
-    public void setBrowser(String browser)
-    {
-        this.browser = browser;
-    }
-
-    public String getOs()
-    {
-        return os;
-    }
-
-    public void setOs(String os)
-    {
-        this.os = os;
-    }
-
-    public Long getExpireTime()
-    {
-        return expireTime;
-    }
-
-    public void setExpireTime(Long expireTime)
-    {
-        this.expireTime = expireTime;
-    }
-
-    public Set<String> getPermissions()
-    {
-        return permissions;
-    }
-
-    public void setPermissions(Set<String> permissions)
-    {
-        this.permissions = permissions;
-    }
-
-    public SysUser getUser()
-    {
-        return user;
-    }
-
-    public void setUser(SysUser user)
-    {
-        this.user = user;
-    }
-
    @Override
    public Collection<? extends GrantedAuthority> getAuthorities()
    {
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
@ -1,12 +1,18 @@
 package com.ruoyi.common.core.page;

 import cn.hutool.core.util.StrUtil;
+import lombok.*;
+import lombok.experimental.Accessors;

 /**
 * 分页数据
 * 
 * @author ruoyi
 */
+
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
 public class PageDomain
 {
    /** 当前记录起始索引 */
@ -30,43 +36,4 @@ public class PageDomain
        return StrUtil.toUnderlineCase(orderByColumn) + " " + isAsc;
    }

-    public Integer getPageNum()
-    {
-        return pageNum;
-    }
-
-    public void setPageNum(Integer pageNum)
-    {
-        this.pageNum = pageNum;
-    }
-
-    public Integer getPageSize()
-    {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize)
-    {
-        this.pageSize = pageSize;
-    }
-
-    public String getOrderByColumn()
-    {
-        return orderByColumn;
-    }
-
-    public void setOrderByColumn(String orderByColumn)
-    {
-        this.orderByColumn = orderByColumn;
-    }
-
-    public String getIsAsc()
-    {
-        return isAsc;
-    }
-
-    public void setIsAsc(String isAsc)
-    {
-        this.isAsc = isAsc;
-    }
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java
@ -1,5 +1,8 @@
 package com.ruoyi.common.core.page;

+import lombok.*;
+import lombok.experimental.Accessors;
+
 import java.io.Serializable;
 import java.util.List;

@ -8,6 +11,10 @@ import java.util.List;
 * 
 * @author ruoyi
 */
+
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
 public class TableDataInfo<T> implements Serializable
 {
    private static final long serialVersionUID = 1L;
@ -24,13 +31,6 @@ public class TableDataInfo<T> implements Serializable
    /** 消息内容 */
    private String msg;

-    /**
-     * 表格数据对象
-     */
-    public TableDataInfo()
-    {
-    }
-
    /**
     * 分页
     * 
@ -43,43 +43,4 @@ public class TableDataInfo<T> implements Serializable
        this.total = total;
    }

-    public long getTotal()
-    {
-        return total;
-    }
-
-    public void setTotal(long total)
-    {
-        this.total = total;
-    }
-
-    public List<T> getRows()
-    {
-        return rows;
-    }
-
-    public void setRows(List<T> rows)
-    {
-        this.rows = rows;
-    }
-
-    public int getCode()
-    {
-        return code;
-    }
-
-    public void setCode(int code)
-    {
-        this.code = code;
-    }
-
-    public String getMsg()
-    {
-        return msg;
-    }
-
-    public void setMsg(String msg)
-    {
-        this.msg = msg;
-    }
 }