消息页面重构

sue602 · Apr 5, 2024 · 730af30 · 730af30
1 parent ae5b2f0
commit 730af30
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 2 deletions.
diff --git a/resmq-dashboard/src/main/java/io/github/resmq/dashboard/controller/MessageController.java b/resmq-dashboard/src/main/java/io/github/resmq/dashboard/controller/MessageController.java
@@ -1,9 +1,14 @@
 package io.github.resmq.dashboard.controller;
 
+import io.github.resmq.dashboard.service.TopicsService;
+import jakarta.annotation.Resource;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import java.util.ArrayList;
+import java.util.Map;
+
 /**
  * <>
  *
@@ -14,9 +19,13 @@
 @RequestMapping("/message")
 public class MessageController {
 
+    @Resource
+    private TopicsService topicsService;
+
     @RequestMapping("")
     public String index(Model model) {
-
+        Map<String, Object> allTopicsInfo = topicsService.getAllTopicsInfo(1, Integer.MAX_VALUE, "");
+        model.addAttribute("topicList", allTopicsInfo.get("data"));
         return "message/message.index";
     }
 

diff --git a/resmq-dashboard/src/main/java/io/github/resmq/dashboard/entity/CommonMessage.java b/resmq-dashboard/src/main/java/io/github/resmq/dashboard/entity/CommonMessage.java
@@ -13,6 +13,8 @@
 @AllArgsConstructor
 public class CommonMessage {
 
+    //todo 消息优先级设计？ timestamp方式？ 路由匹配？ 权重？
+
     private String id;
 
     private String message;

diff --git a/resmq-dashboard/src/main/resources/templates/message/message.index.ftl b/resmq-dashboard/src/main/resources/templates/message/message.index.ftl
@@ -26,6 +26,19 @@
         <section class="content">
 
             <div class="row">
+                <div class="col-xs-4">
+                    <div class="input-group">
+                        <span class="input-group-addon">主题</span>
+                        <select class="form-control" id="topicName">
+                            <option value="-1">全部</option>
+                            <option value="0">无</option>
+                            <#list topicList as topicInfo>
+                                <option value="${topicInfo.name}">${topicInfo.name}</option>
+                            </#list>
+                        </select>
+                    </div>
+                </div>
+
                 <div class="col-xs-4">
                     <div class="input-group">
                         <span class="input-group-addon">消息主题</span>
@@ -72,7 +85,6 @@
 <script src="${request.contextPath}/static/adminlte/bower_components/datatables.net/js/jquery.dataTables.min.js"></script>
 <script src="${request.contextPath}/static/adminlte/bower_components/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
 <script src="${request.contextPath}/static/plugins/jquery/jquery.validate.min.js"></script>
-
 <#--<script src="${request.contextPath}/static/js/message.index.1.js"></script>-->
 
 </body>