|
|
@@ -1,6 +1,5 @@
|
|
|
package com.goafanti.user.controller;
|
|
|
|
|
|
-
|
|
|
import java.io.IOException;
|
|
|
import java.util.List;
|
|
|
import java.util.UUID;
|
|
|
@@ -8,7 +7,8 @@ import java.util.UUID;
|
|
|
import javax.annotation.Resource;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
|
|
|
-import org.apache.commons.lang.StringUtils;
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
+import org.apache.shiro.SecurityUtils;
|
|
|
import org.springframework.stereotype.Controller;
|
|
|
import org.springframework.validation.BindingResult;
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
@@ -49,45 +49,43 @@ import com.goafanti.user.service.UserIdentityService;
|
|
|
import com.goafanti.user.service.UserInfoService;
|
|
|
import com.goafanti.user.service.UserService;
|
|
|
|
|
|
-
|
|
|
-
|
|
|
@Controller
|
|
|
@RequestMapping(value = "/api/user")
|
|
|
public class UserApiController extends BaseApiController {
|
|
|
@Resource
|
|
|
- private UserService userService;
|
|
|
+ private UserService userService;
|
|
|
@Resource(name = "passwordUtil")
|
|
|
- private PasswordUtil passwordUtil;
|
|
|
-
|
|
|
+ private PasswordUtil passwordUtil;
|
|
|
+
|
|
|
@Resource
|
|
|
- private UserIdentityService userIdentityService;
|
|
|
+ private UserIdentityService userIdentityService;
|
|
|
@Resource
|
|
|
- private UserInfoService userInfoService;
|
|
|
+ private UserInfoService userInfoService;
|
|
|
@Resource
|
|
|
- private UserEduService userEduService;
|
|
|
+ private UserEduService userEduService;
|
|
|
@Resource
|
|
|
- private UserCareerService userCareerService;
|
|
|
+ private UserCareerService userCareerService;
|
|
|
@Resource
|
|
|
- private UserAbilityService userAbilityService;
|
|
|
+ private UserAbilityService userAbilityService;
|
|
|
@Resource
|
|
|
- private OrganizationIdentityService organizationIdentityService;
|
|
|
+ private OrganizationIdentityService organizationIdentityService;
|
|
|
@Resource
|
|
|
- private OrganizationInfoService organizationInfoService;
|
|
|
+ private OrganizationInfoService organizationInfoService;
|
|
|
@Resource
|
|
|
- private OrganizationTechService organizationTechService;
|
|
|
+ private OrganizationTechService organizationTechService;
|
|
|
@Resource
|
|
|
- private OrganizationPropertiesService organizationPropertiesService;
|
|
|
-
|
|
|
+ private OrganizationPropertiesService organizationPropertiesService;
|
|
|
+
|
|
|
@RequestMapping(value = "/pwd", method = RequestMethod.POST)
|
|
|
public Result updatePwd(String password, String newPassword) {
|
|
|
Result res = new Result();
|
|
|
if (password == null || newPassword == null) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "必须指定", "密码"));
|
|
|
}
|
|
|
- if (password.equals(newPassword)){
|
|
|
- res.getError().add(buildError(ErrorConstants.PWD_SAME_ERROR,"新密码必须与原密码不同!"));
|
|
|
+ if (password.equals(newPassword)) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.PWD_SAME_ERROR, "新密码必须与原密码不同!"));
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
if (res.getError().isEmpty() && TokenManager.isLogin()) {
|
|
|
User u = new User();
|
|
|
User user = userService.selectByPrimaryKey(TokenManager.getUserId());
|
|
|
@@ -103,62 +101,64 @@ public class UserApiController extends BaseApiController {
|
|
|
}
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 更换手机
|
|
|
+ *
|
|
|
* @param mobile
|
|
|
* @param mobileCode
|
|
|
* @return
|
|
|
*/
|
|
|
- @RequestMapping(value="/mobile" ,method=RequestMethod.POST)
|
|
|
- public Result updateMobile(String mobile,String mobileCode){
|
|
|
+ @RequestMapping(value = "/mobile", method = RequestMethod.POST)
|
|
|
+ public Result updateMobile(String mobile, String mobileCode) {
|
|
|
Result res = new Result();
|
|
|
- if(StringUtils.isBlank(mobile)){
|
|
|
- res.getError().add(buildError(ErrorConstants.MOBILE_EMPTY_ERROR,"手机号不能为空!"));
|
|
|
+ if (StringUtils.isBlank(mobile)) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.MOBILE_EMPTY_ERROR, "手机号不能为空!"));
|
|
|
return res;
|
|
|
}
|
|
|
- //验证码15分钟有效
|
|
|
- if(TimeUtils.checkOverTime("register")){
|
|
|
- res.getError().add(buildError(ErrorConstants.MCODE_OVERTIME_ERROR,"手机验证码超时失效"));
|
|
|
+ // 验证码15分钟有效
|
|
|
+ if (TimeUtils.checkOverTime("register")) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.MCODE_OVERTIME_ERROR, "手机验证码超时失效"));
|
|
|
return res;
|
|
|
}
|
|
|
- if(!TokenManager.getSession().getAttribute(VerifyCodeUtils.M_CODE).equals(mobileCode)){
|
|
|
- res.getError().add(buildError(ErrorConstants.MCODE_ERROR,"手机验证码错误"));
|
|
|
+ if (!TokenManager.getSession().getAttribute(VerifyCodeUtils.M_CODE).equals(mobileCode)) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.MCODE_ERROR, "手机验证码错误"));
|
|
|
return res;
|
|
|
}
|
|
|
User user = userService.selectByPrimaryKey(TokenManager.getUserId());
|
|
|
- if(mobile.equals(user.getMobile())){
|
|
|
- res.getError().add(buildError(ErrorConstants.MOBILE_SAME_ERROR,"新手机号必须和原手机号不同!"));
|
|
|
+ if (mobile.equals(user.getMobile())) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.MOBILE_SAME_ERROR, "新手机号必须和原手机号不同!"));
|
|
|
return res;
|
|
|
}
|
|
|
- if(res.getError().isEmpty() && TokenManager.isLogin()){
|
|
|
+ if (res.getError().isEmpty() && TokenManager.isLogin()) {
|
|
|
user.setMobile(mobile);
|
|
|
res.setData(userService.updateByPrimaryKey(user));
|
|
|
}
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 个人会员基本信息
|
|
|
+ *
|
|
|
* @param userIdentity
|
|
|
* @param bindingResult
|
|
|
* @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/userIndentity", method = RequestMethod.POST)
|
|
|
- public Result basicInfo(UserIdentity userIdentity,BindingResult bindingResult){
|
|
|
+ public Result basicInfo(UserIdentity userIdentity, BindingResult bindingResult) {
|
|
|
Result res = new Result();
|
|
|
if (bindingResult.hasErrors()) {
|
|
|
res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
|
|
|
bindingResult.getFieldError().getField()));
|
|
|
return res;
|
|
|
}
|
|
|
- if(res.getError().isEmpty()){
|
|
|
- UserIdentity identity= userIdentityService.selectUserIdentityByUserId(TokenManager.getUserId());
|
|
|
- if(identity == null){
|
|
|
+ if (res.getError().isEmpty()) {
|
|
|
+ UserIdentity identity = userIdentityService.selectUserIdentityByUserId(TokenManager.getUserId());
|
|
|
+ if (identity == null) {
|
|
|
userIdentity.setId(UUID.randomUUID().toString());
|
|
|
userIdentity.setUid(TokenManager.getUserId());
|
|
|
userIdentityService.insert(userIdentity);
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
userIdentity.setId(identity.getId());
|
|
|
userIdentityService.updateByPrimaryKeySelective(userIdentity);
|
|
|
}
|
|
|
@@ -166,42 +166,55 @@ public class UserApiController extends BaseApiController {
|
|
|
res.setData(userIdentity);
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
- @RequestMapping(value = "/avatar/upload", method = RequestMethod.POST)
|
|
|
- public Result avatar(HttpServletRequest req) {
|
|
|
- Result res = new Result();
|
|
|
- res.setData(handleFile(res, "/avatar/", false, req));
|
|
|
- return res;
|
|
|
- }
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
- * 认证
|
|
|
+ * 公共
|
|
|
+ *
|
|
|
* @param req
|
|
|
* @return
|
|
|
- */
|
|
|
- @RequestMapping(value = "/identity/upload", method = RequestMethod.POST)
|
|
|
- public Result identityFile(HttpServletRequest req) {
|
|
|
- Result res = new Result();
|
|
|
- res.setData(handleFile(res, "/identity/", true, req));
|
|
|
- return res;
|
|
|
+ */
|
|
|
+ @RequestMapping(value = "/avatar/upload", method = RequestMethod.POST)
|
|
|
+ public Result avatar(HttpServletRequest req) {
|
|
|
+ Result res = new Result();
|
|
|
+ res.setData(handleFile(res, "/avatar/", false, req, ""));
|
|
|
+ return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
- * 专利
|
|
|
+ * 认证
|
|
|
+ *
|
|
|
* @param req
|
|
|
* @return
|
|
|
*/
|
|
|
- @RequestMapping(value = "/patent/upload", method = RequestMethod.POST)
|
|
|
- public Result patentFile(HttpServletRequest req) {
|
|
|
+ @RequestMapping(value = "/identity/upload", method = RequestMethod.POST)
|
|
|
+ public Result identityFile(HttpServletRequest req, String sign) {
|
|
|
Result res = new Result();
|
|
|
- res.setData(handleFile(res, "/patent/", true, req));
|
|
|
+ res.setData(sign);
|
|
|
+ res.setData(handleFile(res, "/identity/", true, req, sign));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
- private String handleFile(Result res, String path, boolean isPrivate, HttpServletRequest req) {
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 专利
|
|
|
+ *
|
|
|
+ * @param req
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ /*
|
|
|
+ * @RequestMapping(value = "/patent/upload", method = RequestMethod.POST)
|
|
|
+ * public Result patentFile(HttpServletRequest req) { Result res = new
|
|
|
+ * Result(); res.setData(handleFile(res, "/patent/", true, req)); return
|
|
|
+ * res; }
|
|
|
+ */
|
|
|
+
|
|
|
+ private String handleFile(Result res, String path, boolean isPrivate, HttpServletRequest req, String sign) {
|
|
|
List<MultipartFile> files = getFiles(req);
|
|
|
- String fileName = path + System.nanoTime() + ".jpg";
|
|
|
+ String fileName = "";
|
|
|
+ if (isPrivate) {
|
|
|
+ fileName = path + TokenManager.getUserId() + sign + ".jpg";// /identity/12345idcard1.jpg
|
|
|
+ } else {
|
|
|
+ fileName = path + System.nanoTime() + ".jpg";
|
|
|
+ }
|
|
|
if (!files.isEmpty()) {
|
|
|
try {
|
|
|
MultipartFile mf = files.get(0);
|
|
|
@@ -217,315 +230,330 @@ public class UserApiController extends BaseApiController {
|
|
|
return "";
|
|
|
}
|
|
|
return fileName;
|
|
|
- }
|
|
|
-
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 个人资料
|
|
|
+ *
|
|
|
* @param userInfoBo
|
|
|
* @param bindingResult
|
|
|
* @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/userInfo", method = RequestMethod.POST)
|
|
|
- public Result personalData(UserInfoBo userInfoBo,BindingResult bindingResult){
|
|
|
+ public Result personalData(UserInfoBo userInfoBo, BindingResult bindingResult) {
|
|
|
Result res = new Result();
|
|
|
if (bindingResult.hasErrors()) {
|
|
|
res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
|
|
|
bindingResult.getFieldError().getField()));
|
|
|
return res;
|
|
|
}
|
|
|
- if(res.getError().isEmpty()){
|
|
|
- UserInfo info= userInfoService.selectUserInfoByUserId(TokenManager.getUserId());
|
|
|
- User u =userService.selectByPrimaryKey(TokenManager.getUserId());
|
|
|
- u.setNickname(userInfoBo.getNickname());
|
|
|
- u.setEmail(userInfoBo.getEmail());
|
|
|
- userService.updateByPrimaryKeySelective(u);
|
|
|
- UserInfo userInfo = new UserInfo();
|
|
|
- userInfo.setResidenceProvince(userInfoBo.getResidenceProvince());
|
|
|
- userInfo.setResidenceCity(userInfoBo.getResidenceCity());
|
|
|
- userInfo.setResidenceArea(userInfoBo.getResidenceArea());
|
|
|
- userInfo.setPersonPortraitUrl(userInfoBo.getPersonPortraitUrl());
|
|
|
- userInfo.setPersonalProfile(userInfoBo.getPersonalProfile());
|
|
|
- userInfo.setLifePhotoUrl(userInfoBo.getLifePhotoUrl());
|
|
|
- userInfo.setFixedTelArea(userInfoBo.getFixedTelArea());
|
|
|
- userInfo.setFixedTel(userInfoBo.getFixedTel());
|
|
|
- userInfo.setFixedTelExtension(userInfoBo.getFixedTelExtension());
|
|
|
- userInfo.setQq(userInfoBo.getQq());
|
|
|
- userInfo.setPostalAddress(userInfoBo.getPostalAddress());
|
|
|
- userInfo.setPostcode(userInfoBo.getPostcode());
|
|
|
- if(info == null){
|
|
|
+ if (res.getError().isEmpty()) {
|
|
|
+ UserInfo info = userInfoService.selectUserInfoByUserId(TokenManager.getUserId());
|
|
|
+ User u = userService.selectByPrimaryKey(TokenManager.getUserId());
|
|
|
+ u.setNickname(userInfoBo.getNickname());
|
|
|
+ u.setEmail(userInfoBo.getEmail());
|
|
|
+ userService.updateByPrimaryKeySelective(u);
|
|
|
+ TokenManager.getToken().setNickname(userInfoBo.getNickname());
|
|
|
+ UserInfo userInfo = new UserInfo();
|
|
|
+ userInfo.setResidenceProvince(userInfoBo.getResidenceProvince());
|
|
|
+ userInfo.setResidenceCity(userInfoBo.getResidenceCity());
|
|
|
+ userInfo.setResidenceArea(userInfoBo.getResidenceArea());
|
|
|
+ userInfo.setPersonPortraitUrl(userInfoBo.getPersonPortraitUrl());
|
|
|
+ userInfo.setPersonalProfile(userInfoBo.getPersonalProfile());
|
|
|
+ userInfo.setLifePhotoUrl(userInfoBo.getLifePhotoUrl());
|
|
|
+ userInfo.setFixedTelArea(userInfoBo.getFixedTelArea());
|
|
|
+ userInfo.setFixedTel(userInfoBo.getFixedTel());
|
|
|
+ userInfo.setFixedTelExtension(userInfoBo.getFixedTelExtension());
|
|
|
+ userInfo.setQq(userInfoBo.getQq());
|
|
|
+ userInfo.setPostalAddress(userInfoBo.getPostalAddress());
|
|
|
+ userInfo.setPostcode(userInfoBo.getPostcode());
|
|
|
+ if (info == null) {
|
|
|
userInfo.setId(UUID.randomUUID().toString());
|
|
|
userInfo.setUid(TokenManager.getUserId());
|
|
|
userInfoService.insert(userInfo);
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
userInfo.setId(info.getId());
|
|
|
userInfoService.updateByPrimaryKeySelective(userInfo);
|
|
|
}
|
|
|
- }
|
|
|
+ }
|
|
|
res.setData(userInfoBo);
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 个人会员教育信息
|
|
|
+ *
|
|
|
* @param userEdu
|
|
|
* @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/userEdu", method = RequestMethod.POST)
|
|
|
- public Result educationInfo(UserEdu userEdu){
|
|
|
+ public Result educationInfo(UserEdu userEdu) {
|
|
|
Result res = new Result();
|
|
|
UserEdu edu = userEduService.selectUserEduByUserId(TokenManager.getUserId());
|
|
|
-
|
|
|
- if(edu == null){
|
|
|
+
|
|
|
+ if (edu == null) {
|
|
|
userEdu.setId(UUID.randomUUID().toString());
|
|
|
userEdu.setUid(TokenManager.getUserId());
|
|
|
userEduService.insert(userEdu);
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
userEdu.setId(edu.getId());
|
|
|
userEduService.updateByPrimaryKeySelective(userEdu);
|
|
|
}
|
|
|
res.setData(userEdu);
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 个人会员职业信息
|
|
|
+ *
|
|
|
* @param userCareer
|
|
|
* @return
|
|
|
*/
|
|
|
-
|
|
|
+
|
|
|
@RequestMapping(value = "/userCareer", method = RequestMethod.POST)
|
|
|
- public Result careerInfo(UserCareer userCareer){
|
|
|
+ public Result careerInfo(UserCareer userCareer) {
|
|
|
Result res = new Result();
|
|
|
UserCareer career = userCareerService.selectUserCareerByUserId(TokenManager.getUserId());
|
|
|
-
|
|
|
- if(career == null){
|
|
|
+
|
|
|
+ if (career == null) {
|
|
|
userCareer.setId(UUID.randomUUID().toString());
|
|
|
userCareer.setUid(TokenManager.getUserId());
|
|
|
userCareerService.insert(userCareer);
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
userCareer.setId(career.getId());
|
|
|
userCareerService.updateByPrimaryKeySelective(userCareer);
|
|
|
}
|
|
|
res.setData(userCareer);
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 会员能力标签
|
|
|
+ *
|
|
|
* @param userAbility
|
|
|
* @return
|
|
|
*/
|
|
|
-
|
|
|
+
|
|
|
@RequestMapping(value = "/userAbility", method = RequestMethod.POST)
|
|
|
- public Result abilityLabel(UserAbility userAbility){
|
|
|
+ public Result abilityLabel(UserAbility userAbility) {
|
|
|
Result res = new Result();
|
|
|
UserAbility ability = userAbilityService.selectUserAbilityByUserId(TokenManager.getUserId());
|
|
|
- if(ability == null){
|
|
|
- userAbility.setId(UUID.randomUUID().toString());
|
|
|
- userAbility.setUid(TokenManager.getUserId());
|
|
|
- userAbilityService.insert(userAbility);
|
|
|
- }else{
|
|
|
- userAbility.setId(ability.getId());
|
|
|
- userAbilityService.updateByPrimaryKeySelective(userAbility);
|
|
|
- }
|
|
|
- res.setData(userAbility);
|
|
|
+ if (ability == null) {
|
|
|
+ userAbility.setId(UUID.randomUUID().toString());
|
|
|
+ userAbility.setUid(TokenManager.getUserId());
|
|
|
+ userAbilityService.insert(userAbility);
|
|
|
+ } else {
|
|
|
+ userAbility.setId(ability.getId());
|
|
|
+ userAbilityService.updateByPrimaryKeySelective(userAbility);
|
|
|
+ }
|
|
|
+ res.setData(userAbility);
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 团体会员基本信息
|
|
|
+ *
|
|
|
* @param orgIdentityBo
|
|
|
* @return
|
|
|
*/
|
|
|
- @RequestMapping(value="/orgIdentity",method = RequestMethod.POST)
|
|
|
- public Result groupBasicInfo(OrgIdentityBo orgIdentityBo){
|
|
|
+ @RequestMapping(value = "/orgIdentity", method = RequestMethod.POST)
|
|
|
+ public Result groupBasicInfo(OrgIdentityBo orgIdentityBo) {
|
|
|
Result res = new Result();
|
|
|
OrganizationIdentity organizationIdentity = new OrganizationIdentity();
|
|
|
OrganizationIdentity identity = organizationIdentityService.selectOrgIdentityByUserId(TokenManager.getUserId());
|
|
|
- User u =userService.selectByPrimaryKey(TokenManager.getUserId());
|
|
|
- u.setEmail(orgIdentityBo.getEmail());
|
|
|
- userService.updateByPrimaryKeySelective(u);
|
|
|
+ User u = userService.selectByPrimaryKey(TokenManager.getUserId());
|
|
|
+ u.setEmail(orgIdentityBo.getEmail());
|
|
|
+ userService.updateByPrimaryKeySelective(u);
|
|
|
+ TokenManager.getToken().setEmail(orgIdentityBo.getEmail());
|
|
|
organizationIdentity.setContacts(orgIdentityBo.getContacts());
|
|
|
organizationIdentity.setFixedTel(orgIdentityBo.getFixedTel());
|
|
|
organizationIdentity.setQq(orgIdentityBo.getQq());
|
|
|
organizationIdentity.setPostalAddress(orgIdentityBo.getPostalAddress());
|
|
|
organizationIdentity.setPostcode(orgIdentityBo.getPostcode());
|
|
|
- organizationIdentity.setLegalPerson(orgIdentityBo.getLegalPerson());
|
|
|
- if(identity==null){
|
|
|
+ if (identity == null) {
|
|
|
organizationIdentity.setId(UUID.randomUUID().toString());
|
|
|
organizationIdentity.setUid(TokenManager.getUserId());
|
|
|
organizationIdentityService.insert(organizationIdentity);
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
organizationIdentity.setId(identity.getId());
|
|
|
organizationIdentityService.updateByPrimaryKeySelective(organizationIdentity);
|
|
|
}
|
|
|
res.setData(orgIdentityBo);
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 团体会员单位资料
|
|
|
+ *
|
|
|
* @param orgInfo
|
|
|
* @return
|
|
|
*/
|
|
|
- @RequestMapping(value="/orgPro",method = RequestMethod.POST)
|
|
|
- public Result groupProInfo(OrgProBo proBo){
|
|
|
+ @RequestMapping(value = "/orgPro", method = RequestMethod.POST)
|
|
|
+ public Result groupProInfo(OrgProBo proBo) {
|
|
|
Result res = new Result();
|
|
|
OrganizationInfo orgInfo = proBo.getInfo();
|
|
|
OrganizationProperties orgPro = proBo.getPro();
|
|
|
OrganizationInfo info = organizationInfoService.selectOrgInfoByUserId(TokenManager.getUserId());
|
|
|
OrganizationProperties pro = organizationPropertiesService.selectOrgProByUserId(TokenManager.getUserId());
|
|
|
- if(info == null){
|
|
|
- orgInfo.setId(UUID.randomUUID().toString());
|
|
|
- orgInfo.setUid(TokenManager.getUserId());
|
|
|
- orgInfo = organizationInfoService.insert(orgInfo);
|
|
|
- }else{
|
|
|
- orgInfo.setId(info.getId());
|
|
|
- organizationInfoService.updateByPrimaryKeySelective(orgInfo);
|
|
|
- }
|
|
|
- if(pro == null){
|
|
|
- orgPro.setId(UUID.randomUUID().toString());
|
|
|
- orgPro.setOid(orgInfo.getId());
|
|
|
- organizationPropertiesService.insert(orgPro);
|
|
|
- }else{
|
|
|
- orgPro.setId(pro.getId());
|
|
|
- organizationPropertiesService.updateByPrimaryKeySelective(orgPro);
|
|
|
- }
|
|
|
- res.setData(proBo);
|
|
|
+ if (info == null) {
|
|
|
+ orgInfo.setId(UUID.randomUUID().toString());
|
|
|
+ orgInfo.setUid(TokenManager.getUserId());
|
|
|
+ orgInfo = organizationInfoService.insert(orgInfo);
|
|
|
+ } else {
|
|
|
+ orgInfo.setId(info.getId());
|
|
|
+ organizationInfoService.updateByPrimaryKeySelective(orgInfo);
|
|
|
+ }
|
|
|
+ if (pro == null) {
|
|
|
+ orgPro.setId(UUID.randomUUID().toString());
|
|
|
+ orgPro.setOid(orgInfo.getId());
|
|
|
+ organizationPropertiesService.insert(orgPro);
|
|
|
+ } else {
|
|
|
+ orgPro.setId(pro.getId());
|
|
|
+ organizationPropertiesService.updateByPrimaryKeySelective(orgPro);
|
|
|
+ }
|
|
|
+ res.setData(proBo);
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 团体会员技术能力
|
|
|
+ *
|
|
|
* @param orgTech
|
|
|
* @return
|
|
|
*/
|
|
|
- @RequestMapping(value="/orgTech",method = RequestMethod.POST)
|
|
|
- public Result tech(OrganizationTech orgTech){
|
|
|
+ @RequestMapping(value = "/orgTech", method = RequestMethod.POST)
|
|
|
+ public Result tech(OrganizationTech orgTech) {
|
|
|
Result res = new Result();
|
|
|
OrganizationTech tech = organizationTechService.selectOrgTechByUserId(TokenManager.getUserId());
|
|
|
- if(tech == null){
|
|
|
+ if (tech == null) {
|
|
|
orgTech.setId(UUID.randomUUID().toString());
|
|
|
orgTech.setUid(TokenManager.getUserId());
|
|
|
organizationTechService.insert(orgTech);
|
|
|
-
|
|
|
- }else{
|
|
|
+
|
|
|
+ } else {
|
|
|
orgTech.setId(tech.getId());
|
|
|
organizationTechService.updateByPrimaryKeySelective(orgTech);
|
|
|
}
|
|
|
res.setData(orgTech);
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 个人会员基本信息/团体会员基本信息
|
|
|
+ *
|
|
|
* @return
|
|
|
*/
|
|
|
- @RequestMapping(value="/base",method = RequestMethod.POST)
|
|
|
- public Result basic(){
|
|
|
+ @RequestMapping(value = "/base", method = RequestMethod.GET)
|
|
|
+ public Result basic() {
|
|
|
Result res = new Result();
|
|
|
- UidAndTypeBo ub =basicInfo(userService);
|
|
|
- if(ub.getType()==0){
|
|
|
- UserIdentityBo u = userIdentityService.selectUserIdentityBoByUserId(ub.getUid());
|
|
|
+ UidAndTypeBo ub = basicInfo(userService);
|
|
|
+ if (ub.getType() == 0) {
|
|
|
+ UserIdentityBo u = userIdentityService.selectUserIdentityBoByUserId(ub.getUid());
|
|
|
res.setData(u);
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
OrgIdentityBo o = organizationIdentityService.selectOrgIdentityBoByUserId(ub.getUid());
|
|
|
res.setData(o);
|
|
|
}
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 个人资料/团体会员资料
|
|
|
+ *
|
|
|
* @return
|
|
|
*/
|
|
|
- @RequestMapping(value="/member",method = RequestMethod.POST)
|
|
|
- public Result member(){
|
|
|
+ @RequestMapping(value = "/member", method = RequestMethod.GET)
|
|
|
+ public Result member() {
|
|
|
Result res = new Result();
|
|
|
- UidAndTypeBo ub =basicInfo(userService);
|
|
|
- if(ub.getType()==0){
|
|
|
- UserInfoBo u=userInfoService.selectUserInfoBoByUserId(ub.getUid());
|
|
|
+ UidAndTypeBo ub = basicInfo(userService);
|
|
|
+ if (ub.getType() == 0) {
|
|
|
+ UserInfoBo u = userInfoService.selectUserInfoBoByUserId(ub.getUid());
|
|
|
res.setData(u);
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
OrganizationInfo o = organizationInfoService.selectOrgInfoByUserId(ub.getUid());
|
|
|
- res.setData(o);
|
|
|
+ OrganizationProperties p = organizationPropertiesService.selectOrgProByUserId(ub.getUid());
|
|
|
+ OrgProBo bo = new OrgProBo(o, p);
|
|
|
+ res.setData(bo);
|
|
|
}
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 个人会员教育信息
|
|
|
+ *
|
|
|
* @return
|
|
|
*/
|
|
|
- @RequestMapping(value="/educate",method = RequestMethod.POST)
|
|
|
- public Result educate(){
|
|
|
+ @RequestMapping(value = "/educate", method = RequestMethod.GET)
|
|
|
+ public Result educate() {
|
|
|
Result res = new Result();
|
|
|
- UidAndTypeBo ub =basicInfo(userService);
|
|
|
- UserEdu u = userEduService.selectUserEduByUserId(ub.getUid());
|
|
|
- res.setData(u);
|
|
|
+ UidAndTypeBo ub = basicInfo(userService);
|
|
|
+ UserEdu u = userEduService.selectUserEduByUserId(ub.getUid());
|
|
|
+ res.setData(u);
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 个人会员职业信息/团体会员技术能力
|
|
|
+ *
|
|
|
* @return
|
|
|
*/
|
|
|
- @RequestMapping(value="/job",method = RequestMethod.POST)
|
|
|
- public Result job(){
|
|
|
+ @RequestMapping(value = "/job", method = RequestMethod.GET)
|
|
|
+ public Result job() {
|
|
|
Result res = new Result();
|
|
|
- UidAndTypeBo ub =basicInfo(userService);
|
|
|
- if(ub.getType()==0){
|
|
|
+ UidAndTypeBo ub = basicInfo(userService);
|
|
|
+ if (ub.getType() == 0) {
|
|
|
UserCareer u = userCareerService.selectUserCareerByUserId(ub.getUid());
|
|
|
res.setData(u);
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
OrganizationTech o = organizationTechService.selectOrgTechByUserId(ub.getUid());
|
|
|
res.setData(o);
|
|
|
}
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 个人/团体能力标签
|
|
|
+ *
|
|
|
* @return
|
|
|
*/
|
|
|
- @RequestMapping(value="/ability",method = RequestMethod.POST)
|
|
|
- public Result ability(){
|
|
|
+ @RequestMapping(value = "/ability", method = RequestMethod.GET)
|
|
|
+ public Result ability() {
|
|
|
Result res = new Result();
|
|
|
- UserAbility u = userAbilityService.selectUserAbilityByUserId(basicInfo(userService).getUid());
|
|
|
+ //UserAbility u = userAbilityService.selectUserAbilityByUserId(basicInfo(userService).getUid());
|
|
|
+ UserAbility u =userAbilityService.selectUserAbilityByUserId("ba00235e-eb3a-45b4-8c9d-000fe507cbca");
|
|
|
res.setData(u);
|
|
|
return res;
|
|
|
}
|
|
|
+
|
|
|
|
|
|
|
|
|
|
|
|
- private UidAndTypeBo basicInfo(UserService userService){
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ private UidAndTypeBo basicInfo(UserService userService) {
|
|
|
User u = userService.selectByPrimaryKey(TokenManager.getUserId());
|
|
|
UidAndTypeBo ub = new UidAndTypeBo();
|
|
|
-
|
|
|
+
|
|
|
ub.setType(u.getType());
|
|
|
ub.setUid(u.getId());
|
|
|
return ub;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 登陆后返回用户基本信息
|
|
|
+ *
|
|
|
* @return
|
|
|
*/
|
|
|
- @RequestMapping(value="/afterSignIn",method = RequestMethod.POST)
|
|
|
- public Result afterSignIn(){
|
|
|
+ @RequestMapping(value = "/afterSignIn", method = RequestMethod.GET)
|
|
|
+ public Result afterSignIn() {
|
|
|
Result res = new Result();
|
|
|
- if(TokenManager.isLogin()){
|
|
|
+ if (TokenManager.isLogin()) {
|
|
|
User u = userService.selectByPrimaryKey(TokenManager.getUserId());
|
|
|
u.setPassword("");
|
|
|
res.setData(u);
|
|
|
}
|
|
|
- return res;
|
|
|
+ return res;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-}
|
|
|
|
|
|
+}
|