Переглянути джерело

更新系统消息列表页面

reghao 1 рік тому
батько
коміт
540347d7a4

+ 2 - 2
web/src/main/java/cn/reghao/devops/web/admin/sys/controller/page/SysMessagePageController.java

@@ -2,6 +2,7 @@ package cn.reghao.devops.web.admin.sys.controller.page;
 
 import cn.reghao.devops.web.admin.sys.model.po.SysMessage;
 import cn.reghao.devops.web.admin.sys.db.repository.SysMessageRepository;
+import cn.reghao.devops.web.admin.sys.model.vo.SysMsg;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.data.domain.Page;
@@ -33,8 +34,7 @@ public class SysMessagePageController {
     @GetMapping("")
     public String messagePage(Model model) {
         PageRequest pageRequest = PageRequest.of(0, 10, Sort.by(Sort.Direction.DESC, "createTime"));
-        Page<SysMessage> page = sysMessageRepository.findByUnreadIsTrue(pageRequest);
-        model.addAttribute("page", page);
+        Page<SysMsg> page = sysMessageRepository.findByUnreadIsTrue(pageRequest).map(SysMsg::new);
         model.addAttribute("list", page.getContent());
         return "/admin/msg/sysmsg";
     }

+ 22 - 0
web/src/main/java/cn/reghao/devops/web/admin/sys/model/vo/SysMsg.java

@@ -0,0 +1,22 @@
+package cn.reghao.devops.web.admin.sys.model.vo;
+
+import cn.reghao.devops.web.admin.sys.model.po.SysMessage;
+import cn.reghao.jutil.jdk.converter.DateTimeConverter;
+import lombok.Getter;
+
+/**
+ * @author reghao
+ * @date 2024-08-07 11:31:44
+ */
+@Getter
+public class SysMsg {
+    private int id;
+    private String createAt;
+    private String title;
+
+    public SysMsg(SysMessage sysMessage) {
+        this.id = sysMessage.getId();
+        this.createAt = DateTimeConverter.format(sysMessage.getCreateTime());
+        this.title = sysMessage.getTitle();
+    }
+}

+ 4 - 7
web/src/main/resources/templates/admin/msg/sysmsg.html

@@ -5,7 +5,7 @@
 <body class="timo-layout-page">
 <div class="layui-card">
     <div class="layui-card-header timo-card-header">
-        <span><i class="fa fa-bars"></i> 系统消息</span>
+        <span><i class="fa fa-bars"></i> 系统消息列表</span>
         <i class="layui-icon layui-icon-refresh refresh-btn"></i>
     </div>
     <div class="layui-card-body">
@@ -24,17 +24,15 @@
             <table class="layui-table timo-table">
                 <thead>
                 <tr>
-                    <th data-field="createTime">时间</th>
-                    <th data-field="machineIpv4">标题</th>
-                    <th data-field="unread">状态</th>
+                    <th data-field="createAt">时间</th>
+                    <th data-field="title">标题</th>
                     <th>操作</th>
                 </tr>
                 </thead>
                 <tbody>
                 <tr th:each="item:${list}">
-                    <td th:text="${item.createTime}">时间</td>
+                    <td th:text="${item.createAt}">时间</td>
                     <td th:text="${item.title}">标题</td>
-                    <td th:text="${item.unread}">未读</td>
                     <td>
                         <a class="open-popup" data-title="消息内容" th:attr="data-url=@{'/sys/message/detail/'+${item.id}}"
                            data-size="960,480" href="#">查看</a>
@@ -43,7 +41,6 @@
                 </tbody>
             </table>
         </div>
-        <div th:replace="/common/fragment :: page"></div>
     </div>
 </div>