reformat code
This commit is contained in:
parent
56a49fb271
commit
98d8b621b3
|
|
@ -1,7 +1,6 @@
|
|||
package com.electromagnetic.industry.software.manage.pojo.models;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import io.github.mymonstercat.Model;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
|
|
|
|||
|
|
@ -528,9 +528,12 @@ public class CommonService {
|
|||
|
||||
DataOwnEnum obj = DataOwnEnum.getEnumByCode(dataOwnCode);
|
||||
switch (Objects.requireNonNull(obj)) {
|
||||
case USER_FILE, USER_PRJ -> prjInfo = queryUserPrjTree(PrjQuerySource.USER_DB.value, new FileProjectVO()).getOrDefault(PrjQuerySource.USER_DB.value, new ArrayList<>());
|
||||
case SYS_FILE, SYS_PRJ -> prjInfo = querySysPrjTree(PrjQuerySource.SYS_DB.value, accessibleIds, new FileProjectVO()).getOrDefault(PrjQuerySource.SYS_DB.value, new ArrayList<>());
|
||||
case REPO_PRJ, REPO_FILE -> prjInfo = queryRepoPrjTree(PrjQuerySource.REPO_DB.value, accessibleIds, new FileProjectVO()).getOrDefault(PrjQuerySource.REPO_DB.value, new ArrayList<>());
|
||||
case USER_FILE, USER_PRJ ->
|
||||
prjInfo = queryUserPrjTree(PrjQuerySource.USER_DB.value, new FileProjectVO()).getOrDefault(PrjQuerySource.USER_DB.value, new ArrayList<>());
|
||||
case SYS_FILE, SYS_PRJ ->
|
||||
prjInfo = querySysPrjTree(PrjQuerySource.SYS_DB.value, accessibleIds, new FileProjectVO()).getOrDefault(PrjQuerySource.SYS_DB.value, new ArrayList<>());
|
||||
case REPO_PRJ, REPO_FILE ->
|
||||
prjInfo = queryRepoPrjTree(PrjQuerySource.REPO_DB.value, accessibleIds, new FileProjectVO()).getOrDefault(PrjQuerySource.REPO_DB.value, new ArrayList<>());
|
||||
default -> ElectromagneticResultUtil.fail("-1", "参数错误");
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -64,26 +64,20 @@ import static com.electromagnetic.industry.software.common.enums.FileRepeatEnum.
|
|||
@Service
|
||||
public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileInfo> implements EdFileInfoService {
|
||||
|
||||
private static final Map<String, List<String>> FILE_DB_ID_NAME = new ConcurrentHashMap<>();
|
||||
private final EleLog log = new EleLog(EdFileInfoServiceImpl.class);
|
||||
|
||||
@Resource
|
||||
private CommonService commonService;
|
||||
|
||||
@Resource
|
||||
private FileSystemService fileSystemService;
|
||||
|
||||
@Resource
|
||||
private PermissionService permissionService;
|
||||
|
||||
@Resource
|
||||
private UserMapper userMapper;
|
||||
|
||||
@Resource
|
||||
private ElePropertyConfig elePropertyConfig;
|
||||
|
||||
@Resource
|
||||
private EdFileFavoriteService fileFavoriteService;
|
||||
|
||||
@Resource
|
||||
private FileTagRelationService fileTagRelationService;
|
||||
@Resource
|
||||
|
|
@ -93,8 +87,6 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
|
|||
@Resource
|
||||
private EdFileFavoriteMapper edFileFavoriteMapper;
|
||||
|
||||
private static final Map<String, List<String>> FILE_DB_ID_NAME = new ConcurrentHashMap<>();
|
||||
|
||||
/**
|
||||
* 查询文件列表
|
||||
*
|
||||
|
|
|
|||
|
|
@ -153,11 +153,11 @@ public class EdPrjServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileInfo>
|
|||
.eq(EdFileInfo::getId, prjId));
|
||||
String oldPrjName = fileInfo.getFileName();
|
||||
try {
|
||||
Assert.isTrue(EleCommonUtil.isFileNameValid(newPrjName), StrFormatter.format("{} {},{} 修改失败。", newPrjName, NAME_VALID_MSG, oldPrjName));
|
||||
Long count = this.baseMapper.selectCount(Wrappers.lambdaQuery(EdFileInfo.class)
|
||||
.eq(EdFileInfo::getParentId, PRJ_PARENT_ID)
|
||||
.eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code)
|
||||
.eq(EdFileInfo::getFileName, newPrjName));
|
||||
Assert.isTrue(EleCommonUtil.isFileNameValid(newPrjName), StrFormatter.format("{} {},{} 修改失败。", newPrjName, NAME_VALID_MSG, oldPrjName));
|
||||
if (count > 0) {
|
||||
String info = StrFormatter.format("{} 项目已经存在,{} 修改失败。", newPrjName, oldPrjName);
|
||||
log.info(info);
|
||||
|
|
|
|||
Loading…
Reference in New Issue