zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java | ●●●●● patch | view | raw | blame | history | |
zq-erp/src/main/java/com/matrix/system/app/dto/ModifyUserDto.java | ●●●●● patch | view | raw | blame | history | |
zq-erp/src/main/java/com/matrix/system/app/mapper/SysUsersMapper.java | ●●●●● patch | view | raw | blame | history | |
zq-erp/src/main/java/com/matrix/system/app/vo/UserInfoDetailVo.java | ●●●●● patch | view | raw | blame | history |
zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java
@@ -5,14 +5,13 @@ import com.matrix.core.pojo.AjaxResult; import com.matrix.core.tools.DateUtil; import com.matrix.core.tools.WebUtil; import com.matrix.system.app.dto.BeauticianDto; import com.matrix.system.app.dto.PwdModifyDto; import com.matrix.system.app.dto.UsersQueryDto; import com.matrix.system.app.dto.*; import com.matrix.system.app.mapper.SysBeauticianStateMapper; import com.matrix.system.app.mapper.SysUsersMapper; import com.matrix.system.app.mapper.SysWorkBeatuistaffMapper; import com.matrix.system.app.vo.BeauticianVo; import com.matrix.system.app.vo.UserAchieveVo; import com.matrix.system.app.vo.UserInfoDetailVo; import com.matrix.system.common.bean.SysUsers; import com.matrix.system.common.service.SysUsersService; import com.matrix.system.common.tools.DataAuthUtil; @@ -154,4 +153,29 @@ } @ApiOperation(value = "获取当前登陆用户信息", notes = "获取当前登陆用户信息") @ApiResponses({ @ApiResponse(code = 200, message = "ok", response = UserInfoDetailVo.class) }) @GetMapping(value = "/findUserInfo") public AjaxResult findUserInfo() { SysUsers user = getMe(); UserInfoDetailVo userInfoDetailVo = SysUsersMapper.INSTANCE.usersToDetailInfoVo(user); AjaxResult ajaxResult = AjaxResult.buildSuccessInstance("获取成功"); ajaxResult.putInMap("detail", userInfoDetailVo); return ajaxResult; } @ApiOperation(value = "编辑当前用户信息", notes = "编辑当前用户信息") @PostMapping(value = "/modifyUserInfo") public AjaxResult modifyUserInfo(@RequestBody @Validated ModifyUserDto modifyUserDto) { SysUsers user = SysUsersMapper.INSTANCE.modifyUserDtoToUsers(modifyUserDto); user.setSuId(getMe().getSuId()); int i = sysUsersService.modifyByModel(user); if (i > 0) { return AjaxResult.buildSuccessInstance("修改成功"); } return AjaxResult.buildFailInstance("修改失败"); } } zq-erp/src/main/java/com/matrix/system/app/dto/ModifyUserDto.java
New file @@ -0,0 +1,116 @@ package com.matrix.system.app.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import javax.validation.constraints.NotBlank; import java.util.Date; /** * @author wzy * @date 2021-01-06 **/ @ApiModel(value = "ModifyUserDto", description = "编辑用户信息接口参数接收类") public class ModifyUserDto { @ApiModelProperty(value = "头像") private String photo; @NotBlank(message = "参数错误") @ApiModelProperty(value = "姓名") private String name; @ApiModelProperty(value = "英文名") private String engName; @NotBlank(message = "参数错误") @ApiModelProperty(value = "手机号") private String telphone; @ApiModelProperty(value = "性别") private String sex; @ApiModelProperty(value = "生日") private Date birthday; @ApiModelProperty(value = "邮箱") private String email; @ApiModelProperty(value = "服务签名") private String serviceSign; @ApiModelProperty(value = "地址") private String address; public String getPhoto() { return photo; } public void setPhoto(String photo) { this.photo = photo; } public String getName() { return name; } public void setName(String name) { this.name = name; } public String getEngName() { return engName; } public void setEngName(String engName) { this.engName = engName; } public String getTelphone() { return telphone; } public void setTelphone(String telphone) { this.telphone = telphone; } public String getSex() { return sex; } public void setSex(String sex) { this.sex = sex; } public Date getBirthday() { return birthday; } public void setBirthday(Date birthday) { this.birthday = birthday; } public String getEmail() { return email; } public void setEmail(String email) { this.email = email; } public String getServiceSign() { return serviceSign; } public void setServiceSign(String serviceSign) { this.serviceSign = serviceSign; } public String getAddress() { return address; } public void setAddress(String address) { this.address = address; } } zq-erp/src/main/java/com/matrix/system/app/mapper/SysUsersMapper.java
@@ -1,6 +1,8 @@ package com.matrix.system.app.mapper; import com.matrix.system.app.dto.ModifyUserDto; import com.matrix.system.app.vo.BeauticianVo; import com.matrix.system.app.vo.UserInfoDetailVo; import com.matrix.system.common.bean.SysUsers; import org.mapstruct.Mapper; import org.mapstruct.Mapping; @@ -24,4 +26,28 @@ public abstract List<BeauticianVo> usersListToBeautyList(List<SysUsers> list); @Mapping(source = "suPhoto", target = "photo") @Mapping(source = "suName", target = "name") @Mapping(source = "suAliases", target = "engName") @Mapping(source = "suTel", target = "telphone") @Mapping(source = "suSex", target = "sex") @Mapping(source = "suBirthday", target = "birthday") @Mapping(source = "suEmail", target = "email") @Mapping(source = "serviceSignature", target = "serviceSign") @Mapping(source = "suAddress", target = "address") public abstract UserInfoDetailVo usersToDetailInfoVo(SysUsers sysUsers); public abstract ModifyUserDto usersToModifyUserDto(SysUsers sysUsers); @Mapping(target = "suPhoto", source = "photo") @Mapping(target = "suName", source = "name") @Mapping(target = "suAliases", source = "engName") @Mapping(target = "suTel", source = "telphone") @Mapping(target = "suSex", source = "sex") @Mapping(target = "suBirthday", source = "birthday") @Mapping(target = "suEmail", source = "email") @Mapping(target = "serviceSignature", source = "serviceSign") @Mapping(target = "suAddress", source = "address") public abstract SysUsers modifyUserDtoToUsers(ModifyUserDto modifyUserDto); } zq-erp/src/main/java/com/matrix/system/app/vo/UserInfoDetailVo.java
New file @@ -0,0 +1,113 @@ package com.matrix.system.app.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.Date; /** * @author wzy * @date 2021-01-06 **/ @ApiModel(value = "UserInfoDetailVo", description = "获取当前登陆用户详情接口返回参数类") public class UserInfoDetailVo { @ApiModelProperty(value = "头像") private String photo; @ApiModelProperty(value = "姓名") private String name; @ApiModelProperty(value = "英文名") private String engName; @ApiModelProperty(value = "手机号") private String telphone; @ApiModelProperty(value = "性别") private String sex; @ApiModelProperty(value = "生日") private Date birthday; @ApiModelProperty(value = "邮箱") private String email; @ApiModelProperty(value = "服务签名") private String serviceSign; @ApiModelProperty(value = "地址") private String address; public String getPhoto() { return photo; } public void setPhoto(String photo) { this.photo = photo; } public String getName() { return name; } public void setName(String name) { this.name = name; } public String getEngName() { return engName; } public void setEngName(String engName) { this.engName = engName; } public String getTelphone() { return telphone; } public void setTelphone(String telphone) { this.telphone = telphone; } public String getSex() { return sex; } public void setSex(String sex) { this.sex = sex; } public Date getBirthday() { return birthday; } public void setBirthday(Date birthday) { this.birthday = birthday; } public String getEmail() { return email; } public void setEmail(String email) { this.email = email; } public String getServiceSign() { return serviceSign; } public void setServiceSign(String serviceSign) { this.serviceSign = serviceSign; } public String getAddress() { return address; } public void setAddress(String address) { this.address = address; } }