冲突解决

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.*;
 

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);
 
     /**
      * 政府端：（已发布、已下线）文章详情

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) {