From 15e656fb4d42a54a02e39a94c48356c12467ef22 Mon Sep 17 00:00:00 2001 From: wanjia <553039491@qq.com> Date: Mon, 16 Dec 2024 15:12:57 +0800 Subject: [PATCH 01/17] =?UTF-8?q?feat(=E9=A1=B9=E7=9B=AE=E6=96=87=E6=A1=A3?= =?UTF-8?q?):=E6=9D=83=E9=99=90=E9=87=8D=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/microservices/pms/document/domain/PmsDocument.java | 2 ++ .../pms/document/domain/vo/PmsDocumentDetailVo.java | 2 +- .../pms/document/domain/vo/PmsDocumentInputVo.java | 5 ++--- .../pms/document/domain/vo/PmsDocumentUpdateVo.java | 4 ++-- .../microservices/pms/document/domain/vo/PmsDocumentVo.java | 2 +- .../pms/document/domain/vo/PmsFileTypeDocumentInputVo.java | 5 ++--- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/domain/PmsDocument.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/domain/PmsDocument.java index 76d8a9877..2798339da 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/domain/PmsDocument.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/domain/PmsDocument.java @@ -1,5 +1,6 @@ package com.microservices.pms.document.domain; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.microservices.common.core.annotation.Excel; import com.microservices.common.core.web.domain.BaseEntity; import org.apache.commons.lang3.builder.ToStringBuilder; @@ -56,6 +57,7 @@ public class PmsDocument extends BaseEntity /** 权限 1-私有 2-全员读 3-全员读写 */ @Excel(name = "权限 1-私有 2-全员读 3-全员读写") + @JsonIgnore private Integer permission; public void setId(Long id) diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/domain/vo/PmsDocumentDetailVo.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/domain/vo/PmsDocumentDetailVo.java index 00cfc782f..8e1d6bfff 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/domain/vo/PmsDocumentDetailVo.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/domain/vo/PmsDocumentDetailVo.java @@ -60,7 +60,7 @@ public class PmsDocumentDetailVo private Integer isTop; /** 权限 1-私有 2-全员读 3-全员读写 */ - @ApiModelProperty(value = "权限 1-私有 2-全员读 3-全员读写") + @ApiModelProperty(value = "权限 1-私有 2-全员读 3-全员读写", hidden = true) private Integer permission; @ApiModelProperty(value = "文档创建者") diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/domain/vo/PmsDocumentInputVo.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/domain/vo/PmsDocumentInputVo.java index a773de22c..b84c852eb 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/domain/vo/PmsDocumentInputVo.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/domain/vo/PmsDocumentInputVo.java @@ -60,9 +60,8 @@ public class PmsDocumentInputVo private Integer isTop; /** 权限 1-私有 2-全员读 3-全员读写 */ - @ApiModelProperty(value = "权限 1-私有 2-全员读 3-全员读写", required = true) - @NotNull - private Integer permission; + @ApiModelProperty(value = "权限 1-私有 2-全员读 3-全员读写", hidden = true) + private Integer permission = 3; public PmsDocument toPmsDocument() { PmsDocument pmsDocument = new PmsDocument(); diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/domain/vo/PmsDocumentUpdateVo.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/domain/vo/PmsDocumentUpdateVo.java index 6615244aa..5ba29258a 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/domain/vo/PmsDocumentUpdateVo.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/domain/vo/PmsDocumentUpdateVo.java @@ -47,8 +47,8 @@ public class PmsDocumentUpdateVo private Integer isTop; /** 权限 1-私有 2-全员读 3-全员读写 */ - @ApiModelProperty(value = "权限 1-私有 2-全员读 3-全员读写") - private Integer permission; + @ApiModelProperty(value = "权限 1-私有 2-全员读 3-全员读写", hidden = true) + private Integer permission = 3; public PmsDocument toPmsDocument() { PmsDocument pmsDocument = new PmsDocument(); diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/domain/vo/PmsDocumentVo.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/domain/vo/PmsDocumentVo.java index 2dce58658..baf36d83a 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/domain/vo/PmsDocumentVo.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/domain/vo/PmsDocumentVo.java @@ -55,7 +55,7 @@ public class PmsDocumentVo private Integer isTop; /** 权限 1-私有 2-全员读 3-全员读写 */ - @ApiModelProperty(value = "权限 1-私有 2-全员读 3-全员读写") + @ApiModelProperty(value = "权限 1-私有 2-全员读 3-全员读写", hidden = true) private Integer permission; @ApiModelProperty(value = "文档创建者") diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/domain/vo/PmsFileTypeDocumentInputVo.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/domain/vo/PmsFileTypeDocumentInputVo.java index f7bbf2f27..27f1aaa97 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/domain/vo/PmsFileTypeDocumentInputVo.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/domain/vo/PmsFileTypeDocumentInputVo.java @@ -45,7 +45,6 @@ public class PmsFileTypeDocumentInputVo private String[] attachmentIdentifiers; /** 权限 1-私有 2-全员读 3-全员读写 */ - @ApiModelProperty(value = "权限 1-私有 2-全员读 3-全员读写", required = true) - @NotNull - private Integer permission; + @ApiModelProperty(value = "权限 1-私有 2-全员读 3-全员读写", hidden = true) + private Integer permission = 3; } From a9a75dc100bf0da6a36748cb71d0d021ad6fd168 Mon Sep 17 00:00:00 2001 From: wanjia <553039491@qq.com> Date: Thu, 26 Dec 2024 11:40:03 +0800 Subject: [PATCH 02/17] =?UTF-8?q?feat(=E7=BB=84=E7=BB=87=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E5=8F=B0):=E4=BA=A7=E5=93=81=E7=BB=9F=E8=AE=A1=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dashboard/controller/PmsDashboardController.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/dashboard/controller/PmsDashboardController.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/dashboard/controller/PmsDashboardController.java index 9645e37b5..a331f1e42 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/dashboard/controller/PmsDashboardController.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/dashboard/controller/PmsDashboardController.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; +import static com.microservices.pms.utils.PmsConstants.PRODUCT_PLAN_CLOSED_STATUS_NAME; + @RestController @RequestMapping("/{enterpriseIdentifier}/dashboard") @Api(tags = "项目管理-工作台") @@ -223,8 +225,7 @@ public class PmsDashboardController extends BaseController { PmsRequirementStatResVo pmsRequirementStatResVo = buildPmsRequirementStatResVo( productIdentifier, getReqSpecsList(), - ProductReqStatus.REVIEWED_REQ_SPECS); - + ProductReqStatus.COMPLETED_REQ_SPECS); return R.ok(pmsRequirementStatResVo); } @@ -237,7 +238,7 @@ public class PmsDashboardController extends BaseController { PmsProductStatus pmsProductStatus = new PmsProductStatus(); pmsProductStatus.setType(1); List pmsTypeDataVos = pmsProductStatusService.selectPmsProductStatusList(pmsProductStatus); - List statusStatVos = pmsTypeDataVos.stream().map(e -> { + List statusStatVos = pmsTypeDataVos.stream().filter(e -> !PRODUCT_PLAN_CLOSED_STATUS_NAME.equals(e.getName())).map(e -> { ReqStatusStatVo vo = new ReqStatusStatVo(); vo.setKey(String.valueOf(e.getId())); vo.setNum(status2NumMap.getOrDefault(String.valueOf(e.getId()), 0)); @@ -258,10 +259,9 @@ public class PmsDashboardController extends BaseController { private List getReqSpecsList() { return Stream.of(ProductReqStatus.PENDING_REVIEW_REQ_SPECS.getKey(), ProductReqStatus.PLANNED_REQ_SPECS.getKey(), - ProductReqStatus.REJECTED_CHANGE_REQ_SPECS.getKey(), + ProductReqStatus.REJECTED_REQ_SPECS.getKey(), ProductReqStatus.REVIEWED_REQ_SPECS.getKey(), - ProductReqStatus.COMPLETED_REQ_SPECS.getKey(), - ProductReqStatus.CHANGED_REQ_SPECS.getKey()) + ProductReqStatus.COMPLETED_REQ_SPECS.getKey()) .collect(Collectors.toList()); } From 182db3e87220143025932bf5cfea63a0084a842a Mon Sep 17 00:00:00 2001 From: wanjia <553039491@qq.com> Date: Wed, 15 Jan 2025 09:27:31 +0800 Subject: [PATCH 03/17] =?UTF-8?q?feat(=E7=BB=84=E7=BB=87=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E5=8F=B0):#124149=20=E6=88=91=E7=9A=84=E4=BA=A7=E5=93=81=20?= =?UTF-8?q?=E9=9C=80=E6=B1=82=E8=A7=84=E6=A0=BC=E7=BB=9F=E8=AE=A1=E6=95=B0?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PmsDashboardController.java | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/dashboard/controller/PmsDashboardController.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/dashboard/controller/PmsDashboardController.java index a331f1e42..9b87e0868 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/dashboard/controller/PmsDashboardController.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/dashboard/controller/PmsDashboardController.java @@ -192,7 +192,7 @@ public class PmsDashboardController extends BaseController { PmsProductStatVo statVo = new PmsProductStatVo(); String pmsProductIdentifier = e.getProductIdentifier(); Integer requirementCount = pmsProductRequirementService.countByIdentifierAndStatus(pmsProductIdentifier, getUserReqList()); - Integer reqSpecsCount = pmsProductRequirementService.countByIdentifierAndStatus(pmsProductIdentifier, getReqSpecsList()); + Integer reqSpecsCount = pmsProductRequirementService.countByIdentifierAndStatus(pmsProductIdentifier, getTotalReqSpecsList()); BeanUtils.copyProperties(e, statVo); statVo.setReqSpecsCount(reqSpecsCount); statVo.setUserReqCount(requirementCount); @@ -253,7 +253,7 @@ public class PmsDashboardController extends BaseController { /** - * 获取 需求规格状态list + * 获取 统计饼图所需的需求规格状态list * @return 需求规格状态list */ private List getReqSpecsList() { @@ -265,6 +265,20 @@ public class PmsDashboardController extends BaseController { .collect(Collectors.toList()); } + /** + * 获取Count总数时，需求规格的状态list + * @return 需求规格状态list + */ + private List getTotalReqSpecsList() { + return Stream.of(ProductReqStatus.PENDING_REVIEW_REQ_SPECS.getKey(), + ProductReqStatus.PLANNED_REQ_SPECS.getKey(), + ProductReqStatus.REJECTED_REQ_SPECS.getKey(), + ProductReqStatus.REVIEWED_REQ_SPECS.getKey(), + ProductReqStatus.COMPLETED_REQ_SPECS.getKey(), + ProductReqStatus.CHANGING_REQ_SPECS.getKey()) + .collect(Collectors.toList()); + } + /** * 获取 用户需求状态list * @return 用户需求状态list From 9c89e972878d11869c30200d227857ea96384cfd Mon Sep 17 00:00:00 2001 From: wanjia <553039491@qq.com> Date: Thu, 16 Jan 2025 10:48:23 +0800 Subject: [PATCH 04/17] =?UTF-8?q?fix(=E7=BB=84=E7=BB=87=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E5=8F=B0):=E7=94=A8=E6=88=B7=E9=9C=80=E6=B1=82=E3=80=81?= =?UTF-8?q?=E9=9C=80=E6=B1=82=E8=A7=84=E6=A0=BC=E7=BB=9F=E8=AE=A1=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E7=8E=87=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pms/dashboard/controller/PmsDashboardController.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/dashboard/controller/PmsDashboardController.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/dashboard/controller/PmsDashboardController.java index 60a9b605e..d6231efe0 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/dashboard/controller/PmsDashboardController.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/dashboard/controller/PmsDashboardController.java @@ -312,9 +312,11 @@ public class PmsDashboardController extends BaseController { resVo.setRatio(0); //计算 各自的比率 int sum = statusStatVos.stream().mapToInt(ReqStatusStatVo::getNum).sum(); - if (sum > 0){ - Integer reviewedUserReqCount = status2NumMap.getOrDefault(productReqStatus.getName(), 0); - resVo.setRatio(reviewedUserReqCount/sum * 100); + if (sum > 0) { + Integer completedReqSpecsCount = status2NumMap.getOrDefault(productReqStatus.getKey(), 0); + double ratioDouble = (double) completedReqSpecsCount / sum * 100; + int ratio = (int) Math.round(ratioDouble); + resVo.setRatio(ratio); } return resVo; } From 730b8b30eddb8885d1617188b243782d8bdd11c9 Mon Sep 17 00:00:00 2001 From: wanjia <553039491@qq.com> Date: Thu, 16 Jan 2025 11:45:43 +0800 Subject: [PATCH 05/17] =?UTF-8?q?fix(=E7=BB=84=E7=BB=87=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E5=8F=B0):=E6=88=91=E8=B4=9F=E8=B4=A3=E7=9A=84=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E6=95=B0=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pms/dashboard/controller/PmsDashboardController.java | 5 +++++ .../microservices/pms/dashboard/domain/vo/MyDashboardVo.java | 3 +++ 2 files changed, 8 insertions(+) diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/dashboard/controller/PmsDashboardController.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/dashboard/controller/PmsDashboardController.java index d6231efe0..412788134 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/dashboard/controller/PmsDashboardController.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/dashboard/controller/PmsDashboardController.java @@ -86,6 +86,11 @@ public class PmsDashboardController extends BaseController { pmsProductRequirement.setCreateBy(SecurityUtils.getUsername()); Integer requirementCount = pmsProductRequirementService.selectProductReqSpecsCount(pmsProductRequirement); myDashboardVo.setProductRequirementCount(requirementCount); + + long assignedMeProductCount = pmsProductList.stream() + .filter(pmsProduct -> pmsProduct.getProductAssigneeGitlinkIds().contains(String.valueOf(SecurityUtils.getGitlinkUserId()))) + .count(); + myDashboardVo.setAssignedMeProductCount((int) assignedMeProductCount); } return success(myDashboardVo); } diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/dashboard/domain/vo/MyDashboardVo.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/dashboard/domain/vo/MyDashboardVo.java index 587f2545a..e0cabf57b 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/dashboard/domain/vo/MyDashboardVo.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/dashboard/domain/vo/MyDashboardVo.java @@ -11,4 +11,7 @@ public class MyDashboardVo extends IssueTypeTotalCountVo { @ApiModelProperty(value = "产品需求数") private int productRequirementCount; + + @ApiModelProperty(value = "我负责的产品数") + private int assignedMeProductCount; } From 1d9932346591e0d022c2d0997d8e6d0e586c9865 Mon Sep 17 00:00:00 2001 From: wanjia <553039491@qq.com> Date: Tue, 21 Jan 2025 09:25:34 +0800 Subject: [PATCH 06/17] =?UTF-8?q?fix(=E7=9F=A5=E8=AF=86=E5=BA=93):?= =?UTF-8?q?=E6=88=91=E6=94=B6=E8=97=8F=E7=9A=84=E7=9F=A5=E8=AF=86=E5=BA=93?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PmsDocumentUserFavoriteController.java | 4 ++-- .../document/domain/vo/PmsDocumentFavoriteSearchVo.java | 4 ++++ .../document/service/IPmsDocumentUserFavoriteService.java | 2 +- .../service/impl/PmsDocumentUserFavoriteServiceImpl.java | 8 +++++++- .../src/main/resources/mapper/pms/PmsDocumentMapper.xml | 1 + 5 files changed, 15 insertions(+), 4 deletions(-) diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/controller/PmsDocumentUserFavoriteController.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/controller/PmsDocumentUserFavoriteController.java index 76a0594ab..778b174ef 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/controller/PmsDocumentUserFavoriteController.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/controller/PmsDocumentUserFavoriteController.java @@ -36,10 +36,10 @@ public class PmsDocumentUserFavoriteController extends BaseController * 查询用户收藏文档列表 */ @GetMapping("/list") - public GenericsTableDataInfo list(PmsDocumentFavoriteSearchVo pmsDocumentFavoriteSearchVo) + public GenericsTableDataInfo list(@PathVariable String enterpriseIdentifier, PmsDocumentFavoriteSearchVo pmsDocumentFavoriteSearchVo) { - return pmsDocumentUserFavoriteService.selectPmsDocumentUserFavoriteList(pmsDocumentFavoriteSearchVo); + return pmsDocumentUserFavoriteService.selectPmsDocumentUserFavoriteList(enterpriseIdentifier, pmsDocumentFavoriteSearchVo); } /** diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/domain/vo/PmsDocumentFavoriteSearchVo.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/domain/vo/PmsDocumentFavoriteSearchVo.java index 2cbc5ed6a..06cc2e80b 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/domain/vo/PmsDocumentFavoriteSearchVo.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/domain/vo/PmsDocumentFavoriteSearchVo.java @@ -30,4 +30,8 @@ public class PmsDocumentFavoriteSearchVo extends BaseEntity @JsonIgnore @ApiModelProperty(value = "用户id", hidden = true) private Long currentUserId; + + @JsonIgnore + @ApiModelProperty(value = "企业id", hidden = true) + private Long pmsEnterpriseId; } diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/service/IPmsDocumentUserFavoriteService.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/service/IPmsDocumentUserFavoriteService.java index 2f3abcd00..a44b5ed8f 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/service/IPmsDocumentUserFavoriteService.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/service/IPmsDocumentUserFavoriteService.java @@ -29,5 +29,5 @@ public interface IPmsDocumentUserFavoriteService */ public int deletePmsDocumentUserFavoriteByDocId(Long documentId); - GenericsTableDataInfo selectPmsDocumentUserFavoriteList(PmsDocumentFavoriteSearchVo pmsDocumentFavoriteSearchVo); + GenericsTableDataInfo selectPmsDocumentUserFavoriteList(String enterpriseIdentifier, PmsDocumentFavoriteSearchVo pmsDocumentFavoriteSearchVo); } diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/service/impl/PmsDocumentUserFavoriteServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/service/impl/PmsDocumentUserFavoriteServiceImpl.java index feef7cdc4..1559f0df0 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/service/impl/PmsDocumentUserFavoriteServiceImpl.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/service/impl/PmsDocumentUserFavoriteServiceImpl.java @@ -11,6 +11,8 @@ import com.microservices.pms.document.domain.vo.PmsDocumentVo; import com.microservices.pms.document.mapper.PmsDocumentMapper; import com.microservices.pms.document.mapper.PmsDocumentUserFavoriteMapper; import com.microservices.pms.document.service.IPmsDocumentUserFavoriteService; +import com.microservices.pms.enterprise.service.IPmsEnterpriseService; +import com.microservices.pms.enterprise.service.impl.PmsEnterpriseServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -36,6 +38,9 @@ public class PmsDocumentUserFavoriteServiceImpl implements IPmsDocumentUserFavor @Autowired private PmsDocumentServiceImpl pmsDocumentService; + @Autowired + private IPmsEnterpriseService pmsEnterpriseService; + /** * 新增用户收藏文档 * @@ -67,8 +72,9 @@ public class PmsDocumentUserFavoriteServiceImpl implements IPmsDocumentUserFavor } @Override - public GenericsTableDataInfo selectPmsDocumentUserFavoriteList(PmsDocumentFavoriteSearchVo pmsDocumentFavoriteSearchVo) { + public GenericsTableDataInfo selectPmsDocumentUserFavoriteList(String enterpriseIdentifier, PmsDocumentFavoriteSearchVo pmsDocumentFavoriteSearchVo) { pmsDocumentFavoriteSearchVo.setCurrentUserId(SecurityUtils.getUserId()); + pmsDocumentFavoriteSearchVo.setPmsEnterpriseId(pmsEnterpriseService.selectPmsEnterpriseByIdentifier(enterpriseIdentifier).getId()); List pmsDocumentList = pmsDocumentMapper.selectPmsFavoriteDocumentList(pmsDocumentFavoriteSearchVo); return toPage(pmsDocumentList,pmsDocumentService::buildPmsDocumentVo); } diff --git a/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsDocumentMapper.xml b/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsDocumentMapper.xml index 8a39b39f2..36ad6adc6 100644 --- a/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsDocumentMapper.xml +++ b/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsDocumentMapper.xml @@ -95,6 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join pms_document_user_favorite as pduf on pduf.pms_document_id = pd.id pduf.user_id = #{currentUserId} + and pd.pms_enterprise_id = #{pmsEnterpriseId} and pd.name like concat('%', #{name}, '%') and pd.doc_type = #{docType} ${params.dataScope} From 40bc06fc115ff6f953bfe633f94d237868a224b8 Mon Sep 17 00:00:00 2001 From: wanjia <553039491@qq.com> Date: Tue, 21 Jan 2025 09:56:38 +0800 Subject: [PATCH 07/17] =?UTF-8?q?fix(=E7=9F=A5=E8=AF=86=E5=BA=93):?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E7=BB=84=E7=BB=87=E5=86=85=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E5=90=8C=E5=90=8D=E7=9F=A5=E8=AF=86=E5=BA=93?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pms/document/service/impl/PmsDocumentServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/service/impl/PmsDocumentServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/service/impl/PmsDocumentServiceImpl.java index ddd08b60e..590a42f2d 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/service/impl/PmsDocumentServiceImpl.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/service/impl/PmsDocumentServiceImpl.java @@ -150,7 +150,7 @@ public class PmsDocumentServiceImpl implements IPmsDocumentService checkPmsProjectById(pmsDocument.getPmsProjectId()); checkAuthAndReturnAdminStatus(pmsDocument.getPmsEnterpriseId()); String currentUserName = SecurityUtils.getUsername(); - checkForSameDocumentExistence(pmsDocument.getName(), pmsDocument.getDocType(), pmsDocument.getParentId(), pmsDocument.getPmsProjectId()); + checkForSameDocumentExistence(pmsDocument.getName(), pmsDocument.getDocType(), pmsDocument.getParentId(), pmsDocument.getPmsProjectId(), pmsDocument.getPmsEnterpriseId()); pmsDocument.setCreateTime(DateUtils.getNowDate()); pmsDocument.setCreateBy(currentUserName); return pmsDocumentMapper.insertPmsDocument(pmsDocument); @@ -311,7 +311,7 @@ public class PmsDocumentServiceImpl implements IPmsDocumentService pmsDocument.setCreateTime(DateUtils.getNowDate()); pmsDocument.setUpdateTime(DateUtils.getNowDate()); pmsDocument.setCreateBy(currentUserName); - checkForSameDocumentExistence(pmsDocument.getName(), pmsDocument.getDocType(), pmsDocument.getParentId(), pmsDocument.getPmsProjectId()); + checkForSameDocumentExistence(pmsDocument.getName(), pmsDocument.getDocType(), pmsDocument.getParentId(), pmsDocument.getPmsProjectId(), pmsDocument.getPmsEnterpriseId()); pmsDocumentList.add(pmsDocument); } return pmsDocumentMapper.batchInsertPmsDocument(pmsDocumentList); @@ -324,7 +324,7 @@ public class PmsDocumentServiceImpl implements IPmsDocumentService } } - private void checkForSameDocumentExistence(String name, Integer docType, Long parentId, Long pmsProjectId) { + private void checkForSameDocumentExistence(String name, Integer docType, Long parentId, Long pmsProjectId, Long pmsEnterpriseId) { if (pmsDocumentMapper.countDocumentByNameAndTypeAndParenId(name, docType, parentId, pmsProjectId) > 0) { throw new ServiceException("当前目录已存在同名文档：[%s]", name); } From 67dae46b2263ef3956724b5b5a9aea2571a798cc Mon Sep 17 00:00:00 2001 From: wanjia <553039491@qq.com> Date: Tue, 21 Jan 2025 09:59:12 +0800 Subject: [PATCH 08/17] =?UTF-8?q?fix(=E7=9F=A5=E8=AF=86=E5=BA=93):?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E7=BB=84=E7=BB=87=E5=86=85=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E5=90=8C=E5=90=8D=E7=9F=A5=E8=AF=86=E5=BA=93?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../microservices/pms/document/mapper/PmsDocumentMapper.java | 2 +- .../pms/document/service/impl/PmsDocumentServiceImpl.java | 2 +- .../src/main/resources/mapper/pms/PmsDocumentMapper.xml | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/mapper/PmsDocumentMapper.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/mapper/PmsDocumentMapper.java index 529f309ce..4c8842a60 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/mapper/PmsDocumentMapper.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/mapper/PmsDocumentMapper.java @@ -79,7 +79,7 @@ public interface PmsDocumentMapper int countChildDocByIds(@Param("ids") Long[] ids); - int countDocumentByNameAndTypeAndParenId(@Param("name") String name, @Param("docType") Integer docType, @Param("parenId") Long parenId, @Param("pmsProjectId") Long pmsProjectId); + int countDocumentByNameAndTypeAndParenId(@Param("name") String name, @Param("docType") Integer docType, @Param("parenId") Long parenId, @Param("pmsProjectId") Long pmsProjectId, @Param("pmsEnterpriseId") Long pmsEnterpriseId); int deletePmsDocumentByIdWithoutAuthCheck(@Param("docId") Long docId); diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/service/impl/PmsDocumentServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/service/impl/PmsDocumentServiceImpl.java index 590a42f2d..24d28a868 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/service/impl/PmsDocumentServiceImpl.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/service/impl/PmsDocumentServiceImpl.java @@ -325,7 +325,7 @@ public class PmsDocumentServiceImpl implements IPmsDocumentService } private void checkForSameDocumentExistence(String name, Integer docType, Long parentId, Long pmsProjectId, Long pmsEnterpriseId) { - if (pmsDocumentMapper.countDocumentByNameAndTypeAndParenId(name, docType, parentId, pmsProjectId) > 0) { + if (pmsDocumentMapper.countDocumentByNameAndTypeAndParenId(name, docType, parentId, pmsProjectId, pmsEnterpriseId) > 0) { throw new ServiceException("当前目录已存在同名文档：[%s]", name); } } diff --git a/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsDocumentMapper.xml b/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsDocumentMapper.xml index 36ad6adc6..09af9d367 100644 --- a/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsDocumentMapper.xml +++ b/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsDocumentMapper.xml @@ -217,6 +217,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where `name` = #{name} and doc_type = #{docType} and pms_project_id = #{pmsProjectId} + and pms_enterprise_id = #{pmsEnterpriseId} and parent_id = #{parenId} From a0a1ec3d3d7bc7cdcc70be02666a8b1ec6b56be2 Mon Sep 17 00:00:00 2001 From: wanjia <553039491@qq.com> Date: Tue, 21 Jan 2025 11:23:21 +0800 Subject: [PATCH 09/17] =?UTF-8?q?fix(=E7=BB=84=E7=BB=87=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E5=8F=B0):=E4=BA=A7=E5=93=81=E9=9C=80=E6=B1=82=E3=80=81?= =?UTF-8?q?=E4=BA=A7=E5=93=81=E8=A7=84=E6=A0=BC=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pms/product/domain/vo/PmsRequirementStatResVo.java | 2 +- .../microservices/pms/product/domain/vo/ReqStatusStatVo.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/PmsRequirementStatResVo.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/PmsRequirementStatResVo.java index 16ac4b544..9d98dbca8 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/PmsRequirementStatResVo.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/PmsRequirementStatResVo.java @@ -11,5 +11,5 @@ public class PmsRequirementStatResVo { private List pmsProductStatVos; @ApiModelProperty(value = "统计的比率") - private Integer ratio; + private Integer ratio=0; } diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/ReqStatusStatVo.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/ReqStatusStatVo.java index 2ab6bf0eb..c7db611d7 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/ReqStatusStatVo.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/ReqStatusStatVo.java @@ -11,5 +11,5 @@ import lombok.NoArgsConstructor; @Data @NoArgsConstructor public class ReqStatusStatVo extends EnumCommonVo { - private Integer num; + private Integer num=0; } From 782e2e7e5a2eec6c47820a68df0334a9e71fed38 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Thu, 23 Jan 2025 16:48:40 +0800 Subject: [PATCH 10/17] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B5=81=E6=B0=B4?= =?UTF-8?q?=E7=BA=BF=E6=89=A7=E8=A1=8C=E8=AF=A6=E6=83=85=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PmsCiPipelinesController.java | 20 +++++++ .../domain/vo/PmsCiPipelinesCardRunVo.java | 53 ++++++++++++++++++ .../domain/vo/PmsCiPipelinesCardVo.java | 43 +++++++++++++++ .../domain/vo/PmsCiPipelinesDetailVo.java | 2 + .../pipeline/mapper/PmsCiPipelinesMapper.java | 1 + .../service/IPmsCiPipelinesService.java | 1 + .../impl/PmsCiPipelinesServiceImpl.java | 54 ++++++++++++++++--- .../pms/utils/PmsGitLinkRequestUrl.java | 41 ++++++++++++++ .../mapper/pms/PmsCiPipelinesMapper.xml | 24 +++++++++ 9 files changed, 231 insertions(+), 8 deletions(-) create mode 100644 microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/domain/vo/PmsCiPipelinesCardRunVo.java create mode 100644 microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/domain/vo/PmsCiPipelinesCardVo.java diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/controller/PmsCiPipelinesController.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/controller/PmsCiPipelinesController.java index 4e3d29c4f..1cc549a2b 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/controller/PmsCiPipelinesController.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/controller/PmsCiPipelinesController.java @@ -54,6 +54,26 @@ public class PmsCiPipelinesController extends BaseController return pmsCiPipelinesService.selectPmsCiPipelinesList(enterpriseIdentifier, pipelineName, pipelineType); } + /** + * 查询流水线卡片列表 + */ +// @RequiresPermissions("pms:pipelines:list") + @GetMapping("/cardList") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "当前记录起始索引", paramType = "query", dataType = "Integer"), + @ApiImplicitParam(name = "pageSize", value = "每页显示记录数", paramType = "query", dataType = "Integer"), + @ApiImplicitParam(name = "orderByColumn", value = "排序列（更新时间：updateTime，创建时间：createTime）", paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "isAsc", value = "排序的方向desc或者asc,默认asc", paramType = "query", dataType = "String") + }) + @ApiOperation("流水线卡片列表") + public GenericsTableDataInfo cardList(@ApiParam(name = "enterpriseIdentifier", value = "企业标识") @PathVariable String enterpriseIdentifier, + @ApiParam("流水线名称搜索") @RequestParam(required = false) String pipelineName, + @ApiParam("流水线构建类型 1-声明式流水线 2-图形化流水线") @RequestParam(required = false) Integer pipelineType) + { + + return pmsCiPipelinesService.selectPmsCiPipelinesCardList(enterpriseIdentifier, pipelineName, pipelineType); + } + /** * 获取流水线详细信息 */ diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/domain/vo/PmsCiPipelinesCardRunVo.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/domain/vo/PmsCiPipelinesCardRunVo.java new file mode 100644 index 000000000..71bacc762 --- /dev/null +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/domain/vo/PmsCiPipelinesCardRunVo.java @@ -0,0 +1,53 @@ +package com.microservices.pms.pipeline.domain.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 流水线卡片执行详情对象 + * + * @author xxq + * @date 2025-01-23 + */ +@Data +@ApiModel("流水线卡片执行详情对象") +public class PmsCiPipelinesCardRunVo { + + + @ApiModelProperty(value = "名称") + private String name; + + @ApiModelProperty(value = "总执行数量") + private Long total; + + @ApiModelProperty(value = "成功执行数量") + private Long success; + + @ApiModelProperty(value = "失败执行数量") + private Long failure; + + @ApiModelProperty(value = "是否定时任务") + private Boolean schedule; + + @ApiModelProperty(value = "执行状态") + private Long status; + + @ApiModelProperty(value = "开始时间") + private Long started; + + @ApiModelProperty(value = "结束时间") + private Long stopped; + + @ApiModelProperty(value = "执行时长") + private Long length; + + @ApiModelProperty(value = "创建时间") + private Long created; + + @ApiModelProperty(value = "更新时间") + private Long updated; + +} diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/domain/vo/PmsCiPipelinesCardVo.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/domain/vo/PmsCiPipelinesCardVo.java new file mode 100644 index 000000000..175295468 --- /dev/null +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/domain/vo/PmsCiPipelinesCardVo.java @@ -0,0 +1,43 @@ +package com.microservices.pms.pipeline.domain.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 流水线卡片详情对象 pms_ci_pipelines + * + * @author xxq + * @date 2025-01-23 + */ +@Data +@ApiModel("流水线卡片详情对象") +public class PmsCiPipelinesCardVo { + + private Long id; + + /** + * 仓库owner + */ + @ApiModelProperty(value = "仓库owner") + private String owner; + + /** + * 仓库标识 + */ + @ApiModelProperty(value = "仓库标识") + private String repoIdentifier; + + @ApiModelProperty(value = "仓库名") + private String repoName; + + + @ApiModelProperty(value = "url") + private String url; + + @ApiModelProperty(value = "流水线列表") + private List pipelinesList; + +} diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/domain/vo/PmsCiPipelinesDetailVo.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/domain/vo/PmsCiPipelinesDetailVo.java index f271bbf1a..e4c75e967 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/domain/vo/PmsCiPipelinesDetailVo.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/domain/vo/PmsCiPipelinesDetailVo.java @@ -77,4 +77,6 @@ public class PmsCiPipelinesDetailVo @ApiModelProperty(value = "流水线模板JSON") private JSONObject pipelineTemplateJson; + @ApiModelProperty(value = "流水线执行详情") + private PmsCiPipelinesCardRunVo pmsCiPipelinesCardRunVo; } diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/mapper/PmsCiPipelinesMapper.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/mapper/PmsCiPipelinesMapper.java index 2bb1037e5..d8519b67e 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/mapper/PmsCiPipelinesMapper.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/mapper/PmsCiPipelinesMapper.java @@ -30,6 +30,7 @@ public interface PmsCiPipelinesMapper * @return 流水线集合 */ public List selectPmsCiPipelinesList(PmsCiPipelines pmsCiPipelines); + public List selectPmsCiPipelinesCardList(PmsCiPipelines pmsCiPipelines); /** * 新增流水线 diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/service/IPmsCiPipelinesService.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/service/IPmsCiPipelinesService.java index a427e2715..68a5bcb2a 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/service/IPmsCiPipelinesService.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/service/IPmsCiPipelinesService.java @@ -32,6 +32,7 @@ public interface IPmsCiPipelinesService * @return 流水线集合 */ public GenericsTableDataInfo selectPmsCiPipelinesList(String enterpriseIdentifier, String pipelineName, Integer pipelineType); + public GenericsTableDataInfo selectPmsCiPipelinesCardList(String enterpriseIdentifier, String pipelineName, Integer pipelineType); /** * 新增流水线 diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/service/impl/PmsCiPipelinesServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/service/impl/PmsCiPipelinesServiceImpl.java index a631a87b5..a5f6ca9c9 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/service/impl/PmsCiPipelinesServiceImpl.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/service/impl/PmsCiPipelinesServiceImpl.java @@ -1,15 +1,12 @@ package com.microservices.pms.pipeline.service.impl; -import java.net.URISyntaxException; -import java.util.Date; -import java.util.List; - import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSONObject; import com.microservices.common.core.exception.ServiceException; import com.microservices.common.core.utils.DateUtils; import com.microservices.common.core.utils.StringUtils; import com.microservices.common.core.utils.YamlValidatorUtils; +import com.microservices.common.core.utils.html.EscapeUtil; import com.microservices.common.core.web.page.GenericsTableDataInfo; import com.microservices.common.httpClient.domain.EntryDto; import com.microservices.common.httpClient.domain.FileEntryDto; @@ -19,21 +16,26 @@ import com.microservices.pms.common.service.IPmsCommonService; import com.microservices.pms.enterprise.domain.PmsEnterprise; import com.microservices.pms.enterprise.service.IPmsEnterpriseService; import com.microservices.pms.pipeline.domain.PmsCiPipelineGraphics; +import com.microservices.pms.pipeline.domain.PmsCiPipelines; import com.microservices.pms.pipeline.domain.vo.*; +import com.microservices.pms.pipeline.mapper.PmsCiPipelinesMapper; import com.microservices.pms.pipeline.service.IPmsCiPipelineGraphicsService; -import com.microservices.pms.utils.PmsConstants; +import com.microservices.pms.pipeline.service.IPmsCiPipelinesService; import com.microservices.pms.utils.PmsGitLinkRequestUrl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.microservices.pms.pipeline.mapper.PmsCiPipelinesMapper; -import com.microservices.pms.pipeline.domain.PmsCiPipelines; -import com.microservices.pms.pipeline.service.IPmsCiPipelinesService; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; +import java.net.URISyntaxException; +import java.util.Collections; +import java.util.Date; +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; import static com.microservices.common.core.utils.JSONUtils.convertObjectToJSONObject; import static com.microservices.common.core.utils.PageUtils.startPage; @@ -104,6 +106,28 @@ public class PmsCiPipelinesServiceImpl implements IPmsCiPipelinesService { return toPage(pipelinesList, this::buildPmsCiPipelinesDetailVo); } + /** + * 查询流水线卡片列表 + * + * @param enterpriseIdentifier 企业标识 + * @param pipelineName 流水线名 + * @param pipelineType + * @return 流水线 + */ + @Override + public GenericsTableDataInfo selectPmsCiPipelinesCardList(String enterpriseIdentifier, String pipelineName, Integer pipelineType) { + PmsEnterprise pmsEnterprise = pmsEnterpriseService.selectPmsEnterpriseByIdentifier(enterpriseIdentifier); + PmsCiPipelines pmsCiPipelines = new PmsCiPipelines(); + pmsCiPipelines.setPipelineName(pipelineName); + pmsCiPipelines.setPmsEnterpriseId(pmsEnterprise.getId()); + pmsCiPipelines.setPipelineType(pipelineType); + startPage(); + List pipelinesList = pmsCiPipelinesMapper.selectPmsCiPipelinesCardList(pmsCiPipelines); + String workflows = Optional.ofNullable(pipelinesList).orElse(Collections.emptyList()).stream().map(PmsCiPipelines::getFileName).collect(Collectors.joining(",")); + List result = gitLinkRequestHelper.doGetToObjectList(PmsGitLinkRequestUrl.GET_ACTION_RUN_DATA(pmsCiPipelines.getOwner(), workflows), PmsCiPipelinesCardRunVo.class); + return toPage(pipelinesList, x -> this.buildPmsCiPipelinesCardDetailVo(x, result)); + } + private PmsCiPipelinesDetailVo buildPmsCiPipelinesDetailVo(PmsCiPipelines pmsCiPipelines) { PmsCiPipelinesDetailVo pmsCiPipelinesDetailVo = new PmsCiPipelinesDetailVo(); BeanUtils.copyProperties(pmsCiPipelines, pmsCiPipelinesDetailVo); @@ -111,6 +135,20 @@ public class PmsCiPipelinesServiceImpl implements IPmsCiPipelinesService { return pmsCiPipelinesDetailVo; } + private PmsCiPipelinesCardVo buildPmsCiPipelinesCardDetailVo(PmsCiPipelines pmsCiPipelines, List result) { + PmsCiPipelinesCardVo pmsCiPipelinesCardVo = new PmsCiPipelinesCardVo(); + BeanUtils.copyProperties(pmsCiPipelines, pmsCiPipelinesCardVo); + pmsCiPipelinesCardVo.setUrl(EscapeUtil.removeExtraSlashOfUrl(gitLinkRequestHelper.gitLinkUrl + "/" + pmsCiPipelines.getOwner() + "/" + pmsCiPipelines.getRepoIdentifier())); + PmsCiPipelines queryCiPipelines = new PmsCiPipelines(); + queryCiPipelines.setRepoIdentifier(pmsCiPipelines.getRepoIdentifier()); + queryCiPipelines.setOwner(pmsCiPipelines.getOwner()); + queryCiPipelines.setPmsEnterpriseId(pmsCiPipelines.getPmsEnterpriseId()); + List pipelinesList = pmsCiPipelinesMapper.selectPmsCiPipelinesCardList(queryCiPipelines); + pmsCiPipelinesCardVo.setPipelinesList(Optional.ofNullable(pipelinesList).orElse(Collections.emptyList()).stream().map(this::buildPmsCiPipelinesDetailVo).collect(Collectors.toList())); + pmsCiPipelinesCardVo.getPipelinesList().forEach(x -> x.setPmsCiPipelinesCardRunVo(result.stream().filter(a -> a.getName().equals(x.getFileName())).findFirst().orElse(null))); + return pmsCiPipelinesCardVo; + } + /** * 新增流水线 * 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 e84cc5a4e..656da1a2a 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 @@ -395,4 +395,45 @@ public class PmsGitLinkRequestUrl extends GitLinkRequestUrl { public static GitLinkRequestUrl GET_PIPELINE_RUN_RESULTS(String owner, String repoIdentifier, String run){ return getGitLinkRequestUrl(String.format("/api/v1/%s/%s/pipelines/run_results.json?run_id=%s", owner, repoIdentifier, run)); } + + public static GitLinkRequestUrl GET_ACTION_NODES(String keyword, Integer pageNum, Integer pageSize) { + String path = String.format("/api/action/nodes.json?search=%s", keyword); + if (pageNum != null && pageSize != null) { + path = path + String.format("&page=%s&limit=%s", pageNum, pageSize); + } + return getGitLinkRequestUrl(path); + } + + public static GitLinkRequestUrl CREATE_ACTION_NODE(Long actionNodeId) { + return getGitLinkRequestUrl(String.format("api/action/nodes/%s", actionNodeId)); + } + + public static GitLinkRequestUrl GET_ACTION_NODE_TYPES(String keyword, Integer pageNum, Integer pageSize){ + String path = String.format("/api/action/nodes.json?search=%s", keyword); + if (pageNum != null && pageSize != null) { + path = path + String.format("&page=%s&limit=%s", pageNum, pageSize); + } + return getGitLinkRequestUrl(path); + } + + public static GitLinkRequestUrl CREATE_ACTION_NODE_TYPE(Long actionNodeTypeId) { + return getGitLinkRequestUrl(String.format("api/action/node_types/%s", actionNodeTypeId)); + } + + public static GitLinkRequestUrl GET_ACTION_TEMPLATES(String keyword, Integer pageNum, Integer pageSize){ + String path = String.format("/api/action/templates.json?search=%s", keyword); + if (pageNum != null && pageSize != null) { + path = path + String.format("&page=%s&limit=%s", pageNum, pageSize); + } + return getGitLinkRequestUrl(path); + } + + public static GitLinkRequestUrl CREATE_ACTION_TEMPLATE(Long actionTemplateId) { + return getGitLinkRequestUrl(String.format("api/action/action_templates/%s", actionTemplateId)); + } + + public static GitLinkRequestUrl GET_ACTION_RUN_DATA(String owner, String workflows) { + return getGitLinkRequestUrl(String.format("api/pm/action_runs?owner_id=%s&workflows=%s", owner, workflows)); + } + } diff --git a/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsCiPipelinesMapper.xml b/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsCiPipelinesMapper.xml index 155a15d00..bc08dde9a 100644 --- a/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsCiPipelinesMapper.xml +++ b/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsCiPipelinesMapper.xml @@ -55,6 +55,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ${params.dataScope} + +