From 05495682bf26ab6ceb09c27d73f83dd40409cab8 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Mon, 03 Apr 2023 16:34:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java | 37 +++++++++++++++++++++++++++++++++++++
1 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java
index 957f49c..8877bae 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java
@@ -60,6 +60,18 @@
return R.data(patrolTaskService.save(patrolTask));
}
+
+ /**
+ * 自定义添加
+ * @param patrolTask
+ * @return
+ */
+ @ApiOperation(value="巡查任务-自定义添加", notes="巡查任务-自定义添加")
+ @PostMapping(value = "/save")
+ public R save(@RequestBody PatrolTask patrolTask) {
+ return R.data(patrolTaskService.savePatrolTask(patrolTask));
+ }
+
/**
* 编辑
* @return
@@ -68,6 +80,18 @@
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public R edit(@RequestBody PatrolTask patrolTask) {
return R.data(patrolTaskService.updateById(patrolTask));
+ }
+
+
+ /**
+ * 自定义编辑（空间坐标编辑）
+ * @param patrolTask
+ * @return
+ */
+ @ApiOperation(value="巡查任务-自定义编辑", notes="巡查任务-自定义编辑")
+ @RequestMapping(value = "/update", method = {RequestMethod.PUT,RequestMethod.POST})
+ public R update(@RequestBody PatrolTask patrolTask) {
+ return R.data(patrolTaskService.updatePatrolTask(patrolTask));
}
/**
@@ -109,6 +133,19 @@
/**
+ * 自定义通过id查询
+ * @param id
+ * @return
+ */
+ @ApiOperation(value="巡查任务-自定义通过id查询", notes="巡查任务-自定义通过id查询")
+ @GetMapping(value = "/getPatrolTaskById")
+ public R getPatrolTaskById(@RequestParam(name="id",required=true) String id) {
+ PatrolTask PatrolTask = patrolTaskService.getPatrolTaskById(id);
+ return R.data(PatrolTask);
+ }
+
+
+ /**
* 查询巡查人员统计数据信息
* @param patrolTask
* @return
--
Gitblit v1.9.3