查询列表，多添加了一个查询条件（服务器id）

@@ -125,10 +125,11 @@ public class CascadeController {
      * @return {@link ResultJson}
      * @return {@link ResultJson}
      */
      */
     @GetMapping("/server_host")
     @GetMapping("/server_host")
-    public ResultJson getServerAndHostList()
+    public ResultJson getServerAndHostList(@RequestParam(value = "serverName", required = false) String serverName)
     {
     {
-
-        List<BusServer> servers = busServerService.getServerAndHostList();
+        BusServer busServer=BusServer.builder().serverName(serverName)
+                .build();
+        List<BusServer> servers = busServerService.getServerAndHostList(busServer);
         return servers.size() > 0
         return servers.size() > 0
                 ? new ResultJson<>("200", "查询服务器与虚拟主机信息，成功", servers)
                 ? new ResultJson<>("200", "查询服务器与虚拟主机信息，成功", servers)
                 : new ResultJson<>("500", "查询服务器与虚拟主机信息，失败");
                 : new ResultJson<>("500", "查询服务器与虚拟主机信息，失败");

 package com.sunyo.wlpt.message.bus.service.mapper;
 package com.sunyo.wlpt.message.bus.service.mapper;
 
 
 import com.sunyo.wlpt.message.bus.service.domain.BusServer;
 import com.sunyo.wlpt.message.bus.service.domain.BusServer;
-import org.apache.ibatis.annotations.Mapper;import org.apache.ibatis.annotations.Param;import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 
 /**
 /**
  * @author 子诚
  * @author 子诚
@@ -102,7 +105,7 @@ public interface BusServerMapper {
      *
      *
      * @return List<BusServer>
      * @return List<BusServer>
      */
      */
-    List<BusServer> getServerAndHostList();
+    List<BusServer> getServerAndHostList(BusServer busServer);
 
 
     /**
     /**
      * 服务器与虚拟主机是1：n的关系
      * 服务器与虚拟主机是1：n的关系

@@ -109,7 +109,7 @@ public interface BusServerService {
      *
      *
      * @return List<BusServer>
      * @return List<BusServer>
      */
      */
-    List<BusServer> getServerAndHostList();
+    List<BusServer> getServerAndHostList(BusServer busServer);
 
 
     /**
     /**
      * 服务器与虚拟主机是1：n的关系
      * 服务器与虚拟主机是1：n的关系

@@ -150,9 +150,9 @@ public class BusServerServiceImpl implements BusServerService {
     }
     }
 
 
     @Override
     @Override
-    public List<BusServer> getServerAndHostList()
+    public List<BusServer> getServerAndHostList(BusServer busServer)
     {
     {
-        return busServerMapper.getServerAndHostList();
+        return busServerMapper.getServerAndHostList(busServer);
     }
     }
 
 
     @Override
     @Override

@@ -197,7 +197,8 @@
     </select>
     </select>
 
 
     <!--  查询服务器和虚拟主机基本信息（id,名称）  -->
     <!--  查询服务器和虚拟主机基本信息（id,名称）  -->
-    <select id="getServerAndHostList" resultMap="ServerAndVirtualHostMap">
+    <select id="getServerAndHostList" parameterType="com.sunyo.wlpt.message.bus.service.domain.BusServer"
+            resultMap="ServerAndVirtualHostMap">
         select s.id,
         select s.id,
                s.server_name,
                s.server_name,
                v.id as vid,
                v.id as vid,
@@ -205,7 +206,12 @@
                v.server_id
                v.server_id
         from bus_server as s,
         from bus_server as s,
              virtual_host as v
              virtual_host as v
-        where s.id = v.server_id
+        <where>
+            s.id = v.server_id
+            <if test="serverName != null and serverName != ''">
+                and s.server_name = #{serverName,jdbcType=VARCHAR}
+            </if>
+        </where>
     </select>
     </select>
 
 
     <!--  查询服务器和虚拟主机以及虚拟机基本信息（id,名称）  -->
     <!--  查询服务器和虚拟主机以及虚拟机基本信息（id,名称）  -->