From 46979f8e4f21dad56cd29135526091df204ebc4f Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Wed, 10 Nov 2021 18:29:58 +0800 Subject: [PATCH 1/2] =?UTF-8?q?20211110=E6=B7=BB=E5=8A=A0=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ccsens/carbasics/api/TaskController.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/main/java/com/ccsens/carbasics/api/TaskController.java b/src/main/java/com/ccsens/carbasics/api/TaskController.java index 0315f74..c41506d 100644 --- a/src/main/java/com/ccsens/carbasics/api/TaskController.java +++ b/src/main/java/com/ccsens/carbasics/api/TaskController.java @@ -1,8 +1,10 @@ package com.ccsens.carbasics.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.CTaskVo; +import com.ccsens.common.service.IPluginService; import com.ccsens.common.service.ITaskService; import com.ccsens.util.JsonResponse; import com.ccsens.util.bean.dto.QueryDto; @@ -29,6 +31,8 @@ import java.util.List; public class TaskController { @Resource private ITaskService taskService; + @Resource + private IPluginService pluginService; @MustLogin @ApiOperation(value = "查找永久日常任务", notes = "") @@ -70,4 +74,20 @@ public class TaskController { return JsonResponse.newInstance().ok(); } + @MustLogin + @ApiOperation(value = "添加任务", notes = "") + @RequestMapping(value = "/saveTask", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse> saveTask(@ApiParam @Validated @RequestBody QueryDto params) throws Exception { + List queryTasks = taskService.saveTask(params.getParam(), params.getUserId()); + return JsonResponse.newInstance().ok(queryTasks); + } + + @MustLogin + @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 { + pluginService.updateTaskPlugin(params.getParam()); + return JsonResponse.newInstance().ok(); + } + } From eeff9b079c8b09783e992e615c4ce9628e4c07dd Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Wed, 10 Nov 2021 19:33:38 +0800 Subject: [PATCH 2/2] =?UTF-8?q?20211110=E6=B7=BB=E5=8A=A0=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ccsens/carbasics/api/TaskController.java | 4 ++-- src/main/resources/application.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/ccsens/carbasics/api/TaskController.java b/src/main/java/com/ccsens/carbasics/api/TaskController.java index c41506d..d434d17 100644 --- a/src/main/java/com/ccsens/carbasics/api/TaskController.java +++ b/src/main/java/com/ccsens/carbasics/api/TaskController.java @@ -74,7 +74,7 @@ public class TaskController { return JsonResponse.newInstance().ok(); } - @MustLogin +// @MustLogin @ApiOperation(value = "添加任务", notes = "") @RequestMapping(value = "/saveTask", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse> saveTask(@ApiParam @Validated @RequestBody QueryDto params) throws Exception { @@ -82,7 +82,7 @@ public class TaskController { return JsonResponse.newInstance().ok(queryTasks); } - @MustLogin +// @MustLogin @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 { diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index c3b11fb..2fb38e5 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: dev + include: common, util-dev