From 475ee06f7a3445076853b54d9d1dc4b98ea0d94d Mon Sep 17 00:00:00 2001 From: little-cat-sweet <2116400472@qq.com> Date: Thu, 5 Aug 2021 16:07:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=B0=8F=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=B1=95=E7=A4=BA=E5=92=8C=E6=9C=AA=E8=AE=80?= =?UTF-8?q?=E6=95=B8=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SysNoticeController.java | 22 +++++++++++++++++++ .../system/domain/XhpcNoticeReadEntity.java | 12 ++++++++++ .../xhpc/system/mapper/SysNoticeMapper.java | 20 +++++++++++++++++ .../system/service/ISysNoticeService.java | 15 +++++++++++++ .../service/impl/SysNoticeServiceImpl.java | 14 ++++++++++++ .../mapper/system/SysNoticeMapper.xml | 14 ++++++++++++ 6 files changed, 97 insertions(+) create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/domain/XhpcNoticeReadEntity.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/controller/SysNoticeController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/controller/SysNoticeController.java index e130ca08..1fafd517 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/controller/SysNoticeController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/controller/SysNoticeController.java @@ -90,4 +90,26 @@ public class SysNoticeController extends BaseController { return toAjax(noticeService.deleteNoticeByIds(noticeIds)); } + + + /** + * Showing notice items in small app. + * @return + */ + @GetMapping(value = "/show") + public TableDataInfo show(){ + + startPage(); + return getDataTable(noticeService.show()); + } + + @GetMapping(value = "/showNotRead") + public AjaxResult showNotRead(Integer userId){ + + return AjaxResult.success(noticeService.showNotRead(userId)); + + } + + + } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/domain/XhpcNoticeReadEntity.java b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/domain/XhpcNoticeReadEntity.java new file mode 100644 index 00000000..8edebd93 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/domain/XhpcNoticeReadEntity.java @@ -0,0 +1,12 @@ +package com.xhpc.system.domain; + +import com.xhpc.common.core.web.domain.BaseEntity; + +/** + * program: ruoyi + * User: HongYun + * Date:2021-08-05 16 + */ +public class XhpcNoticeReadEntity extends BaseEntity { +// private +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/mapper/SysNoticeMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/mapper/SysNoticeMapper.java index 705cbcd8..67049dd5 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/mapper/SysNoticeMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/mapper/SysNoticeMapper.java @@ -1,8 +1,10 @@ package com.xhpc.system.mapper; import java.util.List; +import java.util.Map; import com.xhpc.system.domain.SysNotice; +import org.apache.ibatis.annotations.Param; /** * 通知公告表 数据层 @@ -58,4 +60,22 @@ public interface SysNoticeMapper * @return 结果 */ public int deleteNoticeByIds(Long[] noticeIds); + + /** + * Showing notice items in the small app. + * @return + */ + List> selectTypeContentCreateTime(); + + /** + * Show the number of notices which have not been read in small app. + * @param userId + * @return + */ + int countNotRead(@Param("userId") Integer userId); + + + List selectNotReadIds(@Param("userId") Integer userId); + + } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/service/ISysNoticeService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/service/ISysNoticeService.java index cff33a72..4510917b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/service/ISysNoticeService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/service/ISysNoticeService.java @@ -1,6 +1,7 @@ package com.xhpc.system.service; import java.util.List; +import java.util.Map; import com.xhpc.system.domain.SysNotice; @@ -58,4 +59,18 @@ public interface ISysNoticeService * @return 结果 */ public int deleteNoticeByIds(Long[] noticeIds); + + + /** + * Showing notice items in small app. + * @return + */ + List> show(); + + /** + * Show the number of notices which have not been read in small app. + * @param userId + * @return + */ + int showNotRead(Integer userId); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/service/impl/SysNoticeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/service/impl/SysNoticeServiceImpl.java index f756fe42..c73da00c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/service/impl/SysNoticeServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/service/impl/SysNoticeServiceImpl.java @@ -1,6 +1,7 @@ package com.xhpc.system.service.impl; import java.util.List; +import java.util.Map; import com.xhpc.system.domain.SysNotice; import com.xhpc.system.mapper.SysNoticeMapper; @@ -90,4 +91,17 @@ public class SysNoticeServiceImpl implements ISysNoticeService { return noticeMapper.deleteNoticeByIds(noticeIds); } + + + @Override + public List> show() { + + return noticeMapper.selectTypeContentCreateTime(); + } + + @Override + public int showNotRead(Integer userId) { + + return noticeMapper.countNotRead(userId); + } } diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml index 31d77f29..0bd90d00 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml @@ -95,4 +95,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + +