|
|
@@ -6,6 +6,8 @@ import com.uas.sso.entity.User;
|
|
|
import com.uas.sso.entity.Userspace;
|
|
|
import com.uas.sso.service.UserService;
|
|
|
import com.uas.sso.service.UserspaceService;
|
|
|
+import org.slf4j.Logger;
|
|
|
+import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.ui.ModelMap;
|
|
|
import org.springframework.util.StringUtils;
|
|
|
@@ -36,6 +38,8 @@ public class ErpUserSpaceManageController extends ErpBaseController {
|
|
|
|
|
|
private final String appId = "uas";
|
|
|
|
|
|
+ private static final Logger LOGGER = LoggerFactory.getLogger(ErpUserSpaceManageController.class);
|
|
|
+
|
|
|
/**
|
|
|
* 更新erp企业信息接口
|
|
|
* @param data 企业信息json字符串
|
|
|
@@ -43,6 +47,7 @@ public class ErpUserSpaceManageController extends ErpBaseController {
|
|
|
@RequestMapping(value = "/updateSpace", method = RequestMethod.POST)
|
|
|
public ModelMap updateSpace(@RequestParam String data) throws UnsupportedEncodingException {
|
|
|
Userspace userspace = JSON.parseObject(URLDecoder.decode(data, "UTF-8"), Userspace.class);
|
|
|
+ LOGGER.info("erp 更新企业信息:参数:{}", userspace);
|
|
|
User admin = userspace.getAdmin();
|
|
|
// 先把企业名称、邮箱、管理员名称解码
|
|
|
userspace.setSpaceName(URLDecoder.decode(userspace.getSpaceName(), "UTF-8"));
|
|
|
@@ -70,23 +75,27 @@ public class ErpUserSpaceManageController extends ErpBaseController {
|
|
|
if (oldSpace == null && !StringUtils.isEmpty(userspace.getSpaceName())) {
|
|
|
oldSpace = userspaceService.findBySpaceName(userspace.getSpaceName());
|
|
|
if (oldSpace != null && !StringUtils.isEmpty(userspace.getBusinessCode()) && !userspace.getBusinessCode().equals(oldSpace.getBusinessCode())) {
|
|
|
+ LOGGER.warn("erp 更新企业信息失败,企业名称({})已被注册:参数:{}", userspace.getSpaceName(), userspace);
|
|
|
return error("企业名称(" + userspace.getSpaceName() + ")已被注册,营业执照号为:" + oldSpace.getBusinessCode());
|
|
|
}
|
|
|
}
|
|
|
if (oldSpace == null && !StringUtils.isEmpty(userspace.getBusinessCode())) {
|
|
|
oldSpace = userspaceService.findByBusinessCode(userspace.getBusinessCode());
|
|
|
if (oldSpace != null && !StringUtils.isEmpty(userspace.getSpaceName()) && !userspace.getSpaceName().equals(oldSpace.getSpaceName())) {
|
|
|
+ LOGGER.warn("erp 更新企业信息失败,营业执照号({})已被注册:参数:{}", userspace.getBusinessCode(), userspace);
|
|
|
return error("营业执照号(" + userspace.getBusinessCode() + ")已被注册,企业名称为:" + oldSpace.getSpaceName());
|
|
|
}
|
|
|
}
|
|
|
|
|
|
if (oldSpace == null) {
|
|
|
+ LOGGER.warn("erp 更新企业信息失败,该企业未被注册:参数:{}", userspace);
|
|
|
return error("该企业未被注册,请到优软云进行注册之后再操作");
|
|
|
}
|
|
|
|
|
|
if (admin.getUserUU() == null) {
|
|
|
// uu号不存在,则更加手机号查询,用不不存在则注册
|
|
|
if (StringUtils.isEmpty(admin.getMobile())) {
|
|
|
+ LOGGER.warn("erp 更新企业信息失败,管理员手机号为空:参数:{}", userspace);
|
|
|
return error("管理员手机号不能为空");
|
|
|
}
|
|
|
checkMobile(admin.getMobile(), null);
|
|
|
@@ -118,6 +127,7 @@ public class ErpUserSpaceManageController extends ErpBaseController {
|
|
|
returnData.put("businessCode", newSpace.getBusinessCode());
|
|
|
returnData.put("accessSecret", newSpace.getAccessSecret());
|
|
|
returnData.put("adminUU", newSpace.getAdminUU());
|
|
|
+ LOGGER.info("erp 更新企业信息成功:参数:{}", userspace);
|
|
|
return success(returnData);
|
|
|
}
|
|
|
|
|
|
@@ -138,11 +148,13 @@ public class ErpUserSpaceManageController extends ErpBaseController {
|
|
|
// 获取用户信息
|
|
|
User user = userService.findByMobile(mobile);
|
|
|
if (user == null) {
|
|
|
+ LOGGER.info("根据用户手机号获取企业信息失败,手机号未注册,参数:{}", mobile);
|
|
|
return error("手机号未注册");
|
|
|
}
|
|
|
|
|
|
// 取出企业信息相关字段
|
|
|
SimplePropertyPreFilter filter = new SimplePropertyPreFilter(Userspace.class, "spaceUU", "spaceName", "businessCode", "regAddress");
|
|
|
+ LOGGER.info("根据用户手机号获取企业信息成功,参数:{}", mobile);
|
|
|
return success(JSON.toJSONString(user.getUserSpaces(), filter));
|
|
|
}
|
|
|
}
|