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 9ccca0899..ea1a557ef 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 @@ -1,6 +1,8 @@ package com.ruoyi.web.controller.yunbookmark; import java.util.List; + +import com.ruoyi.common.core.domain.entity.SysUser; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -33,6 +35,9 @@ public class SqTagController extends BaseController @Autowired private ISqTagService sqTagService; + + + /** * 查询书签_标签列表 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/test/controller/UIDTest.java b/ruoyi-admin/src/main/java/com/ruoyi/web/test/controller/UIDTest.java index 7b155301a..a8dee696a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/test/controller/UIDTest.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/test/controller/UIDTest.java @@ -22,7 +22,7 @@ public class UIDTest extends BaseSpringBootTest{ public void testSerialGenerate() { // Generate UID long cachedUidGeneratoruid = cachedUidGenerator.getUID(); - long defaultUidGeneratoruid = defaultUidGenerator.getUID(); + long defaultUidGeneratoruid = defaultUidGenerator.getUID(); //用这个 System.out.println("cachedUidGeneratoruid:"+cachedUidGeneratoruid); System.out.println("cachedUidGeneratoruid解密:"+cachedUidGenerator.parseUID(cachedUidGeneratoruid)); diff --git a/ruoyi-ui/src/views/bookmark/index/index.vue b/ruoyi-ui/src/views/bookmark/index/index.vue index 4ffe2bb2b..490ec4ea6 100644 --- a/ruoyi-ui/src/views/bookmark/index/index.vue +++ b/ruoyi-ui/src/views/bookmark/index/index.vue @@ -975,17 +975,19 @@ display: flex; } + .header-sousou input{ margin-top: 8px; border: 0px; background-color: #f2f2f2; border-radius: 0!important; + /*border: 1px solid #f2f2f2;*/ } .header-sousou input:focus{ background-color: #FFFFFF!important; - border: 1px solid #f2f2f2; + border: 1px solid #C0C4CC; } diff --git a/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/domain/SqUserTag.java b/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/domain/SqUserTag.java index 20efc6585..b33cfb888 100644 --- a/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/domain/SqUserTag.java +++ b/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/domain/SqUserTag.java @@ -36,6 +36,11 @@ public class SqUserTag extends BaseEntity @Column(name = "tag_id") private Long tagId; + /** 书签排序 */ + @Excel(name = "书签名字") + @Column(name = "tag_name") + private String tagName; + /** 书签引用的数量 */ @Excel(name = "书签引用的数量") @Column(name = "icount") @@ -46,6 +51,15 @@ public class SqUserTag extends BaseEntity @Column(name = "iorder") private Integer iorder; + + public String getTagName() { + return tagName; + } + + public void setTagName(String tagName) { + this.tagName = tagName; + } + public void setId(Long id) { this.id = id; @@ -100,6 +114,7 @@ public class SqUserTag extends BaseEntity .append("tagId", getTagId()) .append("icount", getIcount()) .append("iorder", getIorder()) + .append("tagName", getTagName()) .toString(); } public SqUserTag(){ 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 cd67a8426..064a09c5c 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 @@ -67,4 +67,6 @@ public interface ISqTagService * 功能描述:修改书签 标签检测传入的标签是否 需要添加 */ public Map addtag(String tagName, 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 396a5ef2e..c2d8cac97 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 @@ -103,11 +103,8 @@ public class SqBookmarkServiceImpl implements ISqBookmarkService @Override public int insertSqBookmark(SqBookmark sqBookmark) { - + sqBookmark.setCreateTime(DateUtil.date(System.currentTimeMillis())); int i= sqBookmarkMapper.insertUseGeneratedKeys(sqBookmark); - - - sqBookmark.setCreateTime(DateUtils.getNowDate()); //传入的标签 List> listmap = sqBookmark.getSqTags(); if (listmap==null||listmap.isEmpty()||listmap.size()==0){ @@ -216,7 +213,7 @@ public class SqBookmarkServiceImpl implements ISqBookmarkService addtag=addtag.substring(0,addtag.length()-1); String[] add = addtag.split(","); Long[] num = (Long[]) ConvertUtils.convert(add,Long.class); - sqUserTagMapper.updateCountReduce(num, sqBookmark.getUserid()); + sqUserTagMapper.updateCountAdd(num, sqBookmark.getUserid()); } return sqBookmarkMapper.updateSqBookmark(sqBookmark); 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 3533c9951..1263f9efa 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 @@ -7,6 +7,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import com.github.wujun234.uid.UidGenerator; import com.ruoyi.bookmark.domain.SqUserTag; import com.ruoyi.bookmark.mapper.SqUserTagMapper; import com.ruoyi.common.utils.DateUtils; @@ -18,6 +19,8 @@ import com.ruoyi.bookmark.mapper.SqTagMapper; import com.ruoyi.bookmark.domain.SqTag; import com.ruoyi.bookmark.service.ISqTagService; +import javax.annotation.Resource; + /** * 书签_标签Service业务层处理 * @@ -140,22 +143,25 @@ public class SqTagServiceImpl implements ISqTagService }else { sqUserTag.setIcount(1); sqUserTag.setIorder(1); + sqUserTag.setTagName(tagName); sqUserTagMapper.insertSqUserTag(sqUserTag); } }else { //不存在 >>创建 返回ID + sqTag.setUserId(userId); sqTag.setTagType("P"); sqTag.setIcount(1); sqTag.setStatus(0); sqTag.setCreateTime(DateUtils.getNowDate()); - sqTagMapper.insertUseGeneratedKeys(sqTag); + sqTagMapper.insertSqTag(sqTag); logger.debug("传入的新标签 tagid="+sqTag.getId()); map.put("tagId",sqTag.getId()); //添加到用戶个人书签里面去 sqUserTag.setUserId(userId); sqUserTag.setTagId(Long.valueOf(sqTag.getId())); + sqUserTag.setTagName(sqTag.getName()); sqUserTag.setIcount(1); sqUserTag.setIorder(1); sqUserTagMapper.insertSqUserTag(sqUserTag); diff --git a/ruoyi-yunbookmark/src/main/resources/mapper/bookmark/SqUserTagMapper.xml b/ruoyi-yunbookmark/src/main/resources/mapper/bookmark/SqUserTagMapper.xml index 4aebcd647..ead33e1dd 100644 --- a/ruoyi-yunbookmark/src/main/resources/mapper/bookmark/SqUserTagMapper.xml +++ b/ruoyi-yunbookmark/src/main/resources/mapper/bookmark/SqUserTagMapper.xml @@ -10,10 +10,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select id, user_id, tag_id, icount, iorder from sq_user_tag + select id, user_id, tag_id,tag_name,icount, iorder from sq_user_tag @@ -38,12 +40,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" tag_id, icount, iorder, + tag_name, #{userId}, #{tagId}, #{icount}, #{iorder}, + #{tagName}, @@ -54,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" tag_id = #{tagId}, icount = #{icount}, iorder = #{iorder}, + tagName = #{tagName}, where id = #{id}