提交修改
This commit is contained in:
parent
312d38098d
commit
2b2bde61cd
@ -16,7 +16,6 @@ import org.springframework.web.bind.annotation.RequestBody;
|
|||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@ -59,6 +58,9 @@ public class AdminResourceController {
|
|||||||
*
|
*
|
||||||
* 资源新增或修改
|
* 资源新增或修改
|
||||||
*
|
*
|
||||||
|
*
|
||||||
|
* 这里包含移动
|
||||||
|
*
|
||||||
*/
|
*/
|
||||||
@RequestMapping("/addOrUpdate")
|
@RequestMapping("/addOrUpdate")
|
||||||
public R addOrUpdate(@RequestBody List<VvResourceEntity> resourceAddOrUpdateRequests) {
|
public R addOrUpdate(@RequestBody List<VvResourceEntity> resourceAddOrUpdateRequests) {
|
||||||
@ -73,7 +75,6 @@ public class AdminResourceController {
|
|||||||
return R.ok("保存成功");
|
return R.ok("保存成功");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/***
|
/***
|
||||||
* 资源排序
|
* 资源排序
|
||||||
* @param vvAdminResourceSortRequest
|
* @param vvAdminResourceSortRequest
|
||||||
@ -98,42 +99,32 @@ public class AdminResourceController {
|
|||||||
public R delete(@RequestBody VvAdminResourceDeleteRequest adminResourceDeleteRequest) {
|
public R delete(@RequestBody VvAdminResourceDeleteRequest adminResourceDeleteRequest) {
|
||||||
for (Long resourceId : adminResourceDeleteRequest.getResourceIds()) {
|
for (Long resourceId : adminResourceDeleteRequest.getResourceIds()) {
|
||||||
|
|
||||||
doChildDelete(resourceId);
|
|
||||||
|
|
||||||
vvResourceDao.deleteVvResourceById(resourceId);
|
doBatchDelete(resourceId);
|
||||||
|
|
||||||
}
|
}
|
||||||
return R.ok("删除成功");
|
return R.ok("删除成功");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void doBatchDelete(Long resourceId) {
|
||||||
public void doChildDelete(Long resourceId) {
|
VVResourceDTO vvResourceEntity = vvResourceDao.selectDTOById(resourceId);
|
||||||
List<VvResourceEntity> vvResourceList = new ArrayList<>();
|
getChildResourceList(vvResourceEntity);
|
||||||
getAllResourceList(resourceId, vvResourceList);
|
doDeleteChild(vvResourceEntity);
|
||||||
|
|
||||||
for (VvResourceEntity vvResourceEntity : vvResourceList) {
|
|
||||||
vvResourceDao.deleteVvResourceById(vvResourceEntity.getId());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public void getAllResourceList(Long parentId, List<VvResourceEntity> vvResourceList) {
|
public void doDeleteChild(VVResourceDTO vvResourceDTO) {
|
||||||
|
vvResourceDao.deleteVvResourceById(vvResourceDTO.getId());
|
||||||
List<VvResourceEntity> vvResourceEntities = vvResourceDao.selectByParentId(parentId);
|
|
||||||
|
|
||||||
if (CollectionUtils.isEmpty(vvResourceEntities) || vvResourceEntities.size() == 0) {
|
|
||||||
|
|
||||||
|
if (CollectionUtils.isEmpty(vvResourceDTO.getChildList())) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
vvResourceList.addAll(vvResourceEntities);
|
for (VVResourceDTO vvResourceEntity : vvResourceDTO.getChildList()) {
|
||||||
|
doDeleteChild(vvResourceEntity);
|
||||||
for (VvResourceEntity vvResourceEntity : vvResourceEntities) {
|
|
||||||
|
|
||||||
getAllResourceList(vvResourceEntity.getId(), vvResourceList);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/***
|
/***
|
||||||
* 资源复制
|
* 资源复制
|
||||||
*
|
*
|
||||||
@ -159,12 +150,7 @@ public class AdminResourceController {
|
|||||||
|
|
||||||
VVResourceDTO vvResourceEntity = vvResourceDao.selectDTOById(resourceId);
|
VVResourceDTO vvResourceEntity = vvResourceDao.selectDTOById(resourceId);
|
||||||
|
|
||||||
List<VVResourceDTO> vvResourceEntities = vvResourceDao.selectDtoByParentId(resourceId);
|
getChildResourceList(vvResourceEntity);
|
||||||
|
|
||||||
getChildResourceList(vvResourceEntities);
|
|
||||||
|
|
||||||
|
|
||||||
vvResourceEntity.setChildList(vvResourceEntities);
|
|
||||||
|
|
||||||
|
|
||||||
return R.ok().setData(vvResourceEntity);
|
return R.ok().setData(vvResourceEntity);
|
||||||
@ -173,62 +159,47 @@ public class AdminResourceController {
|
|||||||
|
|
||||||
|
|
||||||
public void doCopy(Long resourceId, Long parentId) {
|
public void doCopy(Long resourceId, Long parentId) {
|
||||||
|
VVResourceDTO vvResourceEntity = vvResourceDao.selectDTOById(resourceId);
|
||||||
|
|
||||||
VvResourceEntity vvResourceEntity = vvResourceDao.selectVvResourceById(resourceId);
|
|
||||||
|
|
||||||
List<VVResourceDTO> vvResourceEntities = vvResourceDao.selectDtoByParentId(resourceId);
|
|
||||||
|
|
||||||
vvResourceEntity.setId(null);
|
|
||||||
vvResourceEntity.setParentId(parentId);
|
vvResourceEntity.setParentId(parentId);
|
||||||
vvResourceDao.insertVvResource(vvResourceEntity);
|
|
||||||
|
|
||||||
getChildResourceList(vvResourceEntities);
|
|
||||||
|
|
||||||
|
|
||||||
doAddChild(vvResourceEntity.getId(), vvResourceEntities);
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
getChildResourceList(vvResourceEntity);
|
||||||
|
|
||||||
|
doAddChild(vvResourceEntity);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void doAddChild(Long parentId, List<VVResourceDTO> vvResourceEntities) {
|
public void doAddChild(VVResourceDTO vvResourceDTO) {
|
||||||
|
vvResourceDTO.setId(null);
|
||||||
|
vvResourceDao.insertVvResource(vvResourceDTO);
|
||||||
|
|
||||||
|
if (CollectionUtils.isEmpty(vvResourceDTO.getChildList())) {
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (VVResourceDTO vvResourceEntity : vvResourceDTO.getChildList()) {
|
||||||
|
vvResourceEntity.setParentId(vvResourceDTO.getId());
|
||||||
|
doAddChild(vvResourceEntity);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public void getChildResourceList(VVResourceDTO vvResourceDTO) {
|
||||||
|
|
||||||
|
List<VVResourceDTO> vvResourceEntities = vvResourceDao.selectDtoByParentId(vvResourceDTO.getId());
|
||||||
|
|
||||||
|
if (CollectionUtils.isEmpty(vvResourceEntities)) {
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
vvResourceDTO.setChildList(vvResourceEntities);
|
||||||
|
|
||||||
for (VVResourceDTO vvResourceEntity : vvResourceEntities) {
|
for (VVResourceDTO vvResourceEntity : vvResourceEntities) {
|
||||||
|
|
||||||
vvResourceEntity.setId(null);
|
getChildResourceList(vvResourceEntity);
|
||||||
|
|
||||||
vvResourceEntity.setParentId(parentId);
|
|
||||||
|
|
||||||
vvResourceDao.insertVvResource(vvResourceEntity);
|
|
||||||
|
|
||||||
if (CollectionUtils.isEmpty(vvResourceEntity.getChildList())) {
|
|
||||||
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
doAddChild(vvResourceEntity.getId(), vvResourceEntity.getChildList());
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
public void getChildResourceList(List<VVResourceDTO> vvResourceList) {
|
|
||||||
for (VVResourceDTO vvResourceDTO : vvResourceList) {
|
|
||||||
|
|
||||||
List<VVResourceDTO> vvResourceEntities = vvResourceDao.selectDtoByParentId(vvResourceDTO.getId());
|
|
||||||
|
|
||||||
if (CollectionUtils.isEmpty(vvResourceEntities)) {
|
|
||||||
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
vvResourceDTO.setChildList(vvResourceEntities);
|
|
||||||
|
|
||||||
getChildResourceList(vvResourceEntities);
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user