From 1876e50ba289eb7bcf6683eb65f359086967870a Mon Sep 17 00:00:00 2001 From: WangHao <43278047@qq.com> Date: Sun, 26 Jul 2020 20:15:47 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90=203?= =?UTF-8?q?=E5=BC=A0=E8=A1=A8=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 8 ++ ruoyi-admin/pom.xml | 5 +- .../main/java/com/ruoyi/RuoYiApplication.java | 3 + .../bookmark/SqBookmarkController.java | 101 ++++++++++++++++++ .../bookmark/SqLabelController.java | 97 +++++++++++++++++ .../controller/bookmark/SqMenuController.java | 97 +++++++++++++++++ .../src/main/resources/application.yml | 2 +- ruoyi-bookmark/pom.xml | 27 +++++ .../com/ruoyi/common/enums/BusinessType.java | 4 + 9 files changed, 342 insertions(+), 2 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/bookmark/SqBookmarkController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/bookmark/SqLabelController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/bookmark/SqMenuController.java create mode 100644 ruoyi-bookmark/pom.xml diff --git a/pom.xml b/pom.xml index bde1e1b39..0d983742a 100644 --- a/pom.xml +++ b/pom.xml @@ -173,6 +173,13 @@ ruoyi-system ${ruoyi.version} + + + + com.ruoyi + ruoyi-bookmark + ${ruoyi.version} + @@ -191,6 +198,7 @@ ruoyi-quartz ruoyi-generator ruoyi-common + ruoyi-bookmark pom diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 1ed741f4f..57ca6d16f 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -72,7 +72,10 @@ com.ruoyi ruoyi-generator - + + com.ruoyi + ruoyi-bookmark + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java index e3c56ee54..005ad7a94 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java @@ -1,14 +1,17 @@ package com.ruoyi; +import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; +import org.springframework.context.annotation.ComponentScan; /** * 启动程序 * * @author ruoyi */ + @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class }) public class RuoYiApplication { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bookmark/SqBookmarkController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bookmark/SqBookmarkController.java new file mode 100644 index 000000000..8e9c105f7 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bookmark/SqBookmarkController.java @@ -0,0 +1,101 @@ +package com.ruoyi.web.controller.bookmark; + + + +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.sq.domain.SqBookmark; +import com.ruoyi.sq.service.ISqBookmarkService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 书签Controller + * + * @author wanghao + * @date 2020-07-26 + */ +@RestController +@RequestMapping("/bookmark/bookmark") +public class SqBookmarkController extends BaseController +{ + @Autowired + private ISqBookmarkService sqBookmarkService; + + /** + * 查询书签列表 + */ + @Log(title = "用户管理", businessType = BusinessType.SELECT) + @PreAuthorize("@ss.hasPermi('bookmark:bookmark:list')") + @GetMapping("/list") + public TableDataInfo list(SqBookmark sqBookmark) + { + startPage(); + List list = sqBookmarkService.selectSqBookmarkList(sqBookmark); + return getDataTable(list); + } + + /** + * 导出书签列表 + */ + @PreAuthorize("@ss.hasPermi('bookmark:bookmark:export')") + @Log(title = "书签", businessType = BusinessType.EXPORT) + @GetMapping("/export") + public AjaxResult export(SqBookmark sqBookmark) + { + List list = sqBookmarkService.selectSqBookmarkList(sqBookmark); + ExcelUtil util = new ExcelUtil(SqBookmark.class); + return util.exportExcel(list, "bookmark"); + } + + /** + * 获取书签详细信息 + */ + @Log(title = "查询书签信息ID", businessType = BusinessType.SELECT) + @PreAuthorize("@ss.hasPermi('bookmark:bookmark:query')") + @GetMapping(value = "/{bookmarkId}") + public AjaxResult getInfo(@PathVariable("bookmarkId") Long bookmarkId) + { + return AjaxResult.success(sqBookmarkService.selectSqBookmarkById(bookmarkId)); + } + + /** + * 新增书签 + */ + @PreAuthorize("@ss.hasPermi('bookmark:bookmark:add')") + @Log(title = "新增书签", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody SqBookmark sqBookmark) + { + return toAjax(sqBookmarkService.insertSqBookmark(sqBookmark)); + } + + /** + * 修改书签 + */ + @PreAuthorize("@ss.hasPermi('bookmark:bookmark:edit')") + @Log(title = "修改书签", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody SqBookmark sqBookmark) + { + return toAjax(sqBookmarkService.updateSqBookmark(sqBookmark)); + } + + /** + * 删除书签 + */ + @PreAuthorize("@ss.hasPermi('bookmark:bookmark:remove')") + @Log(title = "删除书签", businessType = BusinessType.DELETE) + @DeleteMapping("/{bookmarkIds}") + public AjaxResult remove(@PathVariable Long[] bookmarkIds) + { + return toAjax(sqBookmarkService.deleteSqBookmarkByIds(bookmarkIds)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bookmark/SqLabelController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bookmark/SqLabelController.java new file mode 100644 index 000000000..f20126a2e --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bookmark/SqLabelController.java @@ -0,0 +1,97 @@ +package com.ruoyi.web.controller.bookmark; + +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.sq.domain.SqLabel; +import com.ruoyi.sq.service.ISqLabelService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 书签_标签Controller + * + * @author wanghao + * @date 2020-07-26 + */ +@RestController +@RequestMapping("/bookmark/label") +public class SqLabelController extends BaseController +{ + @Autowired + private ISqLabelService sqLabelService; + + /** + * 查询书签_标签列表 + */ + @PreAuthorize("@ss.hasPermi('bookmark:label:list')") + @GetMapping("/list") + public TableDataInfo list(SqLabel sqLabel) + { + startPage(); + List list = sqLabelService.selectSqLabelList(sqLabel); + return getDataTable(list); + } + + /** + * 导出书签_标签列表 + */ + @PreAuthorize("@ss.hasPermi('bookmark:label:export')") + @Log(title = "书签_标签", businessType = BusinessType.EXPORT) + @GetMapping("/export") + public AjaxResult export(SqLabel sqLabel) + { + List list = sqLabelService.selectSqLabelList(sqLabel); + ExcelUtil util = new ExcelUtil(SqLabel.class); + return util.exportExcel(list, "label"); + } + + /** + * 获取书签_标签详细信息 + */ + @PreAuthorize("@ss.hasPermi('bookmark:label:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return AjaxResult.success(sqLabelService.selectSqLabelById(id)); + } + + /** + * 新增书签_标签 + */ + @PreAuthorize("@ss.hasPermi('bookmark:label:add')") + @Log(title = "书签_标签", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody SqLabel sqLabel) + { + return toAjax(sqLabelService.insertSqLabel(sqLabel)); + } + + /** + * 修改书签_标签 + */ + @PreAuthorize("@ss.hasPermi('bookmark:label:edit')") + @Log(title = "书签_标签", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody SqLabel sqLabel) + { + return toAjax(sqLabelService.updateSqLabel(sqLabel)); + } + + /** + * 删除书签_标签 + */ + @PreAuthorize("@ss.hasPermi('bookmark:label:remove')") + @Log(title = "书签_标签", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(sqLabelService.deleteSqLabelByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bookmark/SqMenuController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bookmark/SqMenuController.java new file mode 100644 index 000000000..44733f85c --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bookmark/SqMenuController.java @@ -0,0 +1,97 @@ +package com.ruoyi.web.controller.bookmark; + +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.sq.domain.SqMenu; +import com.ruoyi.sq.service.ISqMenuService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 书签_菜单Controller + * + * @author wanghao + * @date 2020-07-26 + */ +@RestController +@RequestMapping("/bookmark/menu") +public class SqMenuController extends BaseController +{ + @Autowired + private ISqMenuService sqMenuService; + + /** + * 查询书签_菜单列表 + */ + @PreAuthorize("@ss.hasPermi('bookmark:menu:list')") + @GetMapping("/list") + public TableDataInfo list(SqMenu sqMenu) + { + startPage(); + List list = sqMenuService.selectSqMenuList(sqMenu); + return getDataTable(list); + } + + /** + * 导出书签_菜单列表 + */ + @PreAuthorize("@ss.hasPermi('bookmark:menu:export')") + @Log(title = "书签_菜单", businessType = BusinessType.EXPORT) + @GetMapping("/export") + public AjaxResult export(SqMenu sqMenu) + { + List list = sqMenuService.selectSqMenuList(sqMenu); + ExcelUtil util = new ExcelUtil(SqMenu.class); + return util.exportExcel(list, "menu"); + } + + /** + * 获取书签_菜单详细信息 + */ + @PreAuthorize("@ss.hasPermi('bookmark:menu:query')") + @GetMapping(value = "/{menuId}") + public AjaxResult getInfo(@PathVariable("menuId") Long menuId) + { + return AjaxResult.success(sqMenuService.selectSqMenuById(menuId)); + } + + /** + * 新增书签_菜单 + */ + @PreAuthorize("@ss.hasPermi('bookmark:menu:add')") + @Log(title = "书签_菜单", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody SqMenu sqMenu) + { + return toAjax(sqMenuService.insertSqMenu(sqMenu)); + } + + /** + * 修改书签_菜单 + */ + @PreAuthorize("@ss.hasPermi('bookmark:menu:edit')") + @Log(title = "书签_菜单", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody SqMenu sqMenu) + { + return toAjax(sqMenuService.updateSqMenu(sqMenu)); + } + + /** + * 删除书签_菜单 + */ + @PreAuthorize("@ss.hasPermi('bookmark:menu:remove')") + @Log(title = "书签_菜单", businessType = BusinessType.DELETE) + @DeleteMapping("/{menuIds}") + public AjaxResult remove(@PathVariable Long[] menuIds) + { + return toAjax(sqMenuService.deleteSqMenuByIds(menuIds)); + } +} diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 51c37e69a..752d36869 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -84,7 +84,7 @@ token: # 令牌密钥 secret: abcdefghijklmnopqrstuvwxyz # 令牌有效期（默认30分钟） - expireTime: 30 + expireTime: 300 # MyBatis配置 mybatis: diff --git a/ruoyi-bookmark/pom.xml b/ruoyi-bookmark/pom.xml new file mode 100644 index 000000000..05e3bf2c9 --- /dev/null +++ b/ruoyi-bookmark/pom.xml @@ -0,0 +1,27 @@ + + + + ruoyi + com.ruoyi + 3.0.0 + + 4.0.0 + + ruoyi-bookmark + + + bookmark系统模块 + + + + + + com.ruoyi + ruoyi-common + + + + + \ No newline at end of file diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java index 2bbeaf7d3..3aef24b76 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java @@ -7,6 +7,10 @@ package com.ruoyi.common.enums; */ public enum BusinessType { + /** + * 查询 + */ + SELECT, /** * 其它 */