diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/SqBookmarkController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/SqBookmarkController.java
index 2451ccb53..b1a855b80 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/SqBookmarkController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/SqBookmarkController.java
@@ -59,6 +59,31 @@ public class SqBookmarkController extends BaseController
List<SqBookmark> list = sqBookmarkService.selectBymenuIdUserID(menuId,sysUser.getUserId());
return getDataTable(list);
}
+ /**
+ * 回收站
+ * @return
+ */
+ @GetMapping("/selectBydelete")
+ @PreAuthorize("@ss.hasPermi('bookmark:bookmark:list')")
+ public TableDataInfo selectBydelete() {
+ SysUser sysUser=getAuthUser();
+ startPage();
+ List<SqBookmark> list = sqBookmarkService.selectBydelete(sysUser.getUserId());
+ return getDataTable(list);
+ }
+
+ /**
+ * 用户全部书签
+ * @return
+ */
+ @GetMapping("/selectByUseridList")
+ @PreAuthorize("@ss.hasPermi('bookmark:bookmark:list')")
+ public TableDataInfo selectByUseridList() {
+ SysUser sysUser=getAuthUser();
+ startPage();
+ List<SqBookmark> list = sqBookmarkService.selectByUseridList(sysUser.getUserId());
+ return getDataTable(list);
+ }
/**
diff --git a/ruoyi-ui/src/api/bookmark/bookmark.js b/ruoyi-ui/src/api/bookmark/bookmark.js
index c58ea4b26..6a3ddbcfc 100644
--- a/ruoyi-ui/src/api/bookmark/bookmark.js
+++ b/ruoyi-ui/src/api/bookmark/bookmark.js
@@ -8,6 +8,23 @@ export function selectBymenuIdUserID(query) {
params: query
})
}
+//回收站
+export function selectBydelete(query) {
+ return request({
+ url: '/bookmark/bookmark/selectBydelete',
+ method: 'get',
+ params: query
+ })
+}
+
+//用户全部书签
+export function selectByUseridList(query) {
+ return request({
+ url: '/bookmark/bookmark/selectByUseridList',
+ method: 'get',
+ params: query
+ })
+}
diff --git a/ruoyi-ui/src/views/bookmark/content/index.vue b/ruoyi-ui/src/views/bookmark/content/index.vue
index 77b9f5d84..294e96f58 100644
--- a/ruoyi-ui/src/views/bookmark/content/index.vue
+++ b/ruoyi-ui/src/views/bookmark/content/index.vue
@@ -109,7 +109,7 @@
<script>
- import { selectBymenuIdUserID, getBookmark, delBookmark, addBookmark, updateBookmark, exportBookmark } from "@/api/bookmark/bookmark";
+ import { selectBymenuIdUserID,selectBydelete,selectByUseridList, getBookmark, delBookmark, addBookmark, updateBookmark, exportBookmark } from "@/api/bookmark/bookmark";
import { format } from 'timeago.js';
export default {
@@ -151,17 +151,61 @@
},
created() {
var that=this;
- if (that.$route.query.menuId==undefined){
+ var routedata=that.$route.query.menuId;
+ if (routedata==undefined){
that.queryParams.menuId=1;
}else {
- that.queryParams.menuId=that.$route.query.menuId;
+ that.queryParams.menuId=routedata;
}
- this.getList();
+
+ if (routedata=='BOOKMARK'){
+ //全部书签
+ this.getBookmarkList();
+
+ }else if(routedata=='RECYCLE'){
+ //回收站
+ this.getrecycleList();
+
+ }else{
+ //根据menuId查询
+ this.getList();
+ }
+
},
mounted(){
},
methods: {
+ /** 回收站**/
+ getrecycleList() {
+ this.loading = true;
+ selectBydelete(this.queryParams).then(response => {
+ if (response.total!=0&&response.code==200){
+ this.bookmarkList = response.rows;
+ this.total = response.total;
+ this.loading = false;
+ }else {
+ this.showbookmark = false;
+ this.showimg = true;
+ }
+ });
+ },
+ /** 全部书签**/
+ getBookmarkList() {
+ this.loading = true;
+ selectByUseridList(this.queryParams).then(response => {
+ if (response.total!=0&&response.code==200){
+ this.bookmarkList = response.rows;
+ this.total = response.total;
+ this.loading = false;
+ }else {
+ this.showbookmark = false;
+ this.showimg = true;
+ }
+ });
+ },
+
+
/** 查询书签管理列表 */
getList() {
this.loading = true;
diff --git a/ruoyi-ui/src/views/bookmark/index/index.vue b/ruoyi-ui/src/views/bookmark/index/index.vue
index 2fa29eb9f..faf2ddb2f 100644
--- a/ruoyi-ui/src/views/bookmark/index/index.vue
+++ b/ruoyi-ui/src/views/bookmark/index/index.vue
@@ -13,7 +13,7 @@
- <div class="aside-title"><i class="el-icon-s-tools"></i><span>全部书签</span></div>
+ <div class="aside-title" @click="goBookmarkList"><i class="el-icon-s-tools"></i><span>全部书签</span></div>
<div class="aside-title"><i class="el-icon-help"></i><span>发现</span></div>
<div class="aside-title"><i class="el-icon-s-platform"></i><span>任意门</span></div>
<div class="aside-title"><i class="el-icon-message-solid"></i><span>收件箱</span></div>
@@ -23,13 +23,12 @@
</div>
<div class="reminder">工具箱</div>
<div class="aside-title"><i class="el-icon-s-tools"></i><span>收藏同步</span></div>
- <div class="aside-title"><i class="el-icon-help"></i><span>发现书签</span></div>
- <router-link :to="{ name: 'importHtml' }">
- <div class="aside-title">
+ <div class="aside-title" @click="gorecycle"><i class="el-icon-help"></i><span>回收站</span></div>
+ <div class="aside-title" @click="importHtml">
<i class="el-icon-s-platform"></i><span>导入书签</span>
</div>
- </router-link>
- <div class="aside-title"><i class="el-icon-message-solid"></i><span>收件箱</span></div>
+ <div class="aside-title"><i class="el-icon-message-solid"></i><span>意见反馈</span></div>
+ <div class="aside-title"><i class="el-icon-message-solid"></i><span>其他设置</span></div>
<!-- <el-footer class="aside-navigation">-->
<!-- </el-footer>-->
@@ -423,6 +422,7 @@
// }
//return true;
},
+ /** 点击跳转**/
//节点点击
OnClickzTree:function(event,treeId, treeNode){
var that=this;
@@ -449,6 +449,13 @@
that.isShowZtree = !that.isShowZtree;
},
+ /**跳转导入页面**/
+ importHtml:function(){
+ this.$router.push({
+ path: "/importHtml",
+ })
+
+ },
@@ -501,7 +508,30 @@
});
- }
+ },
+ // 全部书签
+ goBookmarkList(){
+ var that=this;
+ that.$router.push({
+ path: "/content",
+ query: {
+ menuId: 'BOOKMARK'
+ }
+ })
+
+ },
+ // 回收站
+ gorecycle(){
+ var that=this;
+ that.$router.push({
+ path: "/content",
+ query: {
+ menuId: 'RECYCLE'
+ }
+ })
+
+ },
+
},
mounted(){
window['editBookmark'] = (e) => {
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
index b19286b98..4d47eac20 100644
--- a/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/mapper/SqBookmarkMapper.java
+++ b/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/mapper/SqBookmarkMapper.java
@@ -23,6 +23,13 @@ public interface SqBookmarkMapper extends MyMapper<SqBookmark>
* @return 书签管理
*/
public List<SqBookmark> selectBymenuIdUserID(@Param("menuID") Long menuID, @Param("userID") Long userID);
+ /**
+ * @auther: Wang
+ * @date: 2020/08/29 23:03
+ * 功能描述: 回收站
+ */
+
+ public List<SqBookmark> selectBydelete(@Param("userID") Long userID);
/**
* 查询书签管理
*
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
index 62a4ba1b6..a5c56cd5b 100644
--- a/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/service/ISqBookmarkService.java
+++ b/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/service/ISqBookmarkService.java
@@ -81,4 +81,15 @@ public interface ISqBookmarkService
* @return 结果
*/
public void updateSqBookmarkBymenuId(Long menuId);
+ /**
+ * 回收站
+ * @return
+ */
+ public List<SqBookmark> selectBydelete(Long userId);
+
+ /**
+ * 用户全部书签
+ * @return
+ */
+ List<SqBookmark> selectByUseridList(Long userId);
}
diff --git a/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/service/impl/SqBookmarkServiceImpl.java b/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/service/impl/SqBookmarkServiceImpl.java
index f6f466132..daced454a 100644
--- a/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/service/impl/SqBookmarkServiceImpl.java
+++ b/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/service/impl/SqBookmarkServiceImpl.java
@@ -2,6 +2,7 @@ package com.ruoyi.bookmark.service.impl;
import java.util.List;
import com.ruoyi.common.utils.DateUtils;
+import com.sun.org.apache.bcel.internal.generic.NEW;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -122,5 +123,24 @@ public class SqBookmarkServiceImpl implements ISqBookmarkService
@Override
public void updateSqBookmarkBymenuId(Long menuId) {
sqBookmarkMapper.updateSqBookmarkBymenuId(menuId);
+
+ }
+ /**
+ * 回收站
+ * @return
+ */
+ @Override
+ public List<SqBookmark> selectBydelete(Long userId) {
+ return sqBookmarkMapper.selectBydelete(userId);
+ }
+ /**
+ * 用户全部书签
+ * @return
+ */
+ @Override
+ public List<SqBookmark> selectByUseridList(Long userId) {
+ SqBookmark sqBookmark= new SqBookmark();
+ sqBookmark.setUserid(userId);
+ return sqBookmarkMapper.select(sqBookmark);
}
}
diff --git a/ruoyi-yunbookmark/src/main/resources/mapper/bookmark/SqBookmarkMapper.xml b/ruoyi-yunbookmark/src/main/resources/mapper/bookmark/SqBookmarkMapper.xml
index 431a4e9d7..fa460c5e7 100644
--- a/ruoyi-yunbookmark/src/main/resources/mapper/bookmark/SqBookmarkMapper.xml
+++ b/ruoyi-yunbookmark/src/main/resources/mapper/bookmark/SqBookmarkMapper.xml
@@ -114,6 +114,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectBymenuIdUserID" parameterType="SqBookmark" resultMap="SqBookmarkResult">
<include refid="selectSqBookmarkVo"/>
- where menu_id = #{menuID} and userid=#{userID}
+ where menu_id = #{menuID} and userid=#{userID} and IDelete=0
</select>
+
+ <select id="selectBydelete" parameterType="SqBookmark" resultMap="SqBookmarkResult">
+ <include refid="selectSqBookmarkVo"/>
+ where userid=#{userID} and IDelete=1
+ </select>
+
</mapper>