队列列表显示CONSUMERGROUP

@@ -31,4 +31,15 @@ public class RouterRcvrFilterController {
         PageInfo<MessageRouterReciverFilter> list = messageRouterReciverFilterService.get(filter,pageNum,pageSize);
         return new ResultJson<>("200","success",list);
     }
+    @PutMapping("/filter")
+    public ResultJson edi(@RequestBody MessageRouterReciverFilter messageRouterReciverFilter){
+        int result=messageRouterReciverFilterService.ediMessageRouterReciverFilter(messageRouterReciverFilter);
+        return result>0?new ResultJson("200","过滤规则修改成功"):new ResultJson("500","过滤规则修改失败");
+    }
+    @DeleteMapping("/filter")
+    public ResultJson del(@RequestBody MessageRouterReciverFilter me){
+        int result=messageRouterReciverFilterService.delMessageRouterReciverFilter(me.getId());
+        return result>0?new ResultJson("200","过滤规则删除成功"):new ResultJson("500","过滤规则删除失败");
+
+    }
 }

 package com.sunyo.wlpt.message.bus.service.domain;
 
+import com.sunyo.wlpt.message.bus.service.model.ConsumerGroup;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -7,6 +8,7 @@ import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @author 子诚
@@ -102,4 +104,6 @@ public class BusQueue implements Serializable {
      * 消费者组名
      */
     private String consumerGroupName;
+
+    private List<ConsumerGroup> consumerList;
 }

@@ -15,6 +15,8 @@ public interface ConsumerGroupMapper {
 
     List<String> groups();
 
+    List<ConsumerGroup> selectByusername(String username);
+
     int updateByPrimaryKeySelective(ConsumerGroup record);
 
     int updateByPrimaryKey(ConsumerGroup record);

@@ -6,4 +6,6 @@ import com.sunyo.wlpt.message.bus.service.model.MessageRouterReciverFilter;
 public interface MessageRouterReciverFilterService {
     int addMessageRouterReciverFilter(MessageRouterReciverFilter messageRouterReciverFilter);
     PageInfo<MessageRouterReciverFilter> get(String filter, int pageNum, int pageSize);
+    int ediMessageRouterReciverFilter(MessageRouterReciverFilter messageRouterReciverFilter);
+    int delMessageRouterReciverFilter(String id);
 }

@@ -31,4 +31,14 @@ public class MessageRouterReciverFilterImpl implements MessageRouterReciverFilte
         PageInfo<MessageRouterReciverFilter> result=new PageInfo<>(list);
         return result;
     }
+
+    @Override
+    public int ediMessageRouterReciverFilter(MessageRouterReciverFilter record) {
+        return messageRouterReciverFilterMapper.updateByPrimaryKey(record);
+    }
+
+    @Override
+    public int delMessageRouterReciverFilter(String id) {
+        return messageRouterReciverFilterMapper.deleteByPrimaryKey(id);
+    }
 }

@@ -26,6 +26,7 @@
             <id column="id" property="id"/>
             <result column="virtual_host_name" property="virtualHostName"/>
         </association>
+        <collection column="username" javaType="java.util.ArrayList" ofType="com.sunyo.wlpt.message.bus.service.model.ConsumerGroup" property="consumerList" select="com.sunyo.wlpt.message.bus.service.mapper.ConsumerGroupMapper.selectByusername" />
     </resultMap>
 
   <sql id="Base_Column_List">
@@ -245,19 +246,8 @@
     <!-- 获取消息队列，列表 -->
     <select id="selectBusQueueList" parameterType="com.sunyo.wlpt.message.bus.service.domain.BusQueue"
             resultMap="QueueAndHostMap">
-        select q.id,
-               q.queue_name,
-               q.virtual_host_id,
-               q.durability,
-               q.auto_delete,
-               q.arguments,
-               q.description,
-               q.user_id,
-               q.username,
-               q.gmt_create,
-               q.gmt_modified,
-               q.partition_count
-        from bus_queue as q
+        select <include refid="Base_Column_List" />
+        from bus_queue
         <where>
             <!-- 用户名称 -->
             <if test="username != null and username != ''">

@@ -17,10 +17,17 @@
     from consumer_group
     where id = #{id,jdbcType=VARCHAR}
   </select>
+  <select id="selectByusername" resultMap="BaseResultMap" parameterType="java.lang.String">
+    select
+    <include refid="Base_Column_List" />
+ from consumer_group
+    where username = #{username,jdbcType=VARCHAR}
+  </select>
   <select id="groups" resultType="java.lang.String" parameterType="java.lang.String" >
     select
-    name
+    <include refid="Base_Column_List" />
     from consumer_group
+    where username = #{username,jdbcType=VARCHAR}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
     delete from consumer_group