批量新增路由与加载已配置路由适配

@@ -6,10 +6,7 @@ import com.sunyo.wlpt.message.bus.service.response.ResultJson;
 import com.sunyo.wlpt.message.bus.service.service.RouterService;
 import com.sunyo.wlpt.message.bus.service.service.RouterService;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 
 import java.util.List;
 import java.util.List;
 
 
@@ -27,4 +24,11 @@ public class RouterController {
       boolean result =  routerService.batchAddRouter(messageRouter);
       boolean result =  routerService.batchAddRouter(messageRouter);
       return  result ? new ResultJson("200","success") :new ResultJson("400","error");
       return  result ? new ResultJson("200","success") :new ResultJson("400","error");
     }
     }
+
+    @GetMapping("searchBysndr")
+    public ResultJson<List<MessageRouter>> getAllRouter(@RequestParam(value = "sndr",required = true) String sndr){
+         List<MessageRouter>  all = routerService.searchBySndr(sndr);
+         return new ResultJson<>("200","success",all);
+    }
+
 }
 }

@@ -2,6 +2,8 @@ package com.sunyo.wlpt.message.bus.service.mapper;
 
 
 import com.sunyo.wlpt.message.bus.service.model.MessageRouter;
 import com.sunyo.wlpt.message.bus.service.model.MessageRouter;
 
 
+import java.util.List;
+
 public interface MessageRouterMapper {
 public interface MessageRouterMapper {
     int deleteByPrimaryKey(String id);
     int deleteByPrimaryKey(String id);
 
 
@@ -11,6 +13,8 @@ public interface MessageRouterMapper {
 
 
     MessageRouter selectByPrimaryKey(String id);
     MessageRouter selectByPrimaryKey(String id);
 
 
+    List<MessageRouter> selectBySndr(String sndr);
+
     int updateByPrimaryKeySelective(MessageRouter record);
     int updateByPrimaryKeySelective(MessageRouter record);
 
 
     int updateByPrimaryKey(MessageRouter record);
     int updateByPrimaryKey(MessageRouter record);

@@ -13,6 +13,8 @@ public interface MessageTypeMapper {
 
 
     MessageType selectByPrimaryKey(String id);
     MessageType selectByPrimaryKey(String id);
 
 
+    MessageType selectParentByChildName(String id);
+
     List<MessageType> selectByParentId(String id);
     List<MessageType> selectByParentId(String id);
 
 
     List<MessageType> selectAll(MessageType record);
     List<MessageType> selectAll(MessageType record);

@@ -16,6 +16,8 @@ public class MessageType extends BasePage{
 
 
     private Integer type;
     private Integer type;
 
 
+    private boolean disabled;
+
     private List<MessageType> children;
     private List<MessageType> children;
 
 
     public String getId() {
     public String getId() {
@@ -56,6 +58,9 @@ public class MessageType extends BasePage{
 
 
     public void setType(Integer type) {
     public void setType(Integer type) {
         this.type = type;
         this.type = type;
+        if (type ==1 || type ==2 ){
+            this.disabled = true;
+        }
     }
     }
 
 
     public List<MessageType> getChildren() {
     public List<MessageType> getChildren() {
@@ -65,4 +70,12 @@ public class MessageType extends BasePage{
     public void setChildren(List<MessageType> children) {
     public void setChildren(List<MessageType> children) {
         this.children = children;
         this.children = children;
     }
     }
+
+    public boolean isDisabled() {
+        return disabled;
+    }
+
+    public void setDisabled(boolean disabled) {
+        this.disabled = disabled;
+    }
 }
 }

@@ -2,7 +2,11 @@ package com.sunyo.wlpt.message.bus.service.service;
 
 
 import com.sunyo.wlpt.message.bus.service.model.MessageRouter;
 import com.sunyo.wlpt.message.bus.service.model.MessageRouter;
 
 
+import java.util.List;
+
 public interface RouterService {
 public interface RouterService {
 
 
     boolean batchAddRouter(MessageRouter messageRouter);
     boolean batchAddRouter(MessageRouter messageRouter);
+
+    List<MessageRouter> searchBySndr(String sndr);
 }
 }

 package com.sunyo.wlpt.message.bus.service.service.impl;
 package com.sunyo.wlpt.message.bus.service.service.impl;
 
 
 import com.sunyo.wlpt.message.bus.service.domain.BusQueue;
 import com.sunyo.wlpt.message.bus.service.domain.BusQueue;
-import com.sunyo.wlpt.message.bus.service.mapper.BusQueueMapper;
-import com.sunyo.wlpt.message.bus.service.mapper.MessageRouterMapper;
-import com.sunyo.wlpt.message.bus.service.mapper.MessageRouterReciverMapper;
-import com.sunyo.wlpt.message.bus.service.mapper.UserTopicMapper;
+import com.sunyo.wlpt.message.bus.service.mapper.*;
 import com.sunyo.wlpt.message.bus.service.model.MessageRouter;
 import com.sunyo.wlpt.message.bus.service.model.MessageRouter;
 import com.sunyo.wlpt.message.bus.service.model.MessageRouterReciver;
 import com.sunyo.wlpt.message.bus.service.model.MessageRouterReciver;
 import com.sunyo.wlpt.message.bus.service.model.MessageType;
 import com.sunyo.wlpt.message.bus.service.model.MessageType;
@@ -29,6 +26,9 @@ public class RouterServiceImp  implements RouterService {
     @Resource
     @Resource
     BusQueueMapper busQueueMapper;
     BusQueueMapper busQueueMapper;
 
 
+    @Resource
+    MessageTypeMapper typeMapper;
+
 
 
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
     @Override
     @Override
@@ -41,9 +41,9 @@ public class RouterServiceImp  implements RouterService {
                  * 批量增加发送者表
                  * 批量增加发送者表
                  */
                  */
                 for (String sndr: senders) {
                 for (String sndr: senders) {
-                    String id = IdUtils.generateId();
+
                     MessageRouter router = new MessageRouter();
                     MessageRouter router = new MessageRouter();
-                    router.setId(id);
+
                     router.setSndr(sndr);
                     router.setSndr(sndr);
                     router.setDes(record.getDes());
                     router.setDes(record.getDes());
                     router.setVer(record.getVer());
                     router.setVer(record.getVer());
@@ -57,18 +57,20 @@ public class RouterServiceImp  implements RouterService {
                     if (messageTypes!=null && !messageTypes.isEmpty()){
                     if (messageTypes!=null && !messageTypes.isEmpty()){
                         for (MessageType type: messageTypes) {
                         for (MessageType type: messageTypes) {
                             /**
                             /**
-                             * 判断消息类型是 大类 主类还是子类
+                             * 只取二级类
                              */
                              */
-                            if (type.getType() == 2){
-                                //大类处理
-                                router.setBtype(type.getName());
-                            }
                             if (type.getType() == 3){
                             if (type.getType() == 3){
+                                String id = IdUtils.generateId();
+                                router.setId(id);
+                                /**
+                                 * 查找二级类的上级类
+                                 */
+                                MessageType bType = typeMapper.selectParentByChildName(type.getName());
+
+                                router.setBtype(bType.getName());
+
                                 //二级类处理
                                 //二级类处理
                                 router.setStype(type.getName());
                                 router.setStype(type.getName());
-                            }
-                        }
-                    }
 
 
                                 /**
                                 /**
                                  * 路由生产者消息入库
                                  * 路由生产者消息入库
@@ -100,7 +102,9 @@ public class RouterServiceImp  implements RouterService {
 
 
                                     }
                                     }
                                 }
                                 }
-
+                            }
+                        }
+                    }
 
 
                 }
                 }
             }
             }
@@ -109,4 +113,14 @@ public class RouterServiceImp  implements RouterService {
             return false;
             return false;
         }
         }
     }
     }
+
+    @Override
+    public List<MessageRouter> searchBySndr(String sndr) {
+        List<MessageRouter> list =  messageRouterMapper.selectBySndr(sndr);
+        for (MessageRouter router:list) {
+            List<MessageRouterReciver>  routerRecivers = routerReciverMapper.selectByRouterKey(router.getId());
+            router.setRcvrList(routerRecivers);
+        }
+        return list;
+    }
 }
 }

@@ -179,10 +179,10 @@
           #{gmtModified,jdbcType=TIMESTAMP},
           #{gmtModified,jdbcType=TIMESTAMP},
       </if>
       </if>
       <if test="partitionCount >0">
       <if test="partitionCount >0">
-           #{partitionCount,jdbcType=TIMESTAMP},
+           #{partitionCount,jdbcType=INTEGER},
       </if>
       </if>
         <if test="queueType >0">
         <if test="queueType >0">
-            #{partitionCount,jdbcType=TIMESTAMP},
+            #{queueType,jdbcType=INTEGER},
         </if>
         </if>
     </trim>
     </trim>
   </insert>
   </insert>

@@ -15,7 +15,6 @@
     <result column="ver" property="ver" jdbcType="VARCHAR" />
     <result column="ver" property="ver" jdbcType="VARCHAR" />
     <result column="creat_time" property="creatTime" jdbcType="TIMESTAMP" />
     <result column="creat_time" property="creatTime" jdbcType="TIMESTAMP" />
     <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
     <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
-    <collection column="id" javaType="java.util.ArrayList" ofType="com.sunyo.wlpt.message.bus.service.model.MessageRouterReciver" property="rcvrList" select="com.sunyo.wlpt.message.bus.service.mapper.selectByRouterKey" />
   </resultMap>
   </resultMap>
   <sql id="Base_Column_List" >
   <sql id="Base_Column_List" >
     id, sndr, btype, stype, optype, msg_limit, `character`, status, `usage`, des, ver, creat_time,
     id, sndr, btype, stype, optype, msg_limit, `character`, status, `usage`, des, ver, creat_time,
@@ -27,14 +26,22 @@
     from message_router
     from message_router
     where id = #{id,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </select>
   </select>
+
+  <select id="selectBySndr" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select
+    <include refid="Base_Column_List" />
+    from message_router
+    where sndr = #{id,jdbcType=VARCHAR}
+  </select>
+
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
     delete from message_router
     delete from message_router
-    where id = #{id,jdbcType=VARCHAR}
+    where id = #{sndr,jdbcType=VARCHAR}
   </delete>
   </delete>
   <insert id="insert" parameterType="com.sunyo.wlpt.message.bus.service.model.MessageRouter" >
   <insert id="insert" parameterType="com.sunyo.wlpt.message.bus.service.model.MessageRouter" >
     insert into message_router (id, sndr, btype, 
     insert into message_router (id, sndr, btype, 
       stype, optype, msg_limit, 
       stype, optype, msg_limit, 
-      `character`, status, `usage`, des,
+      `character`, `status`, `usage`, des,
       ver, creat_time, update_time
       ver, creat_time, update_time
       )
       )
     values (#{id,jdbcType=VARCHAR}, #{sndr,jdbcType=VARCHAR}, #{btype,jdbcType=VARCHAR}, 
     values (#{id,jdbcType=VARCHAR}, #{sndr,jdbcType=VARCHAR}, #{btype,jdbcType=VARCHAR}, 
@@ -68,7 +75,7 @@
         `character`,
         `character`,
       </if>
       </if>
       <if test="status != null" >
       <if test="status != null" >
-        status,
+        `status`,
       </if>
       </if>
       <if test="usage != null" >
       <if test="usage != null" >
         `usage`,
         `usage`,

@@ -24,6 +24,15 @@
     from message_type
     from message_type
     where parent_id = #{parentId,jdbcType=VARCHAR}
     where parent_id = #{parentId,jdbcType=VARCHAR}
   </select>
   </select>
+  <select id="selectParentByChildName" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select
+    <include refid="Base_Column_List" />
+    from message_type
+    where id =
+    (
+    SELECT parent_id from message_type where name = #{name,jdbcType=VARCHAR}
+    )
+  </select>
   <select id="selectAll" parameterType="com.sunyo.wlpt.message.bus.service.model.MessageType" resultMap="BaseResultMap">
   <select id="selectAll" parameterType="com.sunyo.wlpt.message.bus.service.model.MessageType" resultMap="BaseResultMap">
     select
     select
     <include refid="Base_Column_List" />
     <include refid="Base_Column_List" />