From 83b90c3267c43d1703801b575b93fb5ad36671ea Mon Sep 17 00:00:00 2001 From: RuoYi Date: Fri, 12 Jan 2024 11:57:22 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=85=AC=E5=91=8A=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E8=AF=A6=E7=BB=86=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/SysNoticeController.java | 11 ++++++++ .../templates/system/notice/notice.html | 10 ++++--- .../templates/system/notice/view.html | 27 +++++++++++++++++++ .../resources/templates/system/user/view.html | 2 +- .../mapper/system/SysNoticeMapper.xml | 2 +- sql/{ry_20240104.sql => ry_20240112.sql} | 3 ++- 6 files changed, 49 insertions(+), 6 deletions(-) create mode 100644 ruoyi-admin/src/main/resources/templates/system/notice/view.html rename sql/{ry_20240104.sql => ry_20240112.sql} (95%) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java index 3da43269..c83af282 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java @@ -99,6 +99,17 @@ public class SysNoticeController extends BaseController return toAjax(noticeService.updateNotice(notice)); } + /** + * 查询公告详细 + */ + @RequiresPermissions("system:notice:list") + @GetMapping("/view/{noticeId}") + public String view(@PathVariable("noticeId") Long noticeId, ModelMap mmap) + { + mmap.put("notice", noticeService.selectNoticeById(noticeId)); + return prefix + "/view"; + } + /** * 删除公告 */ diff --git a/ruoyi-admin/src/main/resources/templates/system/notice/notice.html b/ruoyi-admin/src/main/resources/templates/system/notice/notice.html index eb7d30dd..4ad5c895 100644 --- a/ruoyi-admin/src/main/resources/templates/system/notice/notice.html +++ b/ruoyi-admin/src/main/resources/templates/system/notice/notice.html @@ -59,6 +59,7 @@ $(function() { var options = { url: prefix + "/list", + viewUrl: prefix + "/view/{id}", createUrl: prefix + "/add", updateUrl: prefix + "/edit/{id}", removeUrl: prefix + "/remove", @@ -71,9 +72,12 @@ title : '序号' }, { - field : 'noticeTitle', - title : '公告标题' - }, + field: 'noticeTitle', + title: '公告标题', + formatter: function (value, row, index) { + return '' + value + ''; + } + }, { field: 'noticeType', title: '公告类型', diff --git a/ruoyi-admin/src/main/resources/templates/system/notice/view.html b/ruoyi-admin/src/main/resources/templates/system/notice/view.html new file mode 100644 index 00000000..38791c64 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/notice/view.html @@ -0,0 +1,27 @@ + + + + + + +
+
+
+
+
+

[[${notice.noticeTitle}]]

+
+ 发送时间：[[${#dates.format(notice.createTime, 'yyyy-MM-dd HH:mm:ss')}]] + 发件人： [[${notice.createBy}]] +
+
+
+
+
+
+
+
+
+ + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/user/view.html b/ruoyi-admin/src/main/resources/templates/system/user/view.html index 2757e1ee..d3d17716 100644 --- a/ruoyi-admin/src/main/resources/templates/system/user/view.html +++ b/ruoyi-admin/src/main/resources/templates/system/user/view.html @@ -1,7 +1,7 @@ - +
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml index dfca13c0..c2037c9e 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml @@ -18,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select notice_id, notice_title, notice_type, notice_content, status, create_by, create_time, update_by, update_time, remark + select notice_id, notice_title, notice_type, cast(notice_content as char) as notice_content, status, create_by, create_time, update_by, update_time, remark from sys_notice diff --git a/sql/ry_20240104.sql b/sql/ry_20240112.sql similarity index 95% rename from sql/ry_20240104.sql rename to sql/ry_20240112.sql index dcf0ce74..eab64b0b 100644 --- a/sql/ry_20240104.sql +++ b/sql/ry_20240112.sql @@ -643,7 +643,7 @@ create table sys_notice ( notice_id int(4) not null auto_increment comment '公告ID', notice_title varchar(50) not null comment '公告标题', notice_type char(1) not null comment '公告类型（1通知 2公告）', - notice_content varchar(2000) default null comment '公告内容', + notice_content longblob default null comment '公告内容', status char(1) default '0' comment '公告状态（0正常 1关闭）', create_by varchar(64) default '' comment '创建者', create_time datetime comment '创建时间', @@ -658,6 +658,7 @@ create table sys_notice ( -- ---------------------------- insert into sys_notice values('1', '温馨提醒：2018-07-01 若依新版本发布啦', '2', '新版本内容', '0', 'admin', sysdate(), '', null, '管理员'); insert into sys_notice values('2', '维护通知：2018-07-01 若依系统凌晨维护', '1', '维护内容', '0', 'admin', sysdate(), '', null, '管理员'); +insert into sys_notice values('3', '若依开源框架介绍', '1', '

项目介绍

RuoYi开源项目是为企业用户定制的后台脚手架框架，为企业打造的一站式解决方案，降低企业开发成本，提升开发效率。主要包括用户管理、角色管理、部门管理、菜单管理、参数管理、字典管理、岗位管理、定时任务、服务监控、登录日志、操作日志、代码生成等功能。其中，还支持多数据源、数据权限、国际化、Redis缓存、Docker部署、滑动验证码、第三方认证登录、分布式事务、分布式文件存储、分库分表处理等技术特点。


官网及演示

若依官网地址： http://ruoyi.vip

若依文档地址： http://doc.ruoyi.vip

演示地址【不分离版】： http://demo.ruoyi.vip

演示地址【分离版本】： http://vue.ruoyi.vip

演示地址【微服务版】： http://cloud.ruoyi.vip

演示地址【移动端版】： http://h5.ruoyi.vip


', '0', 'admin', sysdate(), '', null, '管理员'); -- ----------------------------