|
@@ -34,6 +34,7 @@ import org.springframework.beans.BeanUtils;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
|
|
+import javax.annotation.PostConstruct;
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
import java.util.*;
|
|
import java.util.*;
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
@@ -142,10 +143,13 @@ public class ProjectServiceImpl extends ServiceImpl<IProjectMapper, Project> imp
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public ProjectInfoVo getProjectInfo(Integer projectId,String sceneOrder) {
|
|
|
|
|
|
+ public ProjectInfoVo getProjectInfo(Integer projectId,String sceneOrder,String token) {
|
|
VUtils.isTure(projectId == null).throwMessage(ResultCode.PARAM_MISS);
|
|
VUtils.isTure(projectId == null).throwMessage(ResultCode.PARAM_MISS);
|
|
Project project = this.getById(projectId);
|
|
Project project = this.getById(projectId);
|
|
VUtils.isTure(project == null).throwMessage(ResultCode.PROJECT_NOT_EXIST);
|
|
VUtils.isTure(project == null).throwMessage(ResultCode.PROJECT_NOT_EXIST);
|
|
|
|
+
|
|
|
|
+ checkTokenPer(token, projectId);
|
|
|
|
+
|
|
ProjectInfoVo infoVo = new ProjectInfoVo();
|
|
ProjectInfoVo infoVo = new ProjectInfoVo();
|
|
BeanUtils.copyProperties(project,infoVo);
|
|
BeanUtils.copyProperties(project,infoVo);
|
|
ProjectTeam projectCreater = projectTeamService.getProjectCreater(projectId);
|
|
ProjectTeam projectCreater = projectTeamService.getProjectCreater(projectId);
|
|
@@ -170,8 +174,10 @@ public class ProjectServiceImpl extends ServiceImpl<IProjectMapper, Project> imp
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public void over(Project param) {
|
|
|
|
|
|
+ public void over(Project param,String token) {
|
|
VUtils.isTure(param.getProjectId() == null).throwMessage(ResultCode.PARAM_MISS);
|
|
VUtils.isTure(param.getProjectId() == null).throwMessage(ResultCode.PARAM_MISS);
|
|
|
|
+ checkTokenPer(token, param.getProjectId());
|
|
|
|
+
|
|
LambdaUpdateWrapper<Project> wrapper = new LambdaUpdateWrapper<>();
|
|
LambdaUpdateWrapper<Project> wrapper = new LambdaUpdateWrapper<>();
|
|
wrapper.eq(Project::getProjectId,param.getProjectId())
|
|
wrapper.eq(Project::getProjectId,param.getProjectId())
|
|
.set(Project::getProjectStatus,1);
|
|
.set(Project::getProjectStatus,1);
|
|
@@ -206,6 +212,7 @@ public class ProjectServiceImpl extends ServiceImpl<IProjectMapper, Project> imp
|
|
public void addScene(ProjectAddSceneParam param) {
|
|
public void addScene(ProjectAddSceneParam param) {
|
|
Project project = this.getById(param.getProjectId());
|
|
Project project = this.getById(param.getProjectId());
|
|
VUtils.isTure(project == null).throwMessage(ResultCode.PROJECT_NOT_EXIST);
|
|
VUtils.isTure(project == null).throwMessage(ResultCode.PROJECT_NOT_EXIST);
|
|
|
|
+ checkTokenPer(param.getToken(), param.getProjectId());
|
|
|
|
|
|
Set<Integer> projectIds = new HashSet<>(Arrays.asList(param.getProjectId()));
|
|
Set<Integer> projectIds = new HashSet<>(Arrays.asList(param.getProjectId()));
|
|
List<ProjectNum> projectNums = projectNumService.getListByProjectIds(projectIds);
|
|
List<ProjectNum> projectNums = projectNumService.getListByProjectIds(projectIds);
|
|
@@ -258,6 +265,8 @@ public class ProjectServiceImpl extends ServiceImpl<IProjectMapper, Project> imp
|
|
Project project = this.getById(param.getProjectId());
|
|
Project project = this.getById(param.getProjectId());
|
|
VUtils.isTure(project == null).throwMessage(ResultCode.PARAM_MISS);
|
|
VUtils.isTure(project == null).throwMessage(ResultCode.PARAM_MISS);
|
|
VUtils.isTure(param.getProjectId() == null).throwMessage(ResultCode.PARAM_MISS);
|
|
VUtils.isTure(param.getProjectId() == null).throwMessage(ResultCode.PARAM_MISS);
|
|
|
|
+ checkTokenPer(param.getToken(), param.getProjectId());
|
|
|
|
+
|
|
VUtils.isTure(StringUtils.isBlank(param.getNum())).throwMessage(ResultCode.PARAM_MISS);
|
|
VUtils.isTure(StringUtils.isBlank(param.getNum())).throwMessage(ResultCode.PARAM_MISS);
|
|
projectNumService.delByNumList(param.getProjectId(),Arrays.asList(param.getNum()));
|
|
projectNumService.delByNumList(param.getProjectId(),Arrays.asList(param.getNum()));
|
|
projectLogService.addLog(param.getProjectId(),"删除场景",param.getToken(),Arrays.asList(param.getNum()));
|
|
projectLogService.addLog(param.getProjectId(),"删除场景",param.getToken(),Arrays.asList(param.getNum()));
|
|
@@ -266,8 +275,10 @@ public class ProjectServiceImpl extends ServiceImpl<IProjectMapper, Project> imp
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public void deleteBim(Integer bimId,String token) {
|
|
public void deleteBim(Integer bimId,String token) {
|
|
|
|
+
|
|
ProjectBim bim = projectBimService.getById(bimId);
|
|
ProjectBim bim = projectBimService.getById(bimId);
|
|
if(bim != null){
|
|
if(bim != null){
|
|
|
|
+ checkTokenPer(token, bim.getProjectId());
|
|
projectLogService.addLog(bim.getProjectId(),"删除BIM:"+bim.getBimName(),token,null);
|
|
projectLogService.addLog(bim.getProjectId(),"删除BIM:"+bim.getBimName(),token,null);
|
|
projectBimService.removeById(bimId);
|
|
projectBimService.removeById(bimId);
|
|
this.updateTime(bim.getProjectId());
|
|
this.updateTime(bim.getProjectId());
|
|
@@ -297,8 +308,10 @@ public class ProjectServiceImpl extends ServiceImpl<IProjectMapper, Project> imp
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public void updateName(Project param) {
|
|
|
|
|
|
+ public void updateName(Project param,String token) {
|
|
|
|
+
|
|
VUtils.isTure(param.getProjectId() == null).throwMessage(ResultCode.PARAM_MISS);
|
|
VUtils.isTure(param.getProjectId() == null).throwMessage(ResultCode.PARAM_MISS);
|
|
|
|
+ checkTokenPer(token, param.getProjectId());
|
|
|
|
|
|
LambdaUpdateWrapper<Project> wrapper = new LambdaUpdateWrapper<>();
|
|
LambdaUpdateWrapper<Project> wrapper = new LambdaUpdateWrapper<>();
|
|
wrapper.eq(Project::getProjectId,param.getProjectId());
|
|
wrapper.eq(Project::getProjectId,param.getProjectId());
|
|
@@ -316,6 +329,8 @@ public class ProjectServiceImpl extends ServiceImpl<IProjectMapper, Project> imp
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public void updateBimName(ProjectBim projectBim,String token) {
|
|
public void updateBimName(ProjectBim projectBim,String token) {
|
|
|
|
+ checkTokenPer(token, projectBim.getProjectId());
|
|
|
|
+
|
|
ProjectBim bim = projectBimService.getById(projectBim.getBimId());
|
|
ProjectBim bim = projectBimService.getById(projectBim.getBimId());
|
|
projectBimService.updateBimName(projectBim);
|
|
projectBimService.updateBimName(projectBim);
|
|
this.updateTime(bim.getProjectId());
|
|
this.updateTime(bim.getProjectId());
|
|
@@ -325,6 +340,7 @@ public class ProjectServiceImpl extends ServiceImpl<IProjectMapper, Project> imp
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public void updatePanos(Project param,String token) {
|
|
public void updatePanos(Project param,String token) {
|
|
|
|
+ checkTokenPer(token, param.getProjectId());
|
|
VUtils.isTure(param.getProjectId() == null).throwMessage(ResultCode.PARAM_MISS);
|
|
VUtils.isTure(param.getProjectId() == null).throwMessage(ResultCode.PARAM_MISS);
|
|
VUtils.isTure(StringUtils.isBlank(param.getPanos())).throwMessage(ResultCode.PARAM_MISS);
|
|
VUtils.isTure(StringUtils.isBlank(param.getPanos())).throwMessage(ResultCode.PARAM_MISS);
|
|
|
|
|
|
@@ -341,6 +357,7 @@ public class ProjectServiceImpl extends ServiceImpl<IProjectMapper, Project> imp
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public void delProject(Integer projectId, String token) {
|
|
public void delProject(Integer projectId, String token) {
|
|
|
|
+ checkTokenPer(token, projectId);
|
|
Project project = this.getById(projectId);
|
|
Project project = this.getById(projectId);
|
|
if(project == null){
|
|
if(project == null){
|
|
throw new BusinessException(ResultCode.PROJECT_NOT_EXIST);
|
|
throw new BusinessException(ResultCode.PROJECT_NOT_EXIST);
|
|
@@ -358,4 +375,13 @@ public class ProjectServiceImpl extends ServiceImpl<IProjectMapper, Project> imp
|
|
wrapper.set(Project::getUpdateTime, DateUtils.getData(new Date()));
|
|
wrapper.set(Project::getUpdateTime, DateUtils.getData(new Date()));
|
|
this.update(wrapper);
|
|
this.update(wrapper);
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ public void checkTokenPer(String token,Integer projectId){
|
|
|
|
+ String userName = JwtUtil.getUserName(token);
|
|
|
|
+ List<ProjectTeam> teamList = projectTeamService.getListByUserName(userName);
|
|
|
|
+ Set<Integer> projectIds = teamList.stream().map(ProjectTeam::getProjectId).collect(Collectors.toSet());
|
|
|
|
+ if(!projectIds.contains(projectId)){
|
|
|
|
+ throw new BusinessException(ResultCode.NOT_PERM);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
}
|
|
}
|