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

解决已知问题。

This commit is contained in:
chenxudong 2025-03-14 14:30:22 +08:00
parent 2e4f7eb099
commit d2b391a2ea
4 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/RepoPrjController.java
View File

@ -26,7 +26,7 @@ public class RepoPrjController {
@UserOperation(value = "创建层级", modelName = UserOperationModuleEnum.REPO_PRJ_SETTING) @UserOperation(value = "创建层级", modelName = UserOperationModuleEnum.REPO_PRJ_SETTING)
@RequestMapping("create") @RequestMapping("create")
public ElectromagneticResult<?> create(@RequestParam String prjName) { public ElectromagneticResult<?> create(@RequestParam String prjName) {
return edPrjService.createNewPrj(prjName, DataOwnEnum.USER_PRJ.code); return edPrjService.createNewPrj(prjName, DataOwnEnum.REPO_PRJ.code);
} }
@UserOperation(value = "删除层级", modelName = UserOperationModuleEnum.REPO_PRJ_SETTING) @UserOperation(value = "删除层级", modelName = UserOperationModuleEnum.REPO_PRJ_SETTING)

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

@ -378,7 +378,6 @@ public class CommonService {
.select(EdFileInfo::getId) .select(EdFileInfo::getId)
.eq(EdFileInfo::getDataOwn, DataOwnEnum.REPO_PRJ.code) .eq(EdFileInfo::getDataOwn, DataOwnEnum.REPO_PRJ.code)
.eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code) .eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code)
.eq(EdFileInfo::getCreatedBy, UserThreadLocal.getUserId())
.eq(EdFileInfo::getParentId, PRJ_PARENT_ID); .eq(EdFileInfo::getParentId, PRJ_PARENT_ID);
List<String> prjIds = edFileInfoMapper.selectList(queryWrapper).stream().map(EdFileInfo::getId).collect(Collectors.toList()); List<String> prjIds = edFileInfoMapper.selectList(queryWrapper).stream().map(EdFileInfo::getId).collect(Collectors.toList());

3
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileRecycleServiceImpl.java
View File

@ -2,7 +2,6 @@ package com.electromagnetic.industry.software.manage.service.serviceimpl;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.ObjUtil; import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@ -16,7 +15,6 @@ import com.electromagnetic.industry.software.common.util.ElectromagneticResultUt
import com.electromagnetic.industry.software.common.util.UserThreadLocal; import com.electromagnetic.industry.software.common.util.UserThreadLocal;
import com.electromagnetic.industry.software.manage.config.ElePropertyConfig; import com.electromagnetic.industry.software.manage.config.ElePropertyConfig;
import com.electromagnetic.industry.software.manage.mapper.EdFileInfoMapper; import com.electromagnetic.industry.software.manage.mapper.EdFileInfoMapper;
import com.electromagnetic.industry.software.manage.mapper.FileBackupLogMapper;
import com.electromagnetic.industry.software.manage.mapper.UserMapper; import com.electromagnetic.industry.software.manage.mapper.UserMapper;
import com.electromagnetic.industry.software.manage.pojo.models.EdFileInfo; import com.electromagnetic.industry.software.manage.pojo.models.EdFileInfo;
import com.electromagnetic.industry.software.manage.pojo.models.User; import com.electromagnetic.industry.software.manage.pojo.models.User;
@ -27,7 +25,6 @@ import com.electromagnetic.industry.software.manage.service.FileRecycleService;
import com.electromagnetic.industry.software.manage.service.FileSystemService; import com.electromagnetic.industry.software.manage.service.FileSystemService;
import com.electromagnetic.industry.software.manage.service.PermissionService; import com.electromagnetic.industry.software.manage.service.PermissionService;
import com.electromagnetic.industry.software.manage.tasks.BackupHandler; import com.electromagnetic.industry.software.manage.tasks.BackupHandler;
import com.electromagnetic.industry.software.manage.tasks.BackupTask;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;

3
electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/parse/FileParse.java
View File

@ -5,10 +5,11 @@ import cn.hutool.core.util.IdUtil;
import java.io.File; import java.io.File;
import java.io.InputStream; import java.io.InputStream;
import java.util.Objects;
public abstract class FileParse { public abstract class FileParse {
private static String tmpPath = Thread.currentThread().getContextClassLoader().getResource("").getPath(); private static String tmpPath = Objects.requireNonNull(Thread.currentThread().getContextClassLoader().getResource("")).getPath();
public abstract String parseAllText(InputStream stream, String fileType); public abstract String parseAllText(InputStream stream, String fileType);