|
|
@@ -62,12 +62,13 @@ public class EmsProjectServiceImpl implements EmsProjectService {
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public EmsProjectResponse update(EmsProjectSaveRequest request) {
|
|
|
- if (request.getId() == null) {
|
|
|
- throw new BusinessException("修改项目时 id 不能为空");
|
|
|
+ if (request.getSpaceId() == null) {
|
|
|
+ throw new BusinessException("修改项目时 空间id 不能为空");
|
|
|
}
|
|
|
- EmsProject old = emsProjectMapper.selectById(request.getId());
|
|
|
+ EmsProject old = emsProjectMapper.selectOne(
|
|
|
+ new LambdaQueryWrapper<EmsProject>().eq(EmsProject::getSpaceId, request.getSpaceId()));
|
|
|
if (old == null) {
|
|
|
- throw new BusinessException("错误的项目id值");
|
|
|
+ throw new BusinessException("错误的空间id值");
|
|
|
}
|
|
|
Map<String, String> regionMap = emsSystemDictRegionService.checkAndBuildMap(
|
|
|
request.getProvinceCode(), request.getCityCode(), request.getDistrictCode());
|
|
|
@@ -84,10 +85,11 @@ public class EmsProjectServiceImpl implements EmsProjectService {
|
|
|
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
- public void remove(Long id) {
|
|
|
- EmsProject project = emsProjectMapper.selectById(id);
|
|
|
+ public void remove(Long spaceId) {
|
|
|
+ EmsProject project = emsProjectMapper.selectOne(
|
|
|
+ new LambdaQueryWrapper<EmsProject>().eq(EmsProject::getSpaceId, spaceId));
|
|
|
if (project == null) {
|
|
|
- throw new BusinessException("错误的项目id值");
|
|
|
+ throw new BusinessException("错误的空间id值");
|
|
|
}
|
|
|
if (!baseSpaceService.isLeafSpace(project.getSpaceId())) {
|
|
|
throw new BusinessException("当前项目下有空间节点不允许删除");
|
|
|
@@ -96,9 +98,9 @@ public class EmsProjectServiceImpl implements EmsProjectService {
|
|
|
throw new BusinessException("当前项目有关联的用户使用;不允许删除");
|
|
|
}
|
|
|
emsProjectDeviceSystemMapper.delete(
|
|
|
- new LambdaQueryWrapper<EmsProjectDeviceSystem>().eq(EmsProjectDeviceSystem::getProjectId, id));
|
|
|
- emsProjectMapper.deleteById(id);
|
|
|
- baseSpaceService.removeById(project.getSpaceId());
|
|
|
+ new LambdaQueryWrapper<EmsProjectDeviceSystem>().eq(EmsProjectDeviceSystem::getProjectId, project.getId()));
|
|
|
+ emsProjectMapper.deleteById(project.getId());
|
|
|
+ baseSpaceService.removeById(spaceId);
|
|
|
}
|
|
|
|
|
|
/**
|