From 6e50f6054c3c5229d5303cd6c77e90bae0f88d61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?niohe=C2=B7erbao?= Date: Wed, 2 Aug 2023 16:03:48 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A9=BE=E9=A9=B6=E8=88=B1=E4=B8=93=E5=AE=B6?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dashboard/controller/DashboardController.java | 20 ++++++++++-------- .../dashboard/manage/DashboardExpertManage.java | 3 ++- .../dashboard/manage/DashboardProjectManage.java | 7 ++++--- .../pmapi/dashboard/model/basic/StarExpertBO.java | 24 ++++++++++++++++++++++ .../pmapi/dashboard/model/po/QueryYearPO.java | 19 +++++++++++++++++ .../model/vo/ExpertDashboardSummaryVO.java | 15 +++++++++++++- 6 files changed, 75 insertions(+), 13 deletions(-) create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/dashboard/model/basic/StarExpertBO.java create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/dashboard/model/po/QueryYearPO.java diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/controller/DashboardController.java b/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/controller/DashboardController.java index 58df3ce..be73382 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/controller/DashboardController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/controller/DashboardController.java @@ -3,6 +3,7 @@ package com.ningdatech.pmapi.dashboard.controller; import com.ningdatech.log.annotation.WebLog; import com.ningdatech.pmapi.dashboard.manage.DashboardExpertManage; import com.ningdatech.pmapi.dashboard.manage.DashboardProjectManage; +import com.ningdatech.pmapi.dashboard.model.po.QueryYearPO; import com.ningdatech.pmapi.dashboard.model.vo.DashboardInvestmentSummaryVO; import com.ningdatech.pmapi.dashboard.model.vo.DashboardProjectCntSummaryVO; import com.ningdatech.pmapi.dashboard.model.vo.DashboardProjectSummaryVO; @@ -12,9 +13,12 @@ import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; 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 javax.validation.Valid; + /** * @author liuxinxin * @date 2023/8/2 上午10:36 @@ -33,29 +37,29 @@ public class DashboardController { @PostMapping("/expert-summary") @ApiOperation("专家驾驶舱统计数据") @WebLog("专家驾驶舱统计数据") - public ExpertDashboardSummaryVO getExpertDashboardSummary() { - return dashboardExpertManage.getExpertDashboardSummary(); + public ExpertDashboardSummaryVO getExpertDashboardSummary(@Valid @RequestBody QueryYearPO queryYearPO) { + return dashboardExpertManage.getExpertDashboardSummary(queryYearPO); } @PostMapping("project-summary") @ApiOperation("驾驶舱项目总览") @WebLog("驾驶舱项目总览") - public DashboardProjectSummaryVO getProjectSummary() { - return dashboardProjectManage.getProjectSummary(); + public DashboardProjectSummaryVO getProjectSummary(@Valid @RequestBody QueryYearPO queryYearPO) { + return dashboardProjectManage.getProjectSummary(queryYearPO); } @PostMapping("project-cnt-summary") @ApiOperation("驾驶舱项目数量") @WebLog("驾驶舱项目数量") - public DashboardProjectCntSummaryVO getProjectCntSummary() { - return dashboardProjectManage.getProjectCntSummary(); + public DashboardProjectCntSummaryVO getProjectCntSummary(@Valid @RequestBody QueryYearPO queryYearPO) { + return dashboardProjectManage.getProjectCntSummary(queryYearPO); } @PostMapping("investment-summary") @ApiOperation("驾驶舱投资金额") @WebLog("驾驶舱投资金额") - public DashboardInvestmentSummaryVO getInvestmentSummary() { - return dashboardProjectManage.getInvestmentSummary(); + public DashboardInvestmentSummaryVO getInvestmentSummary(@Valid @RequestBody QueryYearPO queryYearPO) { + return dashboardProjectManage.getInvestmentSummary(queryYearPO); } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/manage/DashboardExpertManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/manage/DashboardExpertManage.java index bf6d3fe..3c16245 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/manage/DashboardExpertManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/manage/DashboardExpertManage.java @@ -1,5 +1,6 @@ package com.ningdatech.pmapi.dashboard.manage; +import com.ningdatech.pmapi.dashboard.model.po.QueryYearPO; import com.ningdatech.pmapi.dashboard.model.vo.ExpertDashboardSummaryVO; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; @@ -14,7 +15,7 @@ import org.springframework.stereotype.Component; public class DashboardExpertManage { - public ExpertDashboardSummaryVO getExpertDashboardSummary() { + public ExpertDashboardSummaryVO getExpertDashboardSummary(QueryYearPO queryYearPO) { return null; } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/manage/DashboardProjectManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/manage/DashboardProjectManage.java index 1efa449..ab4ccad 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/manage/DashboardProjectManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/manage/DashboardProjectManage.java @@ -1,5 +1,6 @@ package com.ningdatech.pmapi.dashboard.manage; +import com.ningdatech.pmapi.dashboard.model.po.QueryYearPO; import com.ningdatech.pmapi.dashboard.model.vo.DashboardInvestmentSummaryVO; import com.ningdatech.pmapi.dashboard.model.vo.DashboardProjectCntSummaryVO; import com.ningdatech.pmapi.dashboard.model.vo.DashboardProjectSummaryVO; @@ -15,16 +16,16 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class DashboardProjectManage { - public DashboardInvestmentSummaryVO getInvestmentSummary() { + public DashboardInvestmentSummaryVO getInvestmentSummary(QueryYearPO queryYearPO) { return null; } - public DashboardProjectCntSummaryVO getProjectCntSummary() { + public DashboardProjectCntSummaryVO getProjectCntSummary(QueryYearPO queryYearPO) { return null; } - public DashboardProjectSummaryVO getProjectSummary() { + public DashboardProjectSummaryVO getProjectSummary(QueryYearPO queryYearPO) { return null; } } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/model/basic/StarExpertBO.java b/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/model/basic/StarExpertBO.java new file mode 100644 index 0000000..b3e354a --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/model/basic/StarExpertBO.java @@ -0,0 +1,24 @@ +package com.ningdatech.pmapi.dashboard.model.basic; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author liuxinxin + * @date 2023/8/2 下午3:57 + */ + +@Data +@ApiModel("明星专家") +public class StarExpertBO { + + @ApiModelProperty("专家姓名") + private String expertName; + + @ApiModelProperty("专家id") + private Long expertId; + + @ApiModelProperty("履职平均分") + private Double averagePerformanceScore; +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/model/po/QueryYearPO.java b/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/model/po/QueryYearPO.java new file mode 100644 index 0000000..6454010 --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/model/po/QueryYearPO.java @@ -0,0 +1,19 @@ +package com.ningdatech.pmapi.dashboard.model.po; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author liuxinxin + * @date 2023/8/2 下午3:51 + */ + +@Data +@ApiModel("查询年份") +public class QueryYearPO { + + @ApiModelProperty("查询年份") + private Integer year; + +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/model/vo/ExpertDashboardSummaryVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/model/vo/ExpertDashboardSummaryVO.java index 0f5e7b4..ee010ae 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/model/vo/ExpertDashboardSummaryVO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/model/vo/ExpertDashboardSummaryVO.java @@ -1,8 +1,13 @@ package com.ningdatech.pmapi.dashboard.model.vo; +import com.ningdatech.pmapi.dashboard.model.basic.AnalysisChart; +import com.ningdatech.pmapi.dashboard.model.basic.StarExpertBO; import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * @author liuxinxin * @date 2023/8/2 下午3:07 @@ -16,12 +21,20 @@ public class ExpertDashboardSummaryVO { * 1、各区域专家总数 * 2、学历分布 * 3、职称级别分布 - * + *

* 4、明星专家 * 5、评审次数 * 6、各类型评审次数 */ + @ApiModelProperty("明星专家列表") + private List starExpertList; + + @ApiModelProperty("评审次数") + private Integer meetingCnt; + + @ApiModelProperty("图表列表 各区域专家总数，学历分布，职称级别分布，各类型评审次数") + List analysisChartList; }