Merge branch '20180105-user-auth' of...

Merge branch '20180105-user-auth' of http://git.quantgroup.cn/head_group/xyqb-user2 into 20180105-user-auth

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

@@ -43,6 +43,6 @@ public class Bootstrap {
         springApplication.setRegisterShutdownHook(true);
         springApplication.run(args);
         log.info("server start...");
-        //Sentry.init("http://13ef5642903a414c910f8d0e0a2c56ee:8b351ad1abf44de3b4c25f39105fb927@172.16.4.89:9000/6");
+        Sentry.init("http://13ef5642903a414c910f8d0e0a2c56ee:8b351ad1abf44de3b4c25f39105fb927@172.16.4.89:9000/6");
     }
 }

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

 package cn.quantgroup.xyqb.controller.internal.user;
 
 import cn.quantgroup.xyqb.aspect.logcaller.LogHttpCaller;
-import cn.quantgroup.xyqb.controller.IBaseController;
 import cn.quantgroup.xyqb.model.JsonResult;
+import cn.quantgroup.xyqb.model.UserAuthorizedParam;
 import cn.quantgroup.xyqb.service.auth.IUserAuthorizedService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import java.util.Map;
 
 /**
  * @author xufei on 2018/1/5.
@@ -30,20 +27,20 @@ public class UserAuthorizedController {
     @RequestMapping(value = "/hasUserAuthorized")
     public JsonResult hasUserAuthorized(String idNo) {
         LOGGER.info("[hasUserAuthorized]需要校验的用户的身份证号为idNo:{}", idNo);
-        return userAuthorizedService.hasUserAuthorized(idNo);
+        return JsonResult.buildSuccessResult(null, userAuthorizedService.hasUserAuthorized(idNo));
     }
 
     @LogHttpCaller
     @RequestMapping(value = "/createUserAuthorized")
-    public JsonResult createUserAuthorized(String name, String idNo, Long userId, String authPattern) {
-        LOGGER.info("[createUserAuthorized]创建实名账户,name:{},idNo:{},", name, idNo, userId, authPattern);
-        return userAuthorizedService.createUserAuthorized(name, idNo, userId, authPattern);
+    public JsonResult createUserAuthorized(UserAuthorizedParam userAuthorizedParam) {
+        LOGGER.info("[createUserAuthorized]创建实名账户,userAuthorizedParam:{},", userAuthorizedParam);
+        return JsonResult.buildSuccessResult(null, userAuthorizedService.createUserAuthorized(userAuthorizedParam));
     }
 
     @LogHttpCaller
     @RequestMapping(value = "/getUserAuthorizedId")
     public JsonResult getUserAuthorizedId(Long userId) {
         LOGGER.info("[getUserAuthorizedId]获取实名账户的id，userId:{}", userId);
-        return userAuthorizedService.getUserAuthorizedId(userId);
+        return JsonResult.buildSuccessResult(null, userAuthorizedService.getUserAuthorizedId(userId));
     }
 }

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

+package cn.quantgroup.xyqb.model;
+
+import lombok.Data;
+import lombok.Getter;
+
+/**
+ * @author xufei on 2018/1/10.
+ */
+@Getter
+@Data
+public class UserAuthorizedParam {
+    private String name;
+    private String idNo;
+    private Long userId;
+    private String authPattern;
+}

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.model.UserAuthorizedParam;
 
 import java.util.Map;
 
@@ -14,18 +15,15 @@ public interface IUserAuthorizedService {
      * @param idNo 身份证号
      * @return
      */
-    JsonResult hasUserAuthorized(String idNo);
+    Boolean hasUserAuthorized(String idNo);
 
     /**
      * 创建实名账户
      *
-     * @param name        用户姓名
-     * @param idNo        身份证号
-     * @param userId      userId
-     * @param authPattern 认证方式
+     * @param userAuthorizedParam
      * @return
      */
-    JsonResult createUserAuthorized(String name, String idNo, Long userId, String authPattern);
+    String createUserAuthorized(UserAuthorizedParam userAuthorizedParam);
 
     /**
      * 通过userId获取实名账户表的id
@@ -33,5 +31,5 @@ public interface IUserAuthorizedService {
      * @param userId userId
      * @return
      */
-    JsonResult getUserAuthorizedId(Long userId);
+    Long getUserAuthorizedId(Long userId);
 }

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

@@ -3,7 +3,7 @@ package cn.quantgroup.xyqb.service.auth.impl;
 import cn.quantgroup.xyqb.Constants;
 import cn.quantgroup.xyqb.entity.UserAuthorized;
 import cn.quantgroup.xyqb.model.AuthPattern;
-import cn.quantgroup.xyqb.model.JsonResult;
+import cn.quantgroup.xyqb.model.UserAuthorizedParam;
 import cn.quantgroup.xyqb.repository.IUserAuthorizedRepository;
 import cn.quantgroup.xyqb.service.auth.IIdCardService;
 import cn.quantgroup.xyqb.service.auth.IUserAuthorizedService;
@@ -13,6 +13,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import javax.naming.Name;
 import java.sql.Timestamp;
 import java.text.ParseException;
 
@@ -29,7 +30,7 @@ public class UserAuthorizedServiceImpl implements IUserAuthorizedService {
     private IUserAuthorizedRepository userAuthorizedRepository;
 
     @Override
-    public JsonResult hasUserAuthorized(String idNo) {
+    public Boolean hasUserAuthorized(String idNo) {
         try {
             if (StringUtils.isBlank(idNo) || !iIdCardService.isIdCardValid(idNo)) {
                 return null;
@@ -40,18 +41,26 @@ public class UserAuthorizedServiceImpl implements IUserAuthorizedService {
 
         UserAuthorized userAuthorized = userAuthorizedRepository.findByIdNo(idNo);
         LOGGER.info("[hasUserAuthorized]查询实名账户userAuthorized:{}", userAuthorized);
-        return JsonResult.buildSuccessResult(null, null != userAuthorized);
+        return null != userAuthorized;
     }
 
     @Override
-    public JsonResult createUserAuthorized(String name, String idNo, Long userId, String authPattern) {
+    public String createUserAuthorized(UserAuthorizedParam userAuthorizedParam) {
+        if (null == userAuthorizedParam) {
+            return Constants.CREATE_USER_AUTHORIZED_FAIL;
+        }
+        String name = userAuthorizedParam.getName();
+        Long userId = userAuthorizedParam.getUserId();
+        String authPattern = userAuthorizedParam.getAuthPattern();
+        String idNo = userAuthorizedParam.getIdNo();
         try {
-            if (StringUtils.isBlank(name) || StringUtils.isBlank(idNo) || StringUtils.isBlank(authPattern)
-                    || !iIdCardService.isIdCardValid(idNo)) {
-                return JsonResult.buildErrorStateResult(null, Constants.CREATE_USER_AUTHORIZED_FAIL);
+            if (StringUtils.isBlank(name) || userId == null || userId == 0L
+                    || StringUtils.isBlank(authPattern) || !iIdCardService.isIdCardValid(idNo)) {
+                return Constants.CREATE_USER_AUTHORIZED_FAIL;
             }
-        } catch (ParseException e) {
-            LOGGER.error("[createUserAuthorized]参数异常e:{}", e);
+        } catch (Exception e) {
+            LOGGER.error("[createUserAuthorized]参数有误:{}", e);
+            return Constants.CREATE_USER_AUTHORIZED_FAIL;
         }
         AuthPattern authPatternEnum = AuthPattern.valueOf(authPattern);
 
@@ -64,28 +73,29 @@ public class UserAuthorizedServiceImpl implements IUserAuthorizedService {
         Timestamp now = new Timestamp(System.currentTimeMillis());
         userAuthorized.setCreatedAt(now);
         userAuthorized.setUpdatedAt(now);
+
         try {
             userAuthorized = userAuthorizedRepository.save(userAuthorized);
             LOGGER.info("[createUserAuthorized]创建实名账户成功,userAuthorized:{}", userAuthorized);
-            return JsonResult.buildSuccessResult(null, Constants.CREATE_USER_AUTHORIZED_SUCCESS);
+            return Constants.CREATE_USER_AUTHORIZED_SUCCESS;
         } catch (Exception e) {
             LOGGER.error("[createUserAuthorized]创建实名账户异常e:{}", e);
-            return JsonResult.buildErrorStateResult(null, Constants.CREATE_USER_AUTHORIZED_FAIL);
+            return Constants.CREATE_USER_AUTHORIZED_FAIL;
         }
     }
 
     @Override
-    public JsonResult getUserAuthorizedId(Long userId) {
+    public Long getUserAuthorizedId(Long userId) {
         if (null == userId || userId == 0) {
-            return JsonResult.buildErrorStateResult(null, null);
+            return null;
         }
 
         UserAuthorized userAuthorized = userAuthorizedRepository.findByUserId(userId);
         if (null == userAuthorized) {
             LOGGER.info("[getUserAuthorizedId]该实名账户不存在userId:{}", userId);
-            return JsonResult.buildErrorStateResult(null, null);
+            return null;
         }
         LOGGER.info("[getUserAuthorizedId]获取实名账户的id,userAuthorized:{}", userAuthorized);
-        return JsonResult.buildSuccessResult(null, userAuthorized.getId());
+        return userAuthorized.getId();
     }
 }