Gitlink
/
microservices
0
1
Fork 12
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(制品库功能完善): 受控库和产品库 均增加 名称和标识字段 

快照库支持快照库名称传入（快照库标识基于操作时间生成）
This commit is contained in:
OTTO 2024-07-30 09:14:26 +08:00
parent d59def1b42
commit 742b70df64
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/ProductRepositoriesSnapshotInputVo.java
View File

@ -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)

7
microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/impl/PmsProductLibrarySnapshotRepoServiceImpl.java
View File

@ -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());