From edfa49f201d3fc8fc6b51b700e91f80246660855 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 13 二月 2024 20:29:14 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/entity/User.java | 38 ++++++++++++++++++++++++++++++++------
1 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/entity/User.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/entity/User.java
index b285da2..167c016 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/entity/User.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/entity/User.java
@@ -1,8 +1,6 @@
package com.zy.asrs.wcs.sys.entity;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.SpringUtils;
import com.zy.asrs.wcs.sys.service.DeptService;
@@ -11,14 +9,16 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.security.core.userdetails.UserDetails;
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.List;
@Data
@TableName("sys_user")
-public class User implements Serializable {
+public class User implements Serializable, UserDetails {
private static final long serialVersionUID = 1L;
@@ -129,6 +129,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
@@ -162,6 +163,12 @@
*/
@ApiModelProperty(value= "澶囨敞")
private String memo;
+
+ @TableField(exist = false)
+ private List<Role> roles;
+
+ @TableField(exist = false)
+ private List<Menu> authorities;
public User() {}
@@ -245,7 +252,7 @@
DeptService service = SpringUtils.getBean(DeptService.class);
Dept dept = service.getById(this.deptId);
if (!Cools.isEmpty(dept)){
- return String.valueOf(dept.getId());
+ return String.valueOf(dept.getName());
}
return null;
}
@@ -254,7 +261,7 @@
HostService service = SpringUtils.getBean(HostService.class);
Host host = service.getById(this.hostId);
if (!Cools.isEmpty(host)){
- return String.valueOf(host.getId());
+ return String.valueOf(host.getName());
}
return null;
}
@@ -315,5 +322,24 @@
return null;
}
+ @Override
+ public boolean isAccountNonExpired() {
+ return true;
+ }
+
+ @Override
+ public boolean isAccountNonLocked() {
+ return this.status != null && this.status == 1;
+ }
+
+ @Override
+ public boolean isCredentialsNonExpired() {
+ return true;
+ }
+
+ @Override
+ public boolean isEnabled() {
+ return true;
+ }
}
--
Gitblit v1.9.1