删除原来的CommonFeignClient改为EpmetCommonServiceOpenFeignClient

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();
 	}