zgty/zt-base
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新增启用接口

Browse Source
This commit is contained in:
潘荣晟
2025-09-29 15:49:53 +08:00
parent 9cdd7db87a
commit 7b304c1529
6 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TemplateInstanceRespVO.java
View File

@@ -75,4 +75,9 @@ public class TemplateInstanceRespVO {
@ExcelProperty("模版分类名称")
private String tpName;
@Schema(description = "创建人", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("创建人")
private String creator;
}

11
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TemplateInstanceServiceImpl.java
View File

@@ -224,6 +224,9 @@ public class TemplateInstanceServiceImpl implements TemplateInstanceService {
boolean transitionAllowed = false;
if (status != null) {
transitionAllowed = status.isTransitionAllowed(TmplStsEnum.DRAFT.getCode());
if (!transitionAllowed){
transitionAllowed = status.isTransitionAllowed(TmplStsEnum.START.getCode());
}
}
if (!transitionAllowed) {
throw exception(STATUS_OPERATION_FAIL);
@@ -253,7 +256,7 @@ public class TemplateInstanceServiceImpl implements TemplateInstanceService {
code = TmplStsEnum.STOPPED.getCode();
} else if (reqVO.getType().equals("enable")) {
// 启用
code = TmplStsEnum.PUBLISHED.getCode();
code = TmplStsEnum.START.getCode();
}
if (code.isEmpty()) {
throw exception(ILLEGAL_OPERATION_TYPE);
@@ -269,8 +272,14 @@ public class TemplateInstanceServiceImpl implements TemplateInstanceService {
public TemplateInstanceRespVO createVersion(String id) {
validateTemplateInstanceExists(Long.valueOf(id));
TemplateInstanceDO templateInstanceDO = templateInstanceMapper.selectById(id);
//如果当前状态不是草稿或者是已启用则不能创建新版本
log.info("当前状态【{}】", templateInstanceDO.getSts());
if (!TmplStsEnum.DRAFT.getCode().equals(templateInstanceDO.getSts()) && !TmplStsEnum.START.getCode().equals(templateInstanceDO.getSts())) {
throw exception(STATUS_OPERATION_FAIL);
}
TemplateInstanceDO newTpInstanceDO = BeanUtils.toBean(templateInstanceDO, TemplateInstanceDO.class);
newTpInstanceDO.setId(null);
newTpInstanceDO.setTenantId(templateInstanceDO.getTenantId());
newTpInstanceDO.setVer(incrementVersion(templateInstanceDO.getVer()));
newTpInstanceDO.setPublishTime(LocalDateTime.now());
newTpInstanceDO.setOrigCntt(templateInstanceDO.getCntt()!=null?templateInstanceDO.getCntt():templateInstanceDO.getOrigCntt());//模板实例内容,默认为上一个版本的当前文件内容