From b112d242575fe96123b1e8dad434f46e6d2bb3d1 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sat, 03 Jun 2023 17:57:15 +0800
Subject: [PATCH] 巡查，智能外呼定时任务相关代码抽离修改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolGroupController.java | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolGroupController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolGroupController.java
index dcee8a0..b2c6984 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolGroupController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolGroupController.java
@@ -75,7 +75,7 @@
* @return
*/
@ApiOperation(value = "巡查指标组-通过id删除", notes = "巡查指标组-通过id删除")
- @DeleteMapping(value = "/delete")
+ @PostMapping(value = "/delete")
public R delete(@RequestParam(name = "id", required = true) String id) {
return R.data(patrolGroupService.removeById(id));
}
@@ -87,7 +87,7 @@
* @return
*/
@ApiOperation(value = "巡查指标组-批量删除", notes = "巡查指标组-批量删除")
- @DeleteMapping(value = "/deleteBatch")
+ @PostMapping(value = "/deleteBatch")
public R deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
return R.data(patrolGroupService.removeByIds(Arrays.asList(ids.split(","))));
}
@@ -145,7 +145,31 @@
*/
@ApiOperation(value = "根据项id查询组id", notes = "根据项id查询组id")
@GetMapping(value = "/getPatrolGroupByItemId")
- public R getPatrolGroupByItemId(String itemId) {
- return R.data(patrolGroupService.getPatrolGroupByItemId(itemId));
+ public R getPatrolGroupByItemId(String itemIds) {
+ return R.data(patrolGroupService.getPatrolGroupByItemId(itemIds));
+ }
+
+ /**
+ * 根据任务id获取巡查项，可判断是否已选
+ */
+ @GetMapping(value = "/getAllPatrolGroupByTaskId")
+ public R getAllPatrolGroupByTaskId(String taskId) {
+ return R.data(patrolGroupService.getAllPatrolGroupByTaskId(taskId));
+ }
+
+ /**
+ * 根据任务id获取巡查组，返回组下的record
+ */
+ @GetMapping(value = "/getPatrolGroupDTO")
+ public R getPatrolGroupDTO(String taskId) {
+ return R.data(patrolGroupService.getPatrolGroupDTO(taskId));
+ }
+
+ /**
+ * 根据任务id获取巡查组
+ */
+ @GetMapping(value = "/getPatrolGroupByTaskId")
+ public R getPatrolGroupByTaskId(String taskId) {
+ return R.data(patrolGroupService.getPatrolGroupByTaskId(taskId));
}
}
--
Gitblit v1.9.3