diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/project/ProjectController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/project/ProjectController.java index 88fa5c31b8..ed31aef27a 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/project/ProjectController.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/project/ProjectController.java @@ -5,21 +5,21 @@ import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.datareport.service.evaluationindex.screen.*; +import com.epmet.datareport.service.evaluationindex.screen.ScreenProjectGridDailyService; +import com.epmet.datareport.service.evaluationindex.screen.ScreenProjectOrgDailyService; +import com.epmet.datareport.service.evaluationindex.screen.ScreenProjectQuantityGridMonthlyService; +import com.epmet.datareport.service.evaluationindex.screen.ScreenProjectQuantityOrgMonthlyService; import com.epmet.datareport.service.project.ProjectService; import com.epmet.dto.form.ProcessListFormDTO; -import com.epmet.dto.form.screen.EfficiencyAnalysisFormDTO; -import com.epmet.dto.form.screen.QueryQuantityMonthlyFormDTO; -import com.epmet.dto.form.screen.ScreenCommonFormDTO; -import com.epmet.dto.result.screen.EfficiencyAnalysisResultDTO; -import com.epmet.dto.result.screen.ProjectQuantityResultDTO; -import com.epmet.dto.result.screen.QueryQuantityMonthlyResultDTO; import com.epmet.project.constant.ProjectConstant; import com.epmet.project.dto.form.DifficultyRankFormDTO; import com.epmet.project.dto.form.ProjectIncrTrendFormDTO; import com.epmet.project.dto.result.*; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.List; @@ -129,43 +129,4 @@ public class ProjectController { public Result> myNextAgency(@LoginUser TokenDto tokenDto){ return new Result>().ok(projectService.getMyNextAgency(tokenDto)); } - - /** - * @param customerId - * @param formDTO - * @description 【事件分析】数量统计查询 平阴大屏 - **/ - @PostMapping("queryquantity") - public Result queryQuantity(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCommonFormDTO formDTO){ - formDTO.setCustomerId(customerId); - return new Result().ok(projectOrgDailyService.queryQuantity(formDTO)); - } - - /** - * @param customerId - * @param formDTO - * @author yinzuomei - * @description 近12个月【事件分析】月度数量分析 平阴大屏 - **/ - @PostMapping("queryquantity-monthly") - public Result queryQuantityMonthly(@RequestHeader("CustomerId") String customerId, @RequestBody QueryQuantityMonthlyFormDTO formDTO) { - formDTO.setCustomerId(customerId); - ValidatorUtils.validateEntity(formDTO); - return new Result().ok(projectQuantityOrgMonthlyService.queryQuantityMonthly(formDTO)); - } - - /** - * @param customerId - * @param formDTO - * @author yinzuomei - * @description 【事件分析】效率分析 平阴大屏 - **/ - @PostMapping("efficiency-analysis") - public Result> efficiencyAnalysis(@RequestHeader("CustomerId") String customerId, @RequestBody EfficiencyAnalysisFormDTO formDTO){ - formDTO.setCustomerId(customerId); - ValidatorUtils.validateEntity(formDTO); - return new Result>().ok(projectOrgDailyService.efficiencyAnalysis(formDTO)); - } - - //todo 【事件类型分析】NEI接口地址： https://nei.netease.com/interface/detail/?pid=57068&id=346721 } 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 a9ac375c02..84e109d3fc 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 @@ -61,38 +61,26 @@ public class ScreenProjectController { */ @PostMapping("projectdistribution") public Result projectDistribution(@RequestBody ScreenProjectDistributionFormDTO formDTO){ - /*if (StringUtils.isBlank(formDTO.getAreaCode()) && StringUtils.isBlank(formDTO.getAgencyId())){ - formDTO.setAreaCode("370124"); - }*/ ValidatorUtils.validateEntity(formDTO); return screenProjectService.projectDistribution(formDTO); } - @PostMapping("projectdetailv2") - public Result projectDetail(@RequestBody ScreenProjectDetailFormDTO formDTO){ - return screenProjectService.projectDistributionDetail(formDTO); - } /** - * 【事件分析】类型分析 - * @author zhaoqifeng - * @date 2021/2/23 15:37 - * @param customerId + * @Description 中央区事件分析-项目详情接口 * @param formDTO - * @return com.epmet.commons.tools.utils.Result> + * @return com.epmet.commons.tools.utils.Result + * @Author liushaowen + * @Date 2021/2/24 16:10 */ - @PostMapping("category-analysis") - public Result> categoryAnalysis(@RequestHeader("CustomerId") String customerId, - @RequestBody CategoryAnalysisFormDTO formDTO) { - log.info("===================customerId"+customerId); - ValidatorUtils.validateEntity(formDTO, CategoryAnalysisFormDTO.CategoryAnalysis.class); - return new Result>().ok(screenProjectService.categoryAnalysis(customerId, formDTO)); + @PostMapping("projectdetailv2") + public Result projectDetail(@RequestBody ScreenProjectDetailFormDTO formDTO){ + return screenProjectService.projectDistributionDetail(formDTO); } - /** * @param customerId * @param formDTO - * @description 【事件分析】数量统计查询 平阴大屏 + * @description 1、【事件分析】数量统计查询 平阴大屏 **/ @PostMapping("queryquantity") public Result queryQuantity(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCommonFormDTO formDTO){ @@ -104,7 +92,7 @@ public class ScreenProjectController { * @param customerId * @param formDTO * @author yinzuomei - * @description 近12个月【事件分析】月度数量分析 平阴大屏 + * @description 2、近12个月【事件分析】月度数量分析 平阴大屏 **/ @PostMapping("queryquantity-monthly") public Result queryQuantityMonthly(@RequestHeader("CustomerId") String customerId, @RequestBody QueryQuantityMonthlyFormDTO formDTO) { @@ -117,7 +105,7 @@ public class ScreenProjectController { * @param customerId * @param formDTO * @author yinzuomei - * @description 【事件分析】效率分析 平阴大屏 + * @description 3、【事件分析】效率分析 平阴大屏 **/ @PostMapping("efficiency-analysis") public Result> efficiencyAnalysis(@RequestHeader("CustomerId") String customerId, @RequestBody EfficiencyAnalysisFormDTO formDTO){ @@ -126,4 +114,19 @@ public class ScreenProjectController { return new Result>().ok(projectOrgDailyService.efficiencyAnalysis(formDTO)); } + /** + * 【事件分析】类型分析 + * @author zhaoqifeng + * @date 2021/2/23 15:37 + * @param customerId + * @param formDTO 【事件类型分析】NEI接口地址： https://nei.netease.com/interface/detail/?pid=57068&id=346721 + * @return com.epmet.commons.tools.utils.Result> + */ + @PostMapping("category-analysis") + public Result> categoryAnalysis(@RequestHeader("CustomerId") String customerId, + @RequestBody CategoryAnalysisFormDTO formDTO) { + log.info("===================customerId"+customerId); + ValidatorUtils.validateEntity(formDTO, CategoryAnalysisFormDTO.CategoryAnalysis.class); + return new Result>().ok(screenProjectService.categoryAnalysis(customerId, formDTO)); + } } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectOrgDailyServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectOrgDailyServiceImpl.java index b4518096dc..1ef82de513 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectOrgDailyServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectOrgDailyServiceImpl.java @@ -66,7 +66,7 @@ public class ScreenProjectOrgDailyServiceImpl implements ScreenProjectOrgDailySe if (null != resultDTO) { return resultDTO; } - log.warn("【事件分析】数量统计查询 结果为空"); + log.warn(String.format("【事件分析】数量统计查询 结果为空,customerId:%s,agencyId:%s",formDTO.getCustomerId(),formDTO.getAgencyId())); ProjectQuantityResultDTO defaultDto = new ProjectQuantityResultDTO(); defaultDto.setCustomerId(formDTO.getCustomerId()); defaultDto.setAgencyId(formDTO.getAgencyId()); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectQuantityOrgMonthlyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectQuantityOrgMonthlyServiceImpl.java index 3d06e12698..730719d035 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectQuantityOrgMonthlyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectQuantityOrgMonthlyServiceImpl.java @@ -156,7 +156,6 @@ public class ScreenProjectQuantityOrgMonthlyServiceImpl extends BaseServiceImpl< List screenProjectOrgDailyDTOS = new ArrayList<>(); //如果有子客户要按照跟组织的area_code查询组织列表 if(customerRelationService.haveSubCustomer(customerId)){ - // CustomerAgencyEntity rootAgency=customerAgencyService.getRootAgencyInfo(customerId); screenProjectOrgDailyDTOS=agencyDao.selectAgencyByAreaCode(rootAgency.getAreaCode()); }else{