实名账户去掉userId

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

@@ -57,8 +57,8 @@ public class UserAuthorizedController {
 
     @LogHttpCaller
     @RequestMapping(value = "/getUserAuthorizedId")
-    public JsonResult getUserAuthorizedId(Long userId) {
-        LOGGER.info("[getUserAuthorizedId]获取实名账户的id，userId:{}", userId);
-        return JsonResult.buildSuccessResult(null, userAuthorizedService.getUserAuthorizedId(userId));
+    public JsonResult getUserAuthorizedId(String userUuid) {
+        LOGGER.info("[getUserAuthorizedId]获取实名账户的id，userUuid:{}", userUuid);
+        return JsonResult.buildSuccessResult(null, userAuthorizedService.getUserAuthorizedId(userUuid));
     }
 }

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

@@ -21,9 +21,6 @@ public class UserAuthorized {
     @GenericGenerator(name ="uuid" , strategy = "uuid")
     private String id;
 
-    @Column(name = "user_id")
-    private Long userId;
-
     @Column(name = "user_uuid")
     private String userUuid;
 

src/main/java/cn/quantgroup/xyqb/repository/IUserAuthorizedRepository.java

@@ -19,8 +19,8 @@ public interface IUserAuthorizedRepository extends JpaRepository<UserAuthorized,
     /**
      * 通过userId查找实名账户
      *
-     * @param userId 用户id
+     * @param userUuid 用户表的uuid
      * @return 实体
      */
-    UserAuthorized findByUserId(Long userId);
+    UserAuthorized findByUserUuid(String  userUuid);
 }

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

@@ -26,10 +26,10 @@ public interface IUserAuthorizedService {
     /**
      * 通过userId获取实名账户表的id
      *
-     * @param userId userId
+     * @param userUuid userUuid
      * @return
      */
-    String getUserAuthorizedId(Long userId);
+    String getUserAuthorizedId(String userUuid);
 
     /**
      * 校验参数

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

@@ -69,7 +69,6 @@ public class UserAuthorizedServiceImpl implements IUserAuthorizedService {
         userAuthorized.setAvailable(Boolean.TRUE);
         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);
@@ -86,17 +85,16 @@ public class UserAuthorizedServiceImpl implements IUserAuthorizedService {
     }
 
     @Override
-    public String getUserAuthorizedId(Long userId) {
-        if (null == userId || userId == 0) {
+    public String getUserAuthorizedId(String userUuid) {
+        if (StringUtils.isBlank(userUuid)) {
             return null;
         }
 
-        UserAuthorized userAuthorized = userAuthorizedRepository.findByUserId(userId);
+        UserAuthorized userAuthorized = userAuthorizedRepository.findByUserUuid(userUuid);
+        LOGGER.info("[getUserAuthorizedId]获取实名账户的id,userUuid:{},userAuthorized:{}", userUuid,userAuthorized);
         if (null == userAuthorized) {
-            LOGGER.info("[getUserAuthorizedId]该实名账户不存在userId:{}", userId);
             return null;
         }
-        LOGGER.info("[getUserAuthorizedId]获取实名账户的id,userAuthorized:{}", userAuthorized);
         return userAuthorized.getId();
     }
 }

src/test/java/repsitory/UserAuthorizedRepsitoryTests.java

@@ -38,8 +38,8 @@ public class UserAuthorizedRepsitoryTests extends BaseParametersTests {
     private IUserAuthorizedRepository userAuthorizedRepository;
 
     UserAuthorized obj = new UserAuthorized();
-    public UserAuthorizedRepsitoryTests(Long userId, String idNo, String name, AuthPattern authPattern, Boolean available) {
-        obj.setUserId(userId);
+    public UserAuthorizedRepsitoryTests(String userUuid, String idNo, String name, AuthPattern authPattern, Boolean available) {
+        obj.setUserUuid(userUuid);
         obj.setIdNo(idNo);
         obj.setName(name);
         obj.setAuthPattern(authPattern);
@@ -59,7 +59,7 @@ public class UserAuthorizedRepsitoryTests extends BaseParametersTests {
 
     @Test
     public void testExist() throws Exception {
-        log.info("testExist: name:{}, idNo:{}, userId:{}, authPattern:{}", obj.getName(), obj.getIdNo(), obj.getUserId(), obj.getAuthPattern());
+        log.info("testExist: name:{}, idNo:{}, userId:{}, authPattern:{}", obj.getName(), obj.getIdNo(), obj.getUserUuid(), obj.getAuthPattern());
         UserAuthorized obj = new UserAuthorized();
         boolean exist = userAuthorizedRepository.exists(Example.of(obj));
         Assert.assertNotNull(obj);
@@ -67,7 +67,7 @@ public class UserAuthorizedRepsitoryTests extends BaseParametersTests {
 
     @Test
     public void testSave() throws Exception {
-        log.info("testSave: name:{}, idNo:{}, userId:{}, authPattern:{}", obj.getName(), obj.getIdNo(), obj.getUserId(), obj.getAuthPattern());
+        log.info("testSave: name:{}, idNo:{}, userId:{}, authPattern:{}", obj.getName(), obj.getIdNo(), obj.getUserUuid(), obj.getAuthPattern());
         UserAuthorized obj = new UserAuthorized();
         obj = userAuthorizedRepository.save(obj);
         Assert.assertNotNull(obj);
@@ -75,7 +75,7 @@ public class UserAuthorizedRepsitoryTests extends BaseParametersTests {
 
     @Test
     public void testQuery(){
-        log.info("testQuery: name:{}, idNo:{}, userId:{}, authPattern:{}", obj.getName(), obj.getIdNo(), obj.getUserId(), obj.getAuthPattern());
+        log.info("testQuery: name:{}, idNo:{}, userId:{}, authPattern:{}", obj.getName(), obj.getIdNo(), obj.getUserUuid(), obj.getAuthPattern());
         UserAuthorized obj = userAuthorizedRepository.findByIdNo(this.obj.getIdNo());
         Assert.assertNotNull(obj);
     }

src/test/java/service/UserAuthorizedServiceTests.java

@@ -38,8 +38,8 @@ public class UserAuthorizedServiceTests extends BaseParametersTests {
     private IUserAuthorizedService userAuthorizedService;
 
     UserAuthorizedParam obj = new UserAuthorizedParam();
-    public UserAuthorizedServiceTests(Long userId, String idNo, String name, AuthPattern authPattern, Boolean available) {
-        obj.setUserId(userId);
+    public UserAuthorizedServiceTests(String userUuid, String idNo, String name, AuthPattern authPattern, Boolean available) {
+        obj.setUserUuid(userUuid);
         obj.setIdNo(idNo);
         obj.setName(name);
         obj.setAuthPattern(Optional.ofNullable(authPattern).orElse(AuthPattern.ZMXY).name());
@@ -58,22 +58,22 @@ public class UserAuthorizedServiceTests extends BaseParametersTests {
 
     @Test
     public void testExist() throws Exception {
-        log.info("testExist: name:{}, idNo:{}, userId:{}, authPattern:{}", obj.getName(), obj.getIdNo(), obj.getUserId(), obj.getAuthPattern());
+        log.info("testExist: name:{}, idNo:{}, userId:{}, authPattern:{}", obj.getName(), obj.getIdNo(), obj.getUserUuid(), obj.getAuthPattern());
         Object obj = userAuthorizedService.hasUserAuthorized(this.obj.getIdNo());
         Assert.assertNotNull(obj);
     }
 
     @Test
     public void testSave() throws Exception {
-        log.info("testSave: name:{}, idNo:{}, userId:{}, authPattern:{}", obj.getName(), obj.getIdNo(), obj.getUserId(), obj.getAuthPattern());
+        log.info("testSave: name:{}, idNo:{}, userId:{}, authPattern:{}", obj.getName(), obj.getIdNo(), obj.getUserUuid(), obj.getAuthPattern());
         Object obj = userAuthorizedService.createUserAuthorized(this.obj);
         Assert.assertNotNull(obj);
     }
 
     @Test
     public void testQuery(){
-        log.info("testQuery: name:{}, idNo:{}, userId:{}, authPattern:{}", obj.getName(), obj.getIdNo(), obj.getUserId(), obj.getAuthPattern());
-        Object obj = userAuthorizedService.getUserAuthorizedId(this.obj.getUserId());
+        log.info("testQuery: name:{}, idNo:{}, userId:{}, authPattern:{}", obj.getName(), obj.getIdNo(), obj.getUserUuid(), obj.getAuthPattern());
+        Object obj = userAuthorizedService.getUserAuthorizedId(this.obj.getUserUuid());
         Assert.assertNotNull(obj);
     }