Merge remote-tracking branch 'origin/dev_pyscreen' into dev_temp

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java

@@ -68,7 +68,7 @@ public class ScreenProjectController {
         return screenProjectService.projectDistribution(formDTO);
     }
 
-    @PostMapping("projectdetail")
+    @PostMapping("projectdetailv2")
     public Result projectDetail(@RequestBody ScreenProjectDetailFormDTO formDTO){
         return screenProjectService.projectDistributionDetail(formDTO);
     }

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

@@ -204,17 +204,15 @@ public class ProjectServiceImpl implements ProjectService {
             return new ProjectDetailResultDTO();
         }*/
         ProjectDetailResultDTO projectDetailResultDTO=new ProjectDetailResultDTO();
-        //todo
         Result<ProjectInfoDTO> result=govProjectOpenFeignClient.queryProjectInfoByProjectId(processListFormDTO.getProjectId());
-        if(result.success()&&null!=result.getData()){
+        if(!result.success()||null==result.getData()){
-            ProjectInfoDTO projectInfoDTO=result.getData();
+            throw new RenException(String.format("项目信息查询失败(该接口目前只支持e事通内的客户),projectId:%s", processListFormDTO.getProjectId()));
-            projectDetailResultDTO.setImgUrlList(projectInfoDTO.getImgUrlList());
-            projectDetailResultDTO.setEventSource(projectInfoDTO.getGridName());
-            projectDetailResultDTO.setEventTitle(projectInfoDTO.getEventTitle());
-            projectDetailResultDTO.setEventContent(projectInfoDTO.getEventContent());
-        }else{
-            log.warn(String.format("项目信息查询失败,projectId:%s",processListFormDTO.getProjectId()));
         }
+        ProjectInfoDTO projectInfoDTO=result.getData();
+        projectDetailResultDTO.setImgUrlList(projectInfoDTO.getImgUrlList());
+        projectDetailResultDTO.setEventSource(projectInfoDTO.getGridName());
+        projectDetailResultDTO.setEventTitle(projectInfoDTO.getEventTitle());
+        projectDetailResultDTO.setEventContent(projectInfoDTO.getEventContent());
         Result<ProcessAndCurrentDeptResultDTO> processList = govProjectOpenFeignClient.getProcessList(processListFormDTO);
         if (!processList.success()) {
             throw new RenException(ProjectConstant.PROCESS_FAILURE);

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenProjectDataCollController.java

@@ -141,7 +141,7 @@ public class ScreenProjectDataCollController {
     @RequestMapping("uploadprojectinfo")
     public Result uploadProjectInfo(@RequestHeader("CustomerId") String customerId,@RequestBody ScreenCollFormDTO<ScreenProjectDataInfoFormDTO> param){
         if (null == param || CollectionUtils.isEmpty(param.getDataList()) || StringUtils.isBlank(param.getDateId())) {
-            throw new ValidateException("参数错误:dataList不能为空且dataId不能为空");
+            throw new ValidateException("参数错误:dataList不能为空且dateId不能为空");
         }
         projectDataService.collect(customerId,param);
         return new Result();