diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/controller/PmsProjectController.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/controller/PmsProjectController.java index 786970e3f..5c49d7d94 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/controller/PmsProjectController.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/controller/PmsProjectController.java @@ -165,4 +165,14 @@ public class PmsProjectController extends BaseController return success(pmsProjectService.getPmsProjectPolyline(pmProjectId)); } + /** + * 获取项目概览-动态 + */ + @RequiresPermissions(value = {"pms:pmsProject:show", "pms:pmsProject:showMe"}, logical = Logical.OR) + @GetMapping(value = "/statistics/dynamics") + @ApiOperation(value = "项目概览-动态") + public AjaxResult getDynamics(@ApiParam("项目id") @RequestParam Long pmProjectId) { + return success(pmsProjectService.getPmsProjectDynamics(pmProjectId)); + } + } diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsProjectServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsProjectServiceImpl.java index 3715af59b..ed1764326 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsProjectServiceImpl.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsProjectServiceImpl.java @@ -455,6 +455,14 @@ public class PmsProjectServiceImpl implements IPmsProjectService } } + @Override + public JSONObject getPmsProjectDynamics(Long pmProjectId) { + // 校验数据权限 + selectAndCheckPmsProjectById(pmProjectId); + JSONObject result = gitLinkRequestHelper.doGet(PmsGitLinkRequestUrl.GET_OPERATE_JOURNALS(pmProjectId)); + //todo 获取项目其他模块操作记录,和项目动态合并,取top10 + return result.getJSONObject(DATA_KEY); + } @Override public JSONObject getPmsProjectStatistics(Long pmProjectId) { diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/utils/PmsGitLinkRequestUrl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/utils/PmsGitLinkRequestUrl.java index 14c805ba6..d9b37d278 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/utils/PmsGitLinkRequestUrl.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/utils/PmsGitLinkRequestUrl.java @@ -386,4 +386,9 @@ public class PmsGitLinkRequestUrl extends GitLinkRequestUrl { return getGitLinkRequestUrl( String.format("/api/pm/dashboards/my_projects?project_id=%d", repositoryId)); } + + public static GitLinkRequestUrl GET_OPERATE_JOURNALS(Long pmProjectId) { + return getGitLinkRequestUrl( + String.format("/api/pm/dashboards/my_operate_journals?pm_project_id=%d&page=1&limit=10", pmProjectId)); + } }