From 7bb7b2b3c06d9bb3461bda8f5d8bc7b7606462e6 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Wed, 27 Aug 2025 23:28:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/data/entity/vv/VvResourceEntity.java | 7 ++- .../VvAdminResourceDeleteRequest.java | 4 +- .../mm/AdminResourceController.java | 45 ++++++++++--------- .../src/test/java/com/api/test/test2.java | 28 ++++++++++++ 4 files changed, 57 insertions(+), 27 deletions(-) diff --git a/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvResourceEntity.java b/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvResourceEntity.java index 23527d8..9a7f80d 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvResourceEntity.java +++ b/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvResourceEntity.java @@ -1,12 +1,11 @@ package com.heyu.api.data.entity.vv; + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import com.lz.mybatis.plugin.annotations.AS; -import java.math.BigDecimal; -import java.util.Date;import java.util.Date; +import java.util.Date; /** *资源库 * @author quyixiao @@ -54,7 +53,7 @@ private static final long serialVersionUID = 1L; //修改时间 private Long modifyTimestamp; //默认排序 - private Integer defaultSort; + private Integer defaultSort = 0 ; /** * * @return diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/resource/VvAdminResourceDeleteRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/resource/VvAdminResourceDeleteRequest.java index 6a7ec6f..f6255cd 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/resource/VvAdminResourceDeleteRequest.java +++ b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/resource/VvAdminResourceDeleteRequest.java @@ -3,11 +3,13 @@ package com.heyu.api.alibaba.request.mm.resource; import lombok.Data; +import java.util.List; + @Data public class VvAdminResourceDeleteRequest { /*** * 订单id */ - private Long resourceId; + private List resourceIds; } diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminResourceController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminResourceController.java index dca51b7..e1aa7fc 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminResourceController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminResourceController.java @@ -55,12 +55,16 @@ public class AdminResourceController { } + /*** + * test2::test1 + * + */ @RequestMapping("/addOrUpdate") public R addOrUpdate(@RequestBody List resourceAddOrUpdateRequests) { for (VvResourceEntity resourceAddOrUpdateRequest : resourceAddOrUpdateRequests) { - if(resourceAddOrUpdateRequest.getId() == null){ - resourceAddOrUpdateRequest.setCreateTimestamp( System.currentTimeMillis()); + if (resourceAddOrUpdateRequest.getId() == null) { + resourceAddOrUpdateRequest.setCreateTimestamp(System.currentTimeMillis()); } resourceAddOrUpdateRequest.setModifyTimestamp(System.currentTimeMillis()); @@ -73,40 +77,41 @@ public class AdminResourceController { public R sort(@RequestBody VvAdminResourceSortRequest vvAdminResourceSortRequest) { List vvResourceEntities = vvResourceDao.selectVvResourceByIds(vvAdminResourceSortRequest.getResourceIds()); for (VvResourceEntity vvResourceEntity : vvResourceEntities) { - vvResourceEntity.setDefaultSort(vvAdminResourceSortRequest.getResourceIds().indexOf(vvResourceEntity.getId()) + 1 ); + vvResourceEntity.setDefaultSort(vvAdminResourceSortRequest.getResourceIds().indexOf(vvResourceEntity.getId()) + 1); vvResourceDao.updateCoverVvResourceById(vvResourceEntity); } return R.ok(); } - @RequestMapping("/delete") - public R addOrUpdate(@RequestBody VvAdminResourceDeleteRequest adminResourceDeleteRequest) { + public R delete(@RequestBody VvAdminResourceDeleteRequest adminResourceDeleteRequest) { + for (Long resourceId : adminResourceDeleteRequest.getResourceIds()) { + + doChildDelete(resourceId); + + vvResourceDao.deleteVvResourceById(resourceId); + } + return R.ok("删除成功"); + } + + public void doChildDelete(Long resourceId) { List vvResourceList = new ArrayList<>(); - - getChildResourceList(adminResourceDeleteRequest.getResourceId(), vvResourceList); - + getChildResourceList(resourceId, vvResourceList); for (VvResourceEntity vvResourceEntity : vvResourceList) { vvResourceDao.deleteVvResourceById(vvResourceEntity.getId()); } - - - - return R.ok("删除成功"); } + public void getChildResourceList(Long parentId, List vvResourceList) { + List vvResourceEntities = vvResourceDao.selectByParentId(parentId); - public void getChildResourceList(Long parentId,List vvResourceList){ + if (CollectionUtils.isEmpty(vvResourceEntities) || vvResourceEntities.size() == 0) { - List vvResourceEntities = vvResourceDao.selectByParentId(parentId); - - if(CollectionUtils.isEmpty(vvResourceEntities) || vvResourceEntities.size() == 0){ - - return ; + return; } vvResourceList.addAll(vvResourceEntities); @@ -120,8 +125,4 @@ public class AdminResourceController { } - - - - } diff --git a/api-web/api-interface/src/test/java/com/api/test/test2.java b/api-web/api-interface/src/test/java/com/api/test/test2.java index 6725711..3ec52a4 100644 --- a/api-web/api-interface/src/test/java/com/api/test/test2.java +++ b/api-web/api-interface/src/test/java/com/api/test/test2.java @@ -1,7 +1,13 @@ package com.api.test; +import com.alibaba.fastjson.JSON; +import com.heyu.api.data.entity.vv.VvResourceEntity; +import org.junit.Test; + import java.nio.file.Files; import java.nio.file.Paths; +import java.util.Arrays; +import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -20,4 +26,26 @@ public class test2 { } + @Test + public void test1() throws Exception{ + VvResourceEntity vvResourceEntity = new VvResourceEntity(); + vvResourceEntity.setFileName("张三"); + vvResourceEntity.setParentId(0L); + vvResourceEntity.setResourceUrl("https://www.baidu.com"); + vvResourceEntity.setType("image"); + + + + VvResourceEntity vvResourceEntity2 = new VvResourceEntity(); + vvResourceEntity2.setFileName("张三"); + vvResourceEntity2.setParentId(0L); + vvResourceEntity2.setResourceUrl("https://www.baidu.com"); + vvResourceEntity2.setType("image"); + + + List vvResourceEntityList = Arrays.asList(vvResourceEntity, vvResourceEntity2); + System.out.println(JSON.toJSONString(vvResourceEntityList) ); + + } + }