From 51661f413d6081d1c98ef739f72c824f23d2757e Mon Sep 17 00:00:00 2001
From: WangHao <43278047@qq.com>
Date: Sun, 15 Nov 2020 18:58:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E9=80=9A=E8=BF=87url?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7=E7=9A=84=E4=B9=A6=E7=AD=BE?=
 =?UTF-8?q?=20=E5=A4=9A=E6=9D=A1=E8=BF=94=E5=9B=9E=E6=9C=80=E6=96=B0?=
 =?UTF-8?q?=E4=B8=80=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yunbookmark/SqBookmarkController.java     | 17 ++++++++++++++
 .../bookmark/service/ISqBookmarkService.java  | 10 +++++++++
 .../service/impl/SqBookmarkServiceImpl.java   | 22 +++++++++++++++++++
 3 files changed, 49 insertions(+)

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 3bcb5b224..b5eeacae6 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
@@ -53,6 +53,23 @@ public class SqBookmarkController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 通过url 查询用户 是否已经添加了此书签
+     *
+     * 如果有多条 返回最新的一条
+     * @return
+     */
+    @GetMapping("/selectByUrlUserID")
+    public AjaxResult selectByUrlUserID(String url) {
+        SysUser sysUser=getAuthUser();
+        startPage();
+        List<SqBookmark> list = sqBookmarkService.selectByUrlUserID(url,sysUser.getUserId());
+        if (list!=null&&!list.isEmpty()){
+            return AjaxResult.success(list.get(0));
+        }
+        return AjaxResult.success(list);
+    }
+
 
     /**
      * 查询用户栏目下的书签
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 266dac89a..5666c4ee5 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
@@ -28,6 +28,7 @@ public interface ISqBookmarkService
     public List<SqBookmark> selectBymenuIdUserID(Long menuID,Long userID,Integer sort,String sousou);
 
 
+
     /**
      * 查询书签管理
      *
@@ -101,4 +102,13 @@ public interface ISqBookmarkService
      * @return
      */
     public int selectByMenuIdCount(Long menuId);
+
+    /**
+     * 通过url 查询用户是否已经添加
+     *
+     * @param  url
+     * @param  userId
+     * @return
+     */
+    List<SqBookmark> selectByUrlUserID(String url, 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 d26529615..2f5a23dbb 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
@@ -4,6 +4,7 @@ package com.ruoyi.bookmark.service.impl;
 import java.util.*;
 
 import cn.hutool.core.date.DateUtil;
+import com.github.pagehelper.PageHelper;
 import com.ruoyi.bookmark.domain.SqBookmarkTag;
 
 import com.ruoyi.bookmark.domain.SqMenu;
@@ -20,6 +21,7 @@ import org.springframework.stereotype.Service;
 import com.ruoyi.bookmark.mapper.SqBookmarkMapper;
 import com.ruoyi.bookmark.domain.SqBookmark;
 import com.ruoyi.bookmark.service.ISqBookmarkService;
+import tk.mybatis.mapper.entity.Example;
 
 
 /**
@@ -284,5 +286,25 @@ public class SqBookmarkServiceImpl implements ISqBookmarkService
        }
     }
 
+    /**
+     * 通过url 查询用户是否已经添加
+     *
+     * @param  url
+     * @param  userId
+     * @return
+     */
+    @Override
+    public List<SqBookmark> selectByUrlUserID(String url, Long userId) {
+
+        Example example = new Example(SqBookmark.class);
+        // 排序
+        example.setOrderByClause("create_time desc");
+        // 条件查询
+        example.createCriteria()
+                .andEqualTo("url", url)
+                .andEqualTo("userid",userId);
+        return sqBookmarkMapper.selectByExample(example);
+    }
+
 
 }