diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/User.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/User.java index 7e9b0aa6..5fff90c5 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/User.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/User.java @@ -91,6 +91,9 @@ public class User extends BaseEntity implements Serializable { @ApiModelProperty(value = "头像存储的路径", hidden = true) private String avatarPath; + @ApiModelProperty(value = "年龄") + private Integer age; + @ApiModelProperty(value = "密码") private String password; @@ -122,4 +125,4 @@ public class User extends BaseEntity implements Serializable { public int hashCode() { return Objects.hash(id, username); } -} \ No newline at end of file +} diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/UserDto.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/UserDto.java index 9ec68740..d854d117 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/UserDto.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/UserDto.java @@ -68,6 +68,9 @@ public class UserDto extends BaseDTO implements Serializable { @ApiModelProperty(value = "头像路径") private String avatarPath; + @ApiModelProperty(value = "年龄") + private Integer age; + @ApiModelProperty(value = "密码") private String password; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/UserQueryCriteria.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/UserQueryCriteria.java index e1da3434..e5483abe 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/UserQueryCriteria.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/UserQueryCriteria.java @@ -53,4 +53,8 @@ public class UserQueryCriteria implements Serializable { @ApiModelProperty(value = "创建时间") @Query(type = Query.Type.BETWEEN) private List createTime; + + @Query + @ApiModelProperty(value = "年龄") + private Integer age; } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java index 70693885..cd2e5e70 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java @@ -138,6 +138,7 @@ public class UserServiceImpl implements UserService { user.setPhone(resources.getPhone()); user.setNickName(resources.getNickName()); user.setGender(resources.getGender()); + user.setAge(resources.getAge()); userRepository.save(user); // 清除缓存 delCaches(user.getId(), user.getUsername()); @@ -154,6 +155,7 @@ public class UserServiceImpl implements UserService { user.setNickName(resources.getNickName()); user.setPhone(resources.getPhone()); user.setGender(resources.getGender()); + user.setAge(resources.getAge()); userRepository.save(user); // 清理缓存 delCaches(user.getId(), user.getUsername()); @@ -259,6 +261,7 @@ public class UserServiceImpl implements UserService { map.put("邮箱", userDTO.getEmail()); map.put("状态", userDTO.getEnabled() ? "启用" : "禁用"); map.put("手机号码", userDTO.getPhone()); + map.put("年龄", userDTO.getAge()); map.put("修改密码的时间", userDTO.getPwdResetTime()); map.put("创建日期", userDTO.getCreateTime()); list.add(map); diff --git a/sql/add_age_to_user.sql b/sql/add_age_to_user.sql new file mode 100644 index 00000000..f070bfeb --- /dev/null +++ b/sql/add_age_to_user.sql @@ -0,0 +1,2 @@ +-- Add age column to sys_user table +ALTER TABLE sys_user ADD COLUMN age INT DEFAULT NULL COMMENT '年龄';