|
@@ -92,6 +92,10 @@ public class DocDirController extends BaseController {
|
|
|
* 图片树
|
|
|
*/
|
|
|
private final String picTree = "3";
|
|
|
+ /**
|
|
|
+ * 图片树
|
|
|
+ */
|
|
|
+ private final String pdfTree = "4";
|
|
|
|
|
|
/**
|
|
|
* 获取文件树
|
|
@@ -108,15 +112,27 @@ public class DocDirController extends BaseController {
|
|
|
@ApiOperation("图片文件树")
|
|
|
@GetMapping(value = "/pic-tree")
|
|
|
public TreeVO picTree() {
|
|
|
+ //个人空间
|
|
|
String type = "3";
|
|
|
return tree(type, picTree);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
+ * 获取文件树
|
|
|
+ */
|
|
|
+ @ApiOperation("PDF文件树")
|
|
|
+ @GetMapping(value = "/pdf-tree")
|
|
|
+ public TreeVO pdfTree() {
|
|
|
+ //个人空间
|
|
|
+ String type = "3";
|
|
|
+ return tree(type, pdfTree);
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
* 获取树
|
|
|
*
|
|
|
* @param type 空间类型
|
|
|
- * @param st 1.文件树 2.目录树 3.图片树
|
|
|
+ * @param st 1.文件树 2.目录树 3.图片树 4.pdf树
|
|
|
* @return
|
|
|
*/
|
|
|
private TreeVO tree(String type, String st) {
|
|
@@ -161,7 +177,15 @@ public class DocDirController extends BaseController {
|
|
|
DocInfo info = new DocInfo();
|
|
|
info.setDirId(dir.getDirId());
|
|
|
docInfoService.selectDocInfoList(info).forEach(d -> {
|
|
|
- if (!picTree.equals(st) || Constants.IMAGE_EXTENSION.contains(d.getFileType())) {
|
|
|
+ boolean flag = true;
|
|
|
+ //如果是图片树或者PDF树,需要先进行筛选
|
|
|
+ if (picTree.equals(st)) {
|
|
|
+ flag = Constants.IMAGE_EXTENSION.contains(d.getFileType());
|
|
|
+ } else if (pdfTree.equals(st)) {
|
|
|
+ flag = Constants.PDF_EXTENSION.contains(d.getFileType());
|
|
|
+ }
|
|
|
+
|
|
|
+ if (flag) {
|
|
|
TreeVO childVO = new TreeVO();
|
|
|
childVO.setId(d.getDocId());
|
|
|
childVO.setLabel(d.getFileName());
|