From 82ddb023f597dcce2869d7b0d5a9ff77fa02be6a Mon Sep 17 00:00:00 2001 From: fkf <1475794025@qq.com> Date: Fri, 18 Aug 2023 19:07:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=EF=BC=8C?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=A4=B4=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/sysuser/SysUserFeign.java | 5 +-- .../system/sysuser/SysUserFeignFallback.java | 2 +- .../system/sysuser/SysUserUpdate.java | 15 +++++++ .../supervise/system/sysuser/SysUserRest.java | 41 +++++++++++++------ .../system/sysuser/SysUserService.java | 24 +++++++++-- 5 files changed, 66 insertions(+), 21 deletions(-) create mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserUpdate.java diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserFeign.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserFeign.java index 6130b2e0..0d03a783 100644 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserFeign.java +++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserFeign.java @@ -78,10 +78,7 @@ public interface SysUserFeign { */ @PostMapping("/updatePassword") @ApiOperation(value = "5、修改密码") - public ResultBean updatePassword(@RequestParam("original") String original, - @RequestParam("password") String password, - @RequestParam("confirmPassword") String confirmPassword, - @RequestParam("userSid") String userSid, + public ResultBean updatePassword(@RequestBody SysUserUpdate sysUserUpdate, HttpServletRequest httpServletRequest); @ApiOperation("删除记录") diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserFeignFallback.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserFeignFallback.java index e6bbadea..5606ccbd 100644 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserFeignFallback.java +++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserFeignFallback.java @@ -65,7 +65,7 @@ public class SysUserFeignFallback implements SysUserFeign { } @Override - public ResultBean updatePassword(String original, String password, String confirmPassword, String userSid, HttpServletRequest httpServletRequest) { + public ResultBean updatePassword(SysUserUpdate sysUserUpdate , HttpServletRequest httpServletRequest) { return ResultBean.fireFail().setMsg("接口anrui_portal/sysuser/updatePassword无法访问"); } diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserUpdate.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserUpdate.java new file mode 100644 index 00000000..2d27df4c --- /dev/null +++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserUpdate.java @@ -0,0 +1,15 @@ +package com.yxt.supervise.system.sysuser; + +import lombok.Data; + +/** + * @author feikefei + * @create 2023-08-18-17:19 + */ +@Data +public class SysUserUpdate { + private String original; + private String password; + private String confirmPassword; + private String userSid; +} diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserRest.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserRest.java index 65d9a4c5..8fc6e36c 100644 --- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserRest.java +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserRest.java @@ -2,6 +2,8 @@ package com.yxt.supervise.system.sysuser; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.yxt.common.base.config.component.FileUploadComponent; +import com.yxt.common.core.result.FileUploadResult; import com.yxt.supervise.system.sysorganization.SysOrganization; import com.yxt.supervise.system.sysorganization.SysOrganizationService; import com.yxt.supervise.system.syspost.SysPost; @@ -23,6 +25,7 @@ import io.swagger.annotations.Api; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; import java.util.*; @@ -60,6 +63,8 @@ public class SysUserRest implements SysUserFeign { private SysPostService sysPostService; @Autowired private HttpServletRequest httpServletRequest; + @Autowired + private FileUploadComponent fileUploadComponent; // 定义点选文字图片验证码允许的误差值 private static final int ERROR_AMOUNT = 50;// 定义允许的误差值，单位是px @@ -371,31 +376,28 @@ public class SysUserRest implements SysUserFeign { /** * 修改密码(★) * - * @param original 原始密码 - * @param password 密码 - * @param confirmPassword 确认密码 * @return */ @Override - public ResultBean updatePassword(String original, String password, String confirmPassword, String userSid, HttpServletRequest httpServletRequest) { + public ResultBean updatePassword(SysUserUpdate sysUserUpdate, HttpServletRequest httpServletRequest) { String token = httpServletRequest.getHeader("token"); // 根据redisToken查询用户信息 - SysUser user = sysUserService.fetchBySid(userSid); + SysUser user = sysUserService.fetchBySid(sysUserUpdate.getUserSid()); if (user == null) { return ResultBean.fireFail().setMsg("抱歉，用户不存在"); } - if (!password - .matches("^(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])[a-zA-Z0-9]{8,10}$")) { - return ResultBean.fireFail().setMsg("密码格式错误，必须为8至10位大小写字母和数字的组合"); - } - String newPassword = Encodes.md5(original); +// if (!sysUserUpdate.getPassword() +// .matches("^(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])[a-zA-Z0-9]{8,10}$")) { +// return ResultBean.fireFail().setMsg("密码格式错误，必须为8至10位大小写字母和数字的组合"); +// } + String newPassword = Encodes.md5(sysUserUpdate.getOriginal()); if (!newPassword.equals(user.getPassword())) { return ResultBean.fireFail().setMsg("原始密码输入错误"); } - if (!password.equals(confirmPassword)) { + if (!sysUserUpdate.getPassword().equals(sysUserUpdate.getConfirmPassword())) { return ResultBean.fireFail().setMsg("密码和确认密码不一致"); } - int i = sysUserService.updatePassword(user.getSid(), Encodes.md5(password)); + int i = sysUserService.updatePassword(user.getSid(), Encodes.md5(sysUserUpdate.getPassword())); if (i == 0) { return ResultBean.fireFail().setMsg("修改失败"); } @@ -698,4 +700,19 @@ public class SysUserRest implements SysUserFeign { public ResultBean getUserByType(@RequestParam("userType") String userType){ return sysUserService.getUserByType(userType); } + + @PostMapping("/uploadfile") + public ResultBean uploadImage(@RequestParam(value = "file") MultipartFile file) { + ResultBean rb = ResultBean.fireFail(); + if (file == null || file.isEmpty()) { + return rb.setMsg("文件为空"); + } + rb = fileUploadComponent.uploadFile(file, null); + return rb; + } + + @PostMapping("/uploadImage") + public ResultBean updateSysUserImage(@RequestBody Map map){ + return sysUserService.updateSysUserImage(map); + } } diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserService.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserService.java index 4f7944e6..2952f9eb 100644 --- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserService.java +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserService.java @@ -40,6 +40,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.client.RestTemplate; import org.springframework.web.multipart.MultipartFile; @@ -346,7 +347,7 @@ public class SysUserService extends MybatisBaseService { //类型为员工的组织机构信息 if(user.getUserType().equals("3")){ - } else if(user.getUserType().equals("1")){ + } else if(user.getUserType().equals(1)){ SysStaffOrg sysStaffOrg = sysStaffOrgService.selectAllByStaffSid(user.getStaffSid()).getData(); if (sysStaffOrg == null) { return null; @@ -379,8 +380,13 @@ public class SysUserService extends MybatisBaseService { userInfoOneVo.setDepartmentName("无部门"); List orgVoList = sysStaffOrgService.getSysStaffOrgListByStaff(user.getStaffSid()); SysStaffPostDetailsVo staffPostDetailsVo = sysStaffPostService.getPostByStaffSid(user.getStaffSid()); - userInfoOneVo.setPostSid(staffPostDetailsVo.getPostSid()); - userInfoOneVo.setPostName(staffPostDetailsVo.getName()); + if(staffPostDetailsVo == null){ + userInfoOneVo.setPostSid(null); + userInfoOneVo.setPostName("无岗位"); + }else { + userInfoOneVo.setPostSid(staffPostDetailsVo.getPostSid()); + userInfoOneVo.setPostName(staffPostDetailsVo.getName()); + } if (orgVoList.size() > 0) { //类型为员工的组织机构信息 SysStaffOrgVo sysStaffOrgVo = orgVoList.get(0); @@ -1225,7 +1231,7 @@ public class SysUserService extends MybatisBaseService { // sysUserLoginVo.setToken(sysUserVo.getToken()); sysUserLoginVo.setIsLogin(true); sysUser.setToken(sysUserVo.getToken()); - return rb.success().setData(sysUser); + return rb.success().setData(sysUserVo); } /** @@ -1461,4 +1467,14 @@ public class SysUserService extends MybatisBaseService { List list=baseMapper.getUserByType(userType); return rb.success().setData(list); } + + public ResultBean updateSysUserImage(Map map){ + String userSid = map.get("userSid"); + String headImage = map.get("headImage"); + ResultBean rb = ResultBean.fireFail(); + SysUser sysUser = fetchBySid(userSid); + sysUser.setHeadImage(headImage); + int sid = baseMapper.update(sysUser, new QueryWrapper().eq("sid", sysUser.getSid())); + return rb.success().setMsg("上传成功"); + } } \ No newline at end of file