Compare commits

..

No commits in common. "ec75439749dac3f4270130d12ce5be75260b67e8" and "a417ec415a2414b4ba3540639f2d178f1d47d389" have entirely different histories.

4 changed files with 4 additions and 39 deletions

View File

@ -122,9 +122,4 @@ public class EdFileInfoController {
public ElectromagneticResult<?> detail(@RequestParam String id) {
return edFileInfoService.detail(id);
}
@RequestMapping(value = "/queryChildFolder", method = RequestMethod.GET)
public ElectromagneticResult<?> queryChildFolder(@RequestParam String parentId) {
return edFileInfoService.queryChildFolder(parentId);
}
}

View File

@ -1,9 +0,0 @@
package com.electromagnetic.industry.software.manage.pojo.resp;
import lombok.Data;
@Data
public class ChildFolderVO {
private String id;
private String fileName;
}

View File

@ -157,11 +157,4 @@ public interface EdFileInfoService {
* 获取文件的层级Id
*/
String getCategoryId (String id);
/**
* 根据父id查询其下自定义的文件夹
* @param parentId
* @return
*/
ElectromagneticResult<?> queryChildFolder(String parentId);
}

View File

@ -27,7 +27,10 @@ import com.electromagnetic.industry.software.manage.pojo.models.EdFileInfo;
import com.electromagnetic.industry.software.manage.pojo.other.FileInfoVO;
import com.electromagnetic.industry.software.manage.pojo.other.UploadRecordDTO;
import com.electromagnetic.industry.software.manage.pojo.req.*;
import com.electromagnetic.industry.software.manage.pojo.resp.*;
import com.electromagnetic.industry.software.manage.pojo.resp.FileInfoQueryPageVO;
import com.electromagnetic.industry.software.manage.pojo.resp.FileProjectVO;
import com.electromagnetic.industry.software.manage.pojo.resp.FileVersionViewVO;
import com.electromagnetic.industry.software.manage.pojo.resp.UploadRecordVO;
import com.electromagnetic.industry.software.manage.service.EdFileInfoService;
import com.electromagnetic.industry.software.manage.service.FileSystemService;
import com.electromagnetic.industry.software.manage.service.PermissionService;
@ -1144,21 +1147,4 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
return file.getFileCode().substring(0, 6);
}
/**
* 根据父id查询其下自定义的文件夹
*
* @param parentId
* @return
*/
@Override
public ElectromagneticResult<?> queryChildFolder(String parentId) {
List<EdFileInfo> edFileInfos = this.baseMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class).select(EdFileInfo::getId, EdFileInfo::getFileName)
.eq(EdFileInfo::getPrjDir, Boolean.FALSE)
.eq(EdFileInfo::getParentId, parentId)
.eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code));
List<ChildFolderVO> res = BeanUtil.copyToList(edFileInfos, ChildFolderVO.class);
return ElectromagneticResultUtil.success(res);
}
}