From d7dc35bc882c3eea4e7cc2327357678d60750fc3 Mon Sep 17 00:00:00 2001 From: haotianmingyue <2421912570@qq.com> Date: Fri, 27 Dec 2024 19:03:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF--=E6=B7=BB=E5=8A=A0--?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=96=B0=E5=85=B3=E6=B3=A8=E4=BA=BA=E6=95=B0?= =?UTF-8?q?,=E8=8E=B7=E5=8F=96=E6=96=B0=E5=85=B3=E6=B3=A8=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/app/AppSystemController.java | 45 ++++++++++++++++++- .../system/mapper/SysUserFollowMapper.java | 5 +++ .../mapper/SysUserNotificationMapper.java | 11 +++++ .../system/service/ISysUserFollowService.java | 5 +++ .../service/ISysUserNotificationService.java | 10 +++++ .../impl/SysUserFollowServiceImpl.java | 8 ++++ .../impl/SysUserNotificationServiceImpl.java | 16 +++++++ .../mapper/system/SysUserFollowMapper.xml | 8 ++++ .../system/SysUserNotificationMapper.xml | 10 +++++ 9 files changed, 117 insertions(+), 1 deletion(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java index db30880b..a09c78ef 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java @@ -2,6 +2,7 @@ package com.ruoyi.web.controller.app; import com.ruoyi.common.constant.CacheConstants; +import com.ruoyi.common.constant.ScheduleConstants; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.redis.RedisCache; @@ -1393,7 +1394,7 @@ public class AppSystemController extends BaseController { } - // 新增关注消息 + // 新增关注 int back = userFollowService.insertSysUserFollow(sysUserFollow); if(back == 0){ @@ -1409,6 +1410,7 @@ public class AppSystemController extends BaseController { sysUserNotification.setType("1"); sysUserNotification.setStatus("0"); + // 发送消息 int back1 = userNotificationService.insertSysUserNotification(sysUserNotification); if(back1 == 0){ return AjaxResult.error("新增关注消息失败"); @@ -1422,6 +1424,45 @@ public class AppSystemController extends BaseController { } + // 消息--查看新增关注数 + @GetMapping("/addFollowerCount") + public AjaxResult addFollowerCount() + { + Long userId = getUserId(); + + Long count = userNotificationService.getAddFollowerCount(userId); + System.out.println("count : "+count); + return success(count); + + } + // 消息--获取新增关注列表 + @GetMapping("/addFollowerList") + public TableDataInfo addFollowerList() + { + Long userId = getUserId(); + + List addFollowerList = userFollowService.getAddFollowerList(userId); + + + //------------------------------------消息已读------------------------------------------- +// // 把消息置为已读 +// SysUserNotification sysUserNotification = new SysUserNotification(); +// +// sysUserNotification.setUserId(userId); +// // 消息类型为新增关注 +// sysUserNotification.setType("1"); +// // 改变状态为已读 +// sysUserNotification.setStatus("1"); + + // 更新数据库 + userNotificationService.readNotifiaction(userId, "1", "1"); + + //-------------------------------------消息已读end----------------------------------------- + + return getDataTable(addFollowerList); + + } + // 测试 warning返回码 @GetMapping("/warning") public AjaxResult warning() @@ -1490,4 +1531,6 @@ public class AppSystemController extends BaseController { return AjaxResult.success(userMessageVo); } + + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserFollowMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserFollowMapper.java index 2f053db9..3bd856ff 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserFollowMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserFollowMapper.java @@ -85,4 +85,9 @@ public interface SysUserFollowMapper * 获取关注我的人数 * */ public Long getFollowedCount(Long userId); + + /* + * 获取新增关注列表 + * */ + public List getAddFollowerList(Long userId); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserNotificationMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserNotificationMapper.java index cd7a3cc7..4d99f5a3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserNotificationMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserNotificationMapper.java @@ -2,6 +2,7 @@ package com.ruoyi.system.mapper; import java.util.List; import com.ruoyi.system.domain.SysUserNotification; +import org.apache.ibatis.annotations.Param; /** * 用户消息通知Mapper接口 @@ -60,4 +61,14 @@ public interface SysUserNotificationMapper public int deleteSysUserNotificationByIds(Long[] ids); public List unreadNotifiaction(Long userId); + + /* + * 查看新增关注数 + * */ + public Long getAddFollowerCount(Long userId); + + /* + * 读消息 + * */ + public Long readNotifiaction(@Param("userId") Long userId, @Param("type") String type, @Param("status") String status); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserFollowService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserFollowService.java index 7a8a4ca2..8fbc002d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserFollowService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserFollowService.java @@ -84,4 +84,9 @@ public interface ISysUserFollowService * 获取关注我的人数 * */ public Long getFollowedCount(Long userId); + + /* + * 获取新增关注列表 + * */ + public List getAddFollowerList(Long userId); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserNotificationService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserNotificationService.java index da69e90a..8594d60c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserNotificationService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserNotificationService.java @@ -64,4 +64,14 @@ public interface ISysUserNotificationService public List unreadNotifiaction(Long userId); + /* + * 查看新增关注数 + * */ + public Long getAddFollowerCount(Long userId); + + /* + * 读消息 + * */ + public Long readNotifiaction(Long userId, String type, String status); + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserFollowServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserFollowServiceImpl.java index 26a02bf8..c8bc2c67 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserFollowServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserFollowServiceImpl.java @@ -133,4 +133,12 @@ public class SysUserFollowServiceImpl implements ISysUserFollowService public Long getFollowedCount(Long userId){ return sysUserFollowMapper.getFollowedCount(userId); } + + /* + * 获取新增关注列表 + * */ + @Override + public List getAddFollowerList(Long userId){ + return sysUserFollowMapper.getAddFollowerList(userId); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserNotificationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserNotificationServiceImpl.java index d7181fb9..e31acb85 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserNotificationServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserNotificationServiceImpl.java @@ -153,5 +153,21 @@ public class SysUserNotificationServiceImpl implements ISysUserNotificationServi + } + + /* + * 查看新增关注数 + * */ + @Override + public Long getAddFollowerCount(Long userId){ + return sysUserNotificationMapper.getAddFollowerCount(userId); + } + + /* + * 读消息 + * */ + @Override + public Long readNotifiaction(Long userId, String type, String status){ + return sysUserNotificationMapper.readNotifiaction(userId, type, status); } } diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserFollowMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserFollowMapper.xml index 08026361..292a6f15 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserFollowMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserFollowMapper.xml @@ -62,6 +62,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + insert into sys_user_follow diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserNotificationMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserNotificationMapper.xml index f76c0525..d8cef5b0 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserNotificationMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserNotificationMapper.xml @@ -41,6 +41,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from sys_user_notification where user_id = #{userId} and status = '0' + insert into sys_user_notification @@ -80,6 +85,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} + + update sys_user_notification + set status = #{status} + where user_id = #{userId} and type = #{type} + delete from sys_user_notification where id = #{id}