|
@ -1029,10 +1029,10 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit |
|
|
List<String> tagsList = Arrays.asList(tags.split("\\|")); |
|
|
List<String> tagsList = Arrays.asList(tags.split("\\|")); |
|
|
List<UpdateTagUseCountsResultDTO> tagsInfo = new ArrayList<>(); |
|
|
List<UpdateTagUseCountsResultDTO> tagsInfo = new ArrayList<>(); |
|
|
//政府端的 标签使用次数 DB
|
|
|
//政府端的 标签使用次数 DB
|
|
|
for (String tag : tagsList) { |
|
|
tagsList.forEach(tag -> { |
|
|
UpdateTagUseCountsResultDTO updateTagUseCount = tagCustomerService.checkTagInfo(tag, customerId, userId); |
|
|
UpdateTagUseCountsResultDTO updateTagUseCount = tagCustomerService.checkTagInfo(tag, customerId, userId); |
|
|
tagsInfo.add(updateTagUseCount); |
|
|
tagsInfo.add(updateTagUseCount); |
|
|
} |
|
|
}); |
|
|
UpdateCustomerTagCacheDTO result = new UpdateCustomerTagCacheDTO(); |
|
|
UpdateCustomerTagCacheDTO result = new UpdateCustomerTagCacheDTO(); |
|
|
result.setCustomerId(customerId); |
|
|
result.setCustomerId(customerId); |
|
|
result.setTagsInfo(tagsInfo); |
|
|
result.setTagsInfo(tagsInfo); |
|
@ -1048,11 +1048,10 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit |
|
|
List<UpdateTagUseCountsResultDTO> tagsInfo = formDto.getTagsInfo(); |
|
|
List<UpdateTagUseCountsResultDTO> tagsInfo = formDto.getTagsInfo(); |
|
|
String customerId = formDto.getCustomerId(); |
|
|
String customerId = formDto.getCustomerId(); |
|
|
//更新缓存标签使用数量
|
|
|
//更新缓存标签使用数量
|
|
|
for (UpdateTagUseCountsResultDTO resultDTO : tagsInfo) { |
|
|
tagsInfo.forEach(resultDTO -> { |
|
|
String customerKey = TagConstant.GOV_TAG_KEY+customerId; |
|
|
String customerKey = TagConstant.GOV_TAG_KEY+customerId; |
|
|
tagRedis.updateTagUseCounts(customerKey,resultDTO); |
|
|
tagRedis.updateTagUseCounts(customerKey,resultDTO); |
|
|
} |
|
|
}); |
|
|
|
|
|
|
|
|
//政府端更新redis的级联标签(set)
|
|
|
//政府端更新redis的级联标签(set)
|
|
|
List<UpdateTagUseCountsResultDTO> tagsInfoCopy = new ArrayList<>(); |
|
|
List<UpdateTagUseCountsResultDTO> tagsInfoCopy = new ArrayList<>(); |
|
|
for (int i = 0; i < tagsInfo.size(); i++) { |
|
|
for (int i = 0; i < tagsInfo.size(); i++) { |
|
@ -1084,12 +1083,12 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit |
|
|
} |
|
|
} |
|
|
List<UpdateGridTagsFormDTO> gridTags = new ArrayList<>(); |
|
|
List<UpdateGridTagsFormDTO> gridTags = new ArrayList<>(); |
|
|
List<UpdateGridTagCacheDTO> gridTagCache = new ArrayList<>(); |
|
|
List<UpdateGridTagCacheDTO> gridTagCache = new ArrayList<>(); |
|
|
for (String gridId : gridIds) { |
|
|
gridIds.forEach(gridId -> { |
|
|
UpdateGridTagCacheDTO cache = new UpdateGridTagCacheDTO(); |
|
|
UpdateGridTagCacheDTO cache = new UpdateGridTagCacheDTO(); |
|
|
cache.setGridId(gridId); |
|
|
cache.setGridId(gridId); |
|
|
cache.setTagsInfo(tagsInfo); |
|
|
cache.setTagsInfo(tagsInfo); |
|
|
gridTagCache.add(cache); |
|
|
gridTagCache.add(cache); |
|
|
for (UpdateTagUseCountsResultDTO resultDTO : tagsInfo) { |
|
|
tagsInfo.forEach(resultDTO -> { |
|
|
UpdateGridTagsFormDTO tag = new UpdateGridTagsFormDTO(); |
|
|
UpdateGridTagsFormDTO tag = new UpdateGridTagsFormDTO(); |
|
|
BeanUtils.copyProperties(resultDTO,tag); |
|
|
BeanUtils.copyProperties(resultDTO,tag); |
|
|
tag.setCreatedBy(userId); |
|
|
tag.setCreatedBy(userId); |
|
@ -1097,8 +1096,8 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit |
|
|
tag.setCustomerId(customerId); |
|
|
tag.setCustomerId(customerId); |
|
|
tag.setGridId(gridId); |
|
|
tag.setGridId(gridId); |
|
|
gridTags.add(tag); |
|
|
gridTags.add(tag); |
|
|
} |
|
|
}); |
|
|
} |
|
|
}); |
|
|
tagGridDao.updateGridTag(gridTags,userId); |
|
|
tagGridDao.updateGridTag(gridTags,userId); |
|
|
return gridTagCache; |
|
|
return gridTagCache; |
|
|
} |
|
|
} |
|
@ -1111,13 +1110,13 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit |
|
|
public void updateCacheGridTag(List<UpdateGridTagCacheDTO> gridTagCache){ |
|
|
public void updateCacheGridTag(List<UpdateGridTagCacheDTO> gridTagCache){ |
|
|
//更新 网格下 标签使用数量
|
|
|
//更新 网格下 标签使用数量
|
|
|
List<UpdateTagUseCountsResultDTO> gridTagCacheCopy = new ArrayList<>(); |
|
|
List<UpdateTagUseCountsResultDTO> gridTagCacheCopy = new ArrayList<>(); |
|
|
for (UpdateGridTagCacheDTO cacheDTO : gridTagCache) { |
|
|
gridTagCache.forEach(cacheDTO -> { |
|
|
String gridId = cacheDTO.getGridId(); |
|
|
String gridId = cacheDTO.getGridId(); |
|
|
String key = TagConstant.GRID_TAG_KEY+gridId; |
|
|
String key = TagConstant.GRID_TAG_KEY+gridId; |
|
|
List<UpdateTagUseCountsResultDTO> tagsInfo = cacheDTO.getTagsInfo(); |
|
|
List<UpdateTagUseCountsResultDTO> tagsInfo = cacheDTO.getTagsInfo(); |
|
|
for (UpdateTagUseCountsResultDTO resultDTO : tagsInfo) { |
|
|
tagsInfo.forEach(resultDTO -> { |
|
|
tagRedis.updateTagUseCounts(key,resultDTO); |
|
|
tagRedis.updateTagUseCounts(key,resultDTO); |
|
|
} |
|
|
}); |
|
|
//级联
|
|
|
//级联
|
|
|
for (int i = 0; i < tagsInfo.size(); i++) { |
|
|
for (int i = 0; i < tagsInfo.size(); i++) { |
|
|
gridTagCacheCopy.addAll(tagsInfo); |
|
|
gridTagCacheCopy.addAll(tagsInfo); |
|
@ -1127,7 +1126,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit |
|
|
tagRedis.updateMoreTag(moreKey,setTag); |
|
|
tagRedis.updateMoreTag(moreKey,setTag); |
|
|
gridTagCacheCopy.clear(); |
|
|
gridTagCacheCopy.clear(); |
|
|
} |
|
|
} |
|
|
} |
|
|
}); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
@ -1143,7 +1142,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit |
|
|
String customerId = draft.getCustomerId(); |
|
|
String customerId = draft.getCustomerId(); |
|
|
String userId = tokenDto.getUserId(); |
|
|
String userId = tokenDto.getUserId(); |
|
|
String articleId = articleDao.getArticleIdByDraftId(draftId); |
|
|
String articleId = articleDao.getArticleIdByDraftId(draftId); |
|
|
for (UpdateTagUseCountsResultDTO resultDTO : tagsInfo) { |
|
|
tagsInfo.forEach(resultDTO -> { |
|
|
AddArticleTagsFormDTO addArticleTag = new AddArticleTagsFormDTO(); |
|
|
AddArticleTagsFormDTO addArticleTag = new AddArticleTagsFormDTO(); |
|
|
addArticleTag.setCreatedBy(userId); |
|
|
addArticleTag.setCreatedBy(userId); |
|
|
addArticleTag.setUpdatedBy(userId); |
|
|
addArticleTag.setUpdatedBy(userId); |
|
@ -1151,7 +1150,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit |
|
|
addArticleTag.setArticleId(articleId); |
|
|
addArticleTag.setArticleId(articleId); |
|
|
BeanUtils.copyProperties(resultDTO,addArticleTag); |
|
|
BeanUtils.copyProperties(resultDTO,addArticleTag); |
|
|
addArticleTags.add(addArticleTag); |
|
|
addArticleTags.add(addArticleTag); |
|
|
} |
|
|
}); |
|
|
articleTagsDao.addArticleTags(addArticleTags); |
|
|
articleTagsDao.addArticleTags(addArticleTags); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |