message_bus / message_bus_service · 提交

转到一个项目

作者 王勇
提交 a4c33c332e33c6b8c1c01707a9e8def68662fe5f 1 个父辈 59a6727a

init commit

内嵌 并排对比
正在显示 3 个修改的文件 包含 13 行增加 和 3 行删除
@@ -64,6 +64,11 @@ public class BusServer implements Serializable { @@ -64,6 +64,11 @@ public class BusServer implements Serializable {
64 private List<VirtualHost> virtualHosts; 64 private List<VirtualHost> virtualHosts;
65 65
66 /** 66 /**
  67 + * 对应的多个虚拟主机的别名，前端特殊使用，误删
  68 + */
  69 + private List<VirtualHost> aliasList;
  70 +
  71 + /**
67 * 服务器名称的别名 72 * 服务器名称的别名
68 */ 73 */
69 private String aliasName; 74 private String aliasName;
@@ -64,6 +64,11 @@ public class VirtualHost implements Serializable { @@ -64,6 +64,11 @@ public class VirtualHost implements Serializable {
64 private List<BusExchange> busExchanges; 64 private List<BusExchange> busExchanges;
65 65
66 /** 66 /**
  67 + * 对应的多个交换机的别名，前端特殊使用，误删
  68 + */
  69 + private List<BusExchange> aliasList;
  70 +
  71 + /**
67 * 虚拟主机名称的别名 72 * 虚拟主机名称的别名
68 */ 73 */
69 private String aliasName; 74 private String aliasName;
@@ -25,11 +25,11 @@ @@ -25,11 +25,11 @@
25 <!-- 该Mapper映射关系的作用，服务器:虚拟主机—>1:n ; 虚拟主机:交换机—>1:n 的关系映射 --> 25 <!-- 该Mapper映射关系的作用，服务器:虚拟主机—>1:n ; 虚拟主机:交换机—>1:n 的关系映射 -->
26 <resultMap id="ServerAndHostAndExchangeMap" type="com.sunyo.wlpt.message.bus.service.domain.BusServer" 26 <resultMap id="ServerAndHostAndExchangeMap" type="com.sunyo.wlpt.message.bus.service.domain.BusServer"
27 extends="BaseResultMap"> 27 extends="BaseResultMap">
28 - <collection property="virtualHosts" ofType="com.sunyo.wlpt.message.bus.service.domain.VirtualHost"> 28 + <collection property="aliasList" ofType="com.sunyo.wlpt.message.bus.service.domain.VirtualHost">
29 <id column="vid" jdbcType="VARCHAR" property="id"/> 29 <id column="vid" jdbcType="VARCHAR" property="id"/>
30 <result column="virtual_host_name" jdbcType="VARCHAR" property="virtualHostName"/> 30 <result column="virtual_host_name" jdbcType="VARCHAR" property="virtualHostName"/>
31 <result column="virtual_host_name" jdbcType="VARCHAR" property="aliasName"/> 31 <result column="virtual_host_name" jdbcType="VARCHAR" property="aliasName"/>
32 - <collection property="busExchanges" ofType="com.sunyo.wlpt.message.bus.service.domain.BusExchange"> 32 + <collection property="aliasList" ofType="com.sunyo.wlpt.message.bus.service.domain.BusExchange">
33 <id column="eid" jdbcType="VARCHAR" property="id"/> 33 <id column="eid" jdbcType="VARCHAR" property="id"/>
34 <result column="exchange_name" jdbcType="VARCHAR" property="exchangeName"/> 34 <result column="exchange_name" jdbcType="VARCHAR" property="exchangeName"/>
35 <result column="exchange_name" jdbcType="VARCHAR" property="aliasName"/> 35 <result column="exchange_name" jdbcType="VARCHAR" property="aliasName"/>
@@ -72,7 +72,7 @@ @@ -72,7 +72,7 @@
72 s.id,s.server_name,v.id as vid,v.virtual_host_name,e.id as eid,e.exchange_name 72 s.id,s.server_name,v.id as vid,v.virtual_host_name,e.id as eid,e.exchange_name
73 from bus_server as s, virtual_host as v,bus_exchange as e 73 from bus_server as s, virtual_host as v,bus_exchange as e
74 where s.id = v.server_id 74 where s.id = v.server_id
75 - and vid = e.virtual_host_id 75 + and v.id = e.virtual_host_id
76 </select> 76 </select>
77 <!-- 获取服务器列表，分页 --> 77 <!-- 获取服务器列表，分页 -->
78 <select id="selectBusServerList" parameterType="com.sunyo.wlpt.message.bus.service.domain.BusServer" 78 <select id="selectBusServerList" parameterType="com.sunyo.wlpt.message.bus.service.domain.BusServer"