Merge branch 'master' of dd.tall.wiki:ccsens_wiki/defaultwbs

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<CClockingInVo.ExcelUrl> export(@ApiParam @Validated @RequestBody QueryDto<CClockingInDto.QueryClockingIn> params) throws Exception{
+        CClockingInVo.ExcelUrl excelUrl = clockingInService.exportRecord(params.getParam(), params.getUserId());
+        return JsonResponse.newInstance().ok(excelUrl);
+    }
 }

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<List<CRoleVo.MemberOfRoleInfo>> queryMemberOfRole(@ApiParam @Validated @RequestBody QueryDto<CRoleDto.QueryMemberOfRole> params) {
+        log.info("查询角色下的所有成员开始{}",params);
+        List<CRoleVo.MemberOfRoleInfo> member = roleService.queryMemberOfRole(params.getParam(),params.getUserId());
+        log.info("查询角色下的所有成员开始{}",params);
+        return JsonResponse.newInstance().ok(member);
+    }
 
 }

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<CShareVo.CreateShareUrl> createShareUrl(@ApiParam @Validated @RequestBody QueryDto<CShareDto.CreateShareUrl> 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<CShareVo.ClickShareInfo> queryByProjectId(@ApiParam @Validated @RequestBody QueryDto<CShareDto.ClickShareUrl> params) {
+        CShareVo.ClickShareInfo clickShareInfo = shareService.clickShareUrl(params.getParam(), params.getUserId(),params.getUserName(),params.getPhone());
+        return JsonResponse.newInstance().ok(clickShareInfo);
+    }
+}

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<List<CTaskVo.QueryTask>> saveTask(@ApiParam @Validated @RequestBody QueryDto<CTaskDto.SaveTask> params) throws Exception {
+        log.info("添加任务开始");
+        List<CTaskVo.QueryTask> 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<List<CTaskVo.TaskOfProject>> queryTaskOfProject(@ApiParam @Validated @RequestBody QueryDto<CTaskDto.QueryTaskOfProject> params) throws Exception {
+        log.info("查找项目下的任务开始{}",params);
+        List<CTaskVo.TaskOfProject> taskList = taskService.queryTaskOfProject(params.getParam(), params.getUserId());
+        log.info("查找项目下的任务结束{}",taskList);
+        return JsonResponse.newInstance().ok(taskList);
+    }
 }