Merge remote-tracking branch 'origin/dev_voice' into dev_voice

epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/EpmetCommonServiceOpenFeignClient.java

@@ -0,0 +1,31 @@
+package com.epmet.feign;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.WorkDayFormDTO;
+import com.epmet.dto.result.WorkDayResultDTO;
+import com.epmet.feign.fallback.EpmetCommonServiceOpenFeignClientFallback;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * 本服务对外开放的API,其他服务通过引用此client调用该服务
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/4 10:28
+ */
+@FeignClient(name = ServiceConstant.EPMET_COMMON_SERVICE, fallback = EpmetCommonServiceOpenFeignClientFallback.class)
+public interface EpmetCommonServiceOpenFeignClient {
+    /**
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.WorkDayResultDTO>>
+     * @author yinzuomei@elink-cn.com
+     * @description 根据起止时间，计算工作日
+     * @date 2020/6/4 10:44
+     **/
+    @PostMapping("commonservice/workday/detentiondays")
+    Result<List<WorkDayResultDTO>> detentionDays(@RequestBody List<WorkDayFormDTO> formDTO);
+}

epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/fallback/EpmetCommonServiceOpenFeignClientFallback.java

@@ -0,0 +1,25 @@
+package com.epmet.feign.fallback;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.ModuleUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.WorkDayFormDTO;
+import com.epmet.dto.result.WorkDayResultDTO;
+import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * 本服务对外开放的API,其他服务通过引用此client调用该服务
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/4 10:32
+ */
+@Component
+public class EpmetCommonServiceOpenFeignClientFallback implements EpmetCommonServiceOpenFeignClient {
+    @Override
+    public Result<List<WorkDayResultDTO>> detentionDays(List<WorkDayFormDTO> formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_COMMON_SERVICE, "detentionDays", formDTO);
+    }
+}

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/CommonFeignClient.java

@@ -1,23 +0,0 @@
-package com.epmet.feign;
-
-import com.epmet.commons.tools.constant.ServiceConstant;
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.form.WorkDayFormDTO;
-import com.epmet.dto.result.WorkDayResultDTO;
-import com.epmet.feign.fallback.CommonFeignClientFallBack;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
-
-/**
- * @author zhaoqifeng
- * @dscription
- * @date 2020/5/12 15:48
- */
-@FeignClient(name = ServiceConstant.EPMET_COMMON_SERVICE, fallback = CommonFeignClientFallBack.class)
-public interface CommonFeignClient {
-	@PostMapping("commonservice/workday/detentiondays")
-	Result<List<WorkDayResultDTO>> detentionDays(@RequestBody List<WorkDayFormDTO> formDTO);
-}

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/CommonFeignClientFallBack.java

@@ -1,24 +0,0 @@
-package com.epmet.feign.fallback;
-
-import com.epmet.commons.tools.constant.ServiceConstant;
-import com.epmet.commons.tools.utils.ModuleUtils;
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.form.WorkDayFormDTO;
-import com.epmet.dto.result.WorkDayResultDTO;
-import com.epmet.feign.CommonFeignClient;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * @author zhaoqifeng
- * @dscription
- * @date 2020/5/12 15:51
- */
-@Component
-public class CommonFeignClientFallBack implements CommonFeignClient {
-	@Override
-	public Result<List<WorkDayResultDTO>> detentionDays(List<WorkDayFormDTO> formDTO) {
-		return ModuleUtils.feignConError(ServiceConstant.EPMET_COMMON_SERVICE, "detentionDays", formDTO);
-	}
-}

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java

@@ -40,7 +40,7 @@ import com.epmet.entity.ProjectEntity;
 import com.epmet.entity.ProjectProcessEntity;
 import com.epmet.entity.ProjectRelatedPersonnelEntity;
 import com.epmet.entity.ProjectStaffEntity;
-import com.epmet.feign.CommonFeignClient;
+import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
 import com.epmet.feign.EpmetUserFeignClient;
 import com.epmet.feign.GovOrgFeignClient;
 import com.epmet.feign.MessageFeignClient;
@@ -69,7 +69,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 	@Autowired
 	private CustomerProjectParameterService parameterService;
 	@Autowired
-	private CommonFeignClient commonFeignClient;
+	private EpmetCommonServiceOpenFeignClient epmetCommonServiceOpenFeignClient;
 	@Autowired
 	private ProjectStaffService projectStaffService;
 	@Autowired
@@ -451,7 +451,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		workDayFormDTO.setStartDate(format.format(projectDTO.getUpdatedTime()));
 		workDayFormDTO.setEndDate(format.format(new Date()));
 		list.add(workDayFormDTO);
-		Result<List<WorkDayResultDTO>> detentionDays = commonFeignClient.detentionDays(list);
+		Result<List<WorkDayResultDTO>> detentionDays = epmetCommonServiceOpenFeignClient.detentionDays(list);
 		return detentionDays.getData().get(NumConstant.ZERO).getDetentionDays();
 	}
 

epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/DraftAttrFromDTO.java

@@ -68,10 +68,15 @@ public class DraftAttrFromDTO implements Serializable {
 	 */
 	private String publisher;
 
+	/**
+	 * 发布单位名称
+	 */
+	private String publisherName;
+
 	/**
 	 * 发布日期
 	 */
-	@NotBlank(message = "发布时间不能为空")
+	@NotBlank(message = "发布日期不能为空")
 	private String publishDate;
 
 	/**

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java

@@ -45,21 +45,15 @@ import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.entity.*;
 import com.epmet.feign.EpmetUserSelfFeignClient;
-import com.epmet.dto.form.ArticlePageFormDTO;
-import com.epmet.dto.form.CommonArticleListFormDTO;
-import com.epmet.dto.result.ArticleBannerResultDTO;
-import com.epmet.dto.result.ArticleLatestResultDTO;
-import com.epmet.dto.result.ArticleListResultDTO;
-import com.epmet.entity.ArticleEntity;
 import com.epmet.redis.ArticleRedis;
 import com.epmet.service.ArticleOperateRecordService;
 import com.epmet.service.ArticlePublishRangeService;
 import com.epmet.service.ArticleService;
 import com.epmet.utils.ModuleConstant;
+import com.epmet.service.ArticleVisitRecordService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
-import com.epmet.service.ArticleVisitRecordService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -205,20 +199,12 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 			draftEntity = new DraftEntity();
 			draftEntity.setTitle(fromDTO.getTitle());
 			draftEntity.setCustomerId(tokenDto.getCustomerId());
-			draftEntity.setPreviewContent("");
+			draftEntity.setIsTop(DraftConstant.UN_TOP);
-			draftEntity.setIsTop(0);
+			draftEntity.setStatusFlag(DraftConstant.UNPUBLISH);
-			draftEntity.setPublishRangeDesc("");
-			draftEntity.setPublisherId("");
-			draftEntity.setPublisherName("");
-			draftEntity.setPublisherType("");
-			draftEntity.setPublishDate(new Date());
-			draftEntity.setStatusFlag("");
-			draftEntity.setTags("");
 			draftEntity.setOrgId("");
 			draftEntity.setOrgIdPath("");
 			draftEntity.setGridId("");
 			draftEntity.setDepartmentId("");
-			draftEntity.setRevision(0);
 			draftEntity.setDelFlag(NumConstant.ZERO_STR);
 
 			draftDao.insert(draftEntity);
@@ -266,16 +252,21 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		}
 		draftEntity.setIsTop(fromDTO.getIsTop());
 
-
-
 		//发布单位
-		String publisher = fromDTO.getPublisher();
+		if (StringUtils.isNotBlank(fromDTO.getPublisher())){
-		String publisherType = fromDTO.getPublisherType();
+			String publisherType = fromDTO.getPublisherType();
-		//TODO 根据发布类型 获取对应的名称
+			String publisherName = fromDTO.getPublisherName();
-
+			if (StringUtils.isBlank(publisherType) || StringUtils.isBlank(publisherName)) {
-		if(StringUtils.isNotBlank(fromDTO.getPublishDate())){
+				log.warn("saveDraftAttr publisher info is illegal,publisher:{},publisherType:{},publisherName:{}",fromDTO.getPublisher(),publisherType,publisherName);
-			draftEntity.setPublishDate(DateUtils.stringToDate(fromDTO.getPublishDate(),DateUtils.DATE_PATTERN));
+				throw new RenException("发布单位不能为空");
+			}
 		}
+		draftEntity.setPublisherName(fromDTO.getPublisherName());
+		draftEntity.setPublisherId(fromDTO.getPublisher());
+		draftEntity.setPublisherType(fromDTO.getPublisher());
+
+
+		draftEntity.setPublishDate(DateUtils.stringToDate(fromDTO.getPublishDate(),DateUtils.DATE_PATTERN));
 
 		//封面
 		DraftCoverEntity coverEntity = buildCoverEntity(tokenDto, fromDTO);
@@ -345,10 +336,6 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		}
 
 		draftPublishRangeDao.deleteByMap(draftIdMap);
-		if (CollectionUtils.isEmpty(publishRangeEntityList)){
-			log.warn("saveOrUpdateAttr publishRangeEntityList is empty");
-			throw new RenException("参数错误");
-		}
 		if (!CollectionUtils.isEmpty(publishRangeEntityList)){
 			publishRangeEntityList.forEach(publishRange->draftPublishRangeDao.insert(publishRange));
 		}

epmet-module/gov-voice/gov-voice-server/src/test/java/com/epmet/ArticleServiceTest.java

@@ -1,5 +1,6 @@
 package com.epmet;
 import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.constant.DraftConstant;
 import com.epmet.dto.form.DraftAttrFromDTO;
 import com.epmet.dto.form.DraftContentFromDTO;
 import com.epmet.service.ArticleService;
@@ -53,7 +54,7 @@ public class ArticleServiceTest {
         draftAttrFromDTO.setDraftId("f93b9fa4e78eadc97164fb5203aa580a");
         draftAttrFromDTO.setCoverImg("http://www.baidu.com");
         draftAttrFromDTO.setTagNameList(Arrays.asList("标签1","标签2"));
-        draftAttrFromDTO.setIsTop(0);
+        draftAttrFromDTO.setIsTop(DraftConstant.UN_TOP);
         draftAttrFromDTO.setGridIdList(Arrays.asList("b3f5c5464ad3634982116c174b22ee35"));
         draftAttrFromDTO.setPublisher("1");
         draftAttrFromDTO.setPublishDate("2020-06-03");