From 8ee3a47937ddcf6354675ce8e50fb49f9c594d62 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 10 Jun 2020 13:32:37 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8F=91=E5=B8=83=E8=8C=83=E5=9B=B4?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8F=91=E5=B8=83=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dao/DraftPublishRangeDao.java | 3 +-- .../main/java/com/epmet/service/impl/ArticleServiceImpl.java | 4 +++- .../src/main/resources/mapper/DraftPublishRangeDao.xml | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftPublishRangeDao.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftPublishRangeDao.java index 7a5d41c9ea..fc1968224f 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftPublishRangeDao.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftPublishRangeDao.java @@ -18,7 +18,6 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.dto.DraftPublishRangeDTO; import com.epmet.entity.DraftPublishRangeEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -41,7 +40,7 @@ public interface DraftPublishRangeDao extends BaseDao { * @author wangc * @date 2020.06.05 10:28 **/ - List selectByDraftId(@Param("draftId")String draftId); + List selectByDraftId(@Param("draftId")String draftId); /** * @Description 根据草稿id查询发布范围id集合 diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java index 1f2920a2bc..0161b9674d 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java @@ -843,7 +843,7 @@ public class ArticleServiceImpl extends BaseServiceImpl draftContents = draftContentDao.selectByDraftId(draftId,null); DraftCoverEntity draftCover = draftCoverDao.selectByDraftId(draftId,null); - List draftPublishRange = draftPublishRangeDao.selectByDraftId(draftId); + List draftPublishRange = draftPublishRangeDao.selectByDraftId(draftId); //3.生成文章以及相关记录 ArticleEntity article = ConvertUtils.sourceToTarget(draft,ArticleEntity.class); @@ -865,10 +865,12 @@ public class ArticleServiceImpl extends BaseServiceImpl NumConstant.ZERO){ draftPublishRange.forEach(range -> { + range.setPublishStatus(DraftConstant.PUBLISHED); ArticlePublishRangeEntity rangeToInsert = ConvertUtils.sourceToTarget(range,ArticlePublishRangeEntity.class); rangeToInsert.setArticleId(article.getId()); rangeToInsert.setId(null); articlePublishRangeDao.insert(rangeToInsert); + articlePublishRangeDao.updateById(range); }); if(null != draftCover){ //draftCover.setAuditStatus(ModuleConstant.AUDIT_STATUS_PASS); diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftPublishRangeDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftPublishRangeDao.xml index 014ccbed68..179283e897 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftPublishRangeDao.xml +++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftPublishRangeDao.xml @@ -4,7 +4,7 @@ - SELECT CUSTOMER_ID, GRID_ID, From a617c18e1e69629b21098abca6ff0b205f117980 Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Wed, 10 Jun 2020 13:37:06 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/ArticleServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java index 0161b9674d..9c158db39b 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java @@ -870,7 +870,7 @@ public class ArticleServiceImpl extends BaseServiceImpl Date: Wed, 10 Jun 2020 14:08:12 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=BC=93=E5=AD=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ArticleServiceImpl.java | 30 ++++++++++++------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java index 9c158db39b..9d16988665 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java @@ -415,7 +415,7 @@ public class ArticleServiceImpl extends BaseServiceImpl { if (gridIdList.contains(grid.getGridId())) { - String agencyGridName = articleGridResultDTO.getAgencyName().concat("_").concat(grid.getGridName()); + String agencyGridName = articleGridResultDTO.getAgencyName().concat("-").concat(grid.getGridName()); agencyGridNameList.add(agencyGridName); DraftPublishRangeEntity draftPublishRangeEntity = new DraftPublishRangeEntity(); draftPublishRangeEntity.setCustomerId(tokenDto.getCustomerId()); @@ -1007,6 +1007,9 @@ public class ArticleServiceImpl extends BaseServiceImpl updateGridTagCacheDTOS = this.updateGridTag(tokenDto, draftId, updateCustomerTagCacheDTO); this.addArticleTags(updateCustomerTagCacheDTO, draftId, tokenDto); @@ -1091,16 +1094,21 @@ public class ArticleServiceImpl extends BaseServiceImpl tagsList = Arrays.asList(tags.split("\\|")); - List tagsInfo = new ArrayList<>(); - //政府端的 标签使用次数 DB - tagsList.forEach(tag -> { - UpdateTagUseCountsResultDTO updateTagUseCount = tagCustomerService.checkTagInfo(tag, customerId, userId); - tagsInfo.add(updateTagUseCount); - }); - UpdateCustomerTagCacheDTO result = new UpdateCustomerTagCacheDTO(); - result.setCustomerId(customerId); - result.setTagsInfo(tagsInfo); + UpdateCustomerTagCacheDTO result = null; + if (StringUtils.isNotBlank(tags)){ + result = new UpdateCustomerTagCacheDTO(); + List tagsList = Arrays.asList(tags.split("\\|")); + List tagsInfo = new ArrayList<>(); + //政府端的 标签使用次数 DB + tagsList.forEach(tag -> { + UpdateTagUseCountsResultDTO updateTagUseCount = tagCustomerService.checkTagInfo(tag, customerId, userId); + tagsInfo.add(updateTagUseCount); + }); + result.setCustomerId(customerId); + result.setTagsInfo(tagsInfo); + } + + return result; }