From 323fe960bd07d0961b1b8f9ae8a4ad237450858e Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 12 四月 2021 17:26:47 +0800
Subject: [PATCH] update 更新基础包与核心包 lombok 化
---
ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java | 45 ----
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java | 57 -----
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java | 84 +--------
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java | 47 +----
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java | 109 +----------
ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java | 53 -----
ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java | 60 +-----
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java | 46 ----
8 files changed, 68 insertions(+), 433 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java b/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java
index d5d8723..682bebd 100644
--- 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 @@
*
* @author ruoyi
*/
+
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
@Component
@ConfigurationProperties(prefix = "ruoyi")
public class RuoYiConfig
@@ -25,64 +33,16 @@
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)
diff --git 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
index f7d5bf4..755ce99 100644
--- 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 @@
/** 璇锋眰鍙傛暟 */
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;
- }
}
diff --git 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
index 171f04c..2569fac 100644
--- 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 @@
*
* @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 @@
/** 瀛愰儴闂� */
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;
- }
}
diff --git 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
index bd835db..2049486 100644
--- 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;
@@ -25,11 +32,6 @@
/** 瀛愯妭鐐� */
@JsonInclude(JsonInclude.Include.NON_EMPTY)
private List<TreeSelect> children;
-
- public TreeSelect()
- {
-
- }
public TreeSelect(SysDept dept)
{
@@ -45,33 +47,4 @@
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;
- }
}
diff --git 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
index a1f8b83..ae2c9e2 100644
--- 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 @@
*/
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;
- }
}
diff --git 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
index 6e3f1c6..bb5b96e 100644
--- 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;
@@ -60,20 +67,6 @@
* 鐢ㄦ埛淇℃伅
*/
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)
{
@@ -138,86 +131,6 @@
public boolean isEnabled()
{
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
diff --git 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
index a68f284..2fc6b87 100644
--- 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 @@
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;
- }
}
diff --git 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
index 71aed2c..72c284f 100644
--- 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 @@
*
* @author ruoyi
*/
+
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
public class TableDataInfo<T> implements Serializable
{
private static final long serialVersionUID = 1L;
@@ -25,13 +32,6 @@
private String msg;
/**
- * 琛ㄦ牸鏁版嵁瀵硅薄
- */
- public TableDataInfo()
- {
- }
-
- /**
* 鍒嗛〉
*
* @param list 鍒楄〃鏁版嵁
@@ -43,43 +43,4 @@
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;
- }
}
--
Gitblit v1.9.3