From 0702cfe5ace664083efe56162285a3987c112353 Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Sat, 18 May 2024 18:22:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=91=E5=BD=A2=E5=88=97=E8=A1=A8=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../video/controller/VideoItemController.java | 9 ++++++ .../video/service/IVideoItemService.java | 2 ++ .../service/impl/VideoItemServiceImpl.java | 28 +++++++++++++++++++ 3 files changed, 39 insertions(+) diff --git a/src/main/java/com/zhgd/xmgl/modules/video/controller/VideoItemController.java b/src/main/java/com/zhgd/xmgl/modules/video/controller/VideoItemController.java index da673e9aa..c0edeb2c8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/controller/VideoItemController.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/controller/VideoItemController.java @@ -250,6 +250,15 @@ public class VideoItemController { return Result.success(videoItemService.selectProjectVideoList(map)); } + @ApiOperation(value = "查询项目视频tree列表", notes = "查询项目视频tree列表") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String"), + }) + @PostMapping("/selectProjectVideoTreeList") + public Result> selectProjectVideoTreeList(@RequestBody Map map) { + return Result.success(videoItemService.selectProjectVideoTreeList(map)); + } + @ApiOperation(value = "查询项目下所有视频列表", notes = "查询项目下所有视频列表") @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String"), diff --git a/src/main/java/com/zhgd/xmgl/modules/video/service/IVideoItemService.java b/src/main/java/com/zhgd/xmgl/modules/video/service/IVideoItemService.java index 3fb409d13..132c2a859 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/service/IVideoItemService.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/service/IVideoItemService.java @@ -47,6 +47,8 @@ public interface IVideoItemService extends IService { Map selectProjectVideoList(Map map); + Map selectProjectVideoTreeList(Map map); + List selecAllVideoList(Map map); Map selectUserVideoList(Map map); diff --git a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/VideoItemServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/VideoItemServiceImpl.java index 34439e0ed..560bf28a1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/VideoItemServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/VideoItemServiceImpl.java @@ -1,6 +1,8 @@ package com.zhgd.xmgl.modules.video.service.impl; import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -411,6 +413,32 @@ public class VideoItemServiceImpl extends ServiceImpl selectProjectVideoTreeList(Map map) { + //视频也要放到分组的下面 + Map data = new HashMap<>(); + map.put("all", null); + Map resultMap = selectProjectVideoList(map); + JSONArray newArray = new JSONArray(); + JSONArray jsonArray = JSONArray.parseArray(JSON.toJSONString(resultMap.get("videoList"))); + for (int i = 0; i < jsonArray.size(); i++) { + JSONObject jo = jsonArray.getJSONObject(i); + newArray.add(jo); + JSONArray videoArr = jo.getJSONArray("list"); + if (videoArr == null) { + continue; + } + for (int j = 0; j < videoArr.size(); j++) { + JSONObject videoJo = videoArr.getJSONObject(j); + videoJo.put("parentId", jo.getString("id")); + newArray.add(videoJo); + } + } + data.put("videoList", ListUtils.listToTree(newArray, "id", "parentId", "children")); + data.put("type", 2); + return data; + } + @Override public List selecAllVideoList(Map map) { return videoItemMapper.selectProjectVideoList(map);