From 4f5a847500afd3296ed40ac308aa2ae9da145bce Mon Sep 17 00:00:00 2001 From: ma <1062634917@qq.com> Date: Fri, 3 Sep 2021 14:35:44 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=88=86=E4=BA=AB=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../defaultwbs/api/ShareController.java | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 src/main/java/com/ccsens/defaultwbs/api/ShareController.java 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); + } +} From 1bc6031b3107e0460ea0a2346f116b6b2e67314d Mon Sep 17 00:00:00 2001 From: ma <1062634917@qq.com> Date: Mon, 6 Sep 2021 15:34:29 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E8=80=83=E5=8B=A4excel?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ccsens/defaultwbs/api/ClockingInController.java | 8 ++++++++ src/main/resources/application.yml | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/ccsens/defaultwbs/api/ClockingInController.java b/src/main/java/com/ccsens/defaultwbs/api/ClockingInController.java index da14f1b..9f81cca 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{ + clockingInService.exportRecord(params.getParam(), params.getUserId()); + return JsonResponse.newInstance().ok(); + } } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index c3b11fb..5abf242 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: test - include: common, util-test + active: prod + include: common, util-prod From 97052df16ce5b8dcbc1030ecdff82b75a4902203 Mon Sep 17 00:00:00 2001 From: ma <1062634917@qq.com> Date: Mon, 6 Sep 2021 16:13:11 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E8=80=83=E5=8B=A4excel?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ccsens/defaultwbs/api/ClockingInController.java | 6 +++--- src/main/resources/application.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/ccsens/defaultwbs/api/ClockingInController.java b/src/main/java/com/ccsens/defaultwbs/api/ClockingInController.java index 9f81cca..747f561 100644 --- a/src/main/java/com/ccsens/defaultwbs/api/ClockingInController.java +++ b/src/main/java/com/ccsens/defaultwbs/api/ClockingInController.java @@ -60,8 +60,8 @@ public class ClockingInController { @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{ - clockingInService.exportRecord(params.getParam(), params.getUserId()); - return JsonResponse.newInstance().ok(); + 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/resources/application.yml b/src/main/resources/application.yml index 5abf242..c3b11fb 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: prod - include: common, util-prod + active: test + include: common, util-test From ebcb7e4a43984e66d55e46b66cb6e832ba38afac Mon Sep 17 00:00:00 2001 From: ma <1062634917@qq.com> Date: Mon, 6 Sep 2021 18:14:50 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ccsens/defaultwbs/api/TaskController.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/main/java/com/ccsens/defaultwbs/api/TaskController.java b/src/main/java/com/ccsens/defaultwbs/api/TaskController.java index b3bbc21..5a8dc57 100644 --- a/src/main/java/com/ccsens/defaultwbs/api/TaskController.java +++ b/src/main/java/com/ccsens/defaultwbs/api/TaskController.java @@ -71,4 +71,13 @@ 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); + } } From caebd115098c6be97f692ddade18ad92b0acb2f6 Mon Sep 17 00:00:00 2001 From: ma <1062634917@qq.com> Date: Tue, 7 Sep 2021 10:00:52 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E4=B8=8B=E7=9A=84=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ccsens/defaultwbs/api/TaskController.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/main/java/com/ccsens/defaultwbs/api/TaskController.java b/src/main/java/com/ccsens/defaultwbs/api/TaskController.java index 5a8dc57..eb51412 100644 --- a/src/main/java/com/ccsens/defaultwbs/api/TaskController.java +++ b/src/main/java/com/ccsens/defaultwbs/api/TaskController.java @@ -80,4 +80,13 @@ public class TaskController { 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); + } } From 79ad55778462afc680d5a5b6d70a623f3e219d1f Mon Sep 17 00:00:00 2001 From: ma <1062634917@qq.com> Date: Tue, 7 Sep 2021 14:59:38 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E4=B8=8B=E7=9A=84=E6=89=80=E6=9C=89=E6=88=90=E5=91=98=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ccsens/defaultwbs/api/RoleController.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) 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); + } }