From 4a5e80cfd2943abe9d51f656b261b321e3e3acf4 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 03 Apr 2023 16:34:24 +0800
Subject: [PATCH] 巡查人员新增巡逻路线空间字段，新增自定义新增，修改，查询方法
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 52 insertions(+), 2 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 6812782..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
@@ -3,6 +3,7 @@
import cn.gistack.sm.patrol.entity.PatrolTask;
import cn.gistack.sm.patrol.entity.PatrolTask;
import cn.gistack.sm.patrol.service.IPatrolTaskService;
+import cn.gistack.sm.patrol.vo.PatrolTaskVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -34,8 +35,8 @@
*/
@ApiOperation(value="巡查任务-分页列表查询", notes="巡查任务-分页列表查询")
@GetMapping(value = "/list")
- public R queryPageList(PatrolTask patrolTask, Query query) {
- IPage<PatrolTask> pageList = patrolTaskService.selectPatrolTask(Condition.getPage(query),patrolTask);
+ public R queryPageList(PatrolTaskVO patrolTask, Query query) {
+ IPage<PatrolTaskVO> pageList = patrolTaskService.selectPatrolTask(Condition.getPage(query),patrolTask);
// IPage<PatrolTask> pageList = patrolTaskService.page(Condition.getPage(query), Condition.getQueryWrapper(PatrolTask));
return R.data(pageList);
}
@@ -59,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
@@ -67,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));
}
/**
@@ -107,4 +132,29 @@
}
+ /**
+ * 自定义通过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
+ */
+ @ApiOperation(value="查询巡查人员统计数据信息", notes="查询巡查人员统计数据信息")
+ @GetMapping(value = "/getPatrolTaskStatistic")
+ public R getPatrolTaskStatistic(PatrolTaskVO patrolTask) {
+ return R.data(patrolTaskService.getPatrolTaskStatistic(patrolTask));
+ }
+
+
}
--
Gitblit v1.9.3