From 389c06f396b9632c29b6749539a85cedfe175779 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=87=E4=BD=B3?= Date: Wed, 8 Sep 2021 09:10:00 +0800 Subject: [PATCH] =?UTF-8?q?type,status=E7=B1=BB=E5=9E=8BByte->Integer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- model/pom.xml | 1 + .../model/dao/entity/SysNotification.java | 12 ++++++------ .../model/dao/entity/vo/SysNotificationAddVo.java | 6 +++--- .../model/dao/mapper/SysNotificationMapper.java | 6 +++--- .../service/notification/SysNotificationService.java | 4 ++-- .../impl/SysNotificationServiceImpl.java | 6 +++--- .../model/service/notification/ServiceTests.java | 6 +++--- 7 files changed, 21 insertions(+), 20 deletions(-) diff --git a/model/pom.xml b/model/pom.xml index eb9a445..7b5a892 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -20,6 +20,7 @@ org.springframework.boot spring-boot-maven-plugin + 2.3.4.RELEASE true diff --git a/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/SysNotification.java b/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/SysNotification.java index cb9f319..60aaaec 100644 --- a/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/SysNotification.java +++ b/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/SysNotification.java @@ -19,9 +19,9 @@ public class SysNotification { private Date createdAt; - private Byte status; + private Integer status; - private Byte type; + private Integer type; private Boolean isDelete; @@ -73,19 +73,19 @@ public class SysNotification { this.createdAt = createdAt; } - public Byte getStatus() { + public Integer getStatus() { return status; } - public void setStatus(Byte status) { + public void setStatus(Integer status) { this.status = status; } - public Byte getType() { + public Integer getType() { return type; } - public void setType(Byte type) { + public void setType(Integer type) { this.type = type; } 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/SysNotificationAddVo.java index b3f7c95..ab62295 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/SysNotificationAddVo.java @@ -12,7 +12,7 @@ public class SysNotificationAddVo { private String notification_url; - private Byte type; + private Integer type; public String getPlatform() { return platform; @@ -54,11 +54,11 @@ public class SysNotificationAddVo { this.notification_url = notification_url; } - public Byte getType() { + public Integer getType() { return type; } - public void setType(Byte type) { + public void setType(Integer type) { this.type = type; } } diff --git a/model/src/main/java/cn/org/gitlink/notification/model/dao/mapper/SysNotificationMapper.java b/model/src/main/java/cn/org/gitlink/notification/model/dao/mapper/SysNotificationMapper.java index 80dcfe9..5393f9b 100644 --- a/model/src/main/java/cn/org/gitlink/notification/model/dao/mapper/SysNotificationMapper.java +++ b/model/src/main/java/cn/org/gitlink/notification/model/dao/mapper/SysNotificationMapper.java @@ -22,14 +22,14 @@ public interface SysNotificationMapper extends BaseMapper { int updateStatusByNotificationId(@Param("platform") String platform, @Param("notificationIds") String notificationIds, - @Param("status") Byte status); + @Param("status") Integer status); int getNewSysNotificationNumber(@Param("platform") String platform, @Param("receiver") Integer receiver); List getUnreadSysNotificationsList(@Param("platform") String platform, @Param("receiver") Integer receiver, - @Param("status") byte status, + @Param("status") Integer status, @Param("notificationNumber") Integer notificationNumber); List getSysNotificationPageList(Page page, String orderBy, @@ -38,5 +38,5 @@ public interface SysNotificationMapper extends BaseMapper { int getSysNotificationNumberByType(@Param("platform") String platform, @Param("receiver") Integer receiver, - @Param("type") Byte type); + @Param("type") Integer type); } 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 de1cc85..86d326d 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 @@ -10,13 +10,13 @@ import java.util.List; public interface SysNotificationService extends IService { boolean addSysNotificationForUsers(SysNotificationAddVo sysNotification); - int changeStatusByNotificationIds(String platform, String notificationIds, Byte status); + 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, Byte type); + 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 6155aec..4ab4420 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 @@ -32,7 +32,7 @@ public class SysNotificationServiceImpl extends ServiceImpl getUnreadSysNotificationsList(String platform, Integer receiver, Integer notificationNumber) { - List sysNotificationList = baseMapper.getUnreadSysNotificationsList(platform, receiver, (byte) 1, notificationNumber); + List sysNotificationList = baseMapper.getUnreadSysNotificationsList(platform, receiver, 1, notificationNumber); return sysNotificationList; } @Override - public int getSysNotificationNumberByType(String platform, Integer receiver, Byte type) { + public int getSysNotificationNumberByType(String platform, Integer receiver, Integer type) { return baseMapper.getSysNotificationNumberByType(platform, receiver, type); } 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 4f10041..7c75e97 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 @@ -34,15 +34,15 @@ public class ServiceTests { Page sysNotificationPage = sysNotificationService.getAllSysNotificationsPageList(1,10,"","gitlink", 100); SysNotificationAddVo sysNotificationAddVo = new SysNotificationAddVo(); sysNotificationAddVo.setSender((long) -1); - sysNotificationAddVo.setReceivers("1,2,3,4"); + 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); logger.info("insertResult:" + j); - int k = sysNotificationService.changeStatusByNotificationIds("gitlink", "2,3", (byte) 2); + int k = sysNotificationService.changeStatusByNotificationIds("gitlink", "2,3", 2); logger.info("updateStatus:" + k); - int l = sysNotificationService.getSysNotificationNumberByType("gitlink", 100, (byte) 1); + int l = sysNotificationService.getSysNotificationNumberByType("gitlink", 100, 1); logger.info("SysNotificationNumber:" + l); } -- 2.34.1