umb添加配置，添加校验

王勇
config/application.yml
src/main/java/com/sunyo/wlpt/message/bus/service/common/Constant.java
src/main/java/com/sunyo/wlpt/message/bus/service/controller/BusQueueController.java
src/main/java/com/sunyo/wlpt/message/bus/service/mapper/UserMessageBindingMapper.java
src/main/java/com/sunyo/wlpt/message/bus/service/service/impl/UserMessageBindingServiceImpl.java
src/main/resources/mapper/UserMessageBindingMapper.xml
--- a/config/application.yml
查看文件 @36da0b5
+++ b/config/application.yml
查看文件 @36da0b5
@@ -14,17 +14,41 @@ spring:
     username: 110
     password: QAHqCJf2kFYCLirM
+  # redis设置
+  redis:
+    database: 0 # Redis 数据库索引（默认为 0）
+    host: 192.168.37.139 # Redis 服务器地址
+    port: 6379 # Redis 服务器连接端口
+    password: 123456 # Redis 服务器连接密码（默认为空）
+    lettuce:
+      pool:
+        max-active: 8 # 连接池最大连接数（使用负值表示没有限制） 默认 8
+        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制） 默认 -1
+        max-idle: 8 # 连接池中的最大空闲连接 默认 8
+        min-idle: 0 # 连接池中的最小空闲连接 默认 0
+
   # rabbitmq配置
   rabbitmq:
-    host: 192.168.37.137
+    host: 192.168.37.139
     port: 5672
-    username: rabbit
+    username: zicheng
     password: 123456
     virtual-host: V_zicheng
-#    host: 192.168.1.63
-#    port: 5672
-#    username: mrz
-#    password: vmvnv1v2
+    # 开启手动ack机制
+  #    listener:
+  #      simple:
+  #        acknowledge-mode: manual
+  #    # 开启 confrim 机制--保证消息发送到交换机
+  #    publisher-confrim-type: simple
+  #    # 开启 return 机制--保证消息从交换机分发到队列
+  #    publisher-returns: true
+
+
+
+  #    host: 192.168.1.63
+  #    port: 5672
+  #    username: mrz
+  #    password: vmvnv1v2
   # 多环境配置
   profiles:
     active: dev
@@ -95,3 +119,4 @@ management:
 info:
   version: 1.0
   description: "消息平台服务"
+
--- a/src/main/java/com/sunyo/wlpt/message/bus/service/common/Constant.java
查看文件 @36da0b5
+++ b/src/main/java/com/sunyo/wlpt/message/bus/service/common/Constant.java
查看文件 @36da0b5
@@ -16,4 +16,6 @@ public class Constant {
     public static final String EXIST_QUEUE_INFO = "该-消息队列-信息已存在，请谨慎输入";
     public static final String EXIST_ROUTINGKEY_INFO = "该-路由键（路由键名称）-信息已存在，请谨慎输入";
+
+    public static final String EXIST_UMB = "该绑定关系已经存在了";
 }
--- a/src/main/java/com/sunyo/wlpt/message/bus/service/controller/BusQueueController.java
查看文件 @36da0b5
+++ b/src/main/java/com/sunyo/wlpt/message/bus/service/controller/BusQueueController.java
查看文件 @36da0b5
@@ -2,9 +2,12 @@ package com.sunyo.wlpt.message.bus.service.controller;
 import com.github.pagehelper.PageInfo;
 import com.sunyo.wlpt.message.bus.service.domain.BusQueue;
+import com.sunyo.wlpt.message.bus.service.domain.UserInfo;
 import com.sunyo.wlpt.message.bus.service.response.ResultJson;
 import com.sunyo.wlpt.message.bus.service.service.BusQueueService;
+import com.sunyo.wlpt.message.bus.service.service.UserInfoService;
 import com.sunyo.wlpt.message.bus.service.utils.IdUtils;
+import io.netty.util.internal.StringUtil;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -23,6 +26,8 @@ import static com.sunyo.wlpt.message.bus.service.common.Constant.EXIST_QUEUE_INF
 public class BusQueueController {
     @Resource
+    private UserInfoService userInfoService;
+    @Resource
     private BusQueueService busQueueService;
     /**
@@ -38,10 +43,16 @@ public class BusQueueController {
     public ResultJson<PageInfo> selectBusQueueList(
             @RequestParam(value = "queueName", required = false) String queueName,
             @RequestParam(value = "virtualHostId", required = false) String virtualHostId,
+            @RequestParam(value = "username", required = false) String username,
             @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
-            @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+            @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize)
+    {
         // 获取查询参数
-        BusQueue busQueue = BusQueue.builder().queueName(queueName).virtualHostId(virtualHostId).build();
+        BusQueue busQueue = BusQueue.builder()
+                .queueName(queueName)
+                .virtualHostId(virtualHostId)
+                .username(username)
+                .build();
         // 分页查询
         PageInfo pageInfo = busQueueService.selectBusQueueList(busQueue, pageNum, pageSize);
         return pageInfo.getTotal() > 0
@@ -56,7 +67,8 @@ public class BusQueueController {
      * @return {@link ResultJson}
      */
     @DeleteMapping("/delete")
-    public ResultJson deleteBusQueue(@RequestBody BusQueue busQueue) {
+    public ResultJson deleteBusQueue(@RequestBody BusQueue busQueue)
+    {
         return busQueueService.deleteByPrimaryKey(busQueue.getId()) > 0
                 ? new ResultJson<>("200", "删除消息队列，成功")
@@ -70,7 +82,8 @@ public class BusQueueController {
      * @return {@link ResultJson}
      */
     @GetMapping("/batchRemove")
-    public ResultJson batchRemoveBusQueue(String ids) {
+    public ResultJson batchRemoveBusQueue(String ids)
+    {
         return busQueueService.deleteByPrimaryKey(ids) > 0
                 ? new ResultJson<>("200", "批量删除消息队列，成功")
@@ -84,7 +97,8 @@ public class BusQueueController {
      * @return {@link ResultJson}
      */
     @PutMapping("/update")
-    public ResultJson updateBusQueue(@RequestBody BusQueue busQueue) {
+    public ResultJson updateBusQueue(@RequestBody BusQueue busQueue)
+    {
         // 先校验队列名称
         String message = validateBusQueue(busQueue);
         return message == null
@@ -101,7 +115,8 @@ public class BusQueueController {
      * @return {@link ResultJson}
      */
     @PostMapping("/insert")
-    public ResultJson insertBusQueue(@RequestBody BusQueue busQueue) {
+    public ResultJson insertBusQueue(@RequestBody BusQueue busQueue)
+    {
         //先验证，增加的虚拟主机的核心信息（交换机名称）是否已存在
         String message = validateBusQueue(busQueue);
         // 设置id
@@ -120,7 +135,14 @@ public class BusQueueController {
      * @param busQueue {@link BusQueue}
      * @return 通过校验，无返回消息
      */
-    private String validateBusQueue(BusQueue busQueue) {
+    private String validateBusQueue(BusQueue busQueue)
+    {
+        if (!StringUtil.isNullOrEmpty(busQueue.getUserId())) {
+            // 根据用户id，填充用户名称；违背了单一职责原则，有时间再改
+            UserInfo userInfo = userInfoService.selectByPrimaryKey(busQueue.getUserId());
+            busQueue.setUsername(userInfo.getUsername());
+        }
+
         // 判断队列名称，是否为空
         if ("".equals(busQueue.getQueueName()) || busQueue.getQueueName() == null) {
             return "该-消息队列-信息中，没有消息队列名称";
--- a/src/main/java/com/sunyo/wlpt/message/bus/service/mapper/UserMessageBindingMapper.java
查看文件 @36da0b5
+++ b/src/main/java/com/sunyo/wlpt/message/bus/service/mapper/UserMessageBindingMapper.java
查看文件 @36da0b5
@@ -65,4 +65,12 @@ public interface UserMessageBindingMapper {
      * @return List<UserMessageBinding>
      */
     List<UserMessageBinding> selectUserMessageBindingList(UserMessageBinding userMessageBinding);
+
+    /**
+     * 在执行填充和添加之前先校验一下是否存在？
+     *
+     * @param userMessageBinding {@link UserMessageBinding}
+     * @return 判断校验是否通过
+     */
+    List<UserMessageBinding> validateBinding(UserMessageBinding userMessageBinding);
 }
--- a/src/main/java/com/sunyo/wlpt/message/bus/service/service/impl/UserMessageBindingServiceImpl.java
查看文件 @36da0b5
+++ b/src/main/java/com/sunyo/wlpt/message/bus/service/service/impl/UserMessageBindingServiceImpl.java
查看文件 @36da0b5
@@ -6,6 +6,7 @@ import com.sunyo.wlpt.message.bus.service.domain.*;
 import com.sunyo.wlpt.message.bus.service.mapper.UserMessageBindingMapper;
 import com.sunyo.wlpt.message.bus.service.service.*;
 import com.sunyo.wlpt.message.bus.service.utils.IdUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -13,11 +14,14 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.util.List;
+import static com.sunyo.wlpt.message.bus.service.common.Constant.EXIST_UMB;
+
 /**
  * @author 子诚
  * Description：
  * 时间：2020/6/29 17:37
  */
+@Slf4j
 @Service
 public class UserMessageBindingServiceImpl implements UserMessageBindingService {
@@ -110,7 +114,7 @@ public class UserMessageBindingServiceImpl implements UserMessageBindingService 
                                         userMessageBinding.setExchangeId(split_exchangeId[j]);
                                         userMessageBinding.setRoutingKeyId(split_routingKeyId[k]);
                                         userMessageBinding.setQueueId(split_queueId[l]);
-                                        int num = userMessageBindingMapper.insertSelective(umb_fillName(userMessageBinding));
+                                        int num = nextValidateAndFill(userMessageBinding);
                                         if (num > 0) {
                                             index = index + num;
                                         }
@@ -119,7 +123,7 @@ public class UserMessageBindingServiceImpl implements UserMessageBindingService 
                                     userMessageBinding.setUserId(split_userId[i]);
                                     userMessageBinding.setExchangeId(split_exchangeId[j]);
                                     userMessageBinding.setRoutingKeyId(split_routingKeyId[k]);
-                                    int num = userMessageBindingMapper.insertSelective(umb_fillName(userMessageBinding));
+                                    int num = nextValidateAndFill(userMessageBinding);
                                     if (num > 0) {
                                         index = index + num;
                                     }
@@ -133,7 +137,7 @@ public class UserMessageBindingServiceImpl implements UserMessageBindingService 
                                     userMessageBinding.setUserId(split_userId[i]);
                                     userMessageBinding.setExchangeId(split_exchangeId[j]);
                                     userMessageBinding.setQueueId(split_queueId[l]);
-                                    int num = userMessageBindingMapper.insertSelective(umb_fillName(userMessageBinding));
+                                    int num = nextValidateAndFill(userMessageBinding);
                                     if (num > 0) {
                                         index = index + num;
                                     }
@@ -141,7 +145,7 @@ public class UserMessageBindingServiceImpl implements UserMessageBindingService 
                             } else {
                                 userMessageBinding.setUserId(split_userId[i]);
                                 userMessageBinding.setExchangeId(split_exchangeId[j]);
-                                int num = userMessageBindingMapper.insertSelective(umb_fillName(userMessageBinding));
+                                int num = nextValidateAndFill(userMessageBinding);
                                 if (num > 0) {
                                     index = index + num;
                                 }
@@ -161,7 +165,7 @@ public class UserMessageBindingServiceImpl implements UserMessageBindingService 
                                     userMessageBinding.setUserId(split_userId[i]);
                                     userMessageBinding.setRoutingKeyId(split_routingKeyId[k]);
                                     userMessageBinding.setQueueId(split_queueId[l]);
-                                    int num = userMessageBindingMapper.insertSelective(umb_fillName(userMessageBinding));
+                                    int num = nextValidateAndFill(userMessageBinding);
                                     if (num > 0) {
                                         index = index + num;
                                     }
@@ -169,7 +173,7 @@ public class UserMessageBindingServiceImpl implements UserMessageBindingService 
                             } else {
                                 userMessageBinding.setUserId(split_userId[i]);
                                 userMessageBinding.setRoutingKeyId(split_routingKeyId[k]);
-                                int num = userMessageBindingMapper.insertSelective(umb_fillName(userMessageBinding));
+                                int num = nextValidateAndFill(userMessageBinding);
                                 if (num > 0) {
                                     index = index + num;
                                 }
@@ -182,14 +186,14 @@ public class UserMessageBindingServiceImpl implements UserMessageBindingService 
                             for (int l = 0; l < split_queueId.length; l++) {
                                 userMessageBinding.setUserId(split_userId[i]);
                                 userMessageBinding.setQueueId(split_queueId[l]);
-                                int num = userMessageBindingMapper.insertSelective(umb_fillName(userMessageBinding));
+                                int num = nextValidateAndFill(userMessageBinding);
                                 if (num > 0) {
                                     index = index + num;
                                 }
                             }
                         } else {
                             userMessageBinding.setUserId(split_userId[i]);
-                            int num = userMessageBindingMapper.insertSelective(umb_fillName(userMessageBinding));
+                            int num = nextValidateAndFill(userMessageBinding);
                             if (num > 0) {
                                 index = index + num;
                             }
@@ -213,7 +217,7 @@ public class UserMessageBindingServiceImpl implements UserMessageBindingService 
                                     userMessageBinding.setExchangeId(split_exchangeId[j]);
                                     userMessageBinding.setRoutingKeyId(split_routingKeyId[k]);
                                     userMessageBinding.setQueueId(split_queueId[l]);
-                                    int num = userMessageBindingMapper.insertSelective(umb_fillName(userMessageBinding));
+                                    int num = nextValidateAndFill(userMessageBinding);
                                     if (num > 0) {
                                         index = index + num;
                                     }
@@ -221,7 +225,7 @@ public class UserMessageBindingServiceImpl implements UserMessageBindingService 
                             } else {
                                 userMessageBinding.setExchangeId(split_exchangeId[j]);
                                 userMessageBinding.setRoutingKeyId(split_routingKeyId[k]);
-                                int num = userMessageBindingMapper.insertSelective(umb_fillName(userMessageBinding));
+                                int num = nextValidateAndFill(userMessageBinding);
                                 if (num > 0) {
                                     index = index + num;
                                 }
@@ -234,14 +238,14 @@ public class UserMessageBindingServiceImpl implements UserMessageBindingService 
                             for (int l = 0; l < split_queueId.length; l++) {
                                 userMessageBinding.setExchangeId(split_exchangeId[j]);
                                 userMessageBinding.setQueueId(split_queueId[l]);
-                                int num = userMessageBindingMapper.insertSelective(umb_fillName(userMessageBinding));
+                                int num = nextValidateAndFill(userMessageBinding);
                                 if (num > 0) {
                                     index = index + num;
                                 }
                             }
                         } else {
                             userMessageBinding.setExchangeId(split_exchangeId[j]);
-                            int num = userMessageBindingMapper.insertSelective(umb_fillName(userMessageBinding));
+                            int num = nextValidateAndFill(userMessageBinding);
                             if (num > 0) {
                                 index = index + num;
                             }
@@ -259,14 +263,14 @@ public class UserMessageBindingServiceImpl implements UserMessageBindingService 
                             for (int l = 0; l < split_queueId.length; l++) {
                                 userMessageBinding.setRoutingKeyId(split_routingKeyId[k]);
                                 userMessageBinding.setQueueId(split_queueId[l]);
-                                int num = userMessageBindingMapper.insertSelective(umb_fillName(userMessageBinding));
+                                int num = nextValidateAndFill(userMessageBinding);
                                 if (num > 0) {
                                     index = index + num;
                                 }
                             }
                         } else {
                             userMessageBinding.setRoutingKeyId(split_routingKeyId[k]);
-                            int num = userMessageBindingMapper.insertSelective(umb_fillName(userMessageBinding));
+                            int num = nextValidateAndFill(userMessageBinding);
                             if (num > 0) {
                                 index = index + num;
                             }
@@ -278,13 +282,13 @@ public class UserMessageBindingServiceImpl implements UserMessageBindingService 
                         String[] split_queueId = queueId.split(splitItem);
                         for (int l = 0; l < split_queueId.length; l++) {
                             userMessageBinding.setQueueId(split_queueId[l]);
-                            int num = userMessageBindingMapper.insertSelective(umb_fillName(userMessageBinding));
+                            int num = nextValidateAndFill(userMessageBinding);
                             if (num > 0) {
                                 index = index + num;
                             }
                         }
                     } else {
-                        int num = userMessageBindingMapper.insertSelective(umb_fillName(userMessageBinding));
+                        int num = nextValidateAndFill(userMessageBinding);
                         if (num > 0) {
                             index = index + num;
                         }
@@ -357,6 +361,38 @@ public class UserMessageBindingServiceImpl implements UserMessageBindingService 
         return userMessageBinding;
     }
+
+    /**
+     * 在执行填充和添加之前先校验一下是否存在？
+     *
+     * @param userMessageBinding {@link UserMessageBinding}
+     * @return 判断校验是否通过
+     */
+    public String validateBinding(UserMessageBinding userMessageBinding)
+    {
+        // 校验
+        List<UserMessageBinding> list = userMessageBindingMapper.validateBinding(userMessageBinding);
+        if (list.size() > 0) {
+            return EXIST_UMB;
+        }
+        return null;
+    }
+
+    /**
+     * 接下来的 校验-填充-添加
+     */
+    public int nextValidateAndFill(UserMessageBinding userMessageBinding)
+    {
+        String validate = validateBinding(userMessageBinding);
+        if (EXIST_UMB.equals(validate)) {
+            log.info(userMessageBinding + "--> 该绑定关系已存在");
+            return 0;
+        } else if (validate == null) {
+            return userMessageBindingMapper.insertSelective(umb_fillName(userMessageBinding));
+        } else {
+            return 0;
+        }
+    }
 }
--- a/src/main/resources/mapper/UserMessageBindingMapper.xml
查看文件 @36da0b5
+++ b/src/main/resources/mapper/UserMessageBindingMapper.xml
查看文件 @36da0b5
@@ -27,22 +27,20 @@
     subscriber, description, gmt_create, gmt_modified
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-      <!--@mbg.generated-->select
-
+      <!--@mbg.generated-->
+      select
       <include refid="Base_Column_List"/>
-
       from user_message_binding
       where id = #{id,jdbcType=VARCHAR}
-
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
       <!--@mbg.generated-->delete
                            from user_message_binding
                            where id = #{id,jdbcType=VARCHAR}
-
   </delete>
   <insert id="insert" parameterType="com.sunyo.wlpt.message.bus.service.domain.UserMessageBinding">
-      <!--@mbg.generated-->insert into user_message_binding (id, user_id, username,
+      <!--@mbg.generated-->
+      insert into user_message_binding (id, user_id, username,
                                         server_id, `server_name`, virtual_host_id,
                                         virtual_host_name, exchange_id, exchange_name,
                                         queue_id, queue_name, routing_key_id,
@@ -58,271 +56,176 @@
               #{routingKeyName,jdbcType=VARCHAR}, #{subscriber,jdbcType=VARCHAR},
               #{description,jdbcType=VARCHAR},
               #{gmtCreate,jdbcType=TIMESTAMP}, #{gmtModified,jdbcType=TIMESTAMP})
-
   </insert>
   <insert id="insertSelective" parameterType="com.sunyo.wlpt.message.bus.service.domain.UserMessageBinding">
-      <!--@mbg.generated-->insert into user_message_binding
-
+      <!--@mbg.generated-->
+      insert into user_message_binding
       <trim prefix="(" suffix=")" suffixOverrides=",">
           <if test="id != null">
               id,
-
           </if>
           <if test="userId != null">
-
               user_id,
-
           </if>
       <if test="username != null">
-
           username,
-
       </if>
       <if test="serverId != null">
-
           server_id,
-
       </if>
       <if test="serverName != null">
-
           `server_name`,
-
       </if>
       <if test="virtualHostId != null">
-
           virtual_host_id,
-
       </if>
       <if test="virtualHostName != null">
-
           virtual_host_name,
-
       </if>
       <if test="exchangeId != null">
-
           exchange_id,
-
       </if>
       <if test="exchangeName != null">
-
           exchange_name,
-
       </if>
       <if test="queueId != null">
-
           queue_id,
-
       </if>
       <if test="queueName != null">
-
           queue_name,
-
       </if>
       <if test="routingKeyId != null">
-
           routing_key_id,
-
       </if>
       <if test="routingKeyName != null">
-
           routing_key_name,
-
       </if>
       <if test="subscriber != null">
-
           subscriber,
-
       </if>
       <if test="description != null">
-
           description,
-
       </if>
       <if test="gmtCreate != null">
-
           gmt_create,
-
       </if>
       <if test="gmtModified != null">
-
           gmt_modified,
       </if>
       </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
         <if test="id != null">
             #{id,jdbcType=VARCHAR},
-
         </if>
       <if test="userId != null">
-
           #{userId,jdbcType=VARCHAR},
-
       </if>
       <if test="username != null">
-
           #{username,jdbcType=VARCHAR},
-
       </if>
       <if test="serverId != null">
-
           #{serverId,jdbcType=VARCHAR},
-
       </if>
       <if test="serverName != null">
-
           #{serverName,jdbcType=VARCHAR},
-
       </if>
       <if test="virtualHostId != null">
-
           #{virtualHostId,jdbcType=VARCHAR},
-
       </if>
       <if test="virtualHostName != null">
-
           #{virtualHostName,jdbcType=VARCHAR},
-
       </if>
       <if test="exchangeId != null">
-
           #{exchangeId,jdbcType=VARCHAR},
-
       </if>
       <if test="exchangeName != null">
-
           #{exchangeName,jdbcType=VARCHAR},
-
       </if>
       <if test="queueId != null">
-
           #{queueId,jdbcType=VARCHAR},
-
       </if>
       <if test="queueName != null">
-
           #{queueName,jdbcType=VARCHAR},
-
       </if>
       <if test="routingKeyId != null">
-
           #{routingKeyId,jdbcType=VARCHAR},
-
       </if>
       <if test="routingKeyName != null">
-
           #{routingKeyName,jdbcType=VARCHAR},
-
       </if>
       <if test="subscriber != null">
-
           #{subscriber,jdbcType=VARCHAR},
-
       </if>
       <if test="description != null">
-
           #{description,jdbcType=VARCHAR},
-
       </if>
       <if test="gmtCreate != null">
-
           #{gmtCreate,jdbcType=TIMESTAMP},
-
       </if>
       <if test="gmtModified != null">
-
           #{gmtModified,jdbcType=TIMESTAMP},
       </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.sunyo.wlpt.message.bus.service.domain.UserMessageBinding">
-      <!--@mbg.generated-->update user_message_binding
-
+      <!--@mbg.generated-->
+      update user_message_binding
       <set>
           <if test="userId != null">
               user_id = #{userId,jdbcType=VARCHAR},
-
           </if>
       <if test="username != null">
-
           username = #{username,jdbcType=VARCHAR},
-
       </if>
       <if test="serverId != null">
-
           server_id = #{serverId,jdbcType=VARCHAR},
-
       </if>
       <if test="serverName != null">
-
           `server_name` = #{serverName,jdbcType=VARCHAR},
-
       </if>
       <if test="virtualHostId != null">
-
           virtual_host_id = #{virtualHostId,jdbcType=VARCHAR},
-
       </if>
       <if test="virtualHostName != null">
-
           virtual_host_name = #{virtualHostName,jdbcType=VARCHAR},
-
       </if>
       <if test="exchangeId != null">
-
           exchange_id = #{exchangeId,jdbcType=VARCHAR},
-
       </if>
       <if test="exchangeName != null">
-
           exchange_name = #{exchangeName,jdbcType=VARCHAR},
-
       </if>
       <if test="queueId != null">
-
           queue_id = #{queueId,jdbcType=VARCHAR},
-
       </if>
       <if test="queueName != null">
-
           queue_name = #{queueName,jdbcType=VARCHAR},
-
       </if>
       <if test="routingKeyId != null">
-
           routing_key_id = #{routingKeyId,jdbcType=VARCHAR},
-
       </if>
       <if test="routingKeyName != null">
-
           routing_key_name = #{routingKeyName,jdbcType=VARCHAR},
-
       </if>
       <if test="subscriber != null">
-
           subscriber = #{subscriber,jdbcType=VARCHAR},
-
       </if>
       <if test="description != null">
-
           description = #{description,jdbcType=VARCHAR},
-
       </if>
       <if test="gmtCreate != null">
-
           gmt_create = #{gmtCreate,jdbcType=TIMESTAMP},
-
       </if>
       <if test="gmtModified != null">
-
           gmt_modified = #{gmtModified,jdbcType=TIMESTAMP},
       </if>
       </set>
       where id = #{id,jdbcType=VARCHAR}
-
   </update>
   <update id="updateByPrimaryKey" parameterType="com.sunyo.wlpt.message.bus.service.domain.UserMessageBinding">
-      <!--@mbg.generated-->update user_message_binding
+      <!--@mbg.generated-->
+      update user_message_binding
       set user_id           = #{userId,jdbcType=VARCHAR},
           username          = #{username,jdbcType=VARCHAR},
           server_id         = #{serverId,jdbcType=VARCHAR},
@@ -340,12 +243,10 @@
           gmt_create        = #{gmtCreate,jdbcType=TIMESTAMP},
           gmt_modified      = #{gmtModified,jdbcType=TIMESTAMP}
       where id = #{id,jdbcType=VARCHAR}
-
   </update>
     <!-- 查询列表，选择性 -->
     <select id="selectUserMessageBindingList"
             parameterType="com.sunyo.wlpt.message.bus.service.domain.UserMessageBinding" resultMap="BaseResultMap">
-
         select user_id,
                username,
                server_id,
@@ -361,60 +262,65 @@
                GROUP_CONCAT(queue_name)  as queue_name,
                GROUP_CONCAT(description) as description
         from user_message_binding
-
         <where>
             <!-- 所属用户登陆名称 -->
             <if test="username != null and username != ''">
                 username = #{username,jdbcType=VARCHAR}
-
             </if>
             <!-- 所属服务器名称 -->
             <if test="serverName != null and serverName != ''">
-
                 AND `server_name` = #{serverName,jdbcType=VARCHAR}
-
             </if>
             <!-- 所属虚拟主机名称 -->
             <if test="virtualHostName != null and virtualHostName != ''">
-
                 AND virtual_host_name = #{virtualHostName,jdbcType=VARCHAR}
-
             </if>
             <!-- 所属交换机名称 -->
             <if test="exchangeName != null and exchangeName != ''">
-
                 AND exchange_name = #{exchangeName,jdbcType=VARCHAR}
-
             </if>
             <!-- 所属队列名称 -->
             <if test="queueName != null and queueName != ''">
-
                 AND queue_name = #{queueName,jdbcType=VARCHAR}
-
             </if>
             <!-- 所属路由键名称 -->
             <if test="routingKeyName != null and routingKeyName != ''">
-
                 AND routing_key_name = #{routingKeyName,jdbcType=VARCHAR}
             </if>
-            <!-- 订阅者 -->
-            <!--            <if test="subscriber != null and subscriber !=''">-->
-            <!--                AND subscriber = #{subscriber,jdbcType=VARCHAR}-->
-            <!--            </if>-->
         </where>
-
         group by user_id, username, server_id, `server_name`, virtual_host_id, virtual_host_name,
                  exchange_id, exchange_name, routing_key_id, routing_key_name
-
     </select>
     <!-- 校验是否已存在 -->
     <select id="validateBinding" resultMap="BaseResultMap">
-
         select
-
         <include refid="Base_Column_List"/>
-
         from user_message_binding
-
+        <where>
+            <!-- 所属用户id -->
+            <if test="userId != null and userId != ''">
+                user_id = #{userId,jdbcType=VARCHAR}
+            </if>
+            <!-- 所属服务器id -->
+            <if test="serverId != null and serverId != ''">
+                AND server_id = #{serverId,jdbcType=VARCHAR}
+            </if>
+            <!-- 所属虚拟主机id -->
+            <if test="virtualHostId != null and virtualHostId != ''">
+                AND virtual_host_id = #{virtualHostId,jdbcType=VARCHAR}
+            </if>
+            <!-- 所属交换机id -->
+            <if test="exchangeId != null and exchangeId != ''">
+                AND exchange_id = #{exchangeId,jdbcType=VARCHAR}
+            </if>
+            <!-- 所属队列id -->
+            <if test="queueId != null and queueId != ''">
+                AND queue_id = #{queueId,jdbcType=VARCHAR}
+            </if>
+            <!-- 所属路由键id -->
+            <if test="routingKeyId != null and routingKeyId != ''">
+                AND routing_key_id = #{routingKeyId,jdbcType=VARCHAR}
+            </if>
+        </where>
     </select>
 </mapper>