review代码

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.service.auth.IUserAuthorizedService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -17,28 +19,31 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/user/auth")
-public class UserAuthorizedController{
+public class UserAuthorizedController {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(UserAuthorizedController.class);
 
     @Resource
     private IUserAuthorizedService userAuthorizedService;
 
-    @RequestMapping(value="/hasUserAuthorized",method = RequestMethod.GET)
-    public Boolean  hasUserAuthorized(String idNo){
-        LOGGER.info("[hasUserAuthorized]需要校验的用户的身份证号为idNo:{}",idNo);
+    @LogHttpCaller
+    @RequestMapping(value = "/hasUserAuthorized")
+    public JsonResult hasUserAuthorized(String idNo) {
+        LOGGER.info("[hasUserAuthorized]需要校验的用户的身份证号为idNo:{}", idNo);
         return userAuthorizedService.hasUserAuthorized(idNo);
     }
 
-    @RequestMapping(value = "/createUserAuthorized",method = RequestMethod.POST)
-    public String createUserAuthorized(@RequestParam Map<String,String> parameters){
-        LOGGER.info("[createUserAuthorized]创建实名账户,parameters:{}",parameters);
-        return userAuthorizedService.createUserAuthorized(parameters);
+    @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);
     }
 
-    @RequestMapping(value = "/getUserAuthorizedId",method = RequestMethod.GET)
-    public Long getUserAuthorizedId(Long userId){
-        LOGGER.info("[getUserAuthorizedId]获取实名账户的id，userId:{}",userId);
+    @LogHttpCaller
+    @RequestMapping(value = "/getUserAuthorizedId")
+    public JsonResult getUserAuthorizedId(Long userId) {
+        LOGGER.info("[getUserAuthorizedId]获取实名账户的id，userId:{}", userId);
         return userAuthorizedService.getUserAuthorizedId(userId);
     }
 }

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

-package cn.quantgroup.xyqb.entity;
-
-import lombok.Data;
-
-import javax.persistence.*;
-import java.sql.Timestamp;
-
-/**
- * @author xufei on 2018/1/5.
- */
-@Data
-@Entity
-@Table(name = "user_authorized_change_record")
-public class UserAuthorizedChangeRecord {
-    @Id
-    @Column(name = "id")
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-
-    @Column(name = "user_authorized_id")
-    private Long userAuthorizedId;
-
-    @Column(name = "before_user_id")
-    private Long beforeUserId;
-
-    @Column(name = "after_user_id")
-    private Long afterUserId;
-
-    //创建时间
-    @Column(name = "created_at")
-    private Timestamp createdAt;
-
-    //上一次修改时间
-    @Column(name = "updated_at")
-    private Timestamp updatedAt;
-}

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

 package cn.quantgroup.xyqb.service.auth;
 
+import cn.quantgroup.xyqb.model.JsonResult;
+
 import java.util.Map;
 
 /**
@@ -10,23 +12,26 @@ public interface IUserAuthorizedService {
      * 该身份证是否有对应的实名账户
      *
      * @param idNo 身份证号
-     * @return true有实名账户 false无实名账户
+     * @return
      */
-    Boolean hasUserAuthorized(String idNo);
+    JsonResult hasUserAuthorized(String idNo);
 
     /**
      * 创建实名账户
      *
-     * @param parameters 请求参数
-     * @return 成功返回success 失败返回fail
+     * @param name        用户姓名
+     * @param idNo        身份证号
+     * @param userId      userId
+     * @param authPattern 认证方式
+     * @return
      */
-    String createUserAuthorized(Map<String,String> parameters);
+    JsonResult createUserAuthorized(String name, String idNo, Long userId, String authPattern);
 
     /**
      * 通过userId获取实名账户表的id
      *
      * @param userId userId
-     * @return userAuthorized的id
+     * @return
      */
-    Long getUserAuthorizedId(Long userId);
+    JsonResult getUserAuthorizedId(Long userId);
 }

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

@@ -3,6 +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.repository.IUserAuthorizedRepository;
 import cn.quantgroup.xyqb.service.auth.IIdCardService;
 import cn.quantgroup.xyqb.service.auth.IUserAuthorizedService;
@@ -10,12 +11,10 @@ import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.sql.Timestamp;
 import java.text.ParseException;
-import java.util.Map;
 
 /**
  * @author xufei on 2018/1/5.
@@ -30,7 +29,7 @@ public class UserAuthorizedServiceImpl implements IUserAuthorizedService {
     private IUserAuthorizedRepository userAuthorizedRepository;
 
     @Override
-    public Boolean hasUserAuthorized(String idNo) {
+    public JsonResult hasUserAuthorized(String idNo) {
         try {
             if (StringUtils.isBlank(idNo) || !iIdCardService.isIdCardValid(idNo)) {
                 return null;
@@ -41,30 +40,23 @@ public class UserAuthorizedServiceImpl implements IUserAuthorizedService {
 
         UserAuthorized userAuthorized = userAuthorizedRepository.findByIdNo(idNo);
         LOGGER.info("[hasUserAuthorized]查询实名账户userAuthorized:{}", userAuthorized);
-        return null != userAuthorized;
+        return JsonResult.buildSuccessResult(null, null != userAuthorized);
     }
 
     @Override
-    public String createUserAuthorized(Map<String,String> parameters) {
-        if (CollectionUtils.isEmpty(parameters)){
-            return Constants.CREATE_USER_AUTHORIZED_FAIL;
-        }
-        String name = parameters.get("name");
-        String idNo= parameters.get("idNo");
-        Long userId = Long.valueOf(parameters.get("userId"));
-        String  authPatternStr= parameters.get("authPattern");
-        AuthPattern authPattern =AuthPattern.valueOf(authPatternStr);
+    public JsonResult createUserAuthorized(String name, String idNo, Long userId, String authPattern) {
         try {
-            if (StringUtils.isBlank(name) || StringUtils.isBlank(idNo) || null ==authPattern
+            if (StringUtils.isBlank(name) || StringUtils.isBlank(idNo) || StringUtils.isBlank(authPattern)
                     || !iIdCardService.isIdCardValid(idNo)) {
-                return Constants.CREATE_USER_AUTHORIZED_FAIL;
+                return JsonResult.buildErrorStateResult(null, Constants.CREATE_USER_AUTHORIZED_FAIL);
             }
         } catch (ParseException e) {
             LOGGER.error("[createUserAuthorized]参数异常e:{}", e);
         }
+        AuthPattern authPatternEnum = AuthPattern.valueOf(authPattern);
 
-        UserAuthorized userAuthorized =new UserAuthorized();
-        userAuthorized.setAuthPattern(authPattern);
+        UserAuthorized userAuthorized = new UserAuthorized();
+        userAuthorized.setAuthPattern(authPatternEnum);
         userAuthorized.setAvailable(Boolean.TRUE);
         userAuthorized.setName(name);
         userAuthorized.setIdNo(idNo);
@@ -73,27 +65,27 @@ public class UserAuthorizedServiceImpl implements IUserAuthorizedService {
         userAuthorized.setCreatedAt(now);
         userAuthorized.setUpdatedAt(now);
         try {
-            userAuthorized=userAuthorizedRepository.save(userAuthorized);
-            LOGGER.info("[createUserAuthorized]创建实名账户成功,userAuthorized:{}",userAuthorized);
-            return Constants.CREATE_USER_AUTHORIZED_SUCCESS;
+            userAuthorized = userAuthorizedRepository.save(userAuthorized);
+            LOGGER.info("[createUserAuthorized]创建实名账户成功,userAuthorized:{}", userAuthorized);
+            return JsonResult.buildSuccessResult(null, Constants.CREATE_USER_AUTHORIZED_SUCCESS);
         } catch (Exception e) {
-            LOGGER.error("[createUserAuthorized]创建实名账户异常e:{}",e);
-            return Constants.CREATE_USER_AUTHORIZED_FAIL;
+            LOGGER.error("[createUserAuthorized]创建实名账户异常e:{}", e);
+            return JsonResult.buildErrorStateResult(null, Constants.CREATE_USER_AUTHORIZED_FAIL);
         }
     }
 
     @Override
-    public Long getUserAuthorizedId(Long userId) {
-        if (null==userId ||userId==0 ){
-            return null;
+    public JsonResult getUserAuthorizedId(Long userId) {
+        if (null == userId || userId == 0) {
+            return JsonResult.buildErrorStateResult(null, null);
         }
 
-        UserAuthorized userAuthorized=userAuthorizedRepository.findByUserId(userId);
-        if (null==userAuthorized){
-            LOGGER.info("[getUserAuthorizedId]该实名账户不存在userId:{}",userId);
-            return null;
+        UserAuthorized userAuthorized = userAuthorizedRepository.findByUserId(userId);
+        if (null == userAuthorized) {
+            LOGGER.info("[getUserAuthorizedId]该实名账户不存在userId:{}", userId);
+            return JsonResult.buildErrorStateResult(null, null);
         }
-        LOGGER.info("[getUserAuthorizedId]获取实名账户的id,userAuthorized:{}",userAuthorized);
-        return userAuthorized.getId();
+        LOGGER.info("[getUserAuthorizedId]获取实名账户的id,userAuthorized:{}", userAuthorized);
+        return JsonResult.buildSuccessResult(null, userAuthorized.getId());
     }
 }