message_bus / message_bus_service · 提交

转到一个项目

作者 王勇
提交 28199d11fa271b521e11218a538e6a70a5ecf796 1 个父辈 e5bb99e3

配置表字段修改

内嵌 并排对比
正在显示 7 个修改的文件 包含 80 行增加 和 15 行删除
@@ -28,6 +28,7 @@ public class UserMessageBindingController { @@ -28,6 +28,7 @@ public class UserMessageBindingController {
28 /** 28 /**
29 * 分页查询，账户消息绑定配置表，列表 29 * 分页查询，账户消息绑定配置表，列表
30 * 30 *
  31 + * @param serverName 所属服务器名称
31 * @param username 所属用户登陆名称 32 * @param username 所属用户登陆名称
32 * @param virtualHostName 所属虚拟主机名称 33 * @param virtualHostName 所属虚拟主机名称
33 * @param exchangeName 所属交换机名称 34 * @param exchangeName 所属交换机名称
@@ -41,6 +42,7 @@ public class UserMessageBindingController { @@ -41,6 +42,7 @@ public class UserMessageBindingController {
41 @GetMapping("/list") 42 @GetMapping("/list")
42 public ResultJson<PageInfo> selectUserMessageBindingList( 43 public ResultJson<PageInfo> selectUserMessageBindingList(
43 @RequestParam(value = "username", required = false) String username, 44 @RequestParam(value = "username", required = false) String username,
  45 + @RequestParam(value = "serverName", required = false) String serverName,
44 @RequestParam(value = "virtualHostName", required = false) String virtualHostName, 46 @RequestParam(value = "virtualHostName", required = false) String virtualHostName,
45 @RequestParam(value = "exchangeName", required = false) String exchangeName, 47 @RequestParam(value = "exchangeName", required = false) String exchangeName,
46 @RequestParam(value = "queueName", required = false) String queueName, 48 @RequestParam(value = "queueName", required = false) String queueName,
@@ -54,6 +56,8 @@ public class UserMessageBindingController { @@ -54,6 +56,8 @@ public class UserMessageBindingController {
54 UserMessageBinding userMessageBinding = new UserMessageBinding(); 56 UserMessageBinding userMessageBinding = new UserMessageBinding();
55 // 获取参数，所属用户登陆名称 57 // 获取参数，所属用户登陆名称
56 userMessageBinding.setUsername(username); 58 userMessageBinding.setUsername(username);
  59 + // 获取参数，所属服务器名称
  60 + userMessageBinding.setServerName(serverName);
57 // 获取参数，所属虚拟主机名称 61 // 获取参数，所属虚拟主机名称
58 userMessageBinding.setVirtualHostName(virtualHostName); 62 userMessageBinding.setVirtualHostName(virtualHostName);
59 // 获取参数，所属交换机名称 63 // 获取参数，所属交换机名称
@@ -30,6 +30,26 @@ public class MessageNote implements Serializable { @@ -30,6 +30,26 @@ public class MessageNote implements Serializable {
30 * 用户的ID 30 * 用户的ID
31 */ 31 */
32 private String userId; 32 private String userId;
  33 + /**
  34 + * 所属虚拟主机的ID
  35 + */
  36 + private String virtualHostId;
  37 +
  38 + /**
  39 + * 所属交换机的ID
  40 + */
  41 + private String exchangeId;
  42 +
  43 + /**
  44 + * 所属队列的ID
  45 + */
  46 + private String queueId;
  47 +
  48 + /**
  49 + * 所属路由键的ID
  50 + */
  51 + private String routingKeyId;
  52 +
33 53
34 /** 54 /**
35 * 用户登陆名称 55 * 用户登陆名称
@@ -10,14 +10,15 @@ import lombok.NoArgsConstructor; @@ -10,14 +10,15 @@ import lombok.NoArgsConstructor;
10 /** 10 /**
11 * @author 子诚 11 * @author 子诚
12 * Description：账户信息绑定配置表 12 * Description：账户信息绑定配置表
13 - * 时间：2020/7/13 14:24 13 + * 时间：2020/7/13 18:03
14 */ 14 */
  15 +
15 @Data 16 @Data
16 @AllArgsConstructor 17 @AllArgsConstructor
17 @NoArgsConstructor 18 @NoArgsConstructor
18 public class UserMessageBinding implements Serializable { 19 public class UserMessageBinding implements Serializable {
19 20
20 - private static final long serialVersionUID = -7983498309821536414L; 21 + private static final long serialVersionUID = 7133408333518754607L;
21 22
22 /** 23 /**
23 * 账户信息绑定配置表的ID 24 * 账户信息绑定配置表的ID
@@ -35,6 +36,16 @@ public class UserMessageBinding implements Serializable { @@ -35,6 +36,16 @@ public class UserMessageBinding implements Serializable {
35 private String username; 36 private String username;
36 37
37 /** 38 /**
  39 + * 所属服务器的ID
  40 + */
  41 + private String serverId;
  42 +
  43 + /**
  44 + * 所属服务器名称
  45 + */
  46 + private String serverName;
  47 +
  48 + /**
38 * 所属虚拟主机的ID 49 * 所属虚拟主机的ID
39 */ 50 */
40 private String virtualHostId; 51 private String virtualHostId;
1 package com.sunyo.wlpt.message.bus.service.mapper; 1 package com.sunyo.wlpt.message.bus.service.mapper;
2 2
3 import com.sunyo.wlpt.message.bus.service.domain.UserMessageBinding; 3 import com.sunyo.wlpt.message.bus.service.domain.UserMessageBinding;
4 -import org.apache.ibatis.annotations.Mapper;import org.apache.ibatis.annotations.Param;import java.util.List; 4 +import org.apache.ibatis.annotations.Mapper;import java.util.List;
5 5
6 /** 6 /**
7 * @author 子诚 7 * @author 子诚
8 * Description： 8 * Description：
9 - * 时间：2020/7/13 14:24 9 + * 时间：2020/7/13 18:03
10 */ 10 */
11 @Mapper 11 @Mapper
12 public interface UserMessageBindingMapper { 12 public interface UserMessageBindingMapper {
@@ -58,7 +58,6 @@ public interface UserMessageBindingMapper { @@ -58,7 +58,6 @@ public interface UserMessageBindingMapper {
58 */ 58 */
59 int updateByPrimaryKey(UserMessageBinding record); 59 int updateByPrimaryKey(UserMessageBinding record);
60 60
61 -  
62 /** 61 /**
63 * 分页查询，获取账户信息绑定配置列表 62 * 分页查询，获取账户信息绑定配置列表
64 * 63 *
@@ -70,3 +70,4 @@ public interface UserMessageBindingService { @@ -70,3 +70,4 @@ public interface UserMessageBindingService {
70 } 70 }
71 71
72 72
  73 +
@@ -91,3 +91,4 @@ public class UserMessageBindingServiceImpl implements UserMessageBindingService @@ -91,3 +91,4 @@ public class UserMessageBindingServiceImpl implements UserMessageBindingService
91 } 91 }
92 92
93 93
  94 +
@@ -7,6 +7,8 @@ @@ -7,6 +7,8 @@
7 <id column="id" jdbcType="VARCHAR" property="id" /> 7 <id column="id" jdbcType="VARCHAR" property="id" />
8 <result column="user_id" jdbcType="VARCHAR" property="userId" /> 8 <result column="user_id" jdbcType="VARCHAR" property="userId" />
9 <result column="username" jdbcType="VARCHAR" property="username" /> 9 <result column="username" jdbcType="VARCHAR" property="username" />
  10 + <result column="server_id" jdbcType="VARCHAR" property="serverId" />
  11 + <result column="server_name" jdbcType="VARCHAR" property="serverName" />
10 <result column="virtual_host_id" jdbcType="VARCHAR" property="virtualHostId" /> 12 <result column="virtual_host_id" jdbcType="VARCHAR" property="virtualHostId" />
11 <result column="virtual_host_name" jdbcType="VARCHAR" property="virtualHostName" /> 13 <result column="virtual_host_name" jdbcType="VARCHAR" property="virtualHostName" />
12 <result column="exchange_id" jdbcType="VARCHAR" property="exchangeId" /> 14 <result column="exchange_id" jdbcType="VARCHAR" property="exchangeId" />
@@ -21,8 +23,9 @@ @@ -21,8 +23,9 @@
21 </resultMap> 23 </resultMap>
22 <sql id="Base_Column_List"> 24 <sql id="Base_Column_List">
23 <!--@mbg.generated--> 25 <!--@mbg.generated-->
24 - id, user_id, username, virtual_host_id, virtual_host_name, exchange_id, exchange_name,  
25 - queue_id, queue_name, routing_key_id, routing_key_name, subscriber, gmt_create, gmt_modified 26 + id, user_id, username, server_id, `server_name`, virtual_host_id, virtual_host_name,
  27 + exchange_id, exchange_name, queue_id, queue_name, routing_key_id, routing_key_name,
  28 + subscriber, gmt_create, gmt_modified
26 </sql> 29 </sql>
27 <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap"> 30 <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
28 <!--@mbg.generated--> 31 <!--@mbg.generated-->
@@ -39,15 +42,17 @@ @@ -39,15 +42,17 @@
39 <insert id="insert" parameterType="com.sunyo.wlpt.message.bus.service.domain.UserMessageBinding"> 42 <insert id="insert" parameterType="com.sunyo.wlpt.message.bus.service.domain.UserMessageBinding">
40 <!--@mbg.generated--> 43 <!--@mbg.generated-->
41 insert into user_message_binding (id, user_id, username, 44 insert into user_message_binding (id, user_id, username,
42 - virtual_host_id, virtual_host_name, exchange_id,  
43 - exchange_name, queue_id, queue_name,  
44 - routing_key_id, routing_key_name, subscriber,  
45 - gmt_create, gmt_modified) 45 + server_id, `server_name`, virtual_host_id,
  46 + virtual_host_name, exchange_id, exchange_name,
  47 + queue_id, queue_name, routing_key_id,
  48 + routing_key_name, subscriber, gmt_create,
  49 + gmt_modified)
46 values (#{id,jdbcType=VARCHAR}, #{userId,jdbcType=VARCHAR}, #{username,jdbcType=VARCHAR}, 50 values (#{id,jdbcType=VARCHAR}, #{userId,jdbcType=VARCHAR}, #{username,jdbcType=VARCHAR},
47 - #{virtualHostId,jdbcType=VARCHAR}, #{virtualHostName,jdbcType=VARCHAR}, #{exchangeId,jdbcType=VARCHAR},  
48 - #{exchangeName,jdbcType=VARCHAR}, #{queueId,jdbcType=VARCHAR}, #{queueName,jdbcType=VARCHAR},  
49 - #{routingKeyId,jdbcType=VARCHAR}, #{routingKeyName,jdbcType=VARCHAR}, #{subscriber,jdbcType=VARCHAR},  
50 - #{gmtCreate,jdbcType=TIMESTAMP}, #{gmtModified,jdbcType=TIMESTAMP}) 51 + #{serverId,jdbcType=VARCHAR}, #{serverName,jdbcType=VARCHAR}, #{virtualHostId,jdbcType=VARCHAR},
  52 + #{virtualHostName,jdbcType=VARCHAR}, #{exchangeId,jdbcType=VARCHAR}, #{exchangeName,jdbcType=VARCHAR},
  53 + #{queueId,jdbcType=VARCHAR}, #{queueName,jdbcType=VARCHAR}, #{routingKeyId,jdbcType=VARCHAR},
  54 + #{routingKeyName,jdbcType=VARCHAR}, #{subscriber,jdbcType=VARCHAR}, #{gmtCreate,jdbcType=TIMESTAMP},
  55 + #{gmtModified,jdbcType=TIMESTAMP})
51 </insert> 56 </insert>
52 <insert id="insertSelective" parameterType="com.sunyo.wlpt.message.bus.service.domain.UserMessageBinding"> 57 <insert id="insertSelective" parameterType="com.sunyo.wlpt.message.bus.service.domain.UserMessageBinding">
53 <!--@mbg.generated--> 58 <!--@mbg.generated-->
@@ -62,6 +67,12 @@ @@ -62,6 +67,12 @@
62 <if test="username != null"> 67 <if test="username != null">
63 username, 68 username,
64 </if> 69 </if>
  70 + <if test="serverId != null">
  71 + server_id,
  72 + </if>
  73 + <if test="serverName != null">
  74 + `server_name`,
  75 + </if>
65 <if test="virtualHostId != null"> 76 <if test="virtualHostId != null">
66 virtual_host_id, 77 virtual_host_id,
67 </if> 78 </if>
@@ -106,6 +117,12 @@ @@ -106,6 +117,12 @@
106 <if test="username != null"> 117 <if test="username != null">
107 #{username,jdbcType=VARCHAR}, 118 #{username,jdbcType=VARCHAR},
108 </if> 119 </if>
  120 + <if test="serverId != null">
  121 + #{serverId,jdbcType=VARCHAR},
  122 + </if>
  123 + <if test="serverName != null">
  124 + #{serverName,jdbcType=VARCHAR},
  125 + </if>
109 <if test="virtualHostId != null"> 126 <if test="virtualHostId != null">
110 #{virtualHostId,jdbcType=VARCHAR}, 127 #{virtualHostId,jdbcType=VARCHAR},
111 </if> 128 </if>
@@ -151,6 +168,12 @@ @@ -151,6 +168,12 @@
151 <if test="username != null"> 168 <if test="username != null">
152 username = #{username,jdbcType=VARCHAR}, 169 username = #{username,jdbcType=VARCHAR},
153 </if> 170 </if>
  171 + <if test="serverId != null">
  172 + server_id = #{serverId,jdbcType=VARCHAR},
  173 + </if>
  174 + <if test="serverName != null">
  175 + `server_name` = #{serverName,jdbcType=VARCHAR},
  176 + </if>
154 <if test="virtualHostId != null"> 177 <if test="virtualHostId != null">
155 virtual_host_id = #{virtualHostId,jdbcType=VARCHAR}, 178 virtual_host_id = #{virtualHostId,jdbcType=VARCHAR},
156 </if> 179 </if>
@@ -192,6 +215,8 @@ @@ -192,6 +215,8 @@
192 update user_message_binding 215 update user_message_binding
193 set user_id = #{userId,jdbcType=VARCHAR}, 216 set user_id = #{userId,jdbcType=VARCHAR},
194 username = #{username,jdbcType=VARCHAR}, 217 username = #{username,jdbcType=VARCHAR},
  218 + server_id = #{serverId,jdbcType=VARCHAR},
  219 + `server_name` = #{serverName,jdbcType=VARCHAR},
195 virtual_host_id = #{virtualHostId,jdbcType=VARCHAR}, 220 virtual_host_id = #{virtualHostId,jdbcType=VARCHAR},
196 virtual_host_name = #{virtualHostName,jdbcType=VARCHAR}, 221 virtual_host_name = #{virtualHostName,jdbcType=VARCHAR},
197 exchange_id = #{exchangeId,jdbcType=VARCHAR}, 222 exchange_id = #{exchangeId,jdbcType=VARCHAR},
@@ -215,6 +240,10 @@ @@ -215,6 +240,10 @@
215 <if test="username != null and username !=''"> 240 <if test="username != null and username !=''">
216 username = #{username,jdbcType=VARCHAR} 241 username = #{username,jdbcType=VARCHAR}
217 </if> 242 </if>
  243 + <!-- 所属服务器名称 -->
  244 + <if test="serverName != null and serverName !=''">
  245 + AND `server_name` = #{serverName,jdbcType=VARCHAR}
  246 + </if>
218 <!-- 所属虚拟主机名称 --> 247 <!-- 所属虚拟主机名称 -->
219 <if test="virtualHostName != null and virtualHostName !=''"> 248 <if test="virtualHostName != null and virtualHostName !=''">
220 AND virtual_host_name = #{virtualHostName,jdbcType=VARCHAR} 249 AND virtual_host_name = #{virtualHostName,jdbcType=VARCHAR}