|
|
|
@ -1,7 +1,9 @@ |
|
|
|
package com.ccsens.tall.web; |
|
|
|
|
|
|
|
import com.ccsens.tall.bean.dto.RoleDto; |
|
|
|
import com.ccsens.tall.bean.vo.ProjectVo; |
|
|
|
import com.ccsens.tall.bean.vo.RoleVo; |
|
|
|
import com.ccsens.tall.bean.vo.TaskVo; |
|
|
|
import com.ccsens.tall.service.IProRoleService; |
|
|
|
import com.ccsens.util.JsonResponse; |
|
|
|
import com.ccsens.util.WebConstant; |
|
|
|
@ -12,6 +14,7 @@ import org.springframework.web.bind.annotation.*; |
|
|
|
|
|
|
|
import javax.annotation.Resource; |
|
|
|
import javax.servlet.http.HttpServletRequest; |
|
|
|
import java.util.List; |
|
|
|
|
|
|
|
/** |
|
|
|
* @author 逗 |
|
|
|
@ -50,10 +53,10 @@ public class RoleController { |
|
|
|
@ApiImplicitParams({ |
|
|
|
}) |
|
|
|
@RequestMapping(value = "/update", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) |
|
|
|
public JsonResponse updateRole(HttpServletRequest request, |
|
|
|
@ApiParam @Validated @RequestBody RoleDto.UpdateRole updateRole) throws Exception { |
|
|
|
public JsonResponse<ProjectVo.RoleInfo> updateRole(HttpServletRequest request, |
|
|
|
@ApiParam @Validated @RequestBody RoleDto.UpdateRole updateRole) throws Exception { |
|
|
|
Long currentUserId = Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject()); |
|
|
|
proRoleService.updateRole(currentUserId,updateRole); |
|
|
|
ProjectVo.RoleInfo roleInfo = proRoleService.updateRole(currentUserId,updateRole); |
|
|
|
return JsonResponse.newInstance().ok(); |
|
|
|
} |
|
|
|
|
|
|
|
@ -79,15 +82,27 @@ public class RoleController { |
|
|
|
return JsonResponse.newInstance().ok(); |
|
|
|
} |
|
|
|
|
|
|
|
@ApiOperation(value = "通过",notes = "") |
|
|
|
// @ApiOperation(value = "通过",notes = "")
|
|
|
|
// @ApiImplicitParams({
|
|
|
|
// })
|
|
|
|
// @RequestMapping(value = "/deleteMember", method = RequestMethod.GET, produces = {"application/json;charset=UTF-8"})
|
|
|
|
// public JsonResponse<RoleVo.RoleByProjectId> queryRoleByProjectId(HttpServletRequest request,
|
|
|
|
// @RequestParam(required = true)Long projectId) throws Exception {
|
|
|
|
// Long currentUserId = Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject());
|
|
|
|
// RoleVo.RoleByProjectId roleInfo = proRoleService.queryRoleByProjectId(projectId);
|
|
|
|
// return JsonResponse.newInstance().ok(roleInfo);
|
|
|
|
// }
|
|
|
|
|
|
|
|
@ApiOperation(value = "点击项目角色查询一级任务及里程碑",notes = "") |
|
|
|
@ApiImplicitParams({ |
|
|
|
}) |
|
|
|
@RequestMapping(value = "/deleteMember", method = RequestMethod.GET, produces = {"application/json;charset=UTF-8"}) |
|
|
|
public JsonResponse<RoleVo.RoleByProjectId> queryRoleByProjectId(HttpServletRequest request, |
|
|
|
@RequestParam(required = true)Long projectId) throws Exception { |
|
|
|
@RequestMapping(value = "/ProjectVirtualRole", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) |
|
|
|
public JsonResponse<List<TaskVo.TaskListByProjectId>> queryByProjectVirtualRole(HttpServletRequest request, |
|
|
|
@ApiParam @Validated @RequestBody RoleDto.ProjectId projectId) throws Exception { |
|
|
|
Long currentUserId = Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject()); |
|
|
|
RoleVo.RoleByProjectId roleInfo = proRoleService.queryRoleByProjectId(projectId); |
|
|
|
return JsonResponse.newInstance().ok(roleInfo); |
|
|
|
List<TaskVo.TaskListByProjectId> taskListByProjectIdList = proRoleService.queryByProjectVirtualRole(projectId); |
|
|
|
return JsonResponse.newInstance().ok(taskListByProjectIdList); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
