diff --git a/src/main/java/com/ccsens/defaultwbs/api/ClockingInController.java b/src/main/java/com/ccsens/defaultwbs/api/ClockingInController.java index da14f1b..747f561 100644 --- a/src/main/java/com/ccsens/defaultwbs/api/ClockingInController.java +++ b/src/main/java/com/ccsens/defaultwbs/api/ClockingInController.java @@ -56,4 +56,12 @@ public class ClockingInController { clockingInService.auditRecord(params.getParam(), params.getUserId()); return JsonResponse.newInstance().ok(); } + + @MustLogin + @ApiOperation(value = "导出考勤excel", notes = "") + @RequestMapping(value = "/export", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse export(@ApiParam @Validated @RequestBody QueryDto params) throws Exception{ + CClockingInVo.ExcelUrl excelUrl = clockingInService.exportRecord(params.getParam(), params.getUserId()); + return JsonResponse.newInstance().ok(excelUrl); + } } diff --git a/src/main/java/com/ccsens/defaultwbs/api/RoleController.java b/src/main/java/com/ccsens/defaultwbs/api/RoleController.java index 5c65d8e..53b7f87 100644 --- a/src/main/java/com/ccsens/defaultwbs/api/RoleController.java +++ b/src/main/java/com/ccsens/defaultwbs/api/RoleController.java @@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.util.List; /** * @author 逗 @@ -45,6 +46,14 @@ public class RoleController { return JsonResponse.newInstance().ok(); } - + @MustLogin + @ApiOperation(value = "查询角色下的所有成员", notes = "") + @RequestMapping(value = "/queryMemberOfRole", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse> queryMemberOfRole(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("查询角色下的所有成员开始{}",params); + List member = roleService.queryMemberOfRole(params.getParam(),params.getUserId()); + log.info("查询角色下的所有成员开始{}",params); + return JsonResponse.newInstance().ok(member); + } } diff --git a/src/main/java/com/ccsens/defaultwbs/api/ShareController.java b/src/main/java/com/ccsens/defaultwbs/api/ShareController.java new file mode 100644 index 0000000..f2d289a --- /dev/null +++ b/src/main/java/com/ccsens/defaultwbs/api/ShareController.java @@ -0,0 +1,50 @@ +package com.ccsens.defaultwbs.api; + +import com.ccsens.cloudutil.annotation.MustLogin; +import com.ccsens.common.bean.dto.CRoleDto; +import com.ccsens.common.bean.dto.CShareDto; +import com.ccsens.common.bean.vo.CRoleVo; +import com.ccsens.common.bean.vo.CShareVo; +import com.ccsens.common.service.IShareService; +import com.ccsens.util.JsonResponse; +import com.ccsens.util.bean.dto.QueryDto; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + * @author AUSU + */ +@Api(tags = "分享相关") +@RestController +@RequestMapping("/share") +@Slf4j +public class ShareController { + + @Resource + private IShareService shareService; + + @MustLogin + @ApiOperation(value = "创建分享连接", notes = "") + @RequestMapping(value = "/create", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse createShareUrl(@ApiParam @Validated @RequestBody QueryDto params) { + CShareVo.CreateShareUrl shareUrl = shareService.createShareUrl(params.getParam(), params.getUserId()); + return JsonResponse.newInstance().ok(shareUrl); + } + + @MustLogin + @ApiOperation(value = "点击分享连接", notes = "") + @RequestMapping(value = "/click", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse queryByProjectId(@ApiParam @Validated @RequestBody QueryDto params) { + CShareVo.ClickShareInfo clickShareInfo = shareService.clickShareUrl(params.getParam(), params.getUserId(),params.getUserName(),params.getPhone()); + return JsonResponse.newInstance().ok(clickShareInfo); + } +} diff --git a/src/main/java/com/ccsens/defaultwbs/api/TaskController.java b/src/main/java/com/ccsens/defaultwbs/api/TaskController.java index b3bbc21..eb51412 100644 --- a/src/main/java/com/ccsens/defaultwbs/api/TaskController.java +++ b/src/main/java/com/ccsens/defaultwbs/api/TaskController.java @@ -71,4 +71,22 @@ public class TaskController { log.info("查询子任务开始{}",sonTask); return JsonResponse.newInstance().ok(sonTask); } + + @ApiOperation(value = "添加任务", notes = "") + @RequestMapping(value = "/save", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse> saveTask(@ApiParam @Validated @RequestBody QueryDto params) throws Exception { + log.info("添加任务开始"); + List taskList = taskService.saveTask(params.getParam(), params.getUserId()); + log.info("添加任务结束{}",taskList); + return JsonResponse.newInstance().ok(taskList); + } + + @ApiOperation(value = "查找项目下的任务", notes = "") + @RequestMapping(value = "/queryTaskOfProject", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse> queryTaskOfProject(@ApiParam @Validated @RequestBody QueryDto params) throws Exception { + log.info("查找项目下的任务开始{}",params); + List taskList = taskService.queryTaskOfProject(params.getParam(), params.getUserId()); + log.info("查找项目下的任务结束{}",taskList); + return JsonResponse.newInstance().ok(taskList); + } }