提交修改

This commit is contained in:
quyixiao 2025-08-27 23:28:12 +08:00
parent 2ace1e675d
commit 7bb7b2b3c0
4 changed files with 57 additions and 27 deletions

View File

@ -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

View File

@ -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<Long> resourceIds;
}

View File

@ -55,12 +55,16 @@ public class AdminResourceController {
}
/***
* test2::test1
*
*/
@RequestMapping("/addOrUpdate")
public R addOrUpdate(@RequestBody List<VvResourceEntity> 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<VvResourceEntity> 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<VvResourceEntity> 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<VvResourceEntity> vvResourceList) {
List<VvResourceEntity> vvResourceEntities = vvResourceDao.selectByParentId(parentId);
public void getChildResourceList(Long parentId,List<VvResourceEntity> vvResourceList){
if (CollectionUtils.isEmpty(vvResourceEntities) || vvResourceEntities.size() == 0) {
List<VvResourceEntity> vvResourceEntities = vvResourceDao.selectByParentId(parentId);
if(CollectionUtils.isEmpty(vvResourceEntities) || vvResourceEntities.size() == 0){
return ;
return;
}
vvResourceList.addAll(vvResourceEntities);
@ -120,8 +125,4 @@ public class AdminResourceController {
}
}

View File

@ -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<VvResourceEntity> vvResourceEntityList = Arrays.asList(vvResourceEntity, vvResourceEntity2);
System.out.println(JSON.toJSONString(vvResourceEntityList) );
}
}