查詢书签显示对应的标签

ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/domain/SqBookmark.java

@@ -8,6 +8,8 @@ import com.ruoyi.common.annotation.Excel;
 
 import javax.persistence.*;
 import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 书签管理对象 sq_bookmark   不存在的字段注解 @Transient
@@ -86,6 +88,16 @@ public class SqBookmark
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
+    private List<Map<String,Object>> sqTags;
+
+
+    public List<Map<String, Object>> getSqTags() {
+        return sqTags;
+    }
+
+    public void setSqTags(List<Map<String, Object>> sqTags) {
+        this.sqTags = sqTags;
+    }
 
     public Date getCreateTime() {
         return createTime;

ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/domain/SqBookmarkTag.java

@@ -11,7 +11,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @author ruoyi
  * @date 2020-09-04
  */
-public class SqBookmarkTag extends BaseEntity
+public class SqBookmarkTag
 {
     private static final long serialVersionUID = 1L;
 

ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/mapper/SqBookmarkTagMapper.java

@@ -1,7 +1,10 @@
 package com.ruoyi.bookmark.mapper;
 
 import java.util.List;
+import java.util.Map;
+
 import com.ruoyi.bookmark.domain.SqBookmarkTag;
+import com.ruoyi.bookmark.domain.SqTag;
 
 /**
  * 书签标签管理Mapper接口
@@ -11,6 +14,15 @@ import com.ruoyi.bookmark.domain.SqBookmarkTag;
  */
 public interface SqBookmarkTagMapper
 {
+
+    /**
+     * 查询该篇文章的 所有书签
+     *
+     * @param
+     * @return 书签_标签
+     */
+    public List<Map<String,Object>> selectSqTaListById(Long bookmarkId);
+
     /**
      * 查询书签标签管理
      *

ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/mapper/SqTagMapper.java

@@ -11,6 +11,8 @@ import com.ruoyi.bookmark.domain.SqTag;
  */
 public interface SqTagMapper
 {
+
+
     /**
      * 查询书签_标签
      *

ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/mapper/SqUserTagMapper.java

@@ -14,6 +14,7 @@ import com.ruoyi.bookmark.domain.SqUserTag;
 public interface SqUserTagMapper
 {
 
+
     /**
      *通过用户userID查用户的所有标签
      *

ruoyi-yunbookmark/src/main/resources/mapper/bookmark/SqBookmarkMapper.xml

@@ -18,6 +18,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="idelete"    column="IDelete"    />
         <result property="start"    column="Start"    />
         <result property="createTime"    column="create_time"    />
+        <collection property="sqTags"
+                    javaType="java.util.ArrayList"
+                    ofType="java.util.Map"
+                    select="com.ruoyi.bookmark.mapper.SqBookmarkTagMapper.selectSqTaListById"
+                    column="bookmark_id">
+
+
+        </collection>
+
     </resultMap>
 
     <sql id="selectSqBookmarkVo">

ruoyi-yunbookmark/src/main/resources/mapper/bookmark/SqBookmarkTagMapper.xml

@@ -22,9 +22,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
-    <select id="selectSqBookmarkTagById" parameterType="Long" resultMap="SqBookmarkTagResult">
+
-        <include refid="selectSqBookmarkTagVo"/>
+    <select id="selectSqTaListById" parameterType="Long" resultType="java.util.Map">
-        where id = #{id}
+        select  a.bookmark_id as bookmarkId, a.tag_id as tagId,b.name from sq_bookmark_tag as a,sq_tag as b WHERE a.tag_id=b.id and  a.bookmark_id = #{bookmarkId}
     </select>
 
     <insert id="insertSqBookmarkTag" parameterType="SqBookmarkTag">

ruoyi-yunbookmark/src/main/resources/mapper/bookmark/SqUserTagMapper.xml

@@ -71,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectSqUserTagByUserId" parameterType="Long" resultType="java.util.Map">
    SELECT u.id,u.user_id as userId,u.tag_id as tagId ,u.icount,u.iorder,t.name
-   from sq_user_tag as u,sq_tag as t
+   from sq_user_tag AS u,sq_tag as t
     WHERE
     u.tag_id=t.id
     AND