change something

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

@@ -13,6 +13,7 @@ import cn.quantgroup.xyqb.service.auth.IIdCardService;
 import cn.quantgroup.xyqb.service.session.ISessionService;
 import cn.quantgroup.xyqb.service.sms.ISmsService;
 import cn.quantgroup.xyqb.service.user.ILkbUserService;
+import cn.quantgroup.xyqb.service.user.IUserDetailService;
 import cn.quantgroup.xyqb.service.user.IUserService;
 import cn.quantgroup.xyqb.util.IPUtil;
 import cn.quantgroup.xyqb.util.PasswordUtil;
@@ -52,8 +53,11 @@ public class AppController implements IBaseController {
     private IUserRepository userRepository;
     @Autowired
     private ISmsService smsService;
+
     @Autowired
-    private IUserDetailRepository userDetailRepository;
+    private IUserDetailService userDetailService;
+    /*@Autowired
+    private IUserDetailRepository userDetailRepository;*/
     @Autowired
     private IIdCardService idCardService;
 
@@ -140,7 +144,7 @@ public class AppController implements IBaseController {
                 userDetail.setUpdatedAt(currentTime);
                 userDetail.setUserId(user.getId());
                 userDetail.setGender(cardInfo.getGender());
-                userDetailRepository.saveAndFlush(userDetail);
+                userDetailService.saveUserDetail(userDetail);
 
                 lkbUserService.userUpdate(user.getUuid(), name, idNo);
             } catch (Exception e) {

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

@@ -5,6 +5,7 @@ import cn.quantgroup.xyqb.entity.UserDetail;
 import cn.quantgroup.xyqb.model.JsonResult;
 import cn.quantgroup.xyqb.model.UserModel;
 import cn.quantgroup.xyqb.repository.IUserDetailRepository;
+import cn.quantgroup.xyqb.service.user.IUserDetailService;
 import cn.quantgroup.xyqb.service.user.IUserService;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,7 +25,9 @@ public class SyncUserController {
     @Autowired
     private IUserService userService;
     @Autowired
-    private IUserDetailRepository userDetailRepository;
+    private IUserDetailService userDetailService;
+    /*@Autowired
+    private IUserDetailRepository userDetailRepository;*/
 
 
     @Autowired
@@ -43,7 +46,7 @@ public class SyncUserController {
         if (null == user) {
             return JsonResult.buildErrorStateResult(null, null);
         }
-        UserDetail detail = userDetailRepository.findByUserId(user.getId());
+        UserDetail detail = userDetailService.findByUserId(user.getId());
         if (null == detail) {
             // FIXME: 16/4/15 前期不对身份证强制要求.后期对修改
 //            return JsonResult.buildErrorStateResult(null, null);
@@ -64,7 +67,7 @@ public class SyncUserController {
         }
         userDetail.setId(null);
         userDetail.setUserId(user.getId());
-        userDetailRepository.saveAndFlush(userDetail);
+        userDetailService.saveUserDetail(userDetail);
         return JsonResult.buildSuccessResult(null, null);
     }
 
@@ -80,7 +83,7 @@ public class SyncUserController {
         if (null == user) {
             return JsonResult.buildErrorStateResult(null, null);
         }
-        UserDetail detail = userDetailRepository.findByUserId(user.getId());
+        UserDetail detail = userDetailService.findByUserId(user.getId());
         if (null == detail) {
             // FIXME: 16/4/15 前期不对身份证强制要求.后期对修改
 //            return JsonResult.buildErrorStateResult(null, null);

src/main/java/cn/quantgroup/xyqb/controller/internal/user/UserController.java

@@ -9,9 +9,9 @@ import cn.quantgroup.xyqb.model.AuthBean;
 import cn.quantgroup.xyqb.model.JsonResult;
 import cn.quantgroup.xyqb.model.UserModel;
 import cn.quantgroup.xyqb.model.session.SessionStruct;
-import cn.quantgroup.xyqb.repository.IUserDetailRepository;
 import cn.quantgroup.xyqb.service.session.ISessionService;
 import cn.quantgroup.xyqb.service.sms.ISmsService;
+import cn.quantgroup.xyqb.service.user.IUserDetailService;
 import cn.quantgroup.xyqb.service.user.IUserService;
 import cn.quantgroup.xyqb.util.PasswordUtil;
 import cn.quantgroup.xyqb.util.ValidationUtil;
@@ -56,7 +56,10 @@ public class UserController implements IBaseController {
     private ISessionService sessionService;
 
     @Autowired
-    private IUserDetailRepository userDetailRepository;
+    private IUserDetailService userDetailService;
+
+    /*@Autowired
+    private IUserDetailRepository userDetailRepository;*/
 
     private static final char[] PWD_BASE = {'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k',
             'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w',
@@ -359,7 +362,8 @@ public class UserController implements IBaseController {
        if (null == user) {
            return JsonResult.buildErrorStateResult(null, null);
        }
-       UserDetail detail = userDetailRepository.findByUserId(user.getId());
+       UserDetail detail = userDetailService.findByUserId(user.getId());
+       //UserDetail detail = userDetailRepository.findByUserId(user.getId());
        UserModel userModel = new UserModel(user, detail);
        return JsonResult.buildSuccessResult("token校验成功", userModel);
     }