From 0b16f5e75c2e9376e5fdb296fe964f34b1d33372 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 04 Apr 2023 09:04:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolRouteController.java | 38 ++++++++++++++++++++++++++++++++++++++
1 files changed, 38 insertions(+), 0 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolRouteController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolRouteController.java
index 9becd39..b6d69d1 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolRouteController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolRouteController.java
@@ -60,6 +60,18 @@
return R.data(patrolRouteService.save(patrolRoute));
}
+ /**
+ * 自定义添加
+ *
+ * @param patrolRoute
+ * @return
+ */
+ @ApiOperation(value="巡查路线-自定义添加", notes="巡查路线-自定义添加")
+ @PostMapping(value = "/save")
+ public R save(@RequestBody PatrolRoute patrolRoute) {
+ return R.data(patrolRouteService.savePatrolRoute(patrolRoute));
+ }
+
/**
* 编辑
*
@@ -71,6 +83,19 @@
public R edit(@RequestBody PatrolRoute patrolRoute) {
return R.data(patrolRouteService.updateById(patrolRoute));
}
+
+
+ /**
+ * 自定义编辑
+ *
+ * @param patrolRoute
+ * @return
+ */
+ @ApiOperation(value="巡查路线-自定义编辑", notes="巡查路线-自定义编辑")
+ @RequestMapping(value = "/update", method = {RequestMethod.PUT,RequestMethod.POST})
+ public R update(@RequestBody PatrolRoute patrolRoute) {
+ return R.data(patrolRouteService.updatePatrolRouteById(patrolRoute));
+ }
/**
* 通过id删除
@@ -110,6 +135,19 @@
return R.data(patrolRoute);
}
+ /**
+ * 自定义通过id查询
+ *
+ * @param id
+ * @return
+ */
+ @ApiOperation(value="巡查路线-自定义通过id查询", notes="巡查路线-自定义通过id查询")
+ @GetMapping(value = "/getPatrolRouteById")
+ public R getPatrolRouteById(@RequestParam(name="id",required=true) String id) {
+ PatrolRoute patrolRoute = patrolRouteService.getPatrolRouteById(id);
+ return R.data(patrolRoute);
+ }
+
/**
* 查询巡查路线树数据
* @param patrolRoute
--
Gitblit v1.9.3