抽取代码

src/main/java/cn/quantgroup/xyqb/Constants.java

@@ -94,6 +94,4 @@ public interface Constants {
 
   String AES_KEY = "ScnmRBhuQpo9kBdn";
 
-  String CREATE_USER_AUTHORIZED_FAIL="fail";
-  String CREATE_USER_AUTHORIZED_SUCCESS="success";
 }

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

@@ -2,6 +2,7 @@ package cn.quantgroup.xyqb.controller.internal.user;
 
 import cn.quantgroup.xyqb.Constants;
 import cn.quantgroup.xyqb.aspect.logcaller.LogHttpCaller;
+import cn.quantgroup.xyqb.entity.UserAuthorized;
 import cn.quantgroup.xyqb.model.JsonResult;
 import cn.quantgroup.xyqb.model.UserAuthorizedParam;
 import cn.quantgroup.xyqb.service.auth.IUserAuthorizedService;
@@ -28,10 +29,10 @@ public class UserAuthorizedController {
     @RequestMapping(value = "/hasUserAuthorized")
     public JsonResult hasUserAuthorized(String idNo) {
         LOGGER.info("[hasUserAuthorized]需要校验的用户的身份证号为idNo:{}", idNo);
-        if (userAuthorizedService.hasUserAuthorized(idNo)){
+        if (userAuthorizedService.hasUserAuthorized(idNo)) {
             return JsonResult.buildSuccessResult(null, true);
-        }else {
-            return JsonResult.buildErrorStateResult(null,false);
+        } else {
+            return JsonResult.buildErrorStateResult(null, false);
         }
     }
 
@@ -39,10 +40,19 @@ public class UserAuthorizedController {
     @RequestMapping(value = "/createUserAuthorized")
     public JsonResult createUserAuthorized(UserAuthorizedParam userAuthorizedParam) {
         LOGGER.info("[createUserAuthorized]创建实名账户,userAuthorizedParam:{},", userAuthorizedParam);
-        if(Constants.CREATE_USER_AUTHORIZED_SUCCESS.equals(userAuthorizedService.createUserAuthorized(userAuthorizedParam))){
-            return JsonResult.buildSuccessResult(null,Constants.CREATE_USER_AUTHORIZED_SUCCESS );
-        }else {
-            return JsonResult.buildErrorStateResult(null,Constants.CREATE_USER_AUTHORIZED_FAIL);
+        try {
+            if (userAuthorizedService.checkUserAuthorizedParam(userAuthorizedParam)) {
+                return JsonResult.buildErrorStateResult("参数异常", null);
+            }
+        } catch (Exception e) {
+            LOGGER.info("[createUserAuthorized]创建实名账户失败e:{}", e);
+            return JsonResult.buildErrorStateResult("参数异常", null);
+        }
+        UserAuthorized userAuthorized = userAuthorizedService.createUserAuthorized(userAuthorizedParam);
+        if (null == userAuthorized) {
+            return JsonResult.buildErrorStateResult("重复创建异常", null);
+        } else {
+            return JsonResult.buildSuccessResult("创建成功", userAuthorized.getId());
         }
     }
 
@@ -50,11 +60,11 @@ public class UserAuthorizedController {
     @RequestMapping(value = "/getUserAuthorizedId")
     public JsonResult getUserAuthorizedId(Long userId) {
         LOGGER.info("[getUserAuthorizedId]获取实名账户的id，userId:{}", userId);
-        Long userAuthorizedId =userAuthorizedService.getUserAuthorizedId(userId);
-        if (null!=userAuthorizedId){
+        Long userAuthorizedId = userAuthorizedService.getUserAuthorizedId(userId);
+        if (null != userAuthorizedId) {
             return JsonResult.buildSuccessResult(null, userAuthorizedId);
-        }else {
-            return JsonResult.buildErrorStateResult(null,null);
+        } else {
+            return JsonResult.buildErrorStateResult(null, null);
         }
     }
 }

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

@@ -21,6 +21,9 @@ public class UserAuthorized {
     @Column(name = "user_id")
     private Long userId;
 
+    @Column(name = "user_uuid")
+    private String userUuid;
+
     //证件号
     @Column(name = "id_no")
     private String idNo;

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

@@ -13,4 +13,5 @@ public class UserAuthorizedParam {
     private String idNo;
     private Long userId;
     private String authPattern;
+    private String userUuid;
 }

src/main/java/cn/quantgroup/xyqb/service/auth/IUserAuthorizedService.java

 package cn.quantgroup.xyqb.service.auth;
 
-import cn.quantgroup.xyqb.model.JsonResult;
+import cn.quantgroup.xyqb.entity.UserAuthorized;
 import cn.quantgroup.xyqb.model.UserAuthorizedParam;
 
-import java.util.Map;
-
 /**
  * @author xufei on 2018/1/5.
  */
@@ -23,7 +21,7 @@ public interface IUserAuthorizedService {
      * @param userAuthorizedParam
      * @return
      */
-    String createUserAuthorized(UserAuthorizedParam userAuthorizedParam);
+    UserAuthorized createUserAuthorized(UserAuthorizedParam userAuthorizedParam);
 
     /**
      * 通过userId获取实名账户表的id
@@ -32,4 +30,13 @@ public interface IUserAuthorizedService {
      * @return
      */
     Long getUserAuthorizedId(Long userId);
+
+    /**
+     * 校验参数
+     *
+     * @param userAuthorizedParam
+     * @return
+     * @throws Exception
+     */
+    Boolean checkUserAuthorizedParam(UserAuthorizedParam userAuthorizedParam) throws Exception;
 }

src/main/java/cn/quantgroup/xyqb/service/auth/impl/UserAuthorizedServiceImpl.java

@@ -45,31 +45,25 @@ public class UserAuthorizedServiceImpl implements IUserAuthorizedService {
     }
 
     @Override
-    public String createUserAuthorized(UserAuthorizedParam userAuthorizedParam) {
-        try {
-            if (checkUserAuthorizedParam(userAuthorizedParam)) {
-                return Constants.CREATE_USER_AUTHORIZED_FAIL;
-            }
-        } catch (Exception e) {
-            LOGGER.error("[createUserAuthorized]参数有误:{}", e);
-            return Constants.CREATE_USER_AUTHORIZED_FAIL;
-        }
-        return saveUserAuthorized(userAuthorizedParam);
-    }
-
-    private Boolean checkUserAuthorizedParam(UserAuthorizedParam userAuthorizedParam) throws Exception {
+    public Boolean checkUserAuthorizedParam(UserAuthorizedParam userAuthorizedParam) throws Exception {
         if (null == userAuthorizedParam) {
             return Boolean.TRUE;
         }
-        String name = userAuthorizedParam.getName();
         Long userId = userAuthorizedParam.getUserId();
+        String userUuid = userAuthorizedParam.getUserUuid();
+        if (userId == null || userId == 0L) {
+            if (StringUtils.isBlank(userUuid)) {
+                return Boolean.TRUE;
+            }
+        }
+        String name = userAuthorizedParam.getName();
         String authPattern = userAuthorizedParam.getAuthPattern();
         String idNo = userAuthorizedParam.getIdNo();
-        return (StringUtils.isBlank(name) || userId == null || userId == 0L
-                || StringUtils.isBlank(authPattern) || !iIdCardService.isIdCardValid(idNo));
+        return (StringUtils.isBlank(name) || StringUtils.isBlank(authPattern) || !iIdCardService.isIdCardValid(idNo));
     }
 
-    private String saveUserAuthorized(UserAuthorizedParam userAuthorizedParam) {
+    @Override
+    public UserAuthorized createUserAuthorized(UserAuthorizedParam userAuthorizedParam) {
         AuthPattern authPatternEnum = AuthPattern.valueOf(userAuthorizedParam.getAuthPattern());
 
         UserAuthorized userAuthorized = new UserAuthorized();
@@ -78,6 +72,7 @@ public class UserAuthorizedServiceImpl implements IUserAuthorizedService {
         userAuthorized.setName(userAuthorizedParam.getName());
         userAuthorized.setIdNo(userAuthorizedParam.getIdNo());
         userAuthorized.setUserId(userAuthorizedParam.getUserId());
+        userAuthorized.setUserUuid(userAuthorizedParam.getUserUuid());
         Timestamp now = new Timestamp(System.currentTimeMillis());
         userAuthorized.setCreatedAt(now);
         userAuthorized.setUpdatedAt(now);
@@ -85,10 +80,10 @@ public class UserAuthorizedServiceImpl implements IUserAuthorizedService {
         try {
             userAuthorized = userAuthorizedRepository.save(userAuthorized);
             LOGGER.info("[createUserAuthorized]创建实名账户成功,userAuthorized:{}", userAuthorized);
-            return Constants.CREATE_USER_AUTHORIZED_SUCCESS;
+            return userAuthorized;
         } catch (Exception e) {
             LOGGER.error("[createUserAuthorized]创建实名账户异常e:{}", e);
-            return Constants.CREATE_USER_AUTHORIZED_FAIL;
+            return null;
         }
     }