topic主页添加查看消费者弹框

jd-opensource · Oct 12, 2020 · 85b960e · 85b960e
1 parent 7d44bfe
commit 85b960e
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 0 deletions.
diff --git a/...ta/joyqueue-data-service/src/main/java/org/joyqueue/service/impl/ConsumerServiceImpl.java b/...ta/joyqueue-data-service/src/main/java/org/joyqueue/service/impl/ConsumerServiceImpl.java
@@ -212,6 +212,7 @@ protected Consumer fillConsumer(Consumer consumer) {
         if (application != null) {
             app.setId(application.getId());
             app.setName(application.getName());
+            consumer.setOwner(application.getOwner());
         }
         return consumer;
     }

diff --git a/joyqueue-console/joyqueue-web/joyqueue-web-application/src/main/resources/routing.xml b/joyqueue-console/joyqueue-web/joyqueue-web-application/src/main/resources/routing.xml
@@ -311,6 +311,9 @@
         <route inherit="delete"
                path="/v1/producer/delete/:id" handlers="producer#delete render"
                errors="error"/>
+        <route inherit="post"
+               path="/v1/producer/query-by-topic" handlers="producer#query-by-topic render"
+               errors="error"/>
 
         <!-- producerConfig -->
         <route inherit="post"
@@ -335,6 +338,9 @@
                errors="error"/>
         <route inherit="delete"
                path="/v1/consumer/delete/:id" handlers="consumer#delete render"/>
+        <route inherit="post"
+               path="/v1/consumer/queryByTopic" handlers="consumer#queryByTopic render"
+               errors="error"/>
 
         <route inherit="get"
                path="/v1/consumer/findAllSubscribeGroups" handlers="consumer#findAllSubscribeGroups render"/>

diff --git a/...b-handler/src/main/java/org/joyqueue/handler/routing/command/monitor/ConsumerCommand.java b/...b-handler/src/main/java/org/joyqueue/handler/routing/command/monitor/ConsumerCommand.java
@@ -147,6 +147,20 @@ public Response delete(@QueryParam(Constants.ID) String id) throws Exception {
         return Responses.success();
     }
 
+    @Path("queryByTopic")
+    public Response queryByTopic(@Body QConsumer qConsumer) throws Exception {
+        if (qConsumer.getTopic() == null || qConsumer.getTopic().getCode() == null) {
+            return Responses.error(Response.HTTP_BAD_REQUEST, "Empty topic!");
+        }
+        String namespace = null;
+        String topic = qConsumer.getTopic().getCode();
+        if (null != qConsumer.getTopic().getNamespace()) {
+            namespace = qConsumer.getTopic().getNamespace().getCode();
+        }
+        List<Consumer> consumers = service.findByTopic(topic, namespace);
+        return Responses.success(consumers);
+    }
+
     @Path("configAddOrUpdate")
     public Response configAddOrUpdate(@Body ConsumerConfig config) throws Exception {
         if (config != null) {