From 620c110289121d66e5b58834a26decb99054afe1 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 30 Mar 2023 09:42:20 +0800
Subject: [PATCH] 巡检
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolGroupController.java | 63 ++++++++++++++++++-------------
1 files changed, 37 insertions(+), 26 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 8b36046..87c3065 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
@@ -1,6 +1,7 @@
package cn.gistack.sm.patrol.controller;
import java.util.Arrays;
+import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -19,11 +20,11 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
- /**
+/**
* @Description: 巡查指标组
*/
@Slf4j
-@Api(tags="巡查指标组")
+@Api(tags = "巡查指标组")
@RestController
@RequestMapping("/patrol/patrolGroup")
@AllArgsConstructor
@@ -35,9 +36,9 @@
*
* @param patrolGroup
*/
- @ApiOperation(value="巡查指标组-分页列表查询", notes="巡查指标组-分页列表查询")
+ @ApiOperation(value = "巡查指标组-分页列表查询", notes = "巡查指标组-分页列表查询")
@GetMapping(value = "/list")
- public R queryPageList(PatrolGroup patrolGroup,Query query) {
+ public R queryPageList(PatrolGroup patrolGroup, Query query) {
// IPage<PatrolGroup> pageList = patrolGroupService.selectPatrolConfig(Condition.getPage(query),patrolGroup);
IPage<PatrolGroup> pageList = patrolGroupService.page(Condition.getPage(query), Condition.getQueryWrapper(patrolGroup));
return R.data(pageList);
@@ -49,7 +50,7 @@
* @param patrolGroup
* @return
*/
- @ApiOperation(value="巡查指标组-添加", notes="巡查指标组-添加")
+ @ApiOperation(value = "巡查指标组-添加", notes = "巡查指标组-添加")
@PostMapping(value = "/add")
public R add(@RequestBody PatrolGroup patrolGroup) {
return R.data(patrolGroupService.save(patrolGroup));
@@ -61,8 +62,8 @@
* @param patrolGroup
* @return
*/
- @ApiOperation(value="巡查指标组-编辑", notes="巡查指标组-编辑")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+ @ApiOperation(value = "巡查指标组-编辑", notes = "巡查指标组-编辑")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public R edit(@RequestBody PatrolGroup patrolGroup) {
return R.data(patrolGroupService.updateById(patrolGroup));
}
@@ -73,9 +74,9 @@
* @param id
* @return
*/
- @ApiOperation(value="巡查指标组-通过id删除", notes="巡查指标组-通过id删除")
+ @ApiOperation(value = "巡查指标组-通过id删除", notes = "巡查指标组-通过id删除")
@DeleteMapping(value = "/delete")
- public R delete(@RequestParam(name="id",required=true) String id) {
+ public R delete(@RequestParam(name = "id", required = true) String id) {
return R.data(patrolGroupService.removeById(id));
}
@@ -85,9 +86,9 @@
* @param ids
* @return
*/
- @ApiOperation(value="巡查指标组-批量删除", notes="巡查指标组-批量删除")
+ @ApiOperation(value = "巡查指标组-批量删除", notes = "巡查指标组-批量删除")
@DeleteMapping(value = "/deleteBatch")
- public R deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+ public R deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
return R.data(patrolGroupService.removeByIds(Arrays.asList(ids.split(","))));
}
@@ -97,24 +98,34 @@
* @param id
* @return
*/
- @ApiOperation(value="巡查指标组-通过id查询", notes="巡查指标组-通过id查询")
+ @ApiOperation(value = "巡查指标组-通过id查询", notes = "巡查指标组-通过id查询")
@GetMapping(value = "/queryById")
- public R queryById(@RequestParam(name="id",required=true) String id) {
+ public R queryById(@RequestParam(name = "id", required = true) String id) {
PatrolGroup patrolGroup = patrolGroupService.getById(id);
return R.data(patrolGroup);
}
-// /**
-// * 根据工程id查询巡查指标组
-// *
-// * @param productId
-// * @return
-// */
-// @AutoLog(value = "巡查指标组-根据工程id查询巡查指标组")
-// @ApiOperation(value="巡查指标组-根据工程id查询巡查指标组", notes="巡查指标组-根据工程id查询巡查指标组")
-// @GetMapping(value = "/queryTree")
-// public R<?> queryTree(@RequestParam(name="productId",required=true) String productId) {
-// WaterConservancyProjectVO waterConservancyProjectVO = patrolGroupService.queryTree(productId);
-// return R.OK(waterConservancyProjectVO);
-// }
+ /**
+ * 根据工程id查询巡查指标组
+ *
+ * @return
+ */
+ @ApiOperation(value = "巡查指标组-根据工程id查询巡查指标组", notes = "巡查指标组-根据工程id查询巡查指标组")
+ @GetMapping(value = "/getPatrolGroupByProjectId")
+ public R queryTree(@RequestParam(name = "projectId", required = true) String projectId) {
+ List<PatrolGroup> list = patrolGroupService.getPatrolGroupByProjectId(projectId);
+ return R.data(list);
+ }
+
+ /**
+ * 获取全部指标组
+ *
+ * @return
+ */
+ @ApiOperation(value = "获取全部指标组", notes = "获取全部指标组")
+ @GetMapping(value = "/all")
+ public R getAll() {
+ List<PatrolGroup> list = patrolGroupService.list();
+ return R.data(list);
+ }
}
--
Gitblit v1.9.3