diff --git a/src/main/java/com/ccsens/defaultwbs/api/TaskController.java b/src/main/java/com/ccsens/defaultwbs/api/TaskController.java index eb51412..f921933 100644 --- a/src/main/java/com/ccsens/defaultwbs/api/TaskController.java +++ b/src/main/java/com/ccsens/defaultwbs/api/TaskController.java @@ -1,7 +1,9 @@ package com.ccsens.defaultwbs.api; import com.ccsens.cloudutil.annotation.MustLogin; +import com.ccsens.common.bean.dto.CPluginDto; import com.ccsens.common.bean.dto.CTaskDto; +import com.ccsens.common.bean.vo.CPluginVo; import com.ccsens.common.bean.vo.CTaskVo; import com.ccsens.common.service.ITaskService; import com.ccsens.defaultwbs.bean.vo.TaskVo; @@ -89,4 +91,40 @@ public class TaskController { log.info("查找项目下的任务结束{}",taskList); return JsonResponse.newInstance().ok(taskList); } + + @ApiOperation(value = "修改任务信息", notes = "") + @RequestMapping(value = "/update", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse updateTask(@ApiParam @Validated @RequestBody QueryDto params) throws Exception { + log.info("修改任务信息开始{}",params); + taskService.updateTaskDetail(params.getParam(), params.getUserId()); + log.info("修改任务信息结束"); + return JsonResponse.newInstance().ok(); + } + + @ApiOperation(value = "删除任务", notes = "") + @RequestMapping(value = "/delete", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse deleteTask(@ApiParam @Validated @RequestBody QueryDto params) throws Exception { + log.info("删除任务开始{}",params); + taskService.deleteTaskDetail(params.getParam(), params.getUserId()); + log.info("删除任务结束"); + return JsonResponse.newInstance().ok(); + } + + @ApiOperation(value = "查找任务下的插件列表", notes = "") + @RequestMapping(value = "/queryTaskPlugin", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse> queryTaskPlugin(@ApiParam @Validated @RequestBody QueryDto params) throws Exception { + log.info("查找任务下的插件列表开始{}",params); + List taskPlugins = taskService.queryPluginByTaskId(params.getParam(), params.getUserId()); + log.info("查找任务下的插件列表结束:{}",taskPlugins); + return JsonResponse.newInstance().ok(taskPlugins); + } + + @ApiOperation(value = "给任务添加关联插件", notes = "") + @RequestMapping(value = "/saveTaskPlugin", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse saveTaskPlugin(@ApiParam @Validated @RequestBody QueryDto params) throws Exception { + log.info("给任务添加关联插件{}",params); + taskService.saveTaskPlugin(params.getParam(), params.getUserId()); + log.info("给任务添加关联插件结束"); + return JsonResponse.newInstance().ok(); + } } diff --git a/src/main/java/com/ccsens/defaultwbs/bean/message/DeliverMessageWithChecker.java b/src/main/java/com/ccsens/defaultwbs/bean/message/DeliverMessageWithChecker.java index 0f6bb10..1d027fa 100644 --- a/src/main/java/com/ccsens/defaultwbs/bean/message/DeliverMessageWithChecker.java +++ b/src/main/java/com/ccsens/defaultwbs/bean/message/DeliverMessageWithChecker.java @@ -5,6 +5,8 @@ import lombok.Data; import lombok.Getter; import lombok.Setter; +import java.util.List; + /** * @author 逗 */ @@ -29,7 +31,7 @@ public class DeliverMessageWithChecker { //交付物id Long deliverId; //角色id(上传的任务所属的角色id) - Long roleId; + List roleId; //检查人id(memberId) Long memberId; //检查人名字(成员名) @@ -37,13 +39,13 @@ public class DeliverMessageWithChecker { } - public DeliverMessageWithChecker(Long taskId, Long taskDetailId, Long deliverId, Long roleId, Long memberId, String memberName){ + public DeliverMessageWithChecker(Long taskId, Long taskDetailId, Long deliverId, List roleIdList, Long memberId, String memberName){ this(); Data d = new Data(); d.setTaskId(taskId); d.setTaskDetailId(taskDetailId); d.setDeliverId(deliverId); - d.setRoleId(roleId); + d.setRoleId(roleIdList); d.setMemberId(memberId); d.setMemberName(memberName); setData(d); diff --git a/src/main/java/com/ccsens/defaultwbs/bean/message/DeliverMessageWithUpload.java b/src/main/java/com/ccsens/defaultwbs/bean/message/DeliverMessageWithUpload.java index 46cd910..6a33d13 100644 --- a/src/main/java/com/ccsens/defaultwbs/bean/message/DeliverMessageWithUpload.java +++ b/src/main/java/com/ccsens/defaultwbs/bean/message/DeliverMessageWithUpload.java @@ -5,6 +5,8 @@ import lombok.Data; import lombok.Getter; import lombok.Setter; +import java.util.List; + /** * @author 逗 */ @@ -29,7 +31,7 @@ public class DeliverMessageWithUpload { //交付物id Long deliverId; //角色id(上传的任务所属的角色id) - Long roleId; + List roleId; //上传者/检查者 id(memberId) Long memberId; //上传者/检查者 名字(成员名) @@ -37,7 +39,7 @@ public class DeliverMessageWithUpload { } - public DeliverMessageWithUpload(Long taskId, Long taskDetailId, Long deliverId, Long roleId, Long memberId, String memberName){ + public DeliverMessageWithUpload(Long taskId, Long taskDetailId, Long deliverId, List roleId, Long memberId, String memberName){ this(); Data d = new Data(); d.setTaskId(taskId); diff --git a/src/main/java/com/ccsens/defaultwbs/service/DeliverService.java b/src/main/java/com/ccsens/defaultwbs/service/DeliverService.java index 608f0d6..dbb2964 100644 --- a/src/main/java/com/ccsens/defaultwbs/service/DeliverService.java +++ b/src/main/java/com/ccsens/defaultwbs/service/DeliverService.java @@ -125,7 +125,7 @@ public class DeliverService implements IDeliverService { public void sendToDeliverUploadMessage(DeliverDto.SaveDeliver params, Long userId, Long taskDetailId, Long deliverId) throws Exception { //获取任务所属的角色id - Long roleId = roleDao.getRoleIdByTaskDetailId(taskDetailId); + List roleIdList = roleDao.getRoleIdByTaskDetailId(taskDetailId); //获取成员id和成员名 CMemberVo.MemberIdAndName memberIdAndName = memberDao.getByUserIdAndProjectId(params.getProjectId(), userId); Long memberId = null; @@ -136,7 +136,7 @@ public class DeliverService implements IDeliverService { } //发送的消息内容 DeliverMessageWithUpload message = new DeliverMessageWithUpload(params.getTaskSubId(), - taskDetailId,deliverId,roleId,memberId,memberName); + taskDetailId,deliverId,roleIdList,memberId,memberName); //通过成员id批量获取userId List userIdList = memberDao.queryUserIdByMemberId(params.getCheckerList()); if(CollectionUtil.isNotEmpty(userIdList)){ @@ -199,7 +199,7 @@ public class DeliverService implements IDeliverService { private void sendToDeliverCheckerMessage(Long deliverId, Long projectId, Long userId) throws Exception { Long subTaskId = null; Long taskDetailId = null; - Long roleId = null; + List roleIdList = null; Long memberId = null; String memberName = null; //获取任务信息 @@ -210,7 +210,7 @@ public class DeliverService implements IDeliverService { if(ObjectUtil.isNotNull(taskSub)){ taskDetailId = taskSub.getTaskDetailId(); //获取任务所属的角色id - roleId = roleDao.getRoleIdByTaskDetailId(taskDetailId); + roleIdList = roleDao.getRoleIdByTaskDetailId(taskDetailId); } } //获取成员id和成员名 @@ -220,7 +220,7 @@ public class DeliverService implements IDeliverService { memberName = memberIdAndName.getName(); } //发送的消息内容 - DeliverMessageWithChecker checkerMessage = new DeliverMessageWithChecker(subTaskId,taskDetailId,deliverId,roleId,memberId,memberName); + DeliverMessageWithChecker checkerMessage = new DeliverMessageWithChecker(subTaskId,taskDetailId,deliverId,roleIdList,memberId,memberName); //获取上传者的userId(消息接收者) ProMember uploadMember = memberDao.selectByPrimaryKey(deliver.getMemberId()); if(ObjectUtil.isNotNull(uploadMember)){ diff --git a/src/main/resources/druid-dev.yml b/src/main/resources/druid-dev.yml index c823ae7..a2d26ea 100644 --- a/src/main/resources/druid-dev.yml +++ b/src/main/resources/druid-dev.yml @@ -28,9 +28,7 @@ spring: testOnReturn: false testWhileIdle: true timeBetweenEvictionRunsMillis: 60000 -# url: jdbc:mysql://49.233.89.188:3306/defaultwbs?useUnicode=true&characterEncoding=UTF-8 - url: jdbc:mysql://www.tall.wiki/defaultwbs?useUnicode=true&characterEncoding=UTF-8 -# url: jdbc:mysql://127.0.0.1/mt?useUnicode=true&characterEncoding=UTF-8 + url: jdbc:mysql://49.233.89.188:3306/defaultwbs?useUnicode=true&characterEncoding=UTF-8 username: root validationQuery: SELECT 1 FROM DUAL # env: CCSENS_GAME