修改notice接口

sql/guns.sql

@@ -16,7 +16,7 @@ USE guns;
  Target Server Version : 50724
  Target Server Version : 50724
  File Encoding         : 65001
  File Encoding         : 65001
 
 
- Date: 29/03/2019 16:33:40
+ Date: 29/03/2019 17:30:55
 */
 */
 
 
 SET NAMES utf8mb4;
 SET NAMES utf8mb4;
@@ -153,7 +153,7 @@ CREATE TABLE `sys_login_log` (
   `MESSAGE` text COMMENT '具体消息',
   `MESSAGE` text COMMENT '具体消息',
   `IP_ADDRESS` varchar(255) DEFAULT NULL COMMENT '登录ip',
   `IP_ADDRESS` varchar(255) DEFAULT NULL COMMENT '登录ip',
   PRIMARY KEY (`LOGIN_LOG_ID`) USING BTREE
   PRIMARY KEY (`LOGIN_LOG_ID`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=1111546715636293634 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='登录记录';
+) ENGINE=InnoDB AUTO_INCREMENT=1111561148093767683 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='登录记录';
 
 
 -- ----------------------------
 -- ----------------------------
 -- Table structure for sys_menu
 -- Table structure for sys_menu
@@ -219,7 +219,7 @@ INSERT INTO `sys_menu` VALUES (141, 'notice', 'system', '[0],[system],', '通知
 INSERT INTO `sys_menu` VALUES (142, 'notice_add', 'notice', '[0],[system],[notice],', '添加通知', NULL, '/notice/add', 1, 3, 'N', NULL, 'ENABLE', NULL, NULL, NULL, '2019-03-29 16:32:27', NULL, 1);
 INSERT INTO `sys_menu` VALUES (142, 'notice_add', 'notice', '[0],[system],[notice],', '添加通知', NULL, '/notice/add', 1, 3, 'N', NULL, 'ENABLE', NULL, NULL, NULL, '2019-03-29 16:32:27', NULL, 1);
 INSERT INTO `sys_menu` VALUES (143, 'notice_update', 'notice', '[0],[system],[notice],', '修改通知', NULL, '/notice/update', 2, 3, 'N', NULL, 'ENABLE', NULL, NULL, NULL, '2019-03-29 16:32:27', NULL, 1);
 INSERT INTO `sys_menu` VALUES (143, 'notice_update', 'notice', '[0],[system],[notice],', '修改通知', NULL, '/notice/update', 2, 3, 'N', NULL, 'ENABLE', NULL, NULL, NULL, '2019-03-29 16:32:27', NULL, 1);
 INSERT INTO `sys_menu` VALUES (144, 'notice_delete', 'notice', '[0],[system],[notice],', '删除通知', NULL, '/notice/delete', 3, 3, 'N', NULL, 'ENABLE', NULL, NULL, NULL, '2019-03-29 16:32:27', NULL, 1);
 INSERT INTO `sys_menu` VALUES (144, 'notice_delete', 'notice', '[0],[system],[notice],', '删除通知', NULL, '/notice/delete', 3, 3, 'N', NULL, 'ENABLE', NULL, NULL, NULL, '2019-03-29 16:32:27', NULL, 1);
-INSERT INTO `sys_menu` VALUES (145, 'sys_message', 'dashboard', '[0],[dashboard],', '消息页', 'layui-icon layui-icon-tips', '/notice/hello', 30, 2, 'Y', NULL, 'ENABLE', NULL, NULL, NULL, '2019-03-29 16:31:05', NULL, 1);
+INSERT INTO `sys_menu` VALUES (145, 'sys_message', 'dashboard', '[0],[dashboard],', '消息页', 'layui-icon layui-icon-tips', '/system/notice', 30, 2, 'Y', NULL, 'ENABLE', NULL, NULL, NULL, '2019-03-29 17:30:28', NULL, 1);
 INSERT INTO `sys_menu` VALUES (149, 'api_mgr', 'dev_tools', '[0],[dev_tools],', '接口文档', 'fa-leaf', '/swagger-ui.html', 2, 2, 'Y', NULL, 'ENABLE', NULL, NULL, NULL, '2019-03-29 16:31:59', NULL, 1);
 INSERT INTO `sys_menu` VALUES (149, 'api_mgr', 'dev_tools', '[0],[dev_tools],', '接口文档', 'fa-leaf', '/swagger-ui.html', 2, 2, 'Y', NULL, 'ENABLE', NULL, NULL, NULL, '2019-03-29 16:31:59', NULL, 1);
 INSERT INTO `sys_menu` VALUES (150, 'to_menu_edit', 'menu', '[0],[system],[menu],', '菜单编辑跳转', '', '/menu/menu_edit', 4, 3, 'N', NULL, 'ENABLE', NULL, NULL, NULL, '2019-03-29 16:32:27', NULL, 1);
 INSERT INTO `sys_menu` VALUES (150, 'to_menu_edit', 'menu', '[0],[system],[menu],', '菜单编辑跳转', '', '/menu/menu_edit', 4, 3, 'N', NULL, 'ENABLE', NULL, NULL, NULL, '2019-03-29 16:32:27', NULL, 1);
 INSERT INTO `sys_menu` VALUES (151, 'menu_list', 'menu', '[0],[system],[menu],', '菜单列表', '', '/menu/list', 5, 3, 'N', NULL, 'ENABLE', NULL, NULL, NULL, '2019-03-29 16:32:27', NULL, 1);
 INSERT INTO `sys_menu` VALUES (151, 'menu_list', 'menu', '[0],[system],[menu],', '菜单列表', '', '/menu/list', 5, 3, 'N', NULL, 'ENABLE', NULL, NULL, NULL, '2019-03-29 16:32:27', NULL, 1);
@@ -288,7 +288,7 @@ CREATE TABLE `sys_operation_log` (
   `SUCCEED` varchar(32) DEFAULT NULL COMMENT '是否成功(字典)',
   `SUCCEED` varchar(32) DEFAULT NULL COMMENT '是否成功(字典)',
   `MESSAGE` text COMMENT '备注',
   `MESSAGE` text COMMENT '备注',
   PRIMARY KEY (`OPERATION_LOG_ID`) USING BTREE
   PRIMARY KEY (`OPERATION_LOG_ID`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=1111546647533379586 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='操作日志';
+) ENGINE=InnoDB AUTO_INCREMENT=1111561249361043458 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='操作日志';
 
 
 -- ----------------------------
 -- ----------------------------
 -- Table structure for sys_relation
 -- Table structure for sys_relation

src/main/java/cn/stylefeng/guns/modular/system/controller/NoticeController.java

@@ -40,7 +40,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 
 import java.util.Date;
 import java.util.Date;
-import java.util.List;
 import java.util.Map;
 import java.util.Map;
 
 
 /**
 /**
@@ -95,19 +94,6 @@ public class NoticeController extends BaseController {
     }
     }
 
 
     /**
     /**
-     * 跳转到首页通知
-     *
-     * @author fengshuonan
-     * @Date 2018/12/23 6:06 PM
-     */
-    @RequestMapping("/hello")
-    public String hello() {
-        List<Notice> notices = noticeService.list();
-        super.setAttr("noticeList", notices);
-        return PREFIX + "notice_index.html";
-    }
-
-    /**
      * 获取通知列表
      * 获取通知列表
      *
      *
      * @author fengshuonan
      * @author fengshuonan

src/main/java/cn/stylefeng/guns/modular/system/controller/SystemController.java

@@ -26,9 +26,11 @@ import cn.stylefeng.guns.core.log.LogObjectHolder;
 import cn.stylefeng.guns.core.shiro.ShiroKit;
 import cn.stylefeng.guns.core.shiro.ShiroKit;
 import cn.stylefeng.guns.core.shiro.ShiroUser;
 import cn.stylefeng.guns.core.shiro.ShiroUser;
 import cn.stylefeng.guns.modular.system.entity.FileInfo;
 import cn.stylefeng.guns.modular.system.entity.FileInfo;
+import cn.stylefeng.guns.modular.system.entity.Notice;
 import cn.stylefeng.guns.modular.system.entity.User;
 import cn.stylefeng.guns.modular.system.entity.User;
 import cn.stylefeng.guns.modular.system.factory.UserFactory;
 import cn.stylefeng.guns.modular.system.factory.UserFactory;
 import cn.stylefeng.guns.modular.system.service.FileInfoService;
 import cn.stylefeng.guns.modular.system.service.FileInfoService;
+import cn.stylefeng.guns.modular.system.service.NoticeService;
 import cn.stylefeng.guns.modular.system.service.UserService;
 import cn.stylefeng.guns.modular.system.service.UserService;
 import cn.stylefeng.roses.core.base.controller.BaseController;
 import cn.stylefeng.roses.core.base.controller.BaseController;
 import cn.stylefeng.roses.core.reqres.response.ResponseData;
 import cn.stylefeng.roses.core.reqres.response.ResponseData;
@@ -50,6 +52,7 @@ import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.net.URLDecoder;
 import java.util.HashMap;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Map;
 import java.util.UUID;
 import java.util.UUID;
 
 
@@ -71,6 +74,9 @@ public class SystemController extends BaseController {
     private FileInfoService fileInfoService;
     private FileInfoService fileInfoService;
 
 
     @Autowired
     @Autowired
+    private NoticeService noticeService;
+
+    @Autowired
     private GunsProperties gunsProperties;
     private GunsProperties gunsProperties;
 
 
     /**
     /**
@@ -96,6 +102,19 @@ public class SystemController extends BaseController {
     }
     }
 
 
     /**
     /**
+     * 跳转到首页通知
+     *
+     * @author fengshuonan
+     * @Date 2018/12/23 6:06 PM
+     */
+    @RequestMapping("/notice")
+    public String hello() {
+        List<Notice> notices = noticeService.list();
+        super.setAttr("noticeList", notices);
+        return "/modular/frame/notice.html";
+    }
+
+    /**
      * 主页面
      * 主页面
      *
      *
      * @author fengshuonan
      * @author fengshuonan