|
|
@ -8,13 +8,11 @@ import cn.hutool.http.HttpUtil; |
|
|
|
import com.alibaba.fastjson.JSONObject; |
|
|
|
import com.ccsens.signin.bean.dto.ProjectDto; |
|
|
|
import com.ccsens.signin.bean.dto.UserDto; |
|
|
|
import com.ccsens.signin.bean.po.SysProjectList; |
|
|
|
import com.ccsens.signin.bean.po.SysProjectListExample; |
|
|
|
import com.ccsens.signin.bean.po.SysUserProject; |
|
|
|
import com.ccsens.signin.bean.po.SysUserProjectExample; |
|
|
|
import com.ccsens.signin.bean.po.*; |
|
|
|
import com.ccsens.signin.bean.vo.ProjectVo; |
|
|
|
import com.ccsens.signin.persist.dao.ProjectDao; |
|
|
|
import com.ccsens.signin.persist.mapper.SysProjectListMapper; |
|
|
|
import com.ccsens.signin.persist.mapper.SysTemplateMapper; |
|
|
|
import com.ccsens.signin.persist.mapper.SysUserProjectMapper; |
|
|
|
import com.ccsens.signin.util.TallConstant; |
|
|
|
import com.ccsens.util.*; |
|
|
@ -45,6 +43,8 @@ public class ProjectService implements IProjectService{ |
|
|
|
private SysUserProjectMapper userProjectMapper; |
|
|
|
@Resource |
|
|
|
private Snowflake snowflake; |
|
|
|
@Resource |
|
|
|
private SysTemplateMapper sysTemplateMapper; |
|
|
|
|
|
|
|
@Override |
|
|
|
public List<ProjectVo.QueryProject> queryProjectList(ProjectDto.QueryProjectDto param, Long userId) { |
|
|
@ -80,6 +80,7 @@ public class ProjectService implements IProjectService{ |
|
|
|
|
|
|
|
@Override |
|
|
|
public void saveProjectList(ProjectDto.SaveProjectDto projectDto) { |
|
|
|
|
|
|
|
//根据项目id查找以前是否已存在
|
|
|
|
SysProjectListExample projectListExample = new SysProjectListExample(); |
|
|
|
projectListExample.createCriteria().andProjectIdEqualTo(projectDto.getId()); |
|
|
@ -91,7 +92,7 @@ public class ProjectService implements IProjectService{ |
|
|
|
project.setParentProjectId(projectDto.getParentId()); |
|
|
|
project.setProjectStartTime(projectDto.getStartTime()); |
|
|
|
project.setProjectEndTime(projectDto.getEndTime()); |
|
|
|
project.setUrl(projectDto.getUrl()); |
|
|
|
// project.setUrl(projectDto.getUrl());
|
|
|
|
projectListMapper.updateByPrimaryKeySelective(project); |
|
|
|
//修改用户项目关联表,
|
|
|
|
if(CollectionUtil.isNotEmpty(projectDto.getUserIdList())){ |
|
|
@ -115,6 +116,19 @@ public class ProjectService implements IProjectService{ |
|
|
|
}); |
|
|
|
} |
|
|
|
}else { |
|
|
|
//根据code找到模板信息
|
|
|
|
SysTemplate template; |
|
|
|
SysTemplateExample sysTemplateExample = new SysTemplateExample(); |
|
|
|
if(projectDto.getCode() == null){ |
|
|
|
sysTemplateExample.createCriteria().andUrlEqualTo(projectDto.getUrl()); |
|
|
|
}else { |
|
|
|
sysTemplateExample.createCriteria().andTemplateCodeEqualTo(projectDto.getCode()); |
|
|
|
} |
|
|
|
List<SysTemplate> sysTemplates = sysTemplateMapper.selectByExample(sysTemplateExample); |
|
|
|
if(CollectionUtil.isEmpty(sysTemplates)){ |
|
|
|
throw new BaseException(CodeEnum.NOT_TEMPLATE); |
|
|
|
} |
|
|
|
template = sysTemplates.get(0); |
|
|
|
//不存在则添加
|
|
|
|
SysProjectList project = new SysProjectList(); |
|
|
|
project.setId(snowflake.nextId()); |
|
|
@ -123,7 +137,8 @@ public class ProjectService implements IProjectService{ |
|
|
|
project.setParentProjectId(projectDto.getParentId()); |
|
|
|
project.setProjectStartTime(projectDto.getStartTime()); |
|
|
|
project.setProjectEndTime(projectDto.getEndTime()); |
|
|
|
project.setUrl(projectDto.getUrl()); |
|
|
|
project.setUrl(template.getUrl()); |
|
|
|
project.setTemplateId(template.getId()); |
|
|
|
projectListMapper.insertSelective(project); |
|
|
|
//添加项目用户关联信息
|
|
|
|
if(CollectionUtil.isNotEmpty(projectDto.getUserIdList())){ |
|
|
|