From 2aab85803043be82096c6c9a3e1eaa4f09245c02 Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Fri, 28 Jan 2022 17:57:52 +0800 Subject: [PATCH] =?UTF-8?q?20220128=E4=BF=AE=E6=94=B9SDK?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 18 +++++++++--------- .../ptos_tall/api/ProjectController.java | 18 +++++++++--------- .../ccsensptos/tallsdk/api/TaskController.java | 7 +++++++ .../ccsensptos/tallsdk/bean/vo/TallTaskVo.java | 2 ++ .../tallsdk/service/ITallService.java | 8 ++++++++ 5 files changed, 35 insertions(+), 18 deletions(-) diff --git a/.drone.yml b/.drone.yml index 9aa7491..154530c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -18,17 +18,17 @@ constants: - mvn clean package -Dmaven.test.skip=true - &SCP_TARGET /home/ptos_open/server - &SCP_SOURCE - - ptos_open/target/*.jar - - ptos_tall/target/*.jar +# - ptos_open/target/*.jar +# - ptos_tall/target/*.jar - &SCP_STRIP_DIR_LEVEL 2 - &SSH_CMDER - - cd /home/ptos_open/server - - pwd - - ./open.sh > /dev/null 2> /dev/null & - - mv ptos_tall-0.0.1-SNAPSHOT.jar /home/ptos_tall/server - - cd /home/ptos_tall/server - - pwd - - ./ptos.sh > /dev/null 2> /dev/null & +# - cd /home/ptos_open/server +# - pwd +# - ./open.sh > /dev/null 2> /dev/null & +# - mv ptos_tall-0.0.1-SNAPSHOT.jar /home/ptos_tall/server +# - cd /home/ptos_tall/server +# - pwd +# - ./ptos.sh > /dev/null 2> /dev/null & #- &NOTIFY_EMAIL weizezhao@ccsens.com - &NOTIFY_WECHATROBOT_WEBHOOK https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=b2b93e9a-128b-41d4-8dce-12004e3f48b9 diff --git a/ptos_tall/src/main/java/com/ccsens/ptos_tall/api/ProjectController.java b/ptos_tall/src/main/java/com/ccsens/ptos_tall/api/ProjectController.java index 57e6a88..9eb9f10 100644 --- a/ptos_tall/src/main/java/com/ccsens/ptos_tall/api/ProjectController.java +++ b/ptos_tall/src/main/java/com/ccsens/ptos_tall/api/ProjectController.java @@ -58,14 +58,14 @@ public class ProjectController { return JsonResponse.newInstance().ok(businessInfos); } - @MustLogin - @ApiOperation(value = "修改项目层级关系", notes = "当前版本任何人都可以移动项目") - @RequestMapping(value = "/byPhone", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse moveProject(@ApiParam @Validated @RequestBody QueryDto params) throws Exception{ - log.info("修改项目层级关系：{}",params); - projectService.moveProject(params.getParam()); - log.info("修改项目层级关系成功"); - return JsonResponse.newInstance().ok(); - } +// @MustLogin +// @ApiOperation(value = "修改项目层级关系", notes = "当前版本任何人都可以移动项目") +// @RequestMapping(value = "/byPhone", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) +// public JsonResponse moveProject(@ApiParam @Validated @RequestBody QueryDto params) throws Exception{ +// log.info("修改项目层级关系：{}",params); +// projectService.moveProject(params.getParam()); +// log.info("修改项目层级关系成功"); +// return JsonResponse.newInstance().ok(); +// } } diff --git a/tall_sdk/src/main/java/com/ccsensptos/tallsdk/api/TaskController.java b/tall_sdk/src/main/java/com/ccsensptos/tallsdk/api/TaskController.java index 758ed23..1197fbd 100644 --- a/tall_sdk/src/main/java/com/ccsensptos/tallsdk/api/TaskController.java +++ b/tall_sdk/src/main/java/com/ccsensptos/tallsdk/api/TaskController.java @@ -55,4 +55,11 @@ public class TaskController { List queryTasks = tallService.queryRegularTask(request.getHeader(WebConstant.HEADER_KEY_TOKEN),params.getParam()); return JsonResponse.newInstance().ok(queryTasks); } + + @ApiOperation(value = "查找定期任务和相应的插件展示信息", notes = "") + @RequestMapping(value = "/regular/plugin", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse> queryRegularTaskAndPlugin(HttpServletRequest request, @ApiParam @Validated @RequestBody QueryDto params) { + List queryTasks = tallService.queryRegularTaskAndPlugin(request.getHeader(WebConstant.HEADER_KEY_TOKEN),params.getParam()); + return JsonResponse.newInstance().ok(queryTasks); + } } diff --git a/tall_sdk/src/main/java/com/ccsensptos/tallsdk/bean/vo/TallTaskVo.java b/tall_sdk/src/main/java/com/ccsensptos/tallsdk/bean/vo/TallTaskVo.java index 59ce0fe..d44f127 100644 --- a/tall_sdk/src/main/java/com/ccsensptos/tallsdk/bean/vo/TallTaskVo.java +++ b/tall_sdk/src/main/java/com/ccsensptos/tallsdk/bean/vo/TallTaskVo.java @@ -99,6 +99,8 @@ public class TallTaskVo { private int rowspan; @ApiModelProperty("跨列") private int colspan; + @ApiModelProperty("跨列") + private String data; } } diff --git a/tall_sdk/src/main/java/com/ccsensptos/tallsdk/service/ITallService.java b/tall_sdk/src/main/java/com/ccsensptos/tallsdk/service/ITallService.java index ec39764..baedd57 100644 --- a/tall_sdk/src/main/java/com/ccsensptos/tallsdk/service/ITallService.java +++ b/tall_sdk/src/main/java/com/ccsensptos/tallsdk/service/ITallService.java @@ -60,4 +60,12 @@ public interface ITallService { * 根据id查询项目信息 */ TallProjectVo.ProjectInfo findProjectById(String header, TallProjectDto.ProjectById params); + + /** + * 查询定期任务包括插件展示的信息 + * @param header token + * @param param 任务id信息 + * @return 返回任务洗洗和插件展示的信息 + */ + List queryRegularTaskAndPlugin(String header, TallTaskDto.QueryRegularTask param); }