Queue，完成

@@ -27,6 +27,7 @@ public class BusQueueController {
     /**
     /**
      * 分页查询，消息队列-列表
      * 分页查询，消息队列-列表
      *
      *
+     * @param virtualHostId 所属虚拟主机id
      * @param queueName 消息队列名称
      * @param queueName 消息队列名称
      * @param pageNum   当前页数
      * @param pageNum   当前页数
      * @param pageSize  每页数量
      * @param pageSize  每页数量
@@ -34,11 +35,14 @@ public class BusQueueController {
      */
      */
     @GetMapping("/list")
     @GetMapping("/list")
     public ResultJson<PageInfo> selectBusQueueList(
     public ResultJson<PageInfo> selectBusQueueList(
+            @RequestParam(value = "virtualHostId", required = false) String virtualHostId,
             @RequestParam(value = "queueName", required = false) String queueName,
             @RequestParam(value = "queueName", required = false) String queueName,
             @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
             @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
             @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
             @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
         ResultJson<PageInfo> result = new ResultJson<>();
         ResultJson<PageInfo> result = new ResultJson<>();
         BusQueue busQueue = new BusQueue();
         BusQueue busQueue = new BusQueue();
+        // 获取参数，所属虚拟主机id
+        busQueue.setVirtualHostId(virtualHostId);
         // 获取参数，队列名称
         // 获取参数，队列名称
         busQueue.setQueueName(queueName);
         busQueue.setQueueName(queueName);
         // 分页查询
         // 分页查询

@@ -67,4 +67,13 @@ public class BusQueue implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date gmtModified;
     private Date gmtModified;
 
 
+    /**
+     * 队列名称的别名
+     */
+    private String aliasName;
+
+    /**
+     * 一个队列对应一个虚拟主机
+     */
+    private VirtualHost virtualHost;
 }
 }

@@ -54,6 +54,11 @@ public class VirtualHost implements Serializable {
     private Date gmtModified;
     private Date gmtModified;
 
 
     /**
     /**
+     * 虚拟主机名称的别名
+     */
+    private String aliasName;
+
+    /**
      * 一个虚拟主机对应一个服务器
      * 一个虚拟主机对应一个服务器
      */
      */
     private BusServer busServer;
     private BusServer busServer;
@@ -68,8 +73,4 @@ public class VirtualHost implements Serializable {
      */
      */
     private List<BusExchange> aliasList;
     private List<BusExchange> aliasList;
 
 
-    /**
-     * 虚拟主机名称的别名
-     */
-    private String aliasName;
 }
 }

@@ -14,6 +14,15 @@
         <result column="gmt_create" jdbcType="TIMESTAMP" property="gmtCreate"/>
         <result column="gmt_create" jdbcType="TIMESTAMP" property="gmtCreate"/>
         <result column="gmt_modified" jdbcType="TIMESTAMP" property="gmtModified"/>
         <result column="gmt_modified" jdbcType="TIMESTAMP" property="gmtModified"/>
     </resultMap>
     </resultMap>
+
+    <!-- 该Mapper映射关系的作用，是队列与虚拟主机的1:1的关系映射 -->
+    <resultMap id="QueueAndHostMap" extends="BaseResultMap"
+               type="com.sunyo.wlpt.message.bus.service.domain.BusQueue">
+        <association property="virtualHost" javaType="com.sunyo.wlpt.message.bus.service.domain.VirtualHost">
+            <id column="id" property="id"></id>
+            <result column="virtual_host_name" property="virtualHostName"/>
+        </association>
+    </resultMap>
     <sql id="Base_Column_List">
     <sql id="Base_Column_List">
         <!--@mbg.generated-->
         <!--@mbg.generated-->
         id, queue_name, virtual_host_id, durability, auto_delete, arguments, description,
         id, queue_name, virtual_host_id, durability, auto_delete, arguments, description,
@@ -30,13 +39,19 @@
     <select id="selectBusQueueList" parameterType="com.sunyo.wlpt.message.bus.service.domain.BusQueue"
     <select id="selectBusQueueList" parameterType="com.sunyo.wlpt.message.bus.service.domain.BusQueue"
             resultMap="BaseResultMap">
             resultMap="BaseResultMap">
         select
         select
-        <include refid="Base_Column_List"/>
-        from bus_queue
+        q.id, q.queue_name, q.virtual_host_id, q.durability, q.auto_delete, q.arguments, q.description,
+        q.gmt_create, q.gmt_modified,v.virtual_host_name
+        from bus_queue as q,virtual_host v
         <where>
         <where>
+            <!-- 所属虚拟主机Id -->
+            <if test="virtualHostId != null and virtualHostId !=''">
+                virtual_host_id = #{virtualHostId,jdbcType=VARCHAR}
+            </if>
             <!-- 消息队列名称 -->
             <!-- 消息队列名称 -->
             <if test="queueName != null and queueName !=''">
             <if test="queueName != null and queueName !=''">
-                queue_name = #{queueName,jdbcType=VARCHAR}
+                and queue_name = #{queueName,jdbcType=VARCHAR}
             </if>
             </if>
+            and v.id = q.virtual_host_id
         </where>
         </where>
     </select>
     </select>
     <!-- 校验消息队列是否已存在-->
     <!-- 校验消息队列是否已存在-->