20211029添加项目关联模板表

signin/src/main/java/com/ccsens/signin/bean/dto/ProjectDto.java

@@ -37,6 +37,8 @@ public class ProjectDto {
         private Long endTime;
         @ApiModelProperty("接口访问地址")
         private String url;
+        @ApiModelProperty("模板code")
+        private String code;
         @ApiModelProperty("用户列表")
         private Set<Long> userIdList;
     }

signin/src/main/java/com/ccsens/signin/service/ProjectService.java

@@ -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())){

signin/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: dev
-    include: util-dev,common
+    active: test
+    include: util-test,common
 

signin/src/main/resources/mapper_dao/ProjectDap.xml

@@ -18,7 +18,7 @@
             p.project_start_time as startTime,
             p.project_end_time as endTime,
             p.project_status as `status`,
-            p.url,
+            if(t.url is null, p.url, t.url) as url,
             t.template_code
 		FROM
 			t_sys_project_list p
@@ -54,18 +54,19 @@
 
     <select id="querySonProject" resultType="com.ccsens.signin.bean.vo.ProjectVo$QueryProject">
         SELECT
-            project_id as id,
-            `name`,
-            project_start_time as startTime,
-            project_end_time as endTime,
-            project_status as `status`,
-            url,
-            parent_project_id AS parentId
+            p.project_id as id,
+            p.`name`,
+            p.project_start_time as startTime,
+            p.project_end_time as endTime,
+            p.project_status as `status`,
+            if(t.url is null, p.url, t.url) as url,
+            p.parent_project_id AS parentId
         FROM
-            t_sys_project_list
+            t_sys_project_list p
+            LEFT JOIN t_sys_template t on p.template_id = t.id and t.rec_status = 0
         WHERE
-            rec_status = 0
-        AND parent_project_id IN
+            p.rec_status = 0
+        AND p.parent_project_id IN
         <foreach collection="idList" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
@@ -112,7 +113,7 @@
     <select id="queryDomain" resultType="java.lang.String">
         SELECT
         url
-        FROM `t_sys_project_list`
+        FROM t_sys_template
         WHERE
         rec_status = 0
         GROUP BY url

util/src/main/java/com/ccsens/util/CodeEnum.java

@@ -222,6 +222,7 @@ public enum  CodeEnum {
     PROJECT_REGION_NO_SAME(181,"项目域不同无法进行操作",true),
     NO_POWER(182,"权限不足",true),
     DATA_DECRYPTION(183,"解密失败，数据可能遭受到破坏，操作取消。",true),
+    NOT_TEMPLATE(183,"找不到对应的模板信息",true),
     ;