个人信息完善

vetti-admin/src/main/java/com/vetti/web/controller/system/SysProfileController.java

@@ -1,6 +1,11 @@
 package com.vetti.web.controller.system;
 
 import java.util.Map;
+
+import cn.hutool.json.JSONUtil;
+import com.vetti.common.enums.UserOperStepsEnum;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -31,6 +36,7 @@ import com.vetti.system.service.ISysUserService;
  * 
  * @author ruoyi
  */
+@Api(tags ="个人信息完善")
 @RestController
 @RequestMapping("/system/user/profile")
 public class SysProfileController extends BaseController
@@ -44,17 +50,56 @@ public class SysProfileController extends BaseController
     /**
      * 个人信息
      */
-    @GetMapping
-    public AjaxResult profile()
+    @ApiOperation("个人信息")
+    @GetMapping("/personalInfo")
+    public AjaxResult<SysUser> profile()
     {
         LoginUser loginUser = getLoginUser();
-        SysUser user = loginUser.getUser();
+        SysUser user = userService.selectUserById(loginUser.getUserId());
         AjaxResult ajax = AjaxResult.success(user);
-        ajax.put("roleGroup", userService.selectUserRoleGroup(loginUser.getUsername()));
-        ajax.put("postGroup", userService.selectUserPostGroup(loginUser.getUsername()));
+//        ajax.put("roleGroup", userService.selectUserRoleGroup(loginUser.getUsername()));
+//        ajax.put("postGroup", userService.selectUserPostGroup(loginUser.getUsername()));
         return ajax;
     }
 
+
+    /**
+     * 修改用户
+     */
+    @ApiOperation("个人信息完善")
+    @Log(title = "个人信息完善", businessType = BusinessType.UPDATE)
+    @PutMapping("/completeInfo")
+    public AjaxResult personalInfoProfile(@RequestBody SysUser user)
+    {
+        LoginUser loginUser = getLoginUser();
+        SysUser currentUser = userService.selectUserById(loginUser.getUserId());
+        if(UserOperStepsEnum.STEPS_1.getCode().equals(user.getSteps())){
+            currentUser.setNickName(user.getNickName());
+            currentUser.setEmail(user.getEmail());
+            currentUser.setPhonenumber(user.getPhonenumber());
+            currentUser.setSex(user.getSex());
+        }else if (UserOperStepsEnum.STEPS_2.getCode().equals(user.getSteps())){
+            currentUser.setJobPosition(user.getJobPosition());
+            currentUser.setExperience(user.getExperience());
+            currentUser.setCvUrl(user.getCvUrl());
+        }else if (UserOperStepsEnum.STEPS_3.getCode().equals(user.getSteps())){
+            currentUser.setLocation(user.getLocation());
+            currentUser.setJobType(user.getJobType());
+            currentUser.setRelocate(user.getRelocate());
+        }else if (UserOperStepsEnum.STEPS_4.getCode().equals(user.getSteps())){
+            //个人展示数据存储
+            currentUser.setBestSideJson(JSONUtil.toJsonStr(user.getBestSideDtoList()));
+        }
+        currentUser.setSteps(user.getSteps());
+        if (userService.updateUserProfile(currentUser) > 0)
+        {
+            // 更新缓存用户信息
+            tokenService.setLoginUser(loginUser);
+        }
+        return success();
+    }
+
+
     /**
      * 修改用户
      */