Merge branch 'master' of http://gitabc.xyqb.com/head_group/xyqb-user2

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

@@ -74,7 +74,7 @@ public class AppController implements IBaseController {
         }
         String requestIp = IPUtil.getRemoteIP(request);
         LOGGER.info("第三方用户登录, loginFrom:{}, requestIp:{}", registerFrom, requestIp);
-        User user = userService.findByPhone(phoneNo);
+        User user = userService.findByPhoneInDb(phoneNo);
         if (user == null) {
             user = register(registerFrom, phoneNo, idNo, name);
         }

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

@@ -6,9 +6,8 @@ import cn.quantgroup.xyqb.model.UserDetailRet;
 import cn.quantgroup.xyqb.model.UserRet;
 import cn.quantgroup.xyqb.model.IdType;
 import cn.quantgroup.xyqb.model.JsonResult;
-import cn.quantgroup.xyqb.repository.IUserDetailRepository;
-import cn.quantgroup.xyqb.repository.IUserRepository;
 import cn.quantgroup.xyqb.service.auth.IIdCardService;
+import cn.quantgroup.xyqb.service.user.IUserDetailService;
 import cn.quantgroup.xyqb.service.user.IUserService;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.LoggerFactory;
@@ -29,12 +28,9 @@ public class InnerController {
     private static final org.slf4j.Logger LOGGER = LoggerFactory.getLogger(InnerController.class);
 
     @Autowired
-
     private IUserService userService;
     @Autowired
-    private IUserRepository userRepository;
-    @Autowired
-    private IUserDetailRepository userDetailRepository;
+    private IUserDetailService userDetailService;
     @Autowired
     private IIdCardService idCardService;
 
@@ -80,7 +76,7 @@ public class InnerController {
             createdAt = System.currentTimeMillis();
             updatedAt = System.currentTimeMillis();
         }
-        User user = userRepository.findByPhoneNo(phoneNo);
+        User user = userService.findByPhone(phoneNo);
         if (user == null) {
             user = new User();
         }
@@ -91,7 +87,7 @@ public class InnerController {
         user.setRegisteredFrom(registeredFrom);
         user.setUuid(uuid);
         user.setPassword(password);
-        user = userRepository.save(user);
+        user = userService.saveUser(user);
         UserRet userRet = null;
         if(user != null){
             userRet = UserRet.getUserRet(user);
@@ -140,7 +136,7 @@ public class InnerController {
             return JsonResult.buildErrorStateResult(null, null);
         }
         userDetail.setEmail(email);
-        userDetail = userDetailRepository.saveAndFlush(userDetail);
+        userDetail = userDetailService.saveUserDetail(userDetail);
         if(userDetail != null){
             return JsonResult.buildSuccessResult(null, UserDetailRet.getUserDetail(userDetail));
         }
@@ -154,7 +150,7 @@ public class InnerController {
      */
     @RequestMapping("/user_detail/search/userId")
     public JsonResult findUserDetailByUserId(Long userId){
-        UserDetail userDetail = userDetailRepository.findByUserId(userId);
+        UserDetail userDetail = userDetailService.findByUserId(userId);
         if(userDetail != null){
             return JsonResult.buildSuccessResult(null, UserDetailRet.getUserDetail(userDetail));
         }
@@ -163,7 +159,7 @@ public class InnerController {
 
     @RequestMapping("/user/search/userId")
     public JsonResult findUserByUserId(Long userId){
-        User user = userRepository.findById(userId);
+        User user = userService.findById(userId);
         if(user != null){
             return JsonResult.buildSuccessResult(null, UserRet.getUserRet(user));
         }
@@ -172,7 +168,7 @@ public class InnerController {
 
     @RequestMapping("/user_detail/search/phone")
     public JsonResult findUserDetailByPhone(String phoneNo){
-        UserDetail userDetail = userDetailRepository.findByPhoneNo(phoneNo);
+        UserDetail userDetail = userDetailService.findByPhoneNo(phoneNo);
         if(userDetail != null){
             return JsonResult.buildSuccessResult(null, UserDetailRet.getUserDetail(userDetail));
         }
@@ -184,7 +180,7 @@ public class InnerController {
         if(StringUtils.isEmpty(qq) || userId == null || userId == 0L){
             return JsonResult.buildErrorStateResult("参数校验失败,qq或用户id为空", null);
         }
-        userDetailRepository.updateUserQQ(qq, userId);
+        userDetailService.updateUserQQ(userId, qq);
         return JsonResult.buildSuccessResult(null, null);
     }
 

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

@@ -39,7 +39,7 @@ public class SyncUserController {
         if (StringUtils.isEmpty(phoneNo)) {
             return JsonResult.buildErrorStateResult(null, null);
         }
-        User user = userService.findByPhone(phoneNo);
+        User user = userService.findByPhoneInDb(phoneNo);
         if (null == user) {
             return JsonResult.buildErrorStateResult(null, null);
         }

src/main/java/cn/quantgroup/xyqb/service/user/IUserDetailService.java

+package cn.quantgroup.xyqb.service.user;
+
+import cn.quantgroup.xyqb.entity.UserDetail;
+
+/**
+ * Created by 11 on 2016/12/29.
+ */
+public interface IUserDetailService {
+    UserDetail findByUserId(Long userId);
+
+    UserDetail saveUserDetail(UserDetail userDetail);
+
+    UserDetail findByPhoneNo(String phoneNo);
+
+    void updateUserQQ(Long userId, String qq);
+}

src/main/java/cn/quantgroup/xyqb/service/user/IUserService.java

@@ -22,4 +22,8 @@ public interface IUserService {
     User findByPhoneInDb(String phone);
 
     User findByUuidInDb(String uuid);
+
+    User saveUser(User user);
+
+    User findById(Long userId);
 }

src/main/java/cn/quantgroup/xyqb/service/user/impl/UserDetailServiceImpl.java

+package cn.quantgroup.xyqb.service.user.impl;
+
+import cn.quantgroup.xyqb.entity.UserDetail;
+import cn.quantgroup.xyqb.repository.IUserDetailRepository;
+import cn.quantgroup.xyqb.service.user.IUserDetailService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * Created by 11 on 2016/12/29.
+ */
+@Service
+public class UserDetailServiceImpl implements IUserDetailService {
+
+    @Autowired
+    private IUserDetailRepository userDetailRepository;
+
+    @Override
+    public UserDetail findByUserId(Long userId) {
+        return userDetailRepository.findByUserId(userId);
+    }
+
+    @Override
+    public UserDetail saveUserDetail(UserDetail userDetail) {
+        return userDetailRepository.save(userDetail);
+    }
+
+    @Override
+    public UserDetail findByPhoneNo(String phoneNo) {
+        return userDetailRepository.findByPhoneNo(phoneNo);
+    }
+
+    @Override
+    public void updateUserQQ(Long userId, String qq) {
+        userDetailRepository.updateUserQQ(qq, userId);
+    }
+}

src/main/java/cn/quantgroup/xyqb/service/user/impl/UserServiceImpl.java

@@ -2,6 +2,8 @@ package cn.quantgroup.xyqb.service.user.impl;
 
 import cn.quantgroup.xyqb.Constants;
 import cn.quantgroup.xyqb.entity.User;
+import cn.quantgroup.xyqb.entity.UserDetail;
+import cn.quantgroup.xyqb.repository.IUserDetailRepository;
 import cn.quantgroup.xyqb.repository.IUserRepository;
 import cn.quantgroup.xyqb.service.sms.ISmsService;
 import cn.quantgroup.xyqb.service.user.ILkbUserService;
@@ -47,6 +49,16 @@ public class UserServiceImpl implements IUserService {
         return userRepository.findByUuid(uuid);
     }
 
+    @Override
+    public User saveUser(User user) {
+        return userRepository.save(user);
+    }
+
+    @Override
+    public User findById(Long userId) {
+        return userRepository.findById(userId);
+    }
+
     @Override
     public User registerAndReturn(String phoneNo, String password, Long registerFrom) {
         String uuid = lkbUserService.registerApp(phoneNo, password);
@@ -72,6 +84,7 @@ public class UserServiceImpl implements IUserService {
     }
 
     @Override
+    @Cacheable(value = "usercache", key = "'xyqbuser' + #uuid", unless = "#result == null", cacheManager = "cacheManager")
     public User findByUuid(String uuid) {
         return userRepository.findByUuid(uuid);
     }