diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/controller/PmsProductLibraryRepositoriesController.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/controller/PmsProductLibraryRepositoriesController.java index 724b1c7f6..afa4b0935 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/controller/PmsProductLibraryRepositoriesController.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/controller/PmsProductLibraryRepositoriesController.java @@ -49,7 +49,7 @@ public class PmsProductLibraryRepositoriesController extends BaseController { @GetMapping("/byRepoName/{repoName}") @ApiOperation(value = "获取制品库详情") public GenericsAjaxResult getByRepoName(@PathVariable String enterpriseIdentifier, - @ApiParam(value = "制品库名称", required = true) @PathVariable String repoName) { + @ApiParam(value = "制品库标识", required = true) @PathVariable String repoName) { return GenericsAjaxResult.success(pmsProductLibraryRepositoriesService.selectPmsProductLibraryRepositoriesDataByName(enterpriseIdentifier, repoName)); } @@ -61,7 +61,7 @@ public class PmsProductLibraryRepositoriesController extends BaseController { @ApiOperation(value = "查询制品库列表") public GenericsTableDataInfo list( @PathVariable String enterpriseIdentifier, - @ApiParam("制品库格式") PmsProductLibraryRepositoriesSearchVo searchVo) { + @ApiParam("制品库搜索") PmsProductLibraryRepositoriesSearchVo searchVo) { startPage(); return pmsProductLibraryRepositoriesService.selectPmsProductLibraryRepositoriesPageList(enterpriseIdentifier, searchVo); } diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/PmsProductLibraryRepositories.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/PmsProductLibraryRepositories.java index 6cbb5b8d1..e767495a2 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/PmsProductLibraryRepositories.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/PmsProductLibraryRepositories.java @@ -31,9 +31,9 @@ public class PmsProductLibraryRepositories extends BaseEntity { private Long id; /** - * 制品仓库名称 + * 制品仓库标识 */ - @ApiModelProperty(value = "制品仓库名称") + @ApiModelProperty(value = "制品仓库标识") private String name; /** @@ -83,11 +83,10 @@ public class PmsProductLibraryRepositories extends BaseEntity { private String attributes; /** - * 预留字段1 + * 制品仓库名称 */ - @ApiModelProperty(value = "预留字段1") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private String reservedField1; + @ApiModelProperty(value = "制品仓库名称") + private String alias; /** * 预留字段2 diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/GroupRepositoriesInputVo.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/GroupRepositoriesInputVo.java index a07145b87..bcd387b8f 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/GroupRepositoriesInputVo.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/GroupRepositoriesInputVo.java @@ -17,10 +17,14 @@ import javax.validation.constraints.Pattern; @Data @ApiModel("虚拟仓库输入对象") public class GroupRepositoriesInputVo extends GroupRepositoriesOperateVo { + @ApiModelProperty(value = "虚拟仓库标识") + @NotBlank(message = "虚拟仓库标识不能为空") + @Pattern(regexp = "^[A-Za-z0-9](?!_)(?!\\.)[A-Za-z0-9_\\-.]*$", message = "虚拟仓库标识不符合规范") + private String name; + @ApiModelProperty(value = "虚拟仓库名称") @NotBlank(message = "虚拟仓库名称不能为空") - @Pattern(regexp = "^[A-Za-z0-9](?!_)(?!\\.)[A-Za-z0-9_\\-.]*$", message = "虚拟仓库名称不符合规范") - private String name; + private String alias; @Override public NexusGroupRepoInputVo toNexusGroupRepoInputVo() { @@ -33,6 +37,7 @@ public class GroupRepositoriesInputVo extends GroupRepositoriesOperateVo { public PmsProductLibraryRepositories toPmsProductLibraryRepositories() { PmsProductLibraryRepositories target = super.toPmsProductLibraryRepositories(); target.setName(name); + target.setAlias(alias); return target; } } diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/GroupRepositoriesOperateVo.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/GroupRepositoriesOperateVo.java index 86986ea54..bf3aa3595 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/GroupRepositoriesOperateVo.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/GroupRepositoriesOperateVo.java @@ -22,8 +22,10 @@ import javax.validation.constraints.NotNull; public class GroupRepositoriesOperateVo { @ApiModelProperty(value = "制品库Id", hidden = true) private Long id; - @ApiModelProperty(value = "虚拟仓库名称", hidden = true) + @ApiModelProperty(value = "虚拟仓库标识", hidden = true) private String name; + @ApiModelProperty(value = "虚拟仓库名称") + private String alias; @ApiModelProperty(value = "企业标识", hidden = true) private String enterpriseIdentifier; @ApiModelProperty(value = "制品库类型", hidden = true) diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/HostedRepositoriesInputVo.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/HostedRepositoriesInputVo.java index 56a5a5ab4..9b4109300 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/HostedRepositoriesInputVo.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/HostedRepositoriesInputVo.java @@ -17,15 +17,19 @@ import javax.validation.constraints.Pattern; @Data @ApiModel("托管制品库输入对象") public class HostedRepositoriesInputVo extends HostedRepositoriesOperateVo { - @ApiModelProperty(value = "制品仓库名称") - @NotBlank(message = "制品库名称不能为空") - @Pattern(regexp = "^[A-Za-z0-9](?!_)(?!\\.)[A-Za-z0-9_\\-.]*$", message = "制品库名称不符合规范") + @ApiModelProperty(value = "制品库标识") + @NotBlank(message = "制品库标识不能为空") + @Pattern(regexp = "^[A-Za-z0-9](?!_)(?!\\.)[A-Za-z0-9_\\-.]*$", message = "制品库标识不符合规范") private String name; + @ApiModelProperty(value = "制品库名称") + @NotBlank(message = "制品库名称不能为空") + private String alias; @Override public PmsProductLibraryRepositories toPmsProductLibraryRepositories() { PmsProductLibraryRepositories target = super.toPmsProductLibraryRepositories(); target.setName(name); + target.setAlias(alias); return target; } diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/HostedRepositoriesOperateVo.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/HostedRepositoriesOperateVo.java index 8c662a558..7f76e6f29 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/HostedRepositoriesOperateVo.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/HostedRepositoriesOperateVo.java @@ -21,7 +21,9 @@ import javax.validation.Valid; public class HostedRepositoriesOperateVo { @ApiModelProperty(value = "制品库Id", hidden = true) private Long id; - @ApiModelProperty(value = "制品库名称", hidden = true) + @ApiModelProperty(value = "制品库名称") + private String alias; + @ApiModelProperty(value = "制品库标识", hidden = true) private String name; @ApiModelProperty(value = "企业标识", hidden = true) private String enterpriseIdentifier; diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/PmsProductLibraryRepositoriesDataVo.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/PmsProductLibraryRepositoriesDataVo.java index f3a298863..fd6155f38 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/PmsProductLibraryRepositoriesDataVo.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/PmsProductLibraryRepositoriesDataVo.java @@ -20,12 +20,12 @@ public class PmsProductLibraryRepositoriesDataVo { */ private Long id; - /** - * 制品仓库名称 - */ - @ApiModelProperty(value = "制品仓库名称") + @ApiModelProperty(value = "制品仓库标识") private String name; + @ApiModelProperty(value = "制品仓库名称") + private String alias; + /** * 制品仓库名称类型 */ diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/PmsProductLibraryRepositoriesSearchVo.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/PmsProductLibraryRepositoriesSearchVo.java index c817a48ce..e5795f87b 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/PmsProductLibraryRepositoriesSearchVo.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/PmsProductLibraryRepositoriesSearchVo.java @@ -15,11 +15,11 @@ import lombok.Data; public class PmsProductLibraryRepositoriesSearchVo { - /** - * 制品仓库名称 - */ - @ApiModelProperty(value = "模糊搜索制品库名称") + @ApiModelProperty(value = "模糊搜索制品库标识") private String name; + + @ApiModelProperty(value = "模糊搜索制品库标识") + private String alias; /** * 制品仓库名称类型 */ diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/PmsProductLibraryRepositoriesSimpleVo.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/PmsProductLibraryRepositoriesSimpleVo.java index 2768b9c25..aebd1af79 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/PmsProductLibraryRepositoriesSimpleVo.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/PmsProductLibraryRepositoriesSimpleVo.java @@ -22,12 +22,12 @@ public class PmsProductLibraryRepositoriesSimpleVo { */ private Long id; - /** - * 制品仓库名称 - */ @ApiModelProperty(value = "制品仓库名称") private String name; + @ApiModelProperty(value = "制品仓库名称") + private String alias; + /** * 制品仓库名称类型 */ diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/ProductRepositoriesInputVo.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/ProductRepositoriesInputVo.java index a7791e730..dad9c8d04 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/ProductRepositoriesInputVo.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/ProductRepositoriesInputVo.java @@ -17,10 +17,14 @@ import javax.validation.constraints.Pattern; @Data @ApiModel("产品库输入对象") public class ProductRepositoriesInputVo extends ProductRepositoriesOperateVo { + @ApiModelProperty(value = "产品库标识") + @NotBlank(message = "产品库标识不能为空") + @Pattern(regexp = "^[A-Za-z0-9](?!_)(?!\\.)[A-Za-z0-9_\\-.]*$", message = "产品库标识不符合规范") + private String name; + @ApiModelProperty(value = "产品库名称") @NotBlank(message = "产品库名称不能为空") - @Pattern(regexp = "^[A-Za-z0-9](?!_)(?!\\.)[A-Za-z0-9_\\-.]*$", message = "产品库名称不符合规范") - private String name; + private String alias; @Override public NexusHostedRepoInputVo toNexusRepoDataVo() { @@ -33,6 +37,7 @@ public class ProductRepositoriesInputVo extends ProductRepositoriesOperateVo { public PmsProductLibraryRepositories toPmsProductLibraryRepositories() { PmsProductLibraryRepositories target = super.toPmsProductLibraryRepositories(); target.setName(name); + target.setAlias(alias); return target; } } diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/ProductRepositoriesOperateVo.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/ProductRepositoriesOperateVo.java index 966d801ad..723a33c25 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/ProductRepositoriesOperateVo.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/ProductRepositoriesOperateVo.java @@ -18,9 +18,11 @@ import lombok.Data; @Data @ApiModel("产品库操作对象") public class ProductRepositoriesOperateVo { - @ApiModelProperty(value = "产品库标识", hidden = true) + @ApiModelProperty(value = "产品库Id", hidden = true) private Long id; - @ApiModelProperty(value = "产品库名称", hidden = true) + @ApiModelProperty(value = "产品库名称") + private String alias; + @ApiModelProperty(value = "产品库标识", hidden = true) private String name; @ApiModelProperty(value = "企业标识", hidden = true) private String enterpriseIdentifier; @@ -31,6 +33,7 @@ public class ProductRepositoriesOperateVo { @ApiModelProperty(value = "产品库描述") private String describe; + public NexusHostedRepoInputVo toNexusRepoDataVo() { NexusHostedRepoInputVo target = new NexusHostedRepoInputVo(); BeanUtils.copyProperties(this, target); diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/impl/PmsProductLibraryAsyncServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/impl/PmsProductLibraryAsyncServiceImpl.java index 69248d691..8a17940e2 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/impl/PmsProductLibraryAsyncServiceImpl.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/impl/PmsProductLibraryAsyncServiceImpl.java @@ -258,7 +258,7 @@ public class PmsProductLibraryAsyncServiceImpl implements IPmsProductLibraryAsyn componentRawInputVo.setAttributes(nexusAssetResultDataVo.getAttributes().getJSONObject("customAttribute").toJSONString()); } componentRawInputVo.setAssetList(assetRawInputVoList); - componentRawInputVo.setDirectory(String.format("/%s/%s", repo.getName(), nexusAssetResultDataVo.getDirectory())); + componentRawInputVo.setDirectory(String.format("/%s/%s", repo.getAlias(), nexusAssetResultDataVo.getDirectory())); pmsProductLibraryComponentService.insertRawComponent(componentRawInputVo); } diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/impl/PmsProductLibraryProductRepoServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/impl/PmsProductLibraryProductRepoServiceImpl.java index 4db11ad36..4311175cb 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/impl/PmsProductLibraryProductRepoServiceImpl.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/impl/PmsProductLibraryProductRepoServiceImpl.java @@ -22,6 +22,7 @@ import com.microservices.pms.productLibrary.service.IPmsProductLibraryProductRep import com.microservices.pms.productLibrary.service.IPmsProductLibraryRepositoriesService; import com.microservices.pms.utils.NexusRequestHelper; import com.microservices.pms.utils.NexusRequestUrl; +import com.microservices.pms.utils.PmsUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -252,7 +253,7 @@ public class PmsProductLibraryProductRepoServiceImpl implements IPmsProductLibra nexusResultDataVoList.forEach(x -> { String decodeId = ServletUtils.urlDecode(x.getId()); // 去除多余连接符 - String nexusComponentId = repo.getName() + "/" + decodeId.replaceAll("/-/", "/"); + String nexusComponentId = PmsUtils.encodeChineseCharacters(repo.getAlias()) + "/" + decodeId.replaceAll("/-/", "/"); String componentPath = component.getPath().replaceAll("/-/", "/"); if (nexusComponentId.equals(componentPath)) { x.setIsChoose(true); diff --git a/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsProductLibraryRepositoriesMapper.xml b/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsProductLibraryRepositoriesMapper.xml index ebfbb1d05..f5c86afb4 100644 --- a/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsProductLibraryRepositoriesMapper.xml +++ b/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsProductLibraryRepositoriesMapper.xml @@ -17,7 +17,7 @@ - + @@ -36,7 +36,7 @@ pplr.create_by, pplr.del_flag, pplr.attributes, - pplr.reserved_field_1, + pplr.alias, pplr.snapshot_name, pplr.format, pe.enterprise_identifier @@ -151,7 +151,7 @@ create_by, del_flag, attributes, - reserved_field_1, + alias, snapshot_name, format, @@ -167,7 +167,7 @@ #{createBy}, #{delFlag}, #{attributes}, - #{reservedField1}, + #{alias}, #{snapshotName}, #{format}, @@ -187,7 +187,7 @@ create_by = #{createBy}, del_flag = #{delFlag}, attributes = #{attributes}, - reserved_field_1 = #{reservedField1}, + alias = #{alias}, snapshot_name = #{snapshotName}, format = #{format},