From c6c9b7d3baa822765768c110304d27623f946286 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期二, 15 七月 2025 14:29:09 +0800
Subject: [PATCH] `1`
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/entity/User.java | 739 +++++++++++++++++++++++++++++---------------------------
1 files changed, 379 insertions(+), 360 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/entity/User.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/entity/User.java
index 41fac77..432ee5d 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/entity/User.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/entity/User.java
@@ -1,360 +1,379 @@
-package com.zy.asrs.wms.system.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.SpringUtils;
-import com.zy.asrs.wms.system.service.DeptService;
-import com.zy.asrs.wms.system.service.HostService;
-import com.zy.asrs.wms.system.service.UserRoleService;
-import com.zy.asrs.wms.system.service.UserService;
-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, UserDetails {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * ID
- */
- @ApiModelProperty(value= "ID")
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
- /**
- * 璐﹀彿
- */
- @ApiModelProperty(value= "璐﹀彿")
- private String username;
-
- /**
- * 瀵嗙爜
- */
- @ApiModelProperty(value= "瀵嗙爜")
- private String password;
-
- /**
- * 鏄电О
- */
- @ApiModelProperty(value= "鏄电О")
- private String nickname;
-
- /**
- * 澶村儚
- */
- @ApiModelProperty(value= "澶村儚")
- private String avatar;
-
- /**
- * 宸ュ彿
- */
- @ApiModelProperty(value= "宸ュ彿")
- private String code;
-
- /**
- * 鎬у埆 0: 鏈煡 1: 鐢� 2: 濂�
- */
- @ApiModelProperty(value= "鎬у埆 0: 鏈煡 1: 鐢� 2: 濂� ")
- private Integer sex;
-
- /**
- * 鎵嬫満鍙�
- */
- @ApiModelProperty(value= "鎵嬫満鍙�")
- private String phone;
-
- /**
- * 閭
- */
- @ApiModelProperty(value= "閭")
- private String email;
-
- /**
- * 閭楠岃瘉 0: 鍚� 1: 鏄�
- */
- @ApiModelProperty(value= "閭楠岃瘉 0: 鍚� 1: 鏄� ")
- private Integer emailVerified;
-
- /**
- * 鎵�灞為儴闂�
- */
- @ApiModelProperty(value= "鎵�灞為儴闂�")
- private Long deptId;
-
- /**
- * 鐪熷疄濮撳悕
- */
- @ApiModelProperty(value= "鐪熷疄濮撳悕")
- private String realName;
-
- /**
- * 韬唤璇佸彿
- */
- @ApiModelProperty(value= "韬唤璇佸彿")
- private String idCard;
-
- /**
- * 鍑虹敓鏃ユ湡
- */
- @ApiModelProperty(value= "鍑虹敓鏃ユ湡")
- private String birthday;
-
- /**
- * 涓汉绠�浠�
- */
- @ApiModelProperty(value= "涓汉绠�浠�")
- private String introduction;
-
- /**
- * 鎵�灞炴満鏋�
- */
- @ApiModelProperty(value= "鎵�灞炴満鏋�")
- private Long hostId;
-
- /**
- * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
- */
- @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
- private Integer status;
-
- /**
- * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
- */
- @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
- @TableLogic
- private Integer deleted;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- /**
- * 娣诲姞浜哄憳
- */
- @ApiModelProperty(value= "娣诲姞浜哄憳")
- private Long createBy;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date updateTime;
-
- /**
- * 淇敼浜哄憳
- */
- @ApiModelProperty(value= "淇敼浜哄憳")
- private Long updateBy;
-
- /**
- * 澶囨敞
- */
- @ApiModelProperty(value= "澶囨敞")
- private String memo;
-
- @TableField(exist = false)
- private Long[] roleIds;
-
- @TableField(exist = false)
- private List<Role> roles;
-
- @TableField(exist = false)
- private List<Menu> authorities;
-
- public User() {}
-
- public User(String username,String password,String nickname,String avatar,String code,Integer sex,String phone,String email,Integer emailVerified,Long deptId,String realName,String idCard,String birthday,String introduction,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
- this.username = username;
- this.password = password;
- this.nickname = nickname;
- this.avatar = avatar;
- this.code = code;
- this.sex = sex;
- this.phone = phone;
- this.email = email;
- this.emailVerified = emailVerified;
- this.deptId = deptId;
- this.realName = realName;
- this.idCard = idCard;
- this.birthday = birthday;
- this.introduction = introduction;
- this.hostId = hostId;
- this.status = status;
- this.deleted = deleted;
- this.createTime = createTime;
- this.createBy = createBy;
- this.updateTime = updateTime;
- this.updateBy = updateBy;
- this.memo = memo;
- }
-
-// User user = new User(
-// null, // 璐﹀彿[闈炵┖]
-// null, // 瀵嗙爜
-// null, // 鏄电О
-// null, // 澶村儚
-// null, // 宸ュ彿
-// null, // 鎬у埆
-// null, // 鎵嬫満鍙�
-// null, // 閭
-// null, // 閭楠岃瘉
-// null, // 鎵�灞為儴闂�
-// null, // 鐪熷疄濮撳悕
-// null, // 韬唤璇佸彿
-// null, // 鍑虹敓鏃ユ湡
-// null, // 涓汉绠�浠�
-// null, // 鎵�灞炴満鏋�
-// null, // 鐘舵��
-// null, // 鏄惁鍒犻櫎
-// null, // 娣诲姞鏃堕棿
-// null, // 娣诲姞浜哄憳
-// null, // 淇敼鏃堕棿
-// null, // 淇敼浜哄憳
-// null // 澶囨敞
-// );
-
- public String getSex$(){
- if (null == this.sex){ return null; }
- switch (this.sex){
- case 0:
- return "鏈煡";
- case 1:
- return "鐢�";
- case 2:
- return "濂�";
- default:
- return String.valueOf(this.sex);
- }
- }
-
- public String getEmailVerified$(){
- if (null == this.emailVerified){ return null; }
- switch (this.emailVerified){
- case 0:
- return "鍚�";
- case 1:
- return "鏄�";
- default:
- return String.valueOf(this.emailVerified);
- }
- }
-
- public String getDeptId$(){
- DeptService service = SpringUtils.getBean(DeptService.class);
- Dept dept = service.getById(this.deptId);
- if (!Cools.isEmpty(dept)){
- return String.valueOf(dept.getName());
- }
- return null;
- }
-
- public String getHostId$(){
- HostService service = SpringUtils.getBean(HostService.class);
- Host host = service.getById(this.hostId);
- if (!Cools.isEmpty(host)){
- return String.valueOf(host.getName());
- }
- return null;
- }
-
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
- case 1:
- return "姝ｅ父";
- case 0:
- return "绂佺敤";
- default:
- return String.valueOf(this.status);
- }
- }
-
- public String getDeleted$(){
- if (null == this.deleted){ return null; }
- switch (this.deleted){
- case 1:
- return "鏄�";
- case 0:
- return "鍚�";
- default:
- return String.valueOf(this.deleted);
- }
- }
-
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
- }
-
- public String getCreateBy$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.getById(this.createBy);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- return null;
- }
-
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
- }
-
- public String getUpdateBy$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.getById(this.updateBy);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- return null;
- }
-
- public Long[] getRoleIds() {
- return this.roleIds;
- }
-
- public Long[] getUserRoleIds() {
- UserRoleService service = SpringUtils.getBean(UserRoleService.class);
- List<UserRole> list = service.list(new LambdaQueryWrapper<UserRole>().eq(UserRole::getUserId, this.id));
- return list.stream().map(UserRole::getRoleId).toArray(Long[]::new);
- }
-
- @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;
- }
-
-}
+package com.zy.asrs.wms.system.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.zy.asrs.common.domain.enums.LoginSystemType;
+import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.framework.common.SpringUtils;
+import com.zy.asrs.wms.system.service.*;
+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, UserDetails{
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 璐﹀彿
+ */
+ @ApiModelProperty(value= "璐﹀彿")
+ private String username;
+
+ /**
+ * 瀵嗙爜
+ */
+ @ApiModelProperty(value= "瀵嗙爜")
+ private String password;
+
+ /**
+ * 鏄电О
+ */
+ @ApiModelProperty(value= "鏄电О")
+ private String nickname;
+
+ /**
+ * 澶村儚
+ */
+ @ApiModelProperty(value= "澶村儚")
+ private String avatar;
+
+ /**
+ * 宸ュ彿
+ */
+ @ApiModelProperty(value= "宸ュ彿")
+ private String code;
+
+ /**
+ * 鎬у埆 0: 鏈煡 1: 鐢� 2: 濂�
+ */
+ @ApiModelProperty(value= "鎬у埆 0: 鏈煡 1: 鐢� 2: 濂� ")
+ private Integer sex;
+
+ /**
+ * 鎵嬫満鍙�
+ */
+ @ApiModelProperty(value= "鎵嬫満鍙�")
+ private String phone;
+
+ /**
+ * 閭
+ */
+ @ApiModelProperty(value= "閭")
+ private String email;
+
+ /**
+ * 閭楠岃瘉 0: 鍚� 1: 鏄�
+ */
+ @ApiModelProperty(value= "閭楠岃瘉 0: 鍚� 1: 鏄� ")
+ private Integer emailVerified;
+
+ /**
+ * 鎵�灞為儴闂�
+ */
+ @ApiModelProperty(value= "鎵�灞為儴闂�")
+ private Long deptId;
+
+ /**
+ * 鐪熷疄濮撳悕
+ */
+ @ApiModelProperty(value= "鐪熷疄濮撳悕")
+ private String realName;
+
+ /**
+ * 韬唤璇佸彿
+ */
+ @ApiModelProperty(value= "韬唤璇佸彿")
+ private String idCard;
+
+ /**
+ * 鍑虹敓鏃ユ湡
+ */
+ @ApiModelProperty(value= "鍑虹敓鏃ユ湡")
+ private String birthday;
+
+ /**
+ * 涓汉绠�浠�
+ */
+ @ApiModelProperty(value= "涓汉绠�浠�")
+ private String introduction;
+
+ /**
+ * 鎵�灞炴満鏋�
+ */
+ @ApiModelProperty(value= "鎵�灞炴満鏋�")
+ private Long hostId;
+
+ /**
+ * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
+ */
+ @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
+ private Integer status;
+
+ /**
+ * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
+ private Integer deleted;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 娣诲姞浜哄憳
+ */
+ @ApiModelProperty(value= "娣诲姞浜哄憳")
+ private Long createBy;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ private Long updateBy;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ @TableField(exist = false)
+ private Long[] roleIds;
+
+ @TableField(exist = false)
+ private List<Role> roles;
+
+ @TableField(exist = false)
+ private List<Menu> authorities;
+
+ public User() {}
+
+ public User(String username,String password,String nickname,String avatar,String code,Integer sex,String phone,String email,Integer emailVerified,Long deptId,String realName,String idCard,String birthday,String introduction,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
+ this.username = username;
+ this.password = password;
+ this.nickname = nickname;
+ this.avatar = avatar;
+ this.code = code;
+ this.sex = sex;
+ this.phone = phone;
+ this.email = email;
+ this.emailVerified = emailVerified;
+ this.deptId = deptId;
+ this.realName = realName;
+ this.idCard = idCard;
+ this.birthday = birthday;
+ this.introduction = introduction;
+ this.hostId = hostId;
+ this.status = status;
+ this.deleted = deleted;
+ this.createTime = createTime;
+ this.createBy = createBy;
+ this.updateTime = updateTime;
+ this.updateBy = updateBy;
+ this.memo = memo;
+ }
+
+// User user = new User(
+// null, // 璐﹀彿[闈炵┖]
+// null, // 瀵嗙爜
+// null, // 鏄电О
+// null, // 澶村儚
+// null, // 宸ュ彿
+// null, // 鎬у埆
+// null, // 鎵嬫満鍙�
+// null, // 閭
+// null, // 閭楠岃瘉
+// null, // 鎵�灞為儴闂�
+// null, // 鐪熷疄濮撳悕
+// null, // 韬唤璇佸彿
+// null, // 鍑虹敓鏃ユ湡
+// null, // 涓汉绠�浠�
+// null, // 鎵�灞炴満鏋�
+// null, // 鐘舵��
+// null, // 鏄惁鍒犻櫎
+// null, // 娣诲姞鏃堕棿
+// null, // 娣诲姞浜哄憳
+// null, // 淇敼鏃堕棿
+// null, // 淇敼浜哄憳
+// null // 澶囨敞
+// );
+
+ public String getSex$(){
+ if (null == this.sex){ return null; }
+ switch (this.sex){
+ case 0:
+ return "鏈煡";
+ case 1:
+ return "鐢�";
+ case 2:
+ return "濂�";
+ default:
+ return String.valueOf(this.sex);
+ }
+ }
+
+ public String getEmailVerified$(){
+ if (null == this.emailVerified){ return null; }
+ switch (this.emailVerified){
+ case 0:
+ return "鍚�";
+ case 1:
+ return "鏄�";
+ default:
+ return String.valueOf(this.emailVerified);
+ }
+ }
+
+ public String getDeptId$(){
+ DeptService service = SpringUtils.getBean(DeptService.class);
+ Dept dept = service.getById(this.deptId);
+ if (!Cools.isEmpty(dept)){
+ return String.valueOf(dept.getName());
+ }
+ return null;
+ }
+
+ public String getHostId$(){
+ HostService service = SpringUtils.getBean(HostService.class);
+ Host host = service.getById(this.hostId);
+ if (!Cools.isEmpty(host)){
+ return String.valueOf(host.getName());
+ }
+ return null;
+ }
+
+ public String getStatus$(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return "姝ｅ父";
+ case 0:
+ return "绂佺敤";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+ public String getDeleted$(){
+ if (null == this.deleted){ return null; }
+ switch (this.deleted){
+ case 1:
+ return "鏄�";
+ case 0:
+ return "鍚�";
+ default:
+ return String.valueOf(this.deleted);
+ }
+ }
+
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getCreateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.createBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getUpdateTime$(){
+ if (Cools.isEmpty(this.updateTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+ public String getUpdateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.updateBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public Long[] getRoleIds() {
+ return this.roleIds;
+ }
+
+ public Long[] getUserRoleIds() {
+ UserRoleService service = SpringUtils.getBean(UserRoleService.class);
+ List<UserRole> list = service.list(new LambdaQueryWrapper<UserRole>().eq(UserRole::getUserId, this.id));
+ return list.stream().map(UserRole::getRoleId).toArray(Long[]::new);
+ }
+
+ @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;
+ }
+
+ public Long getHostId() {
+ boolean root = false;
+ UserRoleService userRoleService = SpringUtils.getBean(UserRoleService.class);
+ UserLoginService userLoginService = SpringUtils.getBean(UserLoginService.class);
+ List<Role> roles = userRoleService.listByUserId(this.id);
+ for (Role role : roles) {
+ if (role.getId() == 1) {
+ root = true;
+ break;
+ }
+ }
+
+ if (root) {
+ UserLogin userLogin = userLoginService.superFindByUserId(this.id, String.valueOf(LoginSystemType.WMS));
+ if (userLogin != null) {
+ return userLogin.getHostId();
+ }
+ }
+ return this.hostId;
+ }
+
+}
--
Gitblit v1.9.1