标签管理

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

@@ -113,9 +113,19 @@ public class SqBookmark
     /** 排序的方式 **/
     @Transient
     private String sort;
+    /** 搜索 **/
+    @Transient
+    private String sousuo;
+
+
 
     private List<Map<String,Object>> sqTags;
+    public SqBookmark (){
+    }
 
-
+    public SqBookmark (String url,Long userid){
+        this.url = url;
+        this.userid = userid;
+    }
 
 }

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

@@ -80,4 +80,7 @@ public class SqTag
     private Date createTime;
 
 
+    public  SqTag(Long userId){
+        this.userId = userId;
+    }
 }

ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/service/impl/SqBookmarkServiceImpl.java

@@ -25,6 +25,8 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.bookmarkhtml.Const;
 import com.ruoyi.common.utils.bookmarkhtml.HtmlName;
 import com.ruoyi.common.utils.bookmarkhtml.ImportHtml;
+import com.sun.org.apache.bcel.internal.generic.RETURN;
+import org.jacoco.agent.rt.internal_f3994fa.core.internal.flow.IFrame;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -119,6 +121,12 @@ public class SqBookmarkServiceImpl implements ISqBookmarkService
     @Transactional
     public int insertSqBookmark(SqBookmark sqBookmark)
     {
+        //判断标签是否已经存在了 999
+        List<SqBookmark> list = sqBookmarkMapper.select(new SqBookmark(sqBookmark.getUrl(),sqBookmark.getUserid()));
+        if (!(list==null||list.isEmpty()))
+            return 999;
+
+
         JSONArray objects = new JSONArray();
         JSONObject json = null;
         //获取官网urls
@@ -378,7 +386,7 @@ public class SqBookmarkServiceImpl implements ISqBookmarkService
 
     @Override
     public int updateBookmarkStarById(Long userId, Long bookmarkId, Integer bookmarkStr) {
-        return sqBookmarkMapper.updateSqBookmarkByStar(bookmarkId,userId,bookmarkStr==1?1:0);
+        return sqBookmarkMapper.updateSqBookmarkByStar(bookmarkId,userId,bookmarkStr==1?0:1);
     }
 
     @Override
@@ -501,23 +509,32 @@ public class SqBookmarkServiceImpl implements ISqBookmarkService
     @Override
     public List<SqBookmark> listByUserAndPolymerization(SqBookmark sqBookmark) {
 
-        SqBookmark searchBookmark = new  SqBookmark();
-        searchBookmark.setUserid(sqBookmark.getUserid());
+        SqBookmark search = new SqBookmark();
+        search.setUserid(sqBookmark.getUserid());
+        search.setSort(sqBookmark.getSort());
+        search.setSousuo(sqBookmark.getSousuo());
+        //未删除的
+        search.setIdelete(Const.BKDELETE);
 
-        if(sqBookmark.getType().equals(Const.RECYCLE)){
-            searchBookmark.setIdelete(Const.BKNOTDELETE);//删除的
-        }else{
-            searchBookmark.setIdelete(Const.BKDELETE);//未删除的
+
+        if (sqBookmark.getType()==null){
+            //搜索情况下走这里
+            return sqBookmarkMapper.listByUserAndPolymerization(search);
         }
-
-        if (sqBookmark.getType().equals(Const.NEWEST)){//最新的
+        if(sqBookmark.getType().equals(Const.RECYCLE)){
+            search.setIdelete(Const.BKNOTDELETE);//删除的
+        }else if (sqBookmark.getType().equals(Const.NEWEST)){//最新的
             //无处理
         }else if(sqBookmark.getType().equals(Const.ASTERISK)){
-            searchBookmark.setBookmarkStar(1);
+            search.setBookmarkStar(1);
         }else if(sqBookmark.getType().equals(Const.SEEYOULATER)){//稍后看
-            searchBookmark.setSeeYouLater(1);
+            search.setSeeYouLater(1);
+        }else {
+            //默认的目录Muidid
+            search.setMenuId(Long.valueOf(sqBookmark.getType()));
         }
-        return sqBookmarkMapper.listByUserAndPolymerization(searchBookmark);
+
+        return sqBookmarkMapper.listByUserAndPolymerization(search);
     }
 
 

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

@@ -187,6 +187,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="idelete != null "> and idelete = #{idelete}</if>
             <if test="bookmarkStar != null "> and bookmark_star = #{bookmarkStar}</if>
             <if test="seeYouLater != null "> and see_you_later = #{seeYouLater}</if>
+            <if test="(sousuo == null  or sousuo == '') and menuId!=null and menuId!=''"> and menu_id = #{menuId}</if>
+            <if test="start != null  and start != ''"> and start = #{start}</if>
+            <if test="sousuo != null  and sousuo != ''"> and title like concat('%', #{sousuo}, '%')</if>
             order by
             <choose>
                 <when test="sort == 0">