新建任务

common/src/main/java/com/ccsens/common/bean/dto/CTaskDto.java

@@ -4,7 +4,10 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
+import java.util.List;
 
 /**
  * @author 逗
@@ -77,4 +80,37 @@ public class CTaskDto {
         @ApiModelProperty("任务详情id")
         private Long detailId;
     }
+
+    @Data
+    @ApiModel("新建任务")
+    public static class SaveTask{
+        @NotBlank(message = "任务名不能为空")
+        @ApiModelProperty("任务名")
+        private String name;
+        @NotBlank(message = "开始时间不能为空")
+        @ApiModelProperty("开始时间")
+        private Long startTime;
+        @NotBlank(message = "结束时间不能为空")
+        @ApiModelProperty("结束时间")
+        private Long endTime;
+        @ApiModelProperty("描述")
+        private String description;
+        @NotBlank(message = "项目id不能为空")
+        @ApiModelProperty("项目id")
+        private Long projectId;
+        @ApiModelProperty("父任务id")
+        private Long parentTaskId;
+        @ApiModelProperty("上道工序id（任务id）")
+        private Long processTaskId;
+        @ApiModelProperty("是否日常任务 0否 1是")
+        private byte global;
+
+        @NotEmpty(message = "负责人不能为空")
+        @ApiModelProperty("负责人")
+        private List<Long> roleIdList;
+        @ApiModelProperty("检查人")
+        private List<Long> checkerIdList;
+        @ApiModelProperty("交付物名")
+        private List<String> deliverList;
+    }
 }

common/src/main/java/com/ccsens/common/service/ITaskService.java

@@ -56,4 +56,12 @@ public interface ITaskService {
      * @return 子项目列表
      */
     List<CTaskVo.SonTaskDetail> findSonTask(CTaskDto.FindSonTask param,Long userId);
+
+    /**
+     * 新建任务
+     * @param param 任务信息
+     * @param userId 用户id
+     * @return 子项目列表
+     */
+    CTaskVo.QueryTask saveTask(CTaskDto.SaveTask param,Long userId);
 }

common/src/main/java/com/ccsens/common/service/TaskService.java

@@ -594,4 +594,18 @@ public class TaskService implements ITaskService {
         return taskDetailDao.findSonTask(param);
     }
 
+    @Override
+    public CTaskVo.QueryTask saveTask(CTaskDto.SaveTask param, Long userId) {
+        //任务详情
+        //任务分解信息
+        //任务添加标签（天，普通/日常任务）
+        //任务关系表（父任务）（项目id）
+        //角色任务关联表（负责人）
+        //TODO 检查人（待定）
+        //上下道工序
+        //插件（添加一个任务名插件）
+
+        return null;
+    }
+
 }

signin/src/main/java/com/ccsens/signin/api/ProjectController.java

@@ -74,4 +74,12 @@ public class ProjectController {
         projectService.setProjectSort(params.getParam(), params.getUserId());
         return JsonResponse.newInstance().ok();
     }
+
+    @MustLoginTall
+    @ApiOperation(value = "删除项目列表的项目", notes = "")
+    @RequestMapping(value = "/deleteProject", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse deleteProject(@ApiParam @Validated @RequestBody QueryDto<ProjectDto.ProjectId> params) throws Exception{
+        projectService.deleteProject(params.getParam(), params.getUserId());
+        return JsonResponse.newInstance().ok();
+    }
 }

signin/src/main/java/com/ccsens/signin/api/UserController.java

@@ -35,9 +35,6 @@ public class UserController {
     @Autowired
     private IUserService userService;
 
-//    @Autowired
-//    private IProMemberService proMemberService;
-
 
     @ApiOperation(value = "/用户登录", notes = "")
     @ApiImplicitParams({

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

@@ -96,4 +96,12 @@ public class ProjectDto {
         @ApiModelProperty("顺序")
         private Integer sort;
     }
+
+    @Data
+    @ApiModel("项目id")
+    public static class  ProjectId{
+        @ApiModelProperty("项目id")
+        private Long id;
+    }
+
 }

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

@@ -212,4 +212,11 @@ public class UserDto {
         @ApiModelProperty("职位")
         private String position;
     }
+
+
+    @Data
+    public static class PhoneAndUserId{
+        private String phone;
+        private Long userId;
+    }
 }

signin/src/main/java/com/ccsens/signin/persist/dao/ProjectDao.java

@@ -35,4 +35,10 @@ public interface ProjectDao {
      * @return 项目信息
      */
     SysProjectList selectByProjectId(@Param("id") Long id);
+
+    /**
+     * 查询所有域名
+     * @return
+     */
+    List<String> queryDomain();
 }

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

@@ -39,4 +39,11 @@ public interface IProjectService {
      * @param saveUserProject 用户id 项目id
      */
     void saveUserProject(ProjectDto.SaveUserProject saveUserProject);
+
+    /**
+     * 删除项目
+     * @param param 项目id
+     * @param userId userId
+     */
+    void deleteProject(ProjectDto.ProjectId param, Long userId);
 }

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

@@ -0,0 +1,4 @@
+package com.ccsens.signin.service;
+
+public interface IRelevanceUser {
+}

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

@@ -254,4 +254,14 @@ public class ProjectService implements IProjectService{
         userProjectMapper.insertSelective(userProject);
     }
 
+    @Override
+    public void deleteProject(ProjectDto.ProjectId param, Long userId) {
+        //TODO 待补充
+        SysProjectList projectList = projectListMapper.selectByPrimaryKey(param.getId());
+        if(ObjectUtil.isNotNull(projectList)){
+            projectList.setRecStatus((byte) 2);
+            projectListMapper.updateByPrimaryKeySelective(projectList);
+        }
+
+    }
 }

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

@@ -0,0 +1,45 @@
+package com.ccsens.signin.service;
+
+import com.ccsens.signin.bean.dto.UserDto;
+import com.ccsens.signin.persist.dao.ProjectDao;
+import com.ccsens.util.RestTemplateUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author 逗
+ */
+@Slf4j
+@Service
+@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
+public class RelevanceUser implements IRelevanceUser{
+    @Resource
+    private ProjectDao projectDao;
+
+    /**
+     * 查询所有域名
+     */
+    public List<String> queryDomain() {
+        return projectDao.queryDomain();
+    }
+
+    /**
+     * 调用业务系统关联成员
+     */
+    public void relevancePhone(String phone, Long userId) {
+        //查询所有的域连接
+        List<String> domainList = queryDomain();
+        //传入手机号和userId，循环调用每个域内关联成员的接口
+        UserDto.PhoneAndUserId phoneAndUserId = new UserDto.PhoneAndUserId();
+        phoneAndUserId.setPhone(phone);
+        phoneAndUserId.setUserId(userId);
+        domainList.forEach(domain -> {
+            RestTemplateUtil.postBody(domain + "/memberWithPhone", phoneAndUserId);
+        });
+    }
+}

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

@@ -394,14 +394,6 @@ public class UserService implements IUserService {
     }
 
 
-//    @Data
-//    private static class WxEnterpriseParam {
-//        private String suiteAccessToken;
-//        private String userTicket;
-//        private String redirect;
-//    }
-
-
     /**
      * @param openId openId
      * @param unionId unionId
@@ -1623,4 +1615,6 @@ public class UserService implements IUserService {
 
         return vertifyCode;
     }
+
+
 }

signin/src/main/resources/application.yml

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

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

@@ -94,5 +94,13 @@
         rec_status = 0
         AND project_id = #{id}
     </select>
+    <select id="queryDomain" resultType="java.lang.String">
+        SELECT
+        url
+        FROM `t_sys_project_list`
+        WHERE
+        rec_status = 0
+        GROUP BY url
+    </select>
 
 </mapper>