提交修改

api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvResourceEntity.java

@@ -1,11 +1,15 @@
 package com.heyu.api.data.entity.vv;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
+
 /**
 *资源库
 * @author quyixiao
@@ -63,6 +67,19 @@ private static final long serialVersionUID = 1L;
     //默认排序
     private Integer defaultSort = 0  ;
 
+
+    public static void main(String[] args) {
+        List<VvResourceEntity> vvResourceEntityList = new ArrayList<>();
+        VvResourceEntity vvResource = new VvResourceEntity();
+        vvResource.setResourceUrl("xxxxxx");
+        vvResource.setType("");
+        vvResource.setFileName("xxxxxxx");
+        vvResource.setParentId(0L);
+
+        vvResourceEntityList.add(vvResource);
+        System.out.println(JSON.toJSONString(vvResourceEntityList));
+    }
+
     /**
      *  
      * @return

api-third/src/main/java/com/heyu/api/alibaba/request/mm/resource/VvResourceListDTO.java

@@ -0,0 +1,16 @@
+package com.heyu.api.alibaba.request.mm.resource;
+
+import com.heyu.api.data.entity.vv.VvResourceEntity;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class VvResourceListDTO extends VvResourceEntity {
+
+    /***
+     *
+     */
+    private List<VvResourceEntity> locations;
+
+}

api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminResourceController.java

@@ -11,11 +11,13 @@ import com.heyu.api.utils.ISelect;
 import com.heyu.api.utils.PPageUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Slf4j
@@ -35,6 +37,7 @@ public class AdminResourceController {
      */
     @RequestMapping("/list")
     public R list(@RequestBody VvAdminResourceRequest adminResourceRequest) {
+
         PPageUtils pageUtils = PPageUtils.startPage(adminResourceRequest.getPageNum(), adminResourceRequest.getPageSize())
                 .doSelect(new ISelect() {
                     @Override
@@ -53,9 +56,34 @@ public class AdminResourceController {
                         );
                     }
                 });
+        List<VvResourceListDTO> vvResourceDTOS = new ArrayList<>();
+        List<VvResourceEntity> vvResourceEntities = pageUtils.getRows();
+
+        List<VvResourceEntity> vvResourceEntityList = new ArrayList<>();
+        getParentResource(adminResourceRequest.getParentId(), vvResourceEntityList);
+        for (VvResourceEntity vvResourceEntity : vvResourceEntities) {
+            VvResourceListDTO vvResourceDTO = new VvResourceListDTO();
+            BeanUtils.copyProperties(vvResourceEntity, vvResourceDTO);
+            vvResourceDTO.setLocations(vvResourceEntityList);
+            vvResourceDTOS.add(vvResourceDTO);
+        }
+        pageUtils.setRows(vvResourceDTOS);
+
         return R.ok().setData(pageUtils);
     }
 
+    /***
+     * @param parentId
+     */
+    public void getParentResource(Long parentId, List<VvResourceEntity> vvResourceEntityList) {
+        if (parentId > 0) {
+            return;
+        }
+
+        VvResourceEntity vvResource = vvResourceDao.selectVvResourceById(parentId);
+        vvResourceEntityList.add(0,vvResource);
+        getParentResource(vvResource.getParentId(), vvResourceEntityList);
+    }
 
     /***
      * test2::test1
@@ -65,10 +93,11 @@ public class AdminResourceController {
      *
      * 这里包含移动
      *
+     *
+     * /mm/resource/addOrUpdate
      */
     @RequestMapping("/addOrUpdate")
     public R addOrUpdate(@RequestBody List<VvResourceEntity> resourceAddOrUpdateRequests) {
-
         for (VvResourceEntity resourceAddOrUpdateRequest : resourceAddOrUpdateRequests) {
             if (resourceAddOrUpdateRequest.getId() == null) {
                 resourceAddOrUpdateRequest.setCreateTimestamp(System.currentTimeMillis());
@@ -83,6 +112,8 @@ public class AdminResourceController {
      * 资源排序
      * @param vvAdminResourceSortRequest
      * @return
+     *
+     * /mm/resource/sort
      */
     @RequestMapping("/sort")
     public R sort(@RequestBody VvAdminResourceSortRequest vvAdminResourceSortRequest) {
@@ -97,7 +128,7 @@ public class AdminResourceController {
 
     /***
      * 资源删除
-     *
+     * /mm/resource/delete
      */
     @RequestMapping("/delete")
     public R delete(@RequestBody VvAdminResourceDeleteRequest adminResourceDeleteRequest) {