motan 主库查询实现，枚举包结构改动

src/main/java/cn/quantgroup/xyqb/controller/external/motan/MotanUserServiceImpl.java

@@ -4,13 +4,15 @@ import cn.quantgroup.motan.bean.*;
 import cn.quantgroup.motan.retbean.*;
 import cn.quantgroup.motan.service.UserMotanService;
 import cn.quantgroup.motan.vo.UserSysResult;
+import cn.quantgroup.user.enums.*;
 import cn.quantgroup.xyqb.Constants;
 import cn.quantgroup.xyqb.entity.*;
-import cn.quantgroup.xyqb.entity.enumerate.*;
 import cn.quantgroup.xyqb.model.*;
+import cn.quantgroup.xyqb.model.IdType;
 import cn.quantgroup.xyqb.model.session.LoginInfo;
 import cn.quantgroup.xyqb.model.session.SessionStruct;
 import cn.quantgroup.xyqb.repository.IUserRepository;
+import cn.quantgroup.xyqb.service.api.IUserApiService;
 import cn.quantgroup.xyqb.service.auth.IIdCardService;
 import cn.quantgroup.xyqb.service.http.IHttpService;
 import cn.quantgroup.xyqb.service.merchant.IMerchantService;
@@ -35,7 +37,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.util.CollectionUtils;
 
-import javax.servlet.http.HttpServletRequest;
 import java.sql.Timestamp;
 import java.text.ParseException;
 import java.util.List;
@@ -45,6 +46,8 @@ import java.util.stream.Collectors;
 
 import static cn.quantgroup.xyqb.constant.UserConstant.USER_ERROR_OR_PASSWORD_ERROR;
 
+//import cn.quantgroup.xyqb.entity.enumerate.*;
+
 /**
  * Created by 11 on 2017/2/27.
  */
@@ -53,7 +56,6 @@ import static cn.quantgroup.xyqb.constant.UserConstant.USER_ERROR_OR_PASSWORD_ER
 public class MotanUserServiceImpl implements UserMotanService {
   private static final ObjectMapper MAPPER = new ObjectMapper();
   private final static Random random = new Random();
-
   static {
     MAPPER.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
   }
@@ -90,6 +92,9 @@ public class MotanUserServiceImpl implements UserMotanService {
   @Autowired
   private IHttpService httpService;
 
+  @Autowired
+  private IUserApiService userApiService;
+
   @Override
   public UserSysResult<XUser> findUserByPhoneNo(String phoneNo) {
     if (!ValidationUtil.validatePhoneNo(phoneNo)) {
@@ -402,9 +407,9 @@ public class MotanUserServiceImpl implements UserMotanService {
 
   @Override
   public UserSysResult<XUserExtInfo> updateUserExtInfo(
-      Long userId, cn.quantgroup.motan.enums.IncomeEnum incomeEnum, cn.quantgroup.motan.enums.IncomeRangeEnum incomeRangeEnum,
-      cn.quantgroup.motan.enums.OccupationEnum occupationEnum, cn.quantgroup.motan.enums.EducationEnum educationEnum, Boolean hasCar,
-      Boolean hasSocialSecurity, Boolean hasHouse, Boolean hasCreditCard, cn.quantgroup.motan.enums.MaritalStatus maritalStatus) {
+      Long userId, IncomeEnum incomeEnum, IncomeRangeEnum incomeRangeEnum,
+      OccupationEnum occupationEnum, EducationEnum educationEnum, Boolean hasCar,
+      Boolean hasSocialSecurity, Boolean hasHouse, Boolean hasCreditCard, MaritalStatus maritalStatus) {
     UserSysResult<XUserExtInfo> userSysResult = returnValue(null, null);
     if (null == userId || 0L == userId) {
       return returnErrorValue("用户id为空");
@@ -504,7 +509,7 @@ public class MotanUserServiceImpl implements UserMotanService {
     UserSpouse userSpouse = userSpouseService.findByUserId(userId);
     if (userSpouse == null) {
       userSpouse = new UserSpouse(userId);
-      userSpouse.setStatus(MaritalStatus.UNKNOWN);
+      userSpouse.setStatus(cn.quantgroup.user.enums.MaritalStatus.UNKNOWN);
     }
     return returnSuccessValue(fromUserSpouse(userSpouse));
   }
@@ -519,7 +524,7 @@ public class MotanUserServiceImpl implements UserMotanService {
     xUserSpouse.setSpouseName(userSpouse.getSpouseName());
     xUserSpouse.setCreatedAt(userSpouse.getCreatedAt());
     xUserSpouse.setUpdateAt(userSpouse.getUpdateAt());
-    xUserSpouse.setStatus(cn.quantgroup.motan.enums.MaritalStatus.valueOf(userSpouse.getStatus().name()));
+    xUserSpouse.setStatus(cn.quantgroup.user.enums.MaritalStatus.valueOf(userSpouse.getStatus().name()));
     return xUserSpouse;
   }
 
@@ -557,8 +562,17 @@ public class MotanUserServiceImpl implements UserMotanService {
 
   @Override
   public UserSysResult<Boolean> userImportCheck(String phoneNo, String registerFrom) {
-    //todo
-    return null;
+    if ("244".equals(registerFrom)) {
+      return returnErrorValue("用户导入检查拒绝");
+    }
+    if (org.apache.commons.lang3.StringUtils.isEmpty(phoneNo) || org.apache.commons.lang3.StringUtils.isEmpty(registerFrom)) {
+      return returnErrorValue("检查传入的参数，参数不全。");
+    }
+    boolean checkPassed = userApiService.userImportCheck(phoneNo);
+    if (checkPassed) {
+      return returnValue(Boolean.TRUE, "success");
+    }
+    return returnErrorValue("用户导入检查拒绝");
   }
 
   @Override
@@ -566,10 +580,10 @@ public class MotanUserServiceImpl implements UserMotanService {
     if (xUserSpouse.getUserId() == null || xUserSpouse.getUserId() == 0) {
       return returnErrorValue("用户不能为空");
     }
-    cn.quantgroup.motan.enums.MaritalStatus status = xUserSpouse.getStatus();
+    cn.quantgroup.user.enums.MaritalStatus status = xUserSpouse.getStatus();
     String spousePhone = xUserSpouse.getSpousePhone();
     String spouseName = xUserSpouse.getSpouseName();
-    if (xUserSpouse.getStatus() == cn.quantgroup.motan.enums.MaritalStatus.MARRIED) {
+    if (xUserSpouse.getStatus() == cn.quantgroup.user.enums.MaritalStatus.MARRIED) {
       if (!ValidationUtil.validatePhoneNo(spousePhone)) {
         return returnErrorValue("手机号格式错误");
       }
@@ -583,9 +597,9 @@ public class MotanUserServiceImpl implements UserMotanService {
       userSpouse = new UserSpouse(xUserSpouse.getUserId());
       userSpouse.setCreatedAt(timestamp);
     }
-    userSpouse.setSpouseName(status == cn.quantgroup.motan.enums.MaritalStatus.MARRIED ? spouseName : "");
-    userSpouse.setSpousePhone(status == cn.quantgroup.motan.enums.MaritalStatus.MARRIED ? spousePhone : "");
-    userSpouse.setStatus(MaritalStatus.valueOf(status.name()));
+    userSpouse.setSpouseName(status == cn.quantgroup.user.enums.MaritalStatus.MARRIED ? spouseName : "");
+    userSpouse.setSpousePhone(status == cn.quantgroup.user.enums.MaritalStatus.MARRIED ? spousePhone : "");
+    userSpouse.setStatus(cn.quantgroup.user.enums.MaritalStatus.valueOf(status.name()));
     userSpouse.setUpdateAt(timestamp);
     userSpouse = userSpouseService.save(userSpouse);
     return returnSuccessValue(fromUserSpouse(userSpouse));
@@ -630,7 +644,7 @@ public class MotanUserServiceImpl implements UserMotanService {
 
   @Override
   public UserSysResult<XLoginInfo> getLoginInfo(String token) {
-    SessionStruct sessionStruct = XyqbSessionContextHolder.getXSessionFromRedis();
+    SessionStruct sessionStruct = XyqbSessionContextHolder.getXSessionFromRedis(token);
     if(null != sessionStruct) {
       log.info("从用户中心获取到了用户登录信息:phone:[{}]", sessionStruct.getValues().getUser().getPhoneNo());
       XLoginInfo loginInfo = new XLoginInfo();
@@ -670,6 +684,7 @@ public class MotanUserServiceImpl implements UserMotanService {
     }
   }
 
+
   /**
    * 封装返回结果.
    *
@@ -764,4 +779,21 @@ public class MotanUserServiceImpl implements UserMotanService {
 
     return user;
   }
+
+  // fixme 什么逻辑
+  @Override
+  public UserSysResult<XUserDetail> modifyUserDetail(UserDetailUpdateBean userDetailUpdateBean) {
+    return null;
+  }
+
+  @Override
+  public UserSysResult<Map<Long, String>> findPhoneByUserIds(List<Long> userIds) {
+
+    if(!CollectionUtils.isEmpty(userIds) && userIds.size()<=500) {
+      Map<Long, String> userIdAndPhoneMap = userService.findPhoneByIdsInDb(userIds);
+      return returnSuccessValue(userIdAndPhoneMap);
+    }else {
+      return returnErrorValue("批量查询每次最多进行500条用户信息的查询");
+    }
+  }
 }

src/main/java/cn/quantgroup/xyqb/controller/external/user/InnerController.java

@@ -2,8 +2,9 @@ package cn.quantgroup.xyqb.controller.external.user;
 
 import cn.quantgroup.xyqb.controller.IBaseController;
 import cn.quantgroup.xyqb.entity.*;
-import cn.quantgroup.xyqb.entity.enumerate.*;
+import cn.quantgroup.user.enums.*;
 import cn.quantgroup.xyqb.model.*;
+import cn.quantgroup.xyqb.model.IdType;
 import cn.quantgroup.xyqb.service.auth.IIdCardService;
 import cn.quantgroup.xyqb.service.session.ISessionService;
 import cn.quantgroup.xyqb.service.user.*;

src/main/java/cn/quantgroup/xyqb/entity/Contact.java

 package cn.quantgroup.xyqb.entity;
 
-import cn.quantgroup.xyqb.entity.enumerate.Relation;
+import cn.quantgroup.user.enums.Relation;
 import lombok.Data;
 
 import javax.persistence.*;

src/main/java/cn/quantgroup/xyqb/entity/UserDetail.java

@@ -75,10 +75,10 @@ public class UserDetail implements Serializable {
     xUserDetail.setName(this.getName());
     xUserDetail.setIdNo(this.getIdNo());
     if (this.getIdType() != null) {
-      xUserDetail.setIdType(cn.quantgroup.motan.enums.IdType.valueOf(this.getIdType().name()));
+      xUserDetail.setIdType(cn.quantgroup.user.enums.IdType.valueOf(this.getIdType().name()));
     }
     if (this.getGender() != null) {
-      xUserDetail.setGender(cn.quantgroup.motan.enums.Gender.valueOf(this.getGender().name()));
+      xUserDetail.setGender(cn.quantgroup.user.enums.Gender.valueOf(this.getGender().name()));
     }
     xUserDetail.setEmail(this.getEmail());
     xUserDetail.setQq(this.getQq());

src/main/java/cn/quantgroup/xyqb/entity/UserExtInfo.java

 package cn.quantgroup.xyqb.entity;
 
 import cn.quantgroup.motan.retbean.XUserExtInfo;
-import cn.quantgroup.xyqb.entity.enumerate.*;
+//import cn.quantgroup.xyqb.entity.enumerate.*;
+import cn.quantgroup.user.enums.*;
 import lombok.Data;
 
 import javax.persistence.*;
@@ -50,14 +51,14 @@ public class UserExtInfo implements Serializable {
     XUserExtInfo xUserExtInfo = new XUserExtInfo();
     xUserExtInfo.setId(this.id);
     xUserExtInfo.setUserId(this.userId);
-    xUserExtInfo.setEducationEnum(cn.quantgroup.motan.enums.EducationEnum.valueOf(this.educationEnum.name()));
-    xUserExtInfo.setIncomeEnum(cn.quantgroup.motan.enums.IncomeEnum.valueOf(this.incomeEnum.name()));
-    xUserExtInfo.setIncomeRangeEnum(cn.quantgroup.motan.enums.IncomeRangeEnum.valueOf(this.incomeRangeEnum.name()));
-    xUserExtInfo.setOccupationEnum(cn.quantgroup.motan.enums.OccupationEnum.valueOf(this.occupationEnum.name()));
+    xUserExtInfo.setEducationEnum(cn.quantgroup.user.enums.EducationEnum.valueOf(this.educationEnum.name()));
+    xUserExtInfo.setIncomeEnum(cn.quantgroup.user.enums.IncomeEnum.valueOf(this.incomeEnum.name()));
+    xUserExtInfo.setIncomeRangeEnum(cn.quantgroup.user.enums.IncomeRangeEnum.valueOf(this.incomeRangeEnum.name()));
+    xUserExtInfo.setOccupationEnum(cn.quantgroup.user.enums.OccupationEnum.valueOf(this.occupationEnum.name()));
     xUserExtInfo.setHasCar(this.hasCar);
     xUserExtInfo.setHasSocialSecurity(this.hasSocialSecurity);
     xUserExtInfo.setHasCreditCard(this.hasCreditCard);
-    xUserExtInfo.setMarryStatus(cn.quantgroup.motan.enums.MaritalStatus.valueOf(this.marryStatus.name()));
+    xUserExtInfo.setMarryStatus(cn.quantgroup.user.enums.MaritalStatus.valueOf(this.marryStatus.name()));
     xUserExtInfo.setCreatedAt(this.createdAt);
     xUserExtInfo.setUpdateAt(this.updateAt);
     return xUserExtInfo;

src/main/java/cn/quantgroup/xyqb/entity/UserSpouse.java

 package cn.quantgroup.xyqb.entity;
 
 
-import cn.quantgroup.xyqb.entity.enumerate.MaritalStatus;
+import cn.quantgroup.user.enums.MaritalStatus;
 import lombok.*;
 
 import javax.persistence.*;

src/main/java/cn/quantgroup/xyqb/model/ContactRet.java

 package cn.quantgroup.xyqb.model;
 
 import cn.quantgroup.xyqb.entity.Contact;
-import cn.quantgroup.xyqb.entity.enumerate.Relation;
+import cn.quantgroup.user.enums.Relation;
 import lombok.Data;
 import org.apache.commons.collections.CollectionUtils;
 

src/main/java/cn/quantgroup/xyqb/model/UserDetailRet.java

@@ -3,7 +3,7 @@ package cn.quantgroup.xyqb.model;
 import cn.quantgroup.xyqb.entity.UserDetail;
 import lombok.Data;
 import org.apache.commons.lang.StringUtils;
-
+import cn.quantgroup.xyqb.model.IdType;
 import java.io.Serializable;
 
 /**

src/main/java/cn/quantgroup/xyqb/model/UserExtInfoRet.java

 package cn.quantgroup.xyqb.model;
 
 import cn.quantgroup.xyqb.entity.UserExtInfo;
-import cn.quantgroup.xyqb.entity.enumerate.*;
+import cn.quantgroup.user.enums.*;
 import lombok.Data;
 
 /**

src/main/java/cn/quantgroup/xyqb/model/UserSpouseRet.java

 package cn.quantgroup.xyqb.model;
 
 import cn.quantgroup.xyqb.entity.UserSpouse;
-import cn.quantgroup.xyqb.entity.enumerate.MaritalStatus;
+import cn.quantgroup.user.enums.MaritalStatus;
 import lombok.Data;
 
 /**

src/main/java/cn/quantgroup/xyqb/model/session/LoginInfo.java

@@ -26,7 +26,7 @@ public class LoginInfo {
   public XLoginInfo toXLoginInfo() {
     XLoginInfo xLoginInfo= new XLoginInfo();
 
-    xLoginInfo.setUser();
+  //  xLoginInfo.setUser();
 
     return xLoginInfo;
   }

src/main/java/cn/quantgroup/xyqb/service/user/vo/UserDetailVO.java

@@ -68,10 +68,10 @@ public class UserDetailVO {
     xUserDetail.setName(this.getName());
     xUserDetail.setIdNo(this.getIdNo());
     if (this.getIdType() != null) {
-      xUserDetail.setIdType(cn.quantgroup.motan.enums.IdType.valueOf(this.getIdType().name()));
+      xUserDetail.setIdType(cn.quantgroup.user.enums.IdType.valueOf(this.getIdType().name()));
     }
     if (this.getGender() != null) {
-      xUserDetail.setGender(cn.quantgroup.motan.enums.Gender.valueOf(this.getGender().name()));
+      xUserDetail.setGender(cn.quantgroup.user.enums.Gender.valueOf(this.getGender().name()));
     }
     xUserDetail.setEmail(this.getEmail());
     xUserDetail.setQq(this.getQq());
@@ -82,6 +82,8 @@ public class UserDetailVO {
     if (this.getUpdatedAt() != null) {
       xUserDetail.setUpdatedAt(new Timestamp(this.getUpdatedAt()));
     }
+
+
     xUserDetail.setIsAuthenticated(this.getIsAuthenticated());
     xUserDetail.setEnable(this.getEnable());
     return xUserDetail;

src/main/java/cn/quantgroup/xyqb/session/XyqbSessionContextHolder.java

@@ -81,4 +81,28 @@ public class XyqbSessionContextHolder {
   public static void releaseSession() {
     threadSession.remove();
   }
+
+  public static SessionStruct getXSessionFromRedis(String token) {
+    if (token == null || token.length() != 36) {
+      return null;
+    }
+    String result = redisTemplate.opsForValue().get(Constants.Session.USER_SESSION_CACHE + token);
+    if (StringUtils.isEmpty(result)) {
+      return null;
+    }
+    try {
+      SessionValue values = JSON.parseObject(result, SessionValue.class);
+
+      if (values == null) {
+        return null;
+      }
+      SessionStruct sessionStruct = new SessionStruct();
+      sessionStruct.setSid(token);
+      sessionStruct.setValues(values);
+      return sessionStruct;
+    }catch (Exception ex){
+      LOGGER.error("序列化session出错", ex);
+      return null;
+    }
+  }
 }