目录加上类型

720yun_fd_manage/gis_domain/src/main/java/com/gis/domain/dto/DirDto.java

@@ -23,4 +23,9 @@ public class DirDto {
     private Long parentId;
 
 
+    @NotBlank(message = "类型不能为空")
+    @ApiModelProperty(value = "类型, 全景图:pano， 图片：image, 音频：audio， 视频：video", required = true)
+    private String type;
+
+
 }

720yun_fd_manage/gis_domain/src/main/java/com/gis/domain/entity/DirEntity.java

@@ -27,6 +27,9 @@ public class DirEntity extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "创建人")
     private String userId;
 
+    @ApiModelProperty(value = "类型, 全景图:pano， 图片：image, 音频：audio， 视频：video")
+    private String type;
+
 //    @ApiModelProperty(value = "层级：第一级1, 最大5级")
 //    private Integer level;
 

720yun_fd_manage/gis_service/src/main/java/com/gis/service/DirService.java

@@ -11,7 +11,7 @@ import com.gis.domain.entity.DirEntity;
 public interface DirService extends IBaseService<DirEntity, Long>{
     Result saveEntity(DirDto param);
 
-    Result getMyTree();
+    Result getMyTree(String type);
 
     Result move(DirMoveDto param);
 }

720yun_fd_manage/gis_service/src/main/java/com/gis/service/impl/DirServiceImpl.java

@@ -60,8 +60,8 @@ public class DirServiceImpl extends IBaseServiceImpl<DirEntity, Long> implements
     }
 
     @Override
-    public Result getMyTree() {
-        DirTreeUtil tree = new DirTreeUtil(getMyList());
+    public Result getMyTree(String type) {
+        DirTreeUtil tree = new DirTreeUtil(getMyList(type));
         return Result.success(tree.buildTree());
     }
 
@@ -82,10 +82,11 @@ public class DirServiceImpl extends IBaseServiceImpl<DirEntity, Long> implements
 
     }
 
-    private List<DirEntity> getMyList(){
+    private List<DirEntity> getMyList(String type){
         String phone = getUserNameForToken();
         Condition condition = new Condition(DirEntity.class);
         condition.and().andEqualTo("userId", phone);
+        condition.and().andEqualTo("type", type);
         return this.findAll(condition);
     }
 }

720yun_fd_manage/gis_service/src/main/java/com/gis/tree/DirTree.java

@@ -27,7 +27,7 @@ public class DirTree {
 //
 //    private String nickName;
 //
-//    private String unit;
+    private String type;
 //
 //    private Integer display;
 //

720yun_fd_manage/gis_service/src/main/java/com/gis/tree/DirTreeUtil.java

@@ -18,6 +18,7 @@ public class DirTreeUtil {
             DirTree treeGrid = new DirTree();
             treeGrid.setId(n.getId());
             treeGrid.setName(n.getName());
+            treeGrid.setType(n.getType());
 
             if (n.getParentId() != null) {
                 treeGrid.setParentId(n.getParentId());

720yun_fd_manage/gis_web/src/main/java/com/gis/web/controller/DirController.java

@@ -22,10 +22,10 @@ public class DirController {
     @Autowired
     DirService dirService;
 
-    @ApiOperation(value = "获取树")
-    @GetMapping("/getTree")
-    public Result getMyTree() {
-        return dirService.getMyTree();
+    @ApiOperation(value = "获取树", notes = "类型, 全景图:pano， 图片：image, 音频：audio， 视频：video")
+    @GetMapping("/getTree/{type}")
+    public Result getMyTree(@PathVariable String type) {
+        return dirService.getMyTree(type);
     }
 
     @ApiOperation(value = "新增|修改")