|
|
@@ -1,14 +1,7 @@
|
|
|
package com.uas.sso.controller;
|
|
|
|
|
|
-import com.alibaba.fastjson.JSON;
|
|
|
-import com.alibaba.fastjson.JSONObject;
|
|
|
-import com.uas.account.entity.UserDetail;
|
|
|
import com.uas.account.exception.AccountException;
|
|
|
-import com.uas.account.support.Page;
|
|
|
-import com.uas.account.util.AccountUtils;
|
|
|
-import com.uas.sso.common.util.HttpUtil;
|
|
|
import com.uas.sso.core.Const;
|
|
|
-import com.uas.sso.core.Status;
|
|
|
import com.uas.sso.entity.*;
|
|
|
import com.uas.sso.service.ApplyUserSpaceService;
|
|
|
import com.uas.sso.service.UserService;
|
|
|
@@ -20,11 +13,8 @@ import org.springframework.util.StringUtils;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import java.io.*;
|
|
|
-import java.sql.Timestamp;
|
|
|
import java.text.SimpleDateFormat;
|
|
|
-import java.util.ArrayList;
|
|
|
import java.util.Date;
|
|
|
-import java.util.List;
|
|
|
import java.util.Set;
|
|
|
|
|
|
|
|
|
@@ -406,4 +396,32 @@ public class UserManagerController extends BaseController {
|
|
|
return success(tokenService.findOne(token).getBind());
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 根据企业uu号和用户uu号获取用户和企业信息
|
|
|
+ * @param userUU 用户uu号
|
|
|
+ * @param spaceUU 企业uu号
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @RequestMapping("/info/userUU")
|
|
|
+ public ModelMap getUserInfo(Long userUU, Long spaceUU) {
|
|
|
+ User user = userService.findOne(userUU);
|
|
|
+ if (user == null) {
|
|
|
+ return error("用户不存在");
|
|
|
+ }
|
|
|
+ Userspace userspace = userspaceService.findOne(spaceUU);
|
|
|
+ if (userspace == null) {
|
|
|
+ return error("企业不存在");
|
|
|
+ }
|
|
|
+ if (!user.getUserSpaces().contains(userspace)) {
|
|
|
+ return error("用户(" + userUU +")不属于企业(" + spaceUU+ ")");
|
|
|
+ }
|
|
|
+ ModelMap data = new ModelMap();
|
|
|
+ data.addAttribute("mobile", user.getMobile());
|
|
|
+ data.addAttribute("imId", user.getImId());
|
|
|
+ data.addAttribute("vipName", user.getVipName());
|
|
|
+ data.addAttribute("email", user.getEmail());
|
|
|
+ data.addAttribute("spaceName", userspace.getSpaceName());
|
|
|
+ return success(data);
|
|
|
+ }
|
|
|
+
|
|
|
}
|