mirror of https://github.com/elunez/eladmin
feat: add age field to user management
Co-Authored-By: fengchaoqin.fcq@antgroup.com <fengchaoqin.fcq@antgroup.com>pull/872/head
parent
332cf6c5fa
commit
d1145e5056
|
@ -91,6 +91,9 @@ public class User extends BaseEntity implements Serializable {
|
||||||
@ApiModelProperty(value = "头像存储的路径", hidden = true)
|
@ApiModelProperty(value = "头像存储的路径", hidden = true)
|
||||||
private String avatarPath;
|
private String avatarPath;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "年龄")
|
||||||
|
private Integer age;
|
||||||
|
|
||||||
@ApiModelProperty(value = "密码")
|
@ApiModelProperty(value = "密码")
|
||||||
private String password;
|
private String password;
|
||||||
|
|
||||||
|
@ -122,4 +125,4 @@ public class User extends BaseEntity implements Serializable {
|
||||||
public int hashCode() {
|
public int hashCode() {
|
||||||
return Objects.hash(id, username);
|
return Objects.hash(id, username);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -68,6 +68,9 @@ public class UserDto extends BaseDTO implements Serializable {
|
||||||
@ApiModelProperty(value = "头像路径")
|
@ApiModelProperty(value = "头像路径")
|
||||||
private String avatarPath;
|
private String avatarPath;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "年龄")
|
||||||
|
private Integer age;
|
||||||
|
|
||||||
@ApiModelProperty(value = "密码")
|
@ApiModelProperty(value = "密码")
|
||||||
private String password;
|
private String password;
|
||||||
|
|
||||||
|
|
|
@ -53,4 +53,8 @@ public class UserQueryCriteria implements Serializable {
|
||||||
@ApiModelProperty(value = "创建时间")
|
@ApiModelProperty(value = "创建时间")
|
||||||
@Query(type = Query.Type.BETWEEN)
|
@Query(type = Query.Type.BETWEEN)
|
||||||
private List<Timestamp> createTime;
|
private List<Timestamp> createTime;
|
||||||
|
|
||||||
|
@Query
|
||||||
|
@ApiModelProperty(value = "年龄")
|
||||||
|
private Integer age;
|
||||||
}
|
}
|
||||||
|
|
|
@ -138,6 +138,7 @@ public class UserServiceImpl implements UserService {
|
||||||
user.setPhone(resources.getPhone());
|
user.setPhone(resources.getPhone());
|
||||||
user.setNickName(resources.getNickName());
|
user.setNickName(resources.getNickName());
|
||||||
user.setGender(resources.getGender());
|
user.setGender(resources.getGender());
|
||||||
|
user.setAge(resources.getAge());
|
||||||
userRepository.save(user);
|
userRepository.save(user);
|
||||||
// 清除缓存
|
// 清除缓存
|
||||||
delCaches(user.getId(), user.getUsername());
|
delCaches(user.getId(), user.getUsername());
|
||||||
|
@ -154,6 +155,7 @@ public class UserServiceImpl implements UserService {
|
||||||
user.setNickName(resources.getNickName());
|
user.setNickName(resources.getNickName());
|
||||||
user.setPhone(resources.getPhone());
|
user.setPhone(resources.getPhone());
|
||||||
user.setGender(resources.getGender());
|
user.setGender(resources.getGender());
|
||||||
|
user.setAge(resources.getAge());
|
||||||
userRepository.save(user);
|
userRepository.save(user);
|
||||||
// 清理缓存
|
// 清理缓存
|
||||||
delCaches(user.getId(), user.getUsername());
|
delCaches(user.getId(), user.getUsername());
|
||||||
|
@ -259,6 +261,7 @@ public class UserServiceImpl implements UserService {
|
||||||
map.put("邮箱", userDTO.getEmail());
|
map.put("邮箱", userDTO.getEmail());
|
||||||
map.put("状态", userDTO.getEnabled() ? "启用" : "禁用");
|
map.put("状态", userDTO.getEnabled() ? "启用" : "禁用");
|
||||||
map.put("手机号码", userDTO.getPhone());
|
map.put("手机号码", userDTO.getPhone());
|
||||||
|
map.put("年龄", userDTO.getAge());
|
||||||
map.put("修改密码的时间", userDTO.getPwdResetTime());
|
map.put("修改密码的时间", userDTO.getPwdResetTime());
|
||||||
map.put("创建日期", userDTO.getCreateTime());
|
map.put("创建日期", userDTO.getCreateTime());
|
||||||
list.add(map);
|
list.add(map);
|
||||||
|
|
|
@ -0,0 +1,2 @@
|
||||||
|
-- Add age column to sys_user table
|
||||||
|
ALTER TABLE sys_user ADD COLUMN age INT DEFAULT NULL COMMENT '年龄';
|
Loading…
Reference in New Issue