项目详情

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/ScreenDifficultyDataService.java

@@ -0,0 +1,14 @@
+package com.epmet.datareport.service.evaluationindex.screen;
+
+import com.epmet.dto.form.ProcessListFormDTO;
+import com.epmet.project.dto.result.ProjectDetailResultDTO;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/10/23 1:26 下午
+ */
+public interface ScreenDifficultyDataService {
+
+    ProjectDetailResultDTO projectDetail(ProcessListFormDTO processListFormDTO);
+
+}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenDifficultyDataServiceImpl.java

@@ -0,0 +1,30 @@
+package com.epmet.datareport.service.evaluationindex.screen.impl;
+
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.constant.DataSourceConstant;
+import com.epmet.datareport.dao.evaluationindex.screen.ScreenDifficultyDataDao;
+import com.epmet.datareport.service.evaluationindex.screen.ScreenDifficultyDataService;
+import com.epmet.dto.form.ProcessListFormDTO;
+import com.epmet.project.dto.result.ProjectDetailResultDTO;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/10/23 1:26 下午
+ */
+@Service
+@Slf4j
+@DataSource(DataSourceConstant.EVALUATION_INDEX)
+public class ScreenDifficultyDataServiceImpl implements ScreenDifficultyDataService {
+
+    @Autowired
+    private ScreenDifficultyDataDao screenDifficultyDataDao;
+
+    @Override
+    public ProjectDetailResultDTO projectDetail(ProcessListFormDTO processListFormDTO) {
+        ProjectDetailResultDTO projectDetailResultDTO = screenDifficultyDataDao.projectDetail(processListFormDTO.getProjectId());
+        return projectDetailResultDTO;
+    }
+}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java

@@ -5,8 +5,8 @@ import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.datareport.dao.evaluationindex.screen.ScreenDifficultyDataDao;
 import com.epmet.datareport.dao.project.ProjectDao;
+import com.epmet.datareport.service.evaluationindex.screen.ScreenDifficultyDataService;
 import com.epmet.dto.form.LoginUserDetailsFormDTO;
 import com.epmet.dto.form.ProcessListFormDTO;
 import com.epmet.dto.result.LoginUserDetailsResultDTO;
@@ -41,9 +41,9 @@ public class ProjectServiceImpl implements ProjectService {
     @Autowired
     private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
     @Autowired
-    private ScreenDifficultyDataDao screenDifficultyDataDao;
-    @Autowired
     private GovProjectOpenFeignClient govProjectOpenFeignClient;
+    @Autowired
+    private ScreenDifficultyDataService screenDifficultyDataService;
 
     /**
      * @Author sun
@@ -185,7 +185,7 @@ public class ProjectServiceImpl implements ProjectService {
      */
     @Override
     public ProjectDetailResultDTO projectDetail(ProcessListFormDTO processListFormDTO) {
-        ProjectDetailResultDTO projectDetailResultDTO = screenDifficultyDataDao.projectDetail(processListFormDTO.getProjectId());
+        ProjectDetailResultDTO projectDetailResultDTO = screenDifficultyDataService.projectDetail(processListFormDTO);
         if (null == projectDetailResultDTO){
             return new ProjectDetailResultDTO();
         }

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

@@ -21,8 +21,8 @@ import java.util.List;
  * @author yinzuomei@elink-cn.com
  * @date 2020/6/4 10:28
  */
-//@FeignClient(name = ServiceConstant.EPMET_COMMON_SERVICE, fallback = EpmetCommonServiceOpenFeignClientFallback.class)
+@FeignClient(name = ServiceConstant.EPMET_COMMON_SERVICE, fallback = EpmetCommonServiceOpenFeignClientFallback.class)
-@FeignClient(name = ServiceConstant.EPMET_COMMON_SERVICE, fallback = EpmetCommonServiceOpenFeignClientFallback.class, url = "localhost:8103")
+//@FeignClient(name = ServiceConstant.EPMET_COMMON_SERVICE, fallback = EpmetCommonServiceOpenFeignClientFallback.class, url = "localhost:8103")
 public interface EpmetCommonServiceOpenFeignClient {
     /**
      * @param formDTO