From 9cc46aa702457a9b78d8adc8401e6bd0dd524484 Mon Sep 17 00:00:00 2001
From: WangHao <43278047@qq.com>
Date: Fri, 29 Oct 2021 18:22:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=88=A0=E9=99=A4=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/yunbookmark/SqTagController.java      | 9 +++++++++
 ruoyi-ui/src/views/bookmark/tag/usertag.vue              | 3 +++
 .../main/java/com/ruoyi/bookmark/mapper/SqTagMapper.java | 7 +++++++
 .../java/com/ruoyi/bookmark/service/ISqTagService.java   | 7 +++++++
 .../ruoyi/bookmark/service/impl/SqTagServiceImpl.java    | 5 +++++
 .../src/main/resources/mapper/bookmark/SqTagMapper.xml   | 4 ++++
 6 files changed, 35 insertions(+)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/SqTagController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/SqTagController.java
index e984547f2..3e8889360 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/SqTagController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/SqTagController.java
@@ -48,6 +48,15 @@ public class SqTagController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 删除书签
+     */
+    @GetMapping("/deleteTag/{id}")
+    public AjaxResult deleteTag(@PathVariable String id)
+    {
+        sqTagService.delteTagByid(id,getAuthUser().getUserId());
+        return AjaxResult.success("操作成功");
+    }
 
     /**
      * 模糊查书签TAG
diff --git a/ruoyi-ui/src/views/bookmark/tag/usertag.vue b/ruoyi-ui/src/views/bookmark/tag/usertag.vue
index 578647b95..a1252e41a 100644
--- a/ruoyi-ui/src/views/bookmark/tag/usertag.vue
+++ b/ruoyi-ui/src/views/bookmark/tag/usertag.vue
@@ -163,6 +163,9 @@
             });
 
           },
+          /** 修改书签*/
+
+          /** 删除书签*/
 
           /** 查询书签 */
           listByUsers() {
diff --git a/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/mapper/SqTagMapper.java b/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/mapper/SqTagMapper.java
index f594a8226..3c65607ab 100644
--- a/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/mapper/SqTagMapper.java
+++ b/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/mapper/SqTagMapper.java
@@ -83,4 +83,11 @@ public interface SqTagMapper extends MyMapper<SqTag>
      * @return 结果
      */
     int updateBookmarkTagIdByTagId(@Param("tagId")Long tagId, @Param("toTagId")Long toTagId, @Param("userId")Long userId);
+
+    /**
+     * @auther: Wang
+     * @date: 2021/10/29 18:13
+     * 功能描述:刪除标签
+     */
+    int delteTagByidAndUserId(@Param("id")Long id, @Param("userId")Long userId);
 }
diff --git a/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/service/ISqTagService.java b/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/service/ISqTagService.java
index 1a0715ba2..797b15687 100644
--- a/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/service/ISqTagService.java
+++ b/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/service/ISqTagService.java
@@ -74,4 +74,11 @@ public interface ISqTagService
      * @date: 2021/10/29 17:54
      */
     int countByuserId(Long userId);
+
+    /**
+     *  @author: wanghao
+     *  @Date: 2021/10/29 18:11
+     *  @Description: 删除用户的标签
+     */
+    int delteTagByid(String id, Long userId);
 }
diff --git a/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/service/impl/SqTagServiceImpl.java b/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/service/impl/SqTagServiceImpl.java
index b66f4de6d..aec70a563 100644
--- a/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/service/impl/SqTagServiceImpl.java
+++ b/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/service/impl/SqTagServiceImpl.java
@@ -140,5 +140,10 @@ public class SqTagServiceImpl implements ISqTagService
         return sqTagMapper.selectCount(sqTag);
     }
 
+    @Override
+    public int delteTagByid(String id, Long userId) {
+        return sqTagMapper.delteTagByidAndUserId(Long.valueOf(id),userId);
+    }
+
 
 }
diff --git a/ruoyi-yunbookmark/src/main/resources/mapper/bookmark/SqTagMapper.xml b/ruoyi-yunbookmark/src/main/resources/mapper/bookmark/SqTagMapper.xml
index efbb0b978..081a1227f 100644
--- a/ruoyi-yunbookmark/src/main/resources/mapper/bookmark/SqTagMapper.xml
+++ b/ruoyi-yunbookmark/src/main/resources/mapper/bookmark/SqTagMapper.xml
@@ -87,6 +87,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         delete from sq_tag where id = #{id}
     </delete>
 
+    <delete id="delteTagByidAndUserId" parameterType="Long">
+        delete from sq_tag where id = #{id} and user_Id =#{userId}
+    </delete>
+
     <delete id="deleteSqTagByIds" parameterType="String">
         delete from sq_tag where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">