Browse Source

保存用户信息接口修改,注释修改

wangmh 7 years ago
parent
commit
69a94c8c09

+ 32 - 13
sso-server/src/main/java/com/uas/sso/controller/UserManagerController.java

@@ -61,7 +61,11 @@ public class UserManagerController extends BaseController {
         }
         User user = new User();
         if (userView.getUserUU() != null) {
-             user = userService.findOne(userView.getUserUU());
+            user = userService.findOne(userView.getUserUU());
+        }
+
+        if (user == null && userView.getMobile() != null) {
+            user = userService.findByMobile(userView.getMobile());
         }
 
         if (user == null) {
@@ -165,7 +169,7 @@ public class UserManagerController extends BaseController {
      * @author wangmh
      * @date 2018/1/31 18:22
      * @param userUU 用户uu号
-     * @param spaceUU 企业uu
+     * @param spaceUU 企业uu
      * @return 用户信息
      */
     @RequestMapping(value = "/apply/bind", method = RequestMethod.POST)
@@ -202,36 +206,32 @@ public class UserManagerController extends BaseController {
 
     /**
      * 用户解除绑定企业
-     * @param userUU 企业uu号
+     * @param userUU 用户uu号
      * @param spaceUU 企业uu号
      * @return
      */
     @RequestMapping(params = "_operate=unbind", method = RequestMethod.POST)
     public ModelMap unbindUserSpace(Long userUU, Long spaceUU) {
-        if (StringUtils.isEmpty(userUU) || StringUtils.isEmpty(spaceUU)) {
-            return error("参数错误");
-        }
         userService.unbindUserspace(userUU, spaceUU);
         return success();
     }
 
     /**
      * 企业添加已注册用户
-     * @param userUU 企业uu号
+     * @param appId 应用id
+     * @param userUU 用户uu号
      * @param spaceUU 企业uu号
      * @return
      */
     @RequestMapping(params = "_operate=bind", method = RequestMethod.POST)
     public ModelMap addUser(String appId, Long userUU, Long spaceUU) {
-        if (StringUtils.isEmpty(userUU) || StringUtils.isEmpty(spaceUU)) {
-            return error("参数错误");
-        }
         userService.bindUserspace(appId, userUU, spaceUU);
         return success();
     }
 
     /**
-     * 企业添加已注册用户
+     * 企业添加未注册用户
+     * @param appId 应用id
      * @param user 用户信息
      * @param spaceUU 企业uu号
      * @return
@@ -291,6 +291,15 @@ public class UserManagerController extends BaseController {
         return error("请填写手机号");
     }
 
+    /**
+     * erp修改用户信息 如果type为password则修改密码,为mobile则修改手机号,为email则修改邮箱
+     * @param type 修改类型
+     * @param userUU 用户uu号
+     * @param spaceUU 企业uu号
+     * @param password 密码
+     * @param data 其他数据
+     * @return
+     */
     @RequestMapping(value = "/update/{type}/{userUU}/{spaceUU}", method = RequestMethod.POST)
     public ModelMap updatePassword(@PathVariable String type, @PathVariable Long userUU, @PathVariable Long spaceUU, String password, String data) {
         // 获取企业密钥
@@ -346,6 +355,11 @@ public class UserManagerController extends BaseController {
         return success(user.getUserUU());
     }
 
+    /**
+     * erp根据token获取用户信息
+     * @param token tokenId
+     * @return
+     */
     @RequestMapping(value = "/getUserByToken", method = RequestMethod.GET)
     public ModelMap findUserByToken(String token) {
         Token existToken = tokenService.findOne(token);
@@ -353,16 +367,21 @@ public class UserManagerController extends BaseController {
             return error("验证过期");
         }
 
+        if (!(existToken.getBind() instanceof ModelMap)) {
+            return error("验证信息错误");
+        }
         ModelMap data = (ModelMap) existToken.getBind();
         User user = userService.findOne((Long) data.get("userUU"));
         return success(user);
     }
 
     /**
-     * APP端
+     * 根据手机号获取所在企业信息
+     * @param mobile 用户手机号
      * @return
      */
-    @RequestMapping("/getSpace")
+    @RequestMapping(value = "/getSpace", method = RequestMethod.GET)
+    @Deprecated
     public ModelMap getSpace(String mobile) {
         User user = userService.findByMobile(mobile);
         Set<Userspace> userSpaces = user.getUserSpaces();