From e5b0ff6fc0370d646e824eaf8bfe7e11529c0fa6 Mon Sep 17 00:00:00 2001
From: lld <15027638633@163.com>
Date: Thu, 2 Apr 2026 02:29:46 +0800
Subject: [PATCH] =?UTF-8?q?message=E6=A6=82=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/agri/system/domain/SysMessage.java    |  3 ++
 .../service/impl/SysMessageServiceImpl.java   |  3 ++
 .../mapper/system/SysMessageMapper.xml        | 41 ++++++++++---------
 3 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/agri-system/src/main/java/com/agri/system/domain/SysMessage.java b/agri-system/src/main/java/com/agri/system/domain/SysMessage.java
index 7457b23..f58dca8 100644
--- a/agri-system/src/main/java/com/agri/system/domain/SysMessage.java
+++ b/agri-system/src/main/java/com/agri/system/domain/SysMessage.java
@@ -82,4 +82,7 @@ public class SysMessage extends BaseEntity
     @JsonSerialize(using = ToStringSerializer.class)
     private Long sortNewId;
 
+    @TableField(exist = false)
+    private Integer unreadCount;
+
 }
diff --git a/agri-system/src/main/java/com/agri/system/service/impl/SysMessageServiceImpl.java b/agri-system/src/main/java/com/agri/system/service/impl/SysMessageServiceImpl.java
index 126843d..14da3e0 100644
--- a/agri-system/src/main/java/com/agri/system/service/impl/SysMessageServiceImpl.java
+++ b/agri-system/src/main/java/com/agri/system/service/impl/SysMessageServiceImpl.java
@@ -101,6 +101,9 @@ public class SysMessageServiceImpl extends ServiceImpl<SysMessageMapper, SysMess
 
     @Override
     public List<SysMessage> getMsgOverview(SysMessage sysMessage) {
+        if (!SecurityUtils.isAdmin()) {
+            sysMessage.setReceiver(SecurityUtils.getUserId());
+        }
         return baseMapper.getMsgOverview(sysMessage);
     }
 }
diff --git a/agri-system/src/main/resources/mapper/system/SysMessageMapper.xml b/agri-system/src/main/resources/mapper/system/SysMessageMapper.xml
index f805a23..674c7ef 100644
--- a/agri-system/src/main/resources/mapper/system/SysMessageMapper.xml
+++ b/agri-system/src/main/resources/mapper/system/SysMessageMapper.xml
@@ -126,30 +126,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getMsgOverview" parameterType="SysMessage" resultMap="SysMessageResult">
         SELECT
-            *
-        FROM
-        (
+            t.*,
+            IFNULL(s.unread_count, 0) AS unread_count
+        FROM (
             SELECT
-                `imei`,
-                `receiver`,
-                `title`,
-                `msg_type`,
-                `read_status`,
-                `content`,
-                `rich_content`,
-                `img_url`,
-                `link_url`,
-                `create_time`,  -- 必须加
-                `id`,           -- 必须加
+                imei, receiver, title, msg_type, read_status,
+                content, rich_content, img_url, link_url,
+                create_time, id,
                 ROW_NUMBER() OVER (PARTITION BY msg_type ORDER BY create_time DESC, id DESC) AS rn
             FROM
-                sys_message d
+                sys_message
             WHERE
-                -- 正确写法：包含今天所有时间
-                d.create_time &gt;= DATE_SUB(CURDATE(), INTERVAL 7 DAY)
-                AND d.create_time &lt; DATE_ADD(CURDATE(), INTERVAL 1 DAY)
+                create_time &gt;= DATE_SUB(CURDATE(), INTERVAL 7 DAY)
+                AND create_time &lt; DATE_ADD(CURDATE(), INTERVAL 1 DAY)
+                and receiver = #{receiver}
             ) t
-        WHERE
-        t.rn = 1;
+        LEFT JOIN (
+            SELECT msg_type, COUNT(*) AS unread_count
+            FROM sys_message
+            WHERE read_status = 0
+                AND create_time &gt;= DATE_SUB(CURDATE(), INTERVAL 7 DAY)
+                AND create_time &lt; DATE_ADD(CURDATE(), INTERVAL 1 DAY)
+              and receiver = #{receiver}
+            GROUP BY msg_type
+        ) s ON t.msg_type = s.msg_type
+        WHERE t.rn = 1;
+
     </select>
 </mapper>
\ No newline at end of file