From 67eee5acf6e3deab1f711be1b4172511fec0f9ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=87=E4=BD=B3?= Date: Wed, 8 Sep 2021 10:18:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?SysNotificationVo=E6=94=B9=E5=90=8D?= =?UTF-8?q?=E4=B8=BANewSysNotificationVo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ationAddVo.java => NewSysNotificationVo.java} | 2 +- .../notification/SysNotificationService.java | 4 ++-- .../impl/SysNotificationServiceImpl.java | 16 ++++++++-------- .../model/service/notification/ServiceTests.java | 16 ++++++++-------- 4 files changed, 19 insertions(+), 19 deletions(-) rename model/src/main/java/cn/org/gitlink/notification/model/dao/entity/vo/{SysNotificationAddVo.java => NewSysNotificationVo.java} (97%) diff --git a/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/vo/SysNotificationAddVo.java b/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/vo/NewSysNotificationVo.java similarity index 97% rename from model/src/main/java/cn/org/gitlink/notification/model/dao/entity/vo/SysNotificationAddVo.java rename to model/src/main/java/cn/org/gitlink/notification/model/dao/entity/vo/NewSysNotificationVo.java index ab62295..20bf99c 100644 --- a/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/vo/SysNotificationAddVo.java +++ b/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/vo/NewSysNotificationVo.java @@ -1,6 +1,6 @@ package cn.org.gitlink.notification.model.dao.entity.vo; -public class SysNotificationAddVo { +public class NewSysNotificationVo { private String platform; diff --git a/model/src/main/java/cn/org/gitlink/notification/model/service/notification/SysNotificationService.java b/model/src/main/java/cn/org/gitlink/notification/model/service/notification/SysNotificationService.java index 86d326d..07a180e 100644 --- a/model/src/main/java/cn/org/gitlink/notification/model/service/notification/SysNotificationService.java +++ b/model/src/main/java/cn/org/gitlink/notification/model/service/notification/SysNotificationService.java @@ -1,14 +1,14 @@ package cn.org.gitlink.notification.model.service.notification; import cn.org.gitlink.notification.model.dao.entity.SysNotification; -import cn.org.gitlink.notification.model.dao.entity.vo.SysNotificationAddVo; +import cn.org.gitlink.notification.model.dao.entity.vo.NewSysNotificationVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; public interface SysNotificationService extends IService { - boolean addSysNotificationForUsers(SysNotificationAddVo sysNotification); + boolean addSysNotificationForUsers(NewSysNotificationVo sysNotification); int changeStatusByNotificationIds(String platform, String notificationIds, Integer status); diff --git a/model/src/main/java/cn/org/gitlink/notification/model/service/notification/impl/SysNotificationServiceImpl.java b/model/src/main/java/cn/org/gitlink/notification/model/service/notification/impl/SysNotificationServiceImpl.java index 4ab4420..1942b06 100644 --- a/model/src/main/java/cn/org/gitlink/notification/model/service/notification/impl/SysNotificationServiceImpl.java +++ b/model/src/main/java/cn/org/gitlink/notification/model/service/notification/impl/SysNotificationServiceImpl.java @@ -1,7 +1,7 @@ package cn.org.gitlink.notification.model.service.notification.impl; import cn.org.gitlink.notification.model.dao.entity.SysNotification; -import cn.org.gitlink.notification.model.dao.entity.vo.SysNotificationAddVo; +import cn.org.gitlink.notification.model.dao.entity.vo.NewSysNotificationVo; import cn.org.gitlink.notification.model.dao.mapper.SysNotificationMapper; import cn.org.gitlink.notification.model.service.notification.SysNotificationService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -17,16 +17,16 @@ public class SysNotificationServiceImpl extends ServiceImpl list = Arrays.asList(sysNotificationAddVo.getReceivers().split(",")); + sysNotification.setSender(newSysNotificationVo.getSender()); + sysNotification.setContent(newSysNotificationVo.getContent()); + sysNotification.setNotificationUrl(newSysNotificationVo.getNotification_url()); + sysNotification.setType(newSysNotificationVo.getType()); + List list = Arrays.asList(newSysNotificationVo.getReceivers().split(",")); for(String s : list){ sysNotification.setReceiver(Long.parseLong(s)); - baseMapper.insertSelective(sysNotificationAddVo.getPlatform(), sysNotification); + baseMapper.insertSelective(newSysNotificationVo.getPlatform(), sysNotification); } return true; } diff --git a/model/src/test/java/cn/org/gitlink/notification/model/service/notification/ServiceTests.java b/model/src/test/java/cn/org/gitlink/notification/model/service/notification/ServiceTests.java index 7c75e97..66f09b7 100644 --- a/model/src/test/java/cn/org/gitlink/notification/model/service/notification/ServiceTests.java +++ b/model/src/test/java/cn/org/gitlink/notification/model/service/notification/ServiceTests.java @@ -3,7 +3,7 @@ package cn.org.gitlink.notification.model.service.notification; import cn.org.gitlink.notification.model.ModelApplicationTest; import cn.org.gitlink.notification.model.dao.entity.SysNotification; -import cn.org.gitlink.notification.model.dao.entity.vo.SysNotificationAddVo; +import cn.org.gitlink.notification.model.dao.entity.vo.NewSysNotificationVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.junit.Test; import org.junit.runner.RunWith; @@ -32,13 +32,13 @@ public class ServiceTests { int i = sysNotificationService.getAllNewSysNotificationNumber("gitlink", 234); List sysNotificationList = sysNotificationService.getUnreadSysNotificationsList("gitlink", 100, 20); Page sysNotificationPage = sysNotificationService.getAllSysNotificationsPageList(1,10,"","gitlink", 100); - SysNotificationAddVo sysNotificationAddVo = new SysNotificationAddVo(); - sysNotificationAddVo.setSender((long) -1); - sysNotificationAddVo.setReceivers("7,8"); - sysNotificationAddVo.setContent("baladiwei 在 gitlink-notification-system 修改ReadMe 文件的标题"); - sysNotificationAddVo.setNotification_url("www.baidu.com"); - sysNotificationAddVo.setPlatform("gitlink"); - boolean j = sysNotificationService.addSysNotificationForUsers(sysNotificationAddVo); + NewSysNotificationVo newSysNotificationVo = new NewSysNotificationVo(); + newSysNotificationVo.setSender((long) -1); + newSysNotificationVo.setReceivers("7,8"); + newSysNotificationVo.setContent("baladiwei 在 gitlink-notification-system 修改ReadMe 文件的标题"); + newSysNotificationVo.setNotification_url("www.baidu.com"); + newSysNotificationVo.setPlatform("gitlink"); + boolean j = sysNotificationService.addSysNotificationForUsers(newSysNotificationVo); logger.info("insertResult:" + j); int k = sysNotificationService.changeStatusByNotificationIds("gitlink", "2,3", 2); logger.info("updateStatus:" + k); From 981c422f9c716c553b962a32b35673c62c9cb09c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=87=E4=BD=B3?= Date: Wed, 8 Sep 2021 14:32:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/entity/vo/NewSysNotificationVo.java | 1 + .../notification/SysNotificationService.java | 6 +++ .../impl/SysNotificationServiceImpl.java | 42 +++++++++++++++++++ 3 files changed, 49 insertions(+) diff --git a/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/vo/NewSysNotificationVo.java b/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/vo/NewSysNotificationVo.java index 20bf99c..8923b3e 100644 --- a/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/vo/NewSysNotificationVo.java +++ b/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/vo/NewSysNotificationVo.java @@ -6,6 +6,7 @@ public class NewSysNotificationVo { private long sender; + //接受者id，单个id或多个 example:"1"/"1,2,3" private String receivers; private String content; diff --git a/model/src/main/java/cn/org/gitlink/notification/model/service/notification/SysNotificationService.java b/model/src/main/java/cn/org/gitlink/notification/model/service/notification/SysNotificationService.java index 07a180e..4986539 100644 --- a/model/src/main/java/cn/org/gitlink/notification/model/service/notification/SysNotificationService.java +++ b/model/src/main/java/cn/org/gitlink/notification/model/service/notification/SysNotificationService.java @@ -8,15 +8,21 @@ import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; public interface SysNotificationService extends IService { + //给用户发送消息 boolean addSysNotificationForUsers(NewSysNotificationVo sysNotification); + //变更消息状态 int changeStatusByNotificationIds(String platform, String notificationIds, Integer status); + //获取全部未读消息数量 int getAllNewSysNotificationNumber(String platform, Integer receiver); + //获取未读消息列表 List getUnreadSysNotificationsList(String platform, Integer receiver, Integer notificationNumber); + //根据类型获取未读系统消息数量 int getSysNotificationNumberByType(String platform, Integer receiver, Integer type); + //获取全部消息分页列表 Page getAllSysNotificationsPageList(int curPage, int pageSize, String orderBy, String platform, Integer receiver); } diff --git a/model/src/main/java/cn/org/gitlink/notification/model/service/notification/impl/SysNotificationServiceImpl.java b/model/src/main/java/cn/org/gitlink/notification/model/service/notification/impl/SysNotificationServiceImpl.java index feec380..ac876b8 100644 --- a/model/src/main/java/cn/org/gitlink/notification/model/service/notification/impl/SysNotificationServiceImpl.java +++ b/model/src/main/java/cn/org/gitlink/notification/model/service/notification/impl/SysNotificationServiceImpl.java @@ -15,6 +15,13 @@ import java.util.List; @Service(value = "sysNotificationServiceImpl") public class SysNotificationServiceImpl extends ServiceImpl implements SysNotificationService { + /** + * @Description: 给用户发送消息 + * @Param: [newSysNotificationVo] + * @return: boolean + * @Author: wanjia + * @Date: 2021/9/8 + */ @Override @Transactional public boolean addSysNotificationForUsers(NewSysNotificationVo newSysNotificationVo) { @@ -31,27 +38,62 @@ public class SysNotificationServiceImpl extends ServiceImpl + * @Author: wanjia + * @Date: 2021/9/8 + */ @Override public List getUnreadSysNotificationsList(String platform, Integer receiver, Integer notificationNumber) { List sysNotificationList = baseMapper.getUnreadSysNotificationsList(platform, receiver, 1, notificationNumber); return sysNotificationList; } + /** + * @Description: 根据类型获取未读系统消息数量 + * @Param: [platform：平台编码, receiver：接收者id, type：消息类型1-系统消息2-@我] + * @return: int + * @Author: wanjia + * @Date: 2021/9/8 + */ @Override public int getSysNotificationNumberByType(String platform, Integer receiver, Integer type) { return baseMapper.getSysNotificationNumberByType(platform, receiver, type); } + /** + * @Description: 获取全部消息分页列表 + * @Param: [curPage, pageSize, orderBy, platform:平台编码, receiver:接受者id] + * @return: Page + * @Author: wanjia + * @Date: 2021/9/8 + */ @Override public Page getAllSysNotificationsPageList(int curPage, int pageSize, String orderBy, String platform, Integer receiver) { Page page = new Page(curPage, pageSize);