From b03873fd4042241e038c3c050b877bdabcf5501e Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 24 Oct 2022 15:31:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E8=A7=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/constant/ArticleConstant.java    | 3 +++
 .../java/com/epmet/service/impl/ArticleServiceImpl.java  | 9 +++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/constant/ArticleConstant.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/constant/ArticleConstant.java
index 2899d54c7b..25f68c9a6d 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/constant/ArticleConstant.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/constant/ArticleConstant.java
@@ -20,6 +20,9 @@ public interface ArticleConstant {
      */
     String PUBLISHED = "published";
     String PUBLISH = "publish";
+    /**
+     * pc,已发布的文章可编辑
+     */
     String UPDATE_ARTICEL="update";
     String PUBLISH_CONTENT = "发布文章";
     /**
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 af49ec4ca4..3ff421c8e6 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
@@ -1856,7 +1856,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		articleOperateRecord.setArticleId(formDTO.getArticleId());
 		articleOperateRecord.setGridIds(CollectionUtils.isEmpty(formDTO.getGridIdList()) ? "" : formDTO.getGridIdList().stream().collect(Collectors.joining(":")));
 		articleOperateRecord.setOpUser(staffInfo.getAgencyName().concat("-").concat(staffInfo.getRealName()));
-		articleOperateRecord.setContent(articleOperateRecord.getOpUser() + "发布文章【" +formDTO.getTitle() + "】");
+		articleOperateRecord.setContent(articleOperateRecord.getOpUser() + "编辑文章【" +formDTO.getTitle() + "】");
 		articleOperateRecord.setOpType(ArticleConstant.UPDATE_ARTICEL);
 		articleOperateRecord.setOpTime(new Date());
 		articleOperateRecordService.insert(articleOperateRecord);
@@ -1866,7 +1866,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 			formDTO.getGridIdList().forEach(g -> {
 				GridInfoCache gridInfoCache = CustomerOrgRedis.getGridInfo(g);
 				if (null == gridInfoCache){
-					throw new EpmetException("未查询到网格信息:"+g);
+					throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"gridId:"+g,"发布范围：网格信息查询异常");
 				}
 				ArticlePublishRangeEntity articlePublishRange = ConvertUtils.sourceToTarget(gridInfoCache,ArticlePublishRangeEntity.class);
 				articlePublishRange.setCustomerId(formDTO.getCustomerId());
@@ -1876,8 +1876,9 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 				articlePublishRange.setAgencyId(gridInfoCache.getPid());
 				AgencyInfoCache agencyInfoCache = CustomerOrgRedis.getAgencyInfo(gridInfoCache.getPid());
 				if (null == agencyInfoCache){
-					throw new EpmetException("未查询到组织信息:"+gridInfoCache.getPid());
+					throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"agencyId:"+gridInfoCache.getPid(),"发布范围：网格所属组织信息查询异常");
 				}
+				//组织id的所有上级
 				articlePublishRange.setPids(agencyInfoCache.getPids());
 				articlePublishRange.setPublishStatus(ArticleConstant.PUBLISHED);
 				articlePublishRange.setId(null);
@@ -1918,7 +1919,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 			this.updateCacheGridTag(updateGridTagCacheDTOS);
 		} catch (Exception e) {
 			//我觉着没必要抛出异常吧，日志打印一下吧
-			log.warn("scanAllPassPublishArticle update redis exception", e);
+			log.warn("updateArticle update redis exception", e);
 			// throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode(), EpmetErrorCode.SERVER_ERROR.getMsg());
 		}