chenxudong
/
electromagnetic-data-new
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clean code

This commit is contained in:
chenxudong 2025-01-10 17:51:20 +08:00
parent 066ee17887
commit 15b45a270d
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java
View File

@ -36,7 +36,6 @@ import javax.annotation.PostConstruct;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.io.File; import java.io.File;
import java.util.*; import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static com.electromagnetic.industry.software.common.cons.ElectromagneticConstants.*; import static com.electromagnetic.industry.software.common.cons.ElectromagneticConstants.*;
@ -45,7 +44,6 @@ import static com.electromagnetic.industry.software.common.cons.ElectromagneticC
public class CommonService { public class CommonService {
private static final Map<String, String> FILE_TYPE_ENUM = new HashMap<>(); private static final Map<String, String> FILE_TYPE_ENUM = new HashMap<>();
private static final Map<String, String> ID_NAME = new ConcurrentHashMap<>();
static { static {
FILE_TYPE_ENUM.put(EleDataTypeEnum.FOLDER.desc, "01"); FILE_TYPE_ENUM.put(EleDataTypeEnum.FOLDER.desc, "01");
@ -83,8 +81,6 @@ public class CommonService {
@Resource @Resource
private FileSystemService fileSystemService; private FileSystemService fileSystemService;
@Autowired
private PermissionService permissionService;
@PostConstruct @PostConstruct
public void init() { public void init() {
@ -143,18 +139,16 @@ public class CommonService {
public List<EdFileInfo> selectAllAdminFolder(String id, boolean isAdminQuery, List<String> accessableIds) { public List<EdFileInfo> selectAllAdminFolder(String id, boolean isAdminQuery, List<String> accessableIds) {
if (isAdminQuery) { LambdaQueryWrapper<EdFileInfo> queryWrapper = Wrappers.lambdaQuery(EdFileInfo.class)
return edFileInfoMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class)
.eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code)
.eq(EdFileInfo::getDataType, EleDataTypeEnum.FOLDER.code)
.eq(EdFileInfo::getParentId, id));
}
return edFileInfoMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class)
.eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code) .eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code)
.eq(EdFileInfo::getDataType, EleDataTypeEnum.FOLDER.code) .eq(EdFileInfo::getDataType, EleDataTypeEnum.FOLDER.code)
.eq(EdFileInfo::getPrjDir, true) .eq(EdFileInfo::getPrjDir, true)
.in(EdFileInfo::getId, accessableIds) .likeRight(EdFileInfo::getFilePath, id);
.likeRight(EdFileInfo::getFilePath, id)); if (!isAdminQuery) {
queryWrapper.in(EdFileInfo::getId, accessableIds);
}
return edFileInfoMapper.selectList(queryWrapper);
} }
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)