修改密码，上传头像

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("删除记录")

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无法访问");
 	}
 

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;
+}

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<FileUploadResult> 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<String, String> map){
+        return sysUserService.updateSysUserImage(map);
+    }
 }

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<SysUserMapper, SysUser> {
         //类型为员工的组织机构信息
         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<SysUserMapper, SysUser> {
                     userInfoOneVo.setDepartmentName("无部门");
                     List<SysStaffOrgVo> 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<SysUserMapper, SysUser> {
 //        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<SysUserMapper, SysUser> {
         List<SysUserVo> list=baseMapper.getUserByType(userType);
         return rb.success().setData(list);
     }
+
+    public ResultBean updateSysUserImage(Map<String, String> 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<SysUser>().eq("sid", sysUser.getSid()));
+        return rb.success().setMsg("上传成功");
+    }
 }