<dev>

1.增加权限设置ApiAuth中,username字段
2.修改接口查看权限列表(queryAuthSingle)根据username模糊搜索

api-service-project/api-service-application/src/main/java/com/zorkdata/apiservice/application/application/ApiApplication.java

@@ -226,9 +226,11 @@ public interface ApiApplication {
      * 根据apiId查询Auth
      *
      * @param apiId
+     * @param keyword
+     * @param
      * @return
      */
-    InvokeResult queryAuthSingle(Integer apiId);
+    InvokeResult queryAuthSingle(Integer apiId, String keyword);
 
     /**
      * 获取Api   Limit,name属性

api-service-project/api-service-application/src/main/java/com/zorkdata/apiservice/application/impl/ApiServiceApplicationImpl.java

@@ -734,13 +734,25 @@ public class ApiServiceApplicationImpl implements ApiApplication {
     }
 
     @Override
-    public InvokeResult queryAuthSingle(Integer apiId) {
+    public InvokeResult queryAuthSingle(Integer apiId, String keyword) {
         Specification<ApiAuth> specification = (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder.equal(root.get("apiId"), apiId);
         InvokeResult invokeResult;
         try {
+            specification = (root, criteriaQuery, criteriaBuilder) -> {
+                List<Predicate> predicates = Lists.newArrayList();
+                Predicate apiId1 = criteriaBuilder.equal(root.get("apiId"), apiId);
+                predicates.add(apiId1);
+                if (StrUtil.isNotBlank(keyword)) {
+                    String kyword = StrUtil.builder("%", keyword, "%").toString();
+                    Predicate keywordPredicate = criteriaBuilder.or(criteriaBuilder.like(root.get("username"), kyword));
+                    predicates.add(keywordPredicate);
+                }
+                return criteriaBuilder.and(predicates.toArray(new Predicate[predicates.size()]));
+            };
             List<ApiAuth> apiAuth = apiAuthRepository.findAll(specification);
             invokeResult = InvokeResult.success();
             invokeResult.setData(apiAuth);
+
         } catch (Exception e) {
             log.error("异常了,", e);
             invokeResult = InvokeResult.fail();

api-service-project/api-service-domain/src/main/java/com/zorkdata/apiservice/domain/assembler/ApiAuthAssembler.java

@@ -33,6 +33,7 @@ public class ApiAuthAssembler {
         apiAuth.setStartTime(apiAuthDTO.getStartTime());
         apiAuth.setEndTime(apiAuthDTO.getEndTime());
         apiAuth.setLimitTime(apiAuthDTO.getLimitTime());
+        apiAuth.setUsername(apiAuthDTO.getUsername());
         return apiAuth;
     }
 
@@ -51,6 +52,7 @@ public class ApiAuthAssembler {
             apiAuthDTO.setUserId(apiAuth.getUserId());
             apiAuthDTO.setLimitNum(apiAuth.getLimitNum());
             apiAuthDTO.setLimitTime(apiAuth.getLimitTime());
+            apiAuthDTO.setUsername(apiAuth.getUsername());
             apiAuthDTOList.add(apiAuthDTO);
 
         }

api-service-project/api-service-domain/src/main/java/com/zorkdata/apiservice/domain/domain/ApiAuth.java

@@ -32,6 +32,11 @@ public class ApiAuth {
      */
     @Column(name = "user_id")
     private Integer userId;
+    /**
+     * 授权用户名称
+     */
+    @Column(name = "username")
+    private String username;
     /**
      * 调用次数限制
      */

api-service-project/api-service-domain/src/main/java/com/zorkdata/apiservice/domain/dto/ApiAuthDTO.java

@@ -24,6 +24,10 @@ public class ApiAuthDTO {
      * 授权用户
      */
     private Integer userId;
+    /**
+     * 授权用户名称
+     */
+    private String username;
     /**
      * 调用次数限制
      */

api-service-project/api-service-facade/src/main/java/com/zorkdata/apiservice/facade/facade/ApiFacade.java

@@ -224,9 +224,10 @@ public interface ApiFacade {
      * 根据apiId查询Auth
      *
      * @param apiId
+     * @param keyword
      * @return
      */
-    InvokeResult queryAuthSingle(Integer apiId);
+    InvokeResult queryAuthSingle(Integer apiId, String keyword);
 
     /**
      * 获取Api   Limit,name属性

api-service-project/api-service-facade/src/main/java/com/zorkdata/apiservice/facade/impl/ApiServicueFacadeImpl.java

@@ -254,8 +254,8 @@ public class ApiServicueFacadeImpl implements ApiFacade {
     }
 
     @Override
-    public InvokeResult queryAuthSingle(Integer apiId) {
-        return apiApplication.queryAuthSingle(apiId);
+    public InvokeResult queryAuthSingle(Integer apiId, String keyword) {
+        return apiApplication.queryAuthSingle(apiId,keyword);
     }
 
     @Override

api-service-project/api-service-web/src/main/java/com/zorkdata/apiservice/controller/ApiServicueController.java

@@ -200,8 +200,9 @@ public class ApiServicueController extends BaseController {
 
     @Inner(value = false)
     @RequestMapping("/queryAuthSingle/{apiId}")
-    public InvokeResult queryAuthSingle(@PathVariable Integer apiId) {
-        return apiFacade.queryAuthSingle(apiId);
+    public InvokeResult queryAuthSingle(@PathVariable Integer apiId,
+                                        @RequestParam(required = false) String keyword) {
+        return apiFacade.queryAuthSingle(apiId, keyword);
     }
 
     @Inner(value = false)