From 742b70df6439d907be1ea52d4e96f1d54a1cba08 Mon Sep 17 00:00:00 2001 From: OTTO <731554297@qq.com> Date: Tue, 30 Jul 2024 09:14:26 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E5=88=B6=E5=93=81=E5=BA=93=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=AE=8C=E5=96=84):=20=E5=8F=97=E6=8E=A7=E5=BA=93?= =?UTF-8?q?=E5=92=8C=E4=BA=A7=E5=93=81=E5=BA=93=20=E5=9D=87=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=20=E5=90=8D=E7=A7=B0=E5=92=8C=E6=A0=87=E8=AF=86?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 快照库支持快照库名称传入（快照库标识基于操作时间生成） --- .../domain/vo/ProductRepositoriesSnapshotInputVo.java | 8 +++++--- .../impl/PmsProductLibrarySnapshotRepoServiceImpl.java | 7 ++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/ProductRepositoriesSnapshotInputVo.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/ProductRepositoriesSnapshotInputVo.java index 5139e9571..42e1703db 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/ProductRepositoriesSnapshotInputVo.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/ProductRepositoriesSnapshotInputVo.java @@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.Pattern; +import javax.validation.constraints.NotBlank; /** * 制品库-仓库对象 pms_product_library_repositories @@ -19,9 +19,11 @@ import javax.validation.constraints.Pattern; @Data @ApiModel("快照库输入对象") public class ProductRepositoriesSnapshotInputVo { - @ApiModelProperty(value = "快照库标识（非必填，未填将根据时分秒生成名称）") - @Pattern(regexp = "^[A-Za-z0-9](?!_)(?!\\.)[A-Za-z0-9_\\-.]*$", message = "快照库标识不符合规范") + @ApiModelProperty(value = "快照库标识", hidden = true) private String name; + @ApiModelProperty(value = "快照库名称") + @NotBlank(message = "快照库名称不能为空") + private String alias; @ApiModelProperty(value = "制品库标识", hidden = true) private String repoName; @ApiModelProperty(value = "关联企业标识", hidden = true) diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/impl/PmsProductLibrarySnapshotRepoServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/impl/PmsProductLibrarySnapshotRepoServiceImpl.java index 3c903624a..25cb98c24 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/impl/PmsProductLibrarySnapshotRepoServiceImpl.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/impl/PmsProductLibrarySnapshotRepoServiceImpl.java @@ -4,7 +4,6 @@ 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.PageUtils; -import com.microservices.common.core.utils.StringUtils; import com.microservices.common.core.web.page.GenericsTableDataInfo; import com.microservices.common.security.utils.SecurityUtils; import com.microservices.pms.productLibrary.domain.PmsProductLibraryRepositories; @@ -78,10 +77,8 @@ public class PmsProductLibrarySnapshotRepoServiceImpl implements IPmsProductLibr @Override public Long insertPmsProductLibrarySnapshot(ProductRepositoriesSnapshotInputVo snapshotInputVo) { - // 未填快照库标识将根据时分秒生成名称 - if (StringUtils.isEmpty(snapshotInputVo.getName())) { - snapshotInputVo.setName(DateUtils.dateTimeNow()); - } + // 快照库标识根据时分秒生成名称 + snapshotInputVo.setName(DateUtils.dateTimeNow()); PmsProductLibraryRepositories repo = pmsProductLibraryRepositoriesService.selectPmsProductLibraryRepositoriesByName(snapshotInputVo.getEnterpriseIdentifier(), snapshotInputVo.getRepoName()); pmsProductLibraryRepositoriesService.checkLockRepositoryStatus(snapshotInputVo.getEnterpriseIdentifier(), repo.getId());