WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

参数清单-增加未收集状态，对应禅道BUG编号 64312

Browse Source
This commit is contained in:
wangzhijiang
2022-12-28 17:19:03 +08:00
parent 469265a730
commit 21a2dccbe7
4 changed files with 39 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/enums/ManifestStateEnum.java
+1
View File
@@ -12,6 +12,7 @@ import java.util.Map;
*/
public enum ManifestStateEnum {
COLLECTING("收集中","Collecting","收集中"),
UNCOLLECTED("未收集","Uncollected","未收集"),
FINISHED("已完成","Finished","已完成");
String name;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+6
View File
@@ -2356,6 +2356,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
if(CollectionUtils.isNotEmpty(paramsCollectManifestLogEOList)){
this.paramsCollectManifestLogEOService.saveBatch(paramsCollectManifestLogEOList);
}
// 更新当前参数清单状态为“收集中”
paramsManifestEO.setState(ManifestStateEnum.COLLECTING.getValue());
this.paramsManifestEOService.updateById(paramsManifestEO);
}
return getMsgOfIssueCollection(msgMapList, cut, "1");
@@ -2531,6 +2534,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
if(CollectionUtils.isNotEmpty(paramsCollectManifestLogEOList)){
this.paramsCollectManifestLogEOService.saveBatch(paramsCollectManifestLogEOList);
}
// 更新当前参数清单状态为“收集中”
paramsManifestEO.setState(ManifestStateEnum.COLLECTING.getValue());
this.paramsManifestEOService.updateById(paramsManifestEO);
}
return getMsgOfIssueCollection(msgMapList, cut, "1");
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
+29 -18
View File
@@ -170,7 +170,7 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
// 对应参数模板发布版本 前端传过来
paramsManifestEO.setId(paramsManifestId);
paramsManifestEO.setProjectVersionId(projectVersionId);
paramsManifestEO.setState(ManifestStateEnum.COLLECTING.getValue());
paramsManifestEO.setState(ManifestStateEnum.UNCOLLECTED.getValue());
paramsManifestEO.setVersion(1); // 默认版本为 1
Date now = new Date();
paramsManifestEO.setCreateTime(now);
@@ -223,16 +223,21 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
*/
@Override
public boolean deleteById(String id, String cut) {
// 判断清单收集状态，已完成状态才可删除
Map<String, Object> map = paramsCollectManifestEOService.isCollectFinished(id);
Boolean finish = (Boolean) map.get("finish");
if (!finish) {
if (CutEnum.CN.getValue().equals(cut)) {
throw new JeroBootException("清单收集中，无法删除！");
} else {
throw new JeroBootException("Manifest collection, and cannot be deleted!");
ParamsManifestEO paramsManifestEO = this.paramsManifestEOMapper.selectById(id);
// 如果该清单状态不是未收集，按照之前的逻辑判断是否能删除，如果是未收集 可以直接删
if(!StringUtils.equals(ManifestStateEnum.UNCOLLECTED.getValue(),paramsManifestEO.getState())){
// 判断清单收集状态，已完成状态才可删除
Map<String, Object> map = paramsCollectManifestEOService.isCollectFinished(id);
Boolean finish = (Boolean) map.get("finish");
if (!finish) {
if (CutEnum.CN.getValue().equals(cut)) {
throw new JeroBootException("清单收集中，无法删除！");
} else {
throw new JeroBootException("Manifest collection, and cannot be deleted!");
}
}
}
// 关联删除配置
LambdaQueryWrapper<ParamsConfigEO> configEOQueryWrapper = new LambdaQueryWrapper<>();
configEOQueryWrapper.eq(ParamsConfigEO::getParamsManifestId, id);
@@ -269,15 +274,21 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
public boolean deleteByIds(List<String> ids, String cut) {
// 判断清单收集状态，已完成状态才可删除
ids.forEach(id-> {
Map<String, Object> map = paramsCollectManifestEOService.isCollectFinished(id);
Boolean finish = (Boolean) map.get("finish");
if (!finish) {
ParamsManifestEO manifestEO = getById(id);
ParamsManifestEO paramsManifestEO = this.paramsManifestEOMapper.selectById(id);
if(paramsManifestEO != null){
// 如果该清单状态不是未收集，按照之前的逻辑判断是否能删除，如果是未收集 可以直接删
if(!StringUtils.equals(ManifestStateEnum.UNCOLLECTED.getValue(),paramsManifestEO.getState())){
Map<String, Object> map = paramsCollectManifestEOService.isCollectFinished(id);
Boolean finish = (Boolean) map.get("finish");
if (!finish) {
ParamsManifestEO manifestEO = getById(id);
if (CutEnum.CN.getValue().equals(cut)) {
throw new JeroBootException("清单:" + manifestEO.getTitle() + "收集中，无法删除！");
} else {
throw new JeroBootException("Manifest " + manifestEO.getTitle() + "collection, and cannot be deleted!");
if (CutEnum.CN.getValue().equals(cut)) {
throw new JeroBootException("清单:" + manifestEO.getTitle() + "收集中，无法删除！");
} else {
throw new JeroBootException("Manifest " + manifestEO.getTitle() + "collection, and cannot be deleted!");
}
}
}
}
});
@@ -729,7 +740,7 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
// 添加参数清单
paramsManifestEO.setId(addManifestId);
paramsManifestEO.setState(ManifestStateEnum.COLLECTING.getValue());
paramsManifestEO.setState(ManifestStateEnum.UNCOLLECTED.getValue());
paramsManifestEO.setVersion(1); // 默认版本为 1
save(paramsManifestEO);
jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
+3 -1
View File
@@ -395,7 +395,7 @@
})
if (flag) {
let param = {
ids: this.selectedRowKeysArray
ids: this.selectedRowKeys.join(',')
}
if (this.selectedRowKeys.length > 0) {
let _this = this
@@ -408,6 +408,7 @@
_this.getlist()
} else {
_this.$message.warning(_this.$t('operationFailed'))
this.selectedRowKeys = []
}
})
}
@@ -432,6 +433,7 @@
this.getlist()
},
getlist() {
this.selectedRowKeys = []
let query = {
projectId: this.$route.query.parentId ? this.$route.query.parentId : this.$route.query.id,
pageSize: this.pageSize,