diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java index 2d2c1e79a0..cc7a55528e 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java +++ b/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); } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java index be4be3fd15..6b37fd0ccd 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java +++ b/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 result=govProjectOpenFeignClient.queryProjectInfoByProjectId(processListFormDTO.getProjectId()); - if(result.success()&&null!=result.getData()){ - ProjectInfoDTO projectInfoDTO=result.getData(); - 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())); + if(!result.success()||null==result.getData()){ + throw new RenException(String.format("项目信息查询失败(该接口目前只支持e事通内的客户),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 processList = govProjectOpenFeignClient.getProcessList(processListFormDTO); if (!processList.success()) { throw new RenException(ProjectConstant.PROCESS_FAILURE); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenProjectDataCollController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenProjectDataCollController.java index cfb2a30536..43b6171c05 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenProjectDataCollController.java +++ b/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 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();