From c4b4684e689f31b725bf7784de068d841790154c Mon Sep 17 00:00:00 2001 From: WangHao <43278047@qq.com> Date: Sun, 2 Aug 2020 23:12:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B9=A6=E7=AD=BE=E7=AE=A1=E7=90=86=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 53 +-- ruoyi-admin/pom.xml | 19 +- .../bookmark/SqLabelController.java | 97 ----- .../controller/bookmark/SqMenuController.java | 97 ----- .../SqBookmarkController.java | 78 ++-- .../java/com/ruoyi/sq/domain/SqLabel.java | 94 ----- .../main/java/com/ruoyi/sq/domain/SqMenu.java | 122 ------ .../com/ruoyi/sq/mapper/SqBookmarkMapper.java | 61 --- .../com/ruoyi/sq/mapper/SqLabelMapper.java | 62 --- .../com/ruoyi/sq/mapper/SqMenuMapper.java | 61 --- .../ruoyi/sq/service/ISqBookmarkService.java | 61 --- .../com/ruoyi/sq/service/ISqLabelService.java | 62 --- .../com/ruoyi/sq/service/ISqMenuService.java | 62 --- .../sq/service/impl/SqLabelServiceImpl.java | 96 ----- .../sq/service/impl/SqMenuServiceImpl.java | 97 ----- .../mapper.bookmark/SqLabelMapper.xml | 76 ---- .../mapper.bookmark/SqMenuMapper.xml | 86 ---- ruoyi-framework/pom.xml | 8 +- ruoyi-ui/src/api/bookmark/bookmark.js | 53 +++ .../src/views/bookmark/bookmark/index.vue | 398 ++++++++++++++++++ {ruoyi-bookmark => ruoyi-yunbookmark}/pom.xml | 10 +- .../ruoyi/bookmark}/domain/SqBookmark.java | 6 +- .../bookmark/mapper/SqBookmarkMapper.java | 70 +++ .../bookmark/service/ISqBookmarkService.java | 72 ++++ .../service/impl/SqBookmarkServiceImpl.java | 68 +-- .../mapper/bookmark}/SqBookmarkMapper.xml | 20 +- 26 files changed, 743 insertions(+), 1246 deletions(-) delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/bookmark/SqLabelController.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/bookmark/SqMenuController.java rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/{bookmark => yunbookmark}/SqBookmarkController.java (62%) delete mode 100644 ruoyi-bookmark/src/main/java/com/ruoyi/sq/domain/SqLabel.java delete mode 100644 ruoyi-bookmark/src/main/java/com/ruoyi/sq/domain/SqMenu.java delete mode 100644 ruoyi-bookmark/src/main/java/com/ruoyi/sq/mapper/SqBookmarkMapper.java delete mode 100644 ruoyi-bookmark/src/main/java/com/ruoyi/sq/mapper/SqLabelMapper.java delete mode 100644 ruoyi-bookmark/src/main/java/com/ruoyi/sq/mapper/SqMenuMapper.java delete mode 100644 ruoyi-bookmark/src/main/java/com/ruoyi/sq/service/ISqBookmarkService.java delete mode 100644 ruoyi-bookmark/src/main/java/com/ruoyi/sq/service/ISqLabelService.java delete mode 100644 ruoyi-bookmark/src/main/java/com/ruoyi/sq/service/ISqMenuService.java delete mode 100644 ruoyi-bookmark/src/main/java/com/ruoyi/sq/service/impl/SqLabelServiceImpl.java delete mode 100644 ruoyi-bookmark/src/main/java/com/ruoyi/sq/service/impl/SqMenuServiceImpl.java delete mode 100644 ruoyi-bookmark/src/main/resources/mapper.bookmark/SqLabelMapper.xml delete mode 100644 ruoyi-bookmark/src/main/resources/mapper.bookmark/SqMenuMapper.xml create mode 100644 ruoyi-ui/src/api/bookmark/bookmark.js create mode 100644 ruoyi-ui/src/views/bookmark/bookmark/index.vue rename {ruoyi-bookmark => ruoyi-yunbookmark}/pom.xml (87%) rename {ruoyi-bookmark/src/main/java/com/ruoyi/sq => ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark}/domain/SqBookmark.java (97%) create mode 100644 ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/mapper/SqBookmarkMapper.java create mode 100644 ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/service/ISqBookmarkService.java rename {ruoyi-bookmark/src/main/java/com/ruoyi/sq => ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark}/service/impl/SqBookmarkServiceImpl.java (58%) rename {ruoyi-bookmark/src/main/resources/mapper.bookmark => ruoyi-yunbookmark/src/main/resources/mapper/bookmark}/SqBookmarkMapper.xml (93%) diff --git a/pom.xml b/pom.xml index 0d983742a..35127175a 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - + com.ruoyi ruoyi 3.0.0 @@ -11,7 +11,7 @@ ruoyi http://www.ruoyi.vip 若依管理系统 - + 3.0.0 UTF-8 @@ -31,11 +31,11 @@ 1.7 0.9.0 - + - + org.springframework.boot @@ -44,35 +44,35 @@ pom import - + com.alibaba druid-spring-boot-starter ${druid.version} - + eu.bitwalker UserAgentUtils ${bitwalker.version} - + com.github.pagehelper pagehelper-spring-boot-starter ${pagehelper.boot.version} - + com.github.oshi oshi-core ${oshi.version} - + io.springfox @@ -89,84 +89,84 @@ - + io.springfox springfox-swagger-ui ${swagger.version} - + commons-io commons-io ${commons.io.version} - + commons-fileupload commons-fileupload ${commons.fileupload.version} - + org.apache.poi poi-ooxml ${poi.version} - + org.apache.velocity velocity ${velocity.version} - + com.alibaba fastjson ${fastjson.version} - + io.jsonwebtoken jjwt ${jwt.version} - + com.github.penggle kaptcha ${kaptcha.version} - + com.ruoyi ruoyi-quartz ${ruoyi.version} - + com.ruoyi ruoyi-generator ${ruoyi.version} - + com.ruoyi ruoyi-framework ${ruoyi.version} - + com.ruoyi @@ -174,13 +174,13 @@ ${ruoyi.version} - + com.ruoyi - ruoyi-bookmark + ruoyi-yunbookmark ${ruoyi.version} - + com.ruoyi @@ -198,7 +198,8 @@ ruoyi-quartz ruoyi-generator ruoyi-common - ruoyi-bookmark + ruoyi-yunbookmark + pom @@ -247,4 +248,4 @@ - \ No newline at end of file + diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 57ca6d16f..1919054cd 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -72,10 +72,7 @@ com.ruoyi ruoyi-generator - - com.ruoyi - ruoyi-bookmark - + @@ -95,17 +92,17 @@ - - org.apache.maven.plugins - maven-war-plugin - 3.0.0 + + org.apache.maven.plugins + maven-war-plugin + 3.0.0 false ${project.artifactId} - - + + ${project.artifactId} - \ No newline at end of file + 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 deleted file mode 100644 index f20126a2e..000000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bookmark/SqLabelController.java +++ /dev/null @@ -1,97 +0,0 @@ -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 deleted file mode 100644 index 44733f85c..000000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bookmark/SqMenuController.java +++ /dev/null @@ -1,97 +0,0 @@ -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/java/com/ruoyi/web/controller/bookmark/SqBookmarkController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/SqBookmarkController.java similarity index 62% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/bookmark/SqBookmarkController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/SqBookmarkController.java index 8e9c105f7..f781ecf06 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bookmark/SqBookmarkController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/SqBookmarkController.java @@ -1,26 +1,32 @@ -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.*; +package com.ruoyi.web.controller.yunbookmark; import java.util.List; +import com.ruoyi.bookmark.domain.SqBookmark; +import com.ruoyi.bookmark.service.ISqBookmarkService; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; + +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + /** - * 书签Controller - * + * 书签管理Controller + * * @author wanghao - * @date 2020-07-26 + * @date 2020-08-02 */ @RestController @RequestMapping("/bookmark/bookmark") @@ -29,10 +35,23 @@ public class SqBookmarkController extends BaseController @Autowired private ISqBookmarkService sqBookmarkService; + + /** - * 查询书签列表 + * 查询用户栏目下的书签 + * @return + */ + @GetMapping("/selectBymenuIdUserID") + public TableDataInfo selectBymenuIdUserID(Long menuID, Long userID) { + startPage(); + List list = sqBookmarkService.selectBymenuIdUserID(menuID,userID); + return getDataTable(list); + } + + + /** + * 查询书签管理列表 */ - @Log(title = "用户管理", businessType = BusinessType.SELECT) @PreAuthorize("@ss.hasPermi('bookmark:bookmark:list')") @GetMapping("/list") public TableDataInfo list(SqBookmark sqBookmark) @@ -43,10 +62,10 @@ public class SqBookmarkController extends BaseController } /** - * 导出书签列表 + * 导出书签管理列表 */ @PreAuthorize("@ss.hasPermi('bookmark:bookmark:export')") - @Log(title = "书签", businessType = BusinessType.EXPORT) + @Log(title = "书签管理", businessType = BusinessType.EXPORT) @GetMapping("/export") public AjaxResult export(SqBookmark sqBookmark) { @@ -56,9 +75,8 @@ public class SqBookmarkController extends BaseController } /** - * 获取书签详细信息 + * 获取书签管理详细信息 */ - @Log(title = "查询书签信息ID", businessType = BusinessType.SELECT) @PreAuthorize("@ss.hasPermi('bookmark:bookmark:query')") @GetMapping(value = "/{bookmarkId}") public AjaxResult getInfo(@PathVariable("bookmarkId") Long bookmarkId) @@ -67,10 +85,10 @@ public class SqBookmarkController extends BaseController } /** - * 新增书签 + * 新增书签管理 */ @PreAuthorize("@ss.hasPermi('bookmark:bookmark:add')") - @Log(title = "新增书签", businessType = BusinessType.INSERT) + @Log(title = "书签管理", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody SqBookmark sqBookmark) { @@ -78,10 +96,10 @@ public class SqBookmarkController extends BaseController } /** - * 修改书签 + * 修改书签管理 */ @PreAuthorize("@ss.hasPermi('bookmark:bookmark:edit')") - @Log(title = "修改书签", businessType = BusinessType.UPDATE) + @Log(title = "书签管理", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody SqBookmark sqBookmark) { @@ -89,10 +107,10 @@ public class SqBookmarkController extends BaseController } /** - * 删除书签 + * 删除书签管理 */ @PreAuthorize("@ss.hasPermi('bookmark:bookmark:remove')") - @Log(title = "删除书签", businessType = BusinessType.DELETE) + @Log(title = "书签管理", businessType = BusinessType.DELETE) @DeleteMapping("/{bookmarkIds}") public AjaxResult remove(@PathVariable Long[] bookmarkIds) { diff --git a/ruoyi-bookmark/src/main/java/com/ruoyi/sq/domain/SqLabel.java b/ruoyi-bookmark/src/main/java/com/ruoyi/sq/domain/SqLabel.java deleted file mode 100644 index 4b8b7532a..000000000 --- a/ruoyi-bookmark/src/main/java/com/ruoyi/sq/domain/SqLabel.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.ruoyi.sq.domain; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 书签_标签对象 sq_label - * - * @author wanghao - * @date 2020-07-26 - */ -public class SqLabel extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** $column.columnComment */ - private Long id; - - /** 书签所属id */ - @Excel(name = "书签所属id") - private Integer userId; - - /** 书签名字 */ - @Excel(name = "书签名字") - private String labelName; - - /** 排序 */ - @Excel(name = "排序") - private Integer order; - - /** 使用数量 */ - @Excel(name = "使用数量") - private Long labelCount; - - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - public void setUserId(Integer userId) - { - this.userId = userId; - } - - public Integer getUserId() - { - return userId; - } - public void setLabelName(String labelName) - { - this.labelName = labelName; - } - - public String getLabelName() - { - return labelName; - } - public void setOrder(Integer order) - { - this.order = order; - } - - public Integer getOrder() - { - return order; - } - public void setLabelCount(Long labelCount) - { - this.labelCount = labelCount; - } - - public Long getLabelCount() - { - return labelCount; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("userId", getUserId()) - .append("labelName", getLabelName()) - .append("order", getOrder()) - .append("createTime", getCreateTime()) - .append("labelCount", getLabelCount()) - .toString(); - } -} diff --git a/ruoyi-bookmark/src/main/java/com/ruoyi/sq/domain/SqMenu.java b/ruoyi-bookmark/src/main/java/com/ruoyi/sq/domain/SqMenu.java deleted file mode 100644 index ef6e4c9ea..000000000 --- a/ruoyi-bookmark/src/main/java/com/ruoyi/sq/domain/SqMenu.java +++ /dev/null @@ -1,122 +0,0 @@ -package com.ruoyi.sq.domain; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 书签_菜单对象 sq_menu - * - * @author wanghao - * @date 2020-07-26 - */ -public class SqMenu extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** $column.columnComment */ - private Long menuId; - - /** 归属用户ID */ - @Excel(name = "归属用户ID") - private Long userId; - - /** 分类名称 */ - @Excel(name = "分类名称") - private String menuName; - - /** 菜单url */ - @Excel(name = "菜单url") - private String menuUrl; - - /** 菜单图标 */ - @Excel(name = "菜单图标") - private String menuIcon; - - /** 父菜单id */ - @Excel(name = "父菜单id") - private Long parentId; - - /** 菜单顺序 */ - @Excel(name = "菜单顺序") - private Integer menuOrder; - - public void setMenuId(Long menuId) - { - this.menuId = menuId; - } - - public Long getMenuId() - { - return menuId; - } - public void setUserId(Long userId) - { - this.userId = userId; - } - - public Long getUserId() - { - return userId; - } - public void setMenuName(String menuName) - { - this.menuName = menuName; - } - - public String getMenuName() - { - return menuName; - } - public void setMenuUrl(String menuUrl) - { - this.menuUrl = menuUrl; - } - - public String getMenuUrl() - { - return menuUrl; - } - public void setMenuIcon(String menuIcon) - { - this.menuIcon = menuIcon; - } - - public String getMenuIcon() - { - return menuIcon; - } - public void setParentId(Long parentId) - { - this.parentId = parentId; - } - - public Long getParentId() - { - return parentId; - } - public void setMenuOrder(Integer menuOrder) - { - this.menuOrder = menuOrder; - } - - public Integer getMenuOrder() - { - return menuOrder; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("menuId", getMenuId()) - .append("userId", getUserId()) - .append("menuName", getMenuName()) - .append("menuUrl", getMenuUrl()) - .append("menuIcon", getMenuIcon()) - .append("parentId", getParentId()) - .append("menuOrder", getMenuOrder()) - .append("createTime", getCreateTime()) - .toString(); - } -} diff --git a/ruoyi-bookmark/src/main/java/com/ruoyi/sq/mapper/SqBookmarkMapper.java b/ruoyi-bookmark/src/main/java/com/ruoyi/sq/mapper/SqBookmarkMapper.java deleted file mode 100644 index 15d6f2d7c..000000000 --- a/ruoyi-bookmark/src/main/java/com/ruoyi/sq/mapper/SqBookmarkMapper.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.ruoyi.sq.mapper; - -import java.util.List; -import com.ruoyi.sq.domain.SqBookmark; - -/** - * 书签Mapper接口 - * - * @author wanghao - * @date 2020-07-26 - */ -public interface SqBookmarkMapper -{ - /** - * 查询书签 - * - * @param bookmarkId 书签ID - * @return 书签 - */ - public SqBookmark selectSqBookmarkById(Long bookmarkId); - - /** - * 查询书签列表 - * - * @param sqBookmark 书签 - * @return 书签集合 - */ - public List selectSqBookmarkList(SqBookmark sqBookmark); - - /** - * 新增书签 - * - * @param sqBookmark 书签 - * @return 结果 - */ - public int insertSqBookmark(SqBookmark sqBookmark); - - /** - * 修改书签 - * - * @param sqBookmark 书签 - * @return 结果 - */ - public int updateSqBookmark(SqBookmark sqBookmark); - - /** - * 删除书签 - * - * @param bookmarkId 书签ID - * @return 结果 - */ - public int deleteSqBookmarkById(Long bookmarkId); - - /** - * 批量删除书签 - * - * @param bookmarkIds 需要删除的数据ID - * @return 结果 - */ - public int deleteSqBookmarkByIds(Long[] bookmarkIds); -} diff --git a/ruoyi-bookmark/src/main/java/com/ruoyi/sq/mapper/SqLabelMapper.java b/ruoyi-bookmark/src/main/java/com/ruoyi/sq/mapper/SqLabelMapper.java deleted file mode 100644 index bd31fe075..000000000 --- a/ruoyi-bookmark/src/main/java/com/ruoyi/sq/mapper/SqLabelMapper.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.ruoyi.sq.mapper; - -import com.ruoyi.sq.domain.SqLabel; - -import java.util.List; - -/** - * 书签_标签Mapper接口 - * - * @author wanghao - * @date 2020-07-26 - */ -public interface SqLabelMapper -{ - /** - * 查询书签_标签 - * - * @param id 书签_标签ID - * @return 书签_标签 - */ - public SqLabel selectSqLabelById(Long id); - - /** - * 查询书签_标签列表 - * - * @param sqLabel 书签_标签 - * @return 书签_标签集合 - */ - public List selectSqLabelList(SqLabel sqLabel); - - /** - * 新增书签_标签 - * - * @param sqLabel 书签_标签 - * @return 结果 - */ - public int insertSqLabel(SqLabel sqLabel); - - /** - * 修改书签_标签 - * - * @param sqLabel 书签_标签 - * @return 结果 - */ - public int updateSqLabel(SqLabel sqLabel); - - /** - * 删除书签_标签 - * - * @param id 书签_标签ID - * @return 结果 - */ - public int deleteSqLabelById(Long id); - - /** - * 批量删除书签_标签 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - public int deleteSqLabelByIds(Long[] ids); -} diff --git a/ruoyi-bookmark/src/main/java/com/ruoyi/sq/mapper/SqMenuMapper.java b/ruoyi-bookmark/src/main/java/com/ruoyi/sq/mapper/SqMenuMapper.java deleted file mode 100644 index f33c35dcf..000000000 --- a/ruoyi-bookmark/src/main/java/com/ruoyi/sq/mapper/SqMenuMapper.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.ruoyi.sq.mapper; - -import java.util.List; -import com.ruoyi.sq.domain.SqMenu; - -/** - * 书签_菜单Mapper接口 - * - * @author wanghao - * @date 2020-07-26 - */ -public interface SqMenuMapper -{ - /** - * 查询书签_菜单 - * - * @param menuId 书签_菜单ID - * @return 书签_菜单 - */ - public SqMenu selectSqMenuById(Long menuId); - - /** - * 查询书签_菜单列表 - * - * @param sqMenu 书签_菜单 - * @return 书签_菜单集合 - */ - public List selectSqMenuList(SqMenu sqMenu); - - /** - * 新增书签_菜单 - * - * @param sqMenu 书签_菜单 - * @return 结果 - */ - public int insertSqMenu(SqMenu sqMenu); - - /** - * 修改书签_菜单 - * - * @param sqMenu 书签_菜单 - * @return 结果 - */ - public int updateSqMenu(SqMenu sqMenu); - - /** - * 删除书签_菜单 - * - * @param menuId 书签_菜单ID - * @return 结果 - */ - public int deleteSqMenuById(Long menuId); - - /** - * 批量删除书签_菜单 - * - * @param menuIds 需要删除的数据ID - * @return 结果 - */ - public int deleteSqMenuByIds(Long[] menuIds); -} diff --git a/ruoyi-bookmark/src/main/java/com/ruoyi/sq/service/ISqBookmarkService.java b/ruoyi-bookmark/src/main/java/com/ruoyi/sq/service/ISqBookmarkService.java deleted file mode 100644 index e96fcbb79..000000000 --- a/ruoyi-bookmark/src/main/java/com/ruoyi/sq/service/ISqBookmarkService.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.ruoyi.sq.service; - -import java.util.List; -import com.ruoyi.sq.domain.SqBookmark; - -/** - * 书签Service接口 - * - * @author wanghao - * @date 2020-07-26 - */ -public interface ISqBookmarkService -{ - /** - * 查询书签 - * - * @param bookmarkId 书签ID - * @return 书签 - */ - public SqBookmark selectSqBookmarkById(Long bookmarkId); - - /** - * 查询书签列表 - * - * @param sqBookmark 书签 - * @return 书签集合 - */ - public List selectSqBookmarkList(SqBookmark sqBookmark); - - /** - * 新增书签 - * - * @param sqBookmark 书签 - * @return 结果 - */ - public int insertSqBookmark(SqBookmark sqBookmark); - - /** - * 修改书签 - * - * @param sqBookmark 书签 - * @return 结果 - */ - public int updateSqBookmark(SqBookmark sqBookmark); - - /** - * 批量删除书签 - * - * @param bookmarkIds 需要删除的书签ID - * @return 结果 - */ - public int deleteSqBookmarkByIds(Long[] bookmarkIds); - - /** - * 删除书签信息 - * - * @param bookmarkId 书签ID - * @return 结果 - */ - public int deleteSqBookmarkById(Long bookmarkId); -} diff --git a/ruoyi-bookmark/src/main/java/com/ruoyi/sq/service/ISqLabelService.java b/ruoyi-bookmark/src/main/java/com/ruoyi/sq/service/ISqLabelService.java deleted file mode 100644 index d648af063..000000000 --- a/ruoyi-bookmark/src/main/java/com/ruoyi/sq/service/ISqLabelService.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.ruoyi.sq.service; - -import com.ruoyi.sq.domain.SqLabel; - -import java.util.List; - -/** - * 书签_标签Service接口 - * - * @author wanghao - * @date 2020-07-26 - */ -public interface ISqLabelService -{ - /** - * 查询书签_标签 - * - * @param id 书签_标签ID - * @return 书签_标签 - */ - public SqLabel selectSqLabelById(Long id); - - /** - * 查询书签_标签列表 - * - * @param sqLabel 书签_标签 - * @return 书签_标签集合 - */ - public List selectSqLabelList(SqLabel sqLabel); - - /** - * 新增书签_标签 - * - * @param sqLabel 书签_标签 - * @return 结果 - */ - public int insertSqLabel(SqLabel sqLabel); - - /** - * 修改书签_标签 - * - * @param sqLabel 书签_标签 - * @return 结果 - */ - public int updateSqLabel(SqLabel sqLabel); - - /** - * 批量删除书签_标签 - * - * @param ids 需要删除的书签_标签ID - * @return 结果 - */ - public int deleteSqLabelByIds(Long[] ids); - - /** - * 删除书签_标签信息 - * - * @param id 书签_标签ID - * @return 结果 - */ - public int deleteSqLabelById(Long id); -} diff --git a/ruoyi-bookmark/src/main/java/com/ruoyi/sq/service/ISqMenuService.java b/ruoyi-bookmark/src/main/java/com/ruoyi/sq/service/ISqMenuService.java deleted file mode 100644 index 807ce509f..000000000 --- a/ruoyi-bookmark/src/main/java/com/ruoyi/sq/service/ISqMenuService.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.ruoyi.sq.service; - -import com.ruoyi.sq.domain.SqMenu; - -import java.util.List; - -/** - * 书签_菜单Service接口 - * - * @author wanghao - * @date 2020-07-26 - */ -public interface ISqMenuService -{ - /** - * 查询书签_菜单 - * - * @param menuId 书签_菜单ID - * @return 书签_菜单 - */ - public SqMenu selectSqMenuById(Long menuId); - - /** - * 查询书签_菜单列表 - * - * @param sqMenu 书签_菜单 - * @return 书签_菜单集合 - */ - public List selectSqMenuList(SqMenu sqMenu); - - /** - * 新增书签_菜单 - * - * @param sqMenu 书签_菜单 - * @return 结果 - */ - public int insertSqMenu(SqMenu sqMenu); - - /** - * 修改书签_菜单 - * - * @param sqMenu 书签_菜单 - * @return 结果 - */ - public int updateSqMenu(SqMenu sqMenu); - - /** - * 批量删除书签_菜单 - * - * @param menuIds 需要删除的书签_菜单ID - * @return 结果 - */ - public int deleteSqMenuByIds(Long[] menuIds); - - /** - * 删除书签_菜单信息 - * - * @param menuId 书签_菜单ID - * @return 结果 - */ - public int deleteSqMenuById(Long menuId); -} diff --git a/ruoyi-bookmark/src/main/java/com/ruoyi/sq/service/impl/SqLabelServiceImpl.java b/ruoyi-bookmark/src/main/java/com/ruoyi/sq/service/impl/SqLabelServiceImpl.java deleted file mode 100644 index 101991e3c..000000000 --- a/ruoyi-bookmark/src/main/java/com/ruoyi/sq/service/impl/SqLabelServiceImpl.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.ruoyi.sq.service.impl; - -import com.ruoyi.sq.domain.SqLabel; -import com.ruoyi.sq.service.ISqLabelService; - -import java.util.List; -import com.ruoyi.common.utils.DateUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ruoyi.sq.mapper.SqLabelMapper; - -/** - * 书签_标签Service业务层处理 - * - * @author wanghao - * @date 2020-07-26 - */ -@Service -public class SqLabelServiceImpl implements ISqLabelService -{ - @Autowired - private SqLabelMapper sqLabelMapper; - - /** - * 查询书签_标签 - * - * @param id 书签_标签ID - * @return 书签_标签 - */ - @Override - public SqLabel selectSqLabelById(Long id) - { - return sqLabelMapper.selectSqLabelById(id); - } - - /** - * 查询书签_标签列表 - * - * @param sqLabel 书签_标签 - * @return 书签_标签 - */ - @Override - public List selectSqLabelList(SqLabel sqLabel) - { - return sqLabelMapper.selectSqLabelList(sqLabel); - } - - /** - * 新增书签_标签 - * - * @param sqLabel 书签_标签 - * @return 结果 - */ - @Override - public int insertSqLabel(SqLabel sqLabel) - { - sqLabel.setCreateTime(DateUtils.getNowDate()); - return sqLabelMapper.insertSqLabel(sqLabel); - } - - /** - * 修改书签_标签 - * - * @param sqLabel 书签_标签 - * @return 结果 - */ - @Override - public int updateSqLabel(SqLabel sqLabel) - { - return sqLabelMapper.updateSqLabel(sqLabel); - } - - /** - * 批量删除书签_标签 - * - * @param ids 需要删除的书签_标签ID - * @return 结果 - */ - @Override - public int deleteSqLabelByIds(Long[] ids) - { - return sqLabelMapper.deleteSqLabelByIds(ids); - } - - /** - * 删除书签_标签信息 - * - * @param id 书签_标签ID - * @return 结果 - */ - @Override - public int deleteSqLabelById(Long id) - { - return sqLabelMapper.deleteSqLabelById(id); - } -} diff --git a/ruoyi-bookmark/src/main/java/com/ruoyi/sq/service/impl/SqMenuServiceImpl.java b/ruoyi-bookmark/src/main/java/com/ruoyi/sq/service/impl/SqMenuServiceImpl.java deleted file mode 100644 index fe785b798..000000000 --- a/ruoyi-bookmark/src/main/java/com/ruoyi/sq/service/impl/SqMenuServiceImpl.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.ruoyi.sq.service.impl; - -import com.ruoyi.sq.domain.SqMenu; -import com.ruoyi.sq.mapper.SqMenuMapper; - -import java.util.List; -import com.ruoyi.common.utils.DateUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.ruoyi.sq.service.ISqMenuService; - -/** - * 书签_菜单Service业务层处理 - * - * @author wanghao - * @date 2020-07-26 - */ -@Service -public class SqMenuServiceImpl implements ISqMenuService -{ - @Autowired - private SqMenuMapper sqMenuMapper; - - /** - * 查询书签_菜单 - * - * @param menuId 书签_菜单ID - * @return 书签_菜单 - */ - @Override - public SqMenu selectSqMenuById(Long menuId) - { - return sqMenuMapper.selectSqMenuById(menuId); - } - - /** - * 查询书签_菜单列表 - * - * @param sqMenu 书签_菜单 - * @return 书签_菜单 - */ - @Override - public List selectSqMenuList(SqMenu sqMenu) - { - return sqMenuMapper.selectSqMenuList(sqMenu); - } - - /** - * 新增书签_菜单 - * - * @param sqMenu 书签_菜单 - * @return 结果 - */ - @Override - public int insertSqMenu(SqMenu sqMenu) - { - sqMenu.setCreateTime(DateUtils.getNowDate()); - return sqMenuMapper.insertSqMenu(sqMenu); - } - - /** - * 修改书签_菜单 - * - * @param sqMenu 书签_菜单 - * @return 结果 - */ - @Override - public int updateSqMenu(SqMenu sqMenu) - { - return sqMenuMapper.updateSqMenu(sqMenu); - } - - /** - * 批量删除书签_菜单 - * - * @param menuIds 需要删除的书签_菜单ID - * @return 结果 - */ - @Override - public int deleteSqMenuByIds(Long[] menuIds) - { - return sqMenuMapper.deleteSqMenuByIds(menuIds); - } - - /** - * 删除书签_菜单信息 - * - * @param menuId 书签_菜单ID - * @return 结果 - */ - @Override - public int deleteSqMenuById(Long menuId) - { - return sqMenuMapper.deleteSqMenuById(menuId); - } -} diff --git a/ruoyi-bookmark/src/main/resources/mapper.bookmark/SqLabelMapper.xml b/ruoyi-bookmark/src/main/resources/mapper.bookmark/SqLabelMapper.xml deleted file mode 100644 index 468a0e7c5..000000000 --- a/ruoyi-bookmark/src/main/resources/mapper.bookmark/SqLabelMapper.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - select id, user_id, label_name, order, create_time, label_count from sq_label - - - - - - - - insert into sq_label - - user_id, - label_name, - order, - create_time, - label_count, - - - #{userId}, - #{labelName}, - #{order}, - #{createTime}, - #{labelCount}, - - - - - update sq_label - - user_id = #{userId}, - label_name = #{labelName}, - order = #{order}, - create_time = #{createTime}, - label_count = #{labelCount}, - - where id = #{id} - - - - delete from sq_label where id = #{id} - - - - delete from sq_label where id in - - #{id} - - - - \ No newline at end of file diff --git a/ruoyi-bookmark/src/main/resources/mapper.bookmark/SqMenuMapper.xml b/ruoyi-bookmark/src/main/resources/mapper.bookmark/SqMenuMapper.xml deleted file mode 100644 index b4314dca6..000000000 --- a/ruoyi-bookmark/src/main/resources/mapper.bookmark/SqMenuMapper.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - - - - - - - - select menu_id, user_id, menu_name, menu_url, menu_icon, parent_id, menu_order, create_time from sq_menu - - - - - - - - insert into sq_menu - - user_id, - menu_name, - menu_url, - menu_icon, - parent_id, - menu_order, - create_time, - - - #{userId}, - #{menuName}, - #{menuUrl}, - #{menuIcon}, - #{parentId}, - #{menuOrder}, - #{createTime}, - - - - - update sq_menu - - user_id = #{userId}, - menu_name = #{menuName}, - menu_url = #{menuUrl}, - menu_icon = #{menuIcon}, - parent_id = #{parentId}, - menu_order = #{menuOrder}, - create_time = #{createTime}, - - where menu_id = #{menuId} - - - - delete from sq_menu where menu_id = #{menuId} - - - - delete from sq_menu where menu_id in - - #{menuId} - - - - \ No newline at end of file diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml index ba2e0ab7b..80836ad96 100644 --- a/ruoyi-framework/pom.xml +++ b/ruoyi-framework/pom.xml @@ -68,7 +68,11 @@ com.ruoyi ruoyi-system - + + + com.ruoyi + ruoyi-yunbookmark + - \ No newline at end of file + diff --git a/ruoyi-ui/src/api/bookmark/bookmark.js b/ruoyi-ui/src/api/bookmark/bookmark.js new file mode 100644 index 000000000..d13346ffb --- /dev/null +++ b/ruoyi-ui/src/api/bookmark/bookmark.js @@ -0,0 +1,53 @@ +import request from '@/utils/request' + +// 查询书签管理列表 +export function listBookmark(query) { + return request({ + url: '/bookmark/bookmark/list', + method: 'get', + params: query + }) +} + +// 查询书签管理详细 +export function getBookmark(bookmarkId) { + return request({ + url: '/bookmark/bookmark/' + bookmarkId, + method: 'get' + }) +} + +// 新增书签管理 +export function addBookmark(data) { + return request({ + url: '/bookmark/bookmark', + method: 'post', + data: data + }) +} + +// 修改书签管理 +export function updateBookmark(data) { + return request({ + url: '/bookmark/bookmark', + method: 'put', + data: data + }) +} + +// 删除书签管理 +export function delBookmark(bookmarkId) { + return request({ + url: '/bookmark/bookmark/' + bookmarkId, + method: 'delete' + }) +} + +// 导出书签管理 +export function exportBookmark(query) { + return request({ + url: '/bookmark/bookmark/export', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/ruoyi-ui/src/views/bookmark/bookmark/index.vue b/ruoyi-ui/src/views/bookmark/bookmark/index.vue new file mode 100644 index 000000000..21b95ea14 --- /dev/null +++ b/ruoyi-ui/src/views/bookmark/bookmark/index.vue @@ -0,0 +1,398 @@ + + + diff --git a/ruoyi-bookmark/pom.xml b/ruoyi-yunbookmark/pom.xml similarity index 87% rename from ruoyi-bookmark/pom.xml rename to ruoyi-yunbookmark/pom.xml index 05e3bf2c9..72622be86 100644 --- a/ruoyi-bookmark/pom.xml +++ b/ruoyi-yunbookmark/pom.xml @@ -9,11 +9,15 @@ 4.0.0 - ruoyi-bookmark + + ruoyi-yunbookmark + + - bookmark系统模块 + yunbookmark系统模块 + @@ -24,4 +28,4 @@ - \ No newline at end of file + diff --git a/ruoyi-bookmark/src/main/java/com/ruoyi/sq/domain/SqBookmark.java b/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/domain/SqBookmark.java similarity index 97% rename from ruoyi-bookmark/src/main/java/com/ruoyi/sq/domain/SqBookmark.java rename to ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/domain/SqBookmark.java index 4978a9b1f..519753ef4 100644 --- a/ruoyi-bookmark/src/main/java/com/ruoyi/sq/domain/SqBookmark.java +++ b/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/domain/SqBookmark.java @@ -1,4 +1,4 @@ -package com.ruoyi.sq.domain; +package com.ruoyi.bookmark.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -6,10 +6,10 @@ import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; /** - * 书签对象 sq_bookmark + * 书签管理对象 sq_bookmark * * @author wanghao - * @date 2020-07-26 + * @date 2020-08-02 */ public class SqBookmark extends BaseEntity { diff --git a/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/mapper/SqBookmarkMapper.java b/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/mapper/SqBookmarkMapper.java new file mode 100644 index 000000000..37d940be6 --- /dev/null +++ b/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/mapper/SqBookmarkMapper.java @@ -0,0 +1,70 @@ +package com.ruoyi.bookmark.mapper; + +import java.util.List; +import com.ruoyi.bookmark.domain.SqBookmark; +import org.apache.ibatis.annotations.Param; + +/** + * 书签管理Mapper接口 + * + * @author wanghao + * @date 2020-08-02 + */ +public interface SqBookmarkMapper +{ + /** + * 查询栏目下书签管理 + * + * @param menuID 栏目ID + * @param userID 用户ID + * @return 书签管理 + */ + public List selectBymenuIdUserID(@Param("menuID") Long menuID,@Param("userID") Long userID); + /** + * 查询书签管理 + * + * @param bookmarkId 书签管理ID + * @return 书签管理 + */ + public SqBookmark selectSqBookmarkById(Long bookmarkId); + + /** + * 查询书签管理列表 + * + * @param sqBookmark 书签管理 + * @return 书签管理集合 + */ + public List selectSqBookmarkList(SqBookmark sqBookmark); + + /** + * 新增书签管理 + * + * @param sqBookmark 书签管理 + * @return 结果 + */ + public int insertSqBookmark(SqBookmark sqBookmark); + + /** + * 修改书签管理 + * + * @param sqBookmark 书签管理 + * @return 结果 + */ + public int updateSqBookmark(SqBookmark sqBookmark); + + /** + * 删除书签管理 + * + * @param bookmarkId 书签管理ID + * @return 结果 + */ + public int deleteSqBookmarkById(Long bookmarkId); + + /** + * 批量删除书签管理 + * + * @param bookmarkIds 需要删除的数据ID + * @return 结果 + */ + public int deleteSqBookmarkByIds(Long[] bookmarkIds); +} diff --git a/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/service/ISqBookmarkService.java b/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/service/ISqBookmarkService.java new file mode 100644 index 000000000..fbb045fb2 --- /dev/null +++ b/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/service/ISqBookmarkService.java @@ -0,0 +1,72 @@ +package com.ruoyi.bookmark.service; + +import java.util.List; +import com.ruoyi.bookmark.domain.SqBookmark; + +/** + * 书签管理Service接口 + * + * @author wanghao + * @date 2020-08-02 + */ +public interface ISqBookmarkService +{ + + /** + * 查询用户栏目下书签管理 + * + * @param menuID 栏目ID + * @param userID 用户ID + * @return 书签管理 + */ + public List selectBymenuIdUserID(Long menuID,Long userID); + + + /** + * 查询书签管理 + * + * @param bookmarkId 书签管理ID + * @return 书签管理 + */ + public SqBookmark selectSqBookmarkById(Long bookmarkId); + + /** + * 查询书签管理列表 + * + * @param sqBookmark 书签管理 + * @return 书签管理集合 + */ + public List selectSqBookmarkList(SqBookmark sqBookmark); + + /** + * 新增书签管理 + * + * @param sqBookmark 书签管理 + * @return 结果 + */ + public int insertSqBookmark(SqBookmark sqBookmark); + + /** + * 修改书签管理 + * + * @param sqBookmark 书签管理 + * @return 结果 + */ + public int updateSqBookmark(SqBookmark sqBookmark); + + /** + * 批量删除书签管理 + * + * @param bookmarkIds 需要删除的书签管理ID + * @return 结果 + */ + public int deleteSqBookmarkByIds(Long[] bookmarkIds); + + /** + * 删除书签管理信息 + * + * @param bookmarkId 书签管理ID + * @return 结果 + */ + public int deleteSqBookmarkById(Long bookmarkId); +} diff --git a/ruoyi-bookmark/src/main/java/com/ruoyi/sq/service/impl/SqBookmarkServiceImpl.java b/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/service/impl/SqBookmarkServiceImpl.java similarity index 58% rename from ruoyi-bookmark/src/main/java/com/ruoyi/sq/service/impl/SqBookmarkServiceImpl.java rename to ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/service/impl/SqBookmarkServiceImpl.java index b75bffe11..07ba7d723 100644 --- a/ruoyi-bookmark/src/main/java/com/ruoyi/sq/service/impl/SqBookmarkServiceImpl.java +++ b/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/service/impl/SqBookmarkServiceImpl.java @@ -1,20 +1,18 @@ -package com.ruoyi.sq.service.impl; - -import com.ruoyi.sq.mapper.SqBookmarkMapper; -import com.ruoyi.sq.service.ISqBookmarkService; +package com.ruoyi.bookmark.service.impl; import java.util.List; import com.ruoyi.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; - -import com.ruoyi.sq.domain.SqBookmark; +import com.ruoyi.bookmark.mapper.SqBookmarkMapper; +import com.ruoyi.bookmark.domain.SqBookmark; +import com.ruoyi.bookmark.service.ISqBookmarkService; /** - * 书签Service业务层处理 - * + * 书签管理Service业务层处理 + * * @author wanghao - * @date 2020-07-26 + * @date 2020-08-02 */ @Service public class SqBookmarkServiceImpl implements ISqBookmarkService @@ -23,10 +21,22 @@ public class SqBookmarkServiceImpl implements ISqBookmarkService private SqBookmarkMapper sqBookmarkMapper; /** - * 查询书签 - * - * @param bookmarkId 书签ID - * @return 书签 + * 查询书签管理 + * + * @param menuID 栏目ID + * @param userID 用户ID + * @return 书签管理 + */ + @Override + public List selectBymenuIdUserID(Long menuID, Long userID) { + return sqBookmarkMapper.selectBymenuIdUserID(menuID,userID); + } + + /** + * 查询书签管理 + * + * @param bookmarkId 书签管理ID + * @return 书签管理 */ @Override public SqBookmark selectSqBookmarkById(Long bookmarkId) @@ -35,10 +45,10 @@ public class SqBookmarkServiceImpl implements ISqBookmarkService } /** - * 查询书签列表 - * - * @param sqBookmark 书签 - * @return 书签 + * 查询书签管理列表 + * + * @param sqBookmark 书签管理 + * @return 书签管理 */ @Override public List selectSqBookmarkList(SqBookmark sqBookmark) @@ -47,9 +57,9 @@ public class SqBookmarkServiceImpl implements ISqBookmarkService } /** - * 新增书签 - * - * @param sqBookmark 书签 + * 新增书签管理 + * + * @param sqBookmark 书签管理 * @return 结果 */ @Override @@ -60,9 +70,9 @@ public class SqBookmarkServiceImpl implements ISqBookmarkService } /** - * 修改书签 - * - * @param sqBookmark 书签 + * 修改书签管理 + * + * @param sqBookmark 书签管理 * @return 结果 */ @Override @@ -72,9 +82,9 @@ public class SqBookmarkServiceImpl implements ISqBookmarkService } /** - * 批量删除书签 - * - * @param bookmarkIds 需要删除的书签ID + * 批量删除书签管理 + * + * @param bookmarkIds 需要删除的书签管理ID * @return 结果 */ @Override @@ -84,9 +94,9 @@ public class SqBookmarkServiceImpl implements ISqBookmarkService } /** - * 删除书签信息 - * - * @param bookmarkId 书签ID + * 删除书签管理信息 + * + * @param bookmarkId 书签管理ID * @return 结果 */ @Override diff --git a/ruoyi-bookmark/src/main/resources/mapper.bookmark/SqBookmarkMapper.xml b/ruoyi-yunbookmark/src/main/resources/mapper/bookmark/SqBookmarkMapper.xml similarity index 93% rename from ruoyi-bookmark/src/main/resources/mapper.bookmark/SqBookmarkMapper.xml rename to ruoyi-yunbookmark/src/main/resources/mapper/bookmark/SqBookmarkMapper.xml index 0b1da59ae..55b9a2949 100644 --- a/ruoyi-bookmark/src/main/resources/mapper.bookmark/SqBookmarkMapper.xml +++ b/ruoyi-yunbookmark/src/main/resources/mapper/bookmark/SqBookmarkMapper.xml @@ -2,8 +2,8 @@ - - + + @@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + insert into sq_bookmark @@ -102,10 +102,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from sq_bookmark where bookmark_id in + delete from sq_bookmark where bookmark_id in #{bookmarkId} - - \ No newline at end of file + + +