From 962c235ba833c6568358e809c0d77ca09c429cbc Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 3 Jun 2020 11:00:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=B2=E7=AA=81=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/controller/ArticleController.java   | 6 +++++-
 .../src/main/java/com/epmet/service/ArticleService.java     | 2 +-
 .../java/com/epmet/service/impl/ArticleServiceImpl.java     | 3 +--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java
index 97923ebebd..91d8def2a4 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java
@@ -30,11 +30,15 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.ArticleDTO;
+import com.epmet.dto.form.ArticleOperationFormDTO;
 import com.epmet.dto.form.DraftContentFromDTO;
+import com.epmet.dto.form.GovArticleDetailFormDTO;
 import com.epmet.dto.result.ArticleGridResultDTO;
+import com.epmet.dto.result.ArticleOperationResultDTO;
+import com.epmet.dto.result.GovArticleDetailResultDTO;
 import com.epmet.excel.ArticleExcel;
-import com.epmet.service.ArticleService;
 import com.epmet.service.ArticleOperateRecordService;
+import com.epmet.service.ArticleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java
index f25628422f..fa4482b97d 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java
@@ -23,6 +23,7 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dto.ArticleDTO;
 import com.epmet.dto.form.DraftContentFromDTO;
 import com.epmet.dto.result.ArticleGridResultDTO;
+import com.epmet.dto.result.GovArticleDetailResultDTO;
 import com.epmet.entity.ArticleEntity;
 
 import java.util.List;
@@ -112,7 +113,6 @@ public interface ArticleService extends BaseService<ArticleEntity> {
      * @return
      */
 	String saveOrUpdateContent(TokenDto tokenDto, DraftContentFromDTO fromDTO);
-	String saveOrUpdateContent(DraftContentFromDTO fromDTO);
 
     /**
      * 政府端：（已发布、已下线）文章详情
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 b3185e8d76..ae8f83582d 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
@@ -38,7 +38,6 @@ import com.epmet.dto.ArticleDTO;
 import com.epmet.dto.feign.GovOrgSelfFeignClient;
 import com.epmet.dto.form.DraftContentFromDTO;
 import com.epmet.dto.result.ArticleGridResultDTO;
-import com.epmet.dto.result.ArticleGridResultDTO;
 import com.epmet.dto.result.GovArticleContentDTO;
 import com.epmet.dto.result.GovArticleDetailResultDTO;
 import com.epmet.entity.ArticleEntity;
@@ -196,7 +195,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		return draftId;
 	}
 
-    @Override
+	@Override
     public GovArticleDetailResultDTO queryGovArticleDetail(String articleId) {
         GovArticleDetailResultDTO articleDetail = baseDao.queryGovArticleDetail(articleId);
         if (null != articleDetail) {