From ee499905b3f4507d2df2c709a2c1c3996c07a61d Mon Sep 17 00:00:00 2001 From: fanxb Date: Mon, 15 Mar 2021 17:56:14 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E4=B9=A6=E7=AD=BE?= =?UTF-8?q?=E6=97=B6=E6=94=B9=E5=8F=98icon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BookmarkServiceImpl.java | 15 ++++++++++----- .../resources/mapper/bookmark-bookmarkMapper.xml | 2 +- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/impl/BookmarkServiceImpl.java b/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/impl/BookmarkServiceImpl.java index a7b3481..4d9b9a0 100644 --- a/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/impl/BookmarkServiceImpl.java +++ b/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/impl/BookmarkServiceImpl.java @@ -13,10 +13,7 @@ import com.fanxb.bookmark.business.bookmark.service.PinYinService; import com.fanxb.bookmark.common.constant.EsConstant; import com.fanxb.bookmark.common.constant.RedisConstant; import com.fanxb.bookmark.common.entity.Bookmark; -import com.fanxb.bookmark.common.util.EsUtil; -import com.fanxb.bookmark.common.util.HttpUtil; -import com.fanxb.bookmark.common.util.RedisUtil; -import com.fanxb.bookmark.common.util.UserContextHolder; +import com.fanxb.bookmark.common.util.*; import lombok.extern.slf4j.Slf4j; import org.elasticsearch.index.query.BoolQueryBuilder; import org.elasticsearch.index.query.QueryBuilders; @@ -76,7 +73,7 @@ public class BookmarkServiceImpl implements BookmarkService { for (int i = 0, length = elements.size(); i < length; i++) { dealBookmark(userId, elements.get(i), path, sortBase + i, bookmarks); } - //每一千条处理插入一次 + //每一千条处理插入一次,批量更新搜索字段 List tempList = new ArrayList<>(1000); for (int i = 0; i < bookmarks.size(); i++) { tempList.add(bookmarks.get(i)); @@ -87,6 +84,12 @@ public class BookmarkServiceImpl implements BookmarkService { } } userApi.versionPlus(userId); + + //异步更新icon + ThreadPoolUtil.execute(() -> { + updateUserBookmarkIcon(userId); + userApi.versionPlus(userId); + }); } /** @@ -199,6 +202,7 @@ public class BookmarkServiceImpl implements BookmarkService { bookmark.setAddTime(bookmark.getCreateTime()); if (bookmark.getType() == Bookmark.BOOKMARK_TYPE) { pinYinService.changeBookmark(bookmark); + bookmark.setIcon(getIconBase64(bookmark.getUrl())); } bookmarkDao.insertOne(bookmark); userApi.versionPlus(userId); @@ -211,6 +215,7 @@ public class BookmarkServiceImpl implements BookmarkService { bookmark.setUserId(userId); if (bookmark.getType() == 0) { pinYinService.changeBookmark(bookmark); + bookmark.setIcon(getIconBase64(bookmark.getUrl())); } bookmarkDao.editBookmark(bookmark); userApi.versionPlus(userId); diff --git a/bookMarkService/business/bookmark/src/main/resources/mapper/bookmark-bookmarkMapper.xml b/bookMarkService/business/bookmark/src/main/resources/mapper/bookmark-bookmarkMapper.xml index b6c705d..7f7ad48 100644 --- a/bookMarkService/business/bookmark/src/main/resources/mapper/bookmark-bookmarkMapper.xml +++ b/bookMarkService/business/bookmark/src/main/resources/mapper/bookmark-bookmarkMapper.xml @@ -77,7 +77,7 @@ update bookmark - set name = #{name}, url = #{url},searchKey = #{searchKey} + set name = #{name}, url = #{url},searchKey = #{searchKey},icon=#{icon} where bookmarkId = #{bookmarkId} and userId = #{userId}