From aa2004ef65a3d8c8e15ec1689fc4f8e1b8d91c59 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 24 Jan 2024 17:05:41 +0800
Subject: [PATCH] 巡检申报增加水库字段
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolReportController.java | 43 +++++++++++++++++++++++++++++++++----------
1 files changed, 33 insertions(+), 10 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolReportController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolReportController.java
index 91b88b3..bb38672 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolReportController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolReportController.java
@@ -15,12 +15,13 @@
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
+import java.util.List;
/**
-* @Description: 巡查设置
+* @Description: 巡查上报
*/
@Slf4j
-@Api(tags="巡查设置")
+@Api(tags="巡查上报")
@RestController
@RequestMapping("/patrol/patrolReport")
@AllArgsConstructor
@@ -31,7 +32,7 @@
/**
* 分页列表查询
*/
- @ApiOperation(value="巡查设置-分页列表查询", notes="巡查设置-分页列表查询")
+ @ApiOperation(value="巡查上报-分页列表查询", notes="巡查上报-分页列表查询")
@GetMapping(value = "/list")
public R<IPage<PatrolConfig>> queryPageList(PatrolConfig patrolConfig,Query query) {
IPage<PatrolConfig> pageList = patrolReportService.selectPatrolReport(Condition.getPage(query),patrolConfig);
@@ -41,7 +42,7 @@
/**
* 添加
*/
- @ApiOperation(value="巡查设置-添加", notes="巡查设置-添加")
+ @ApiOperation(value="巡查上报-添加", notes="巡查上报-添加")
@PostMapping(value = "/add")
public R add(@RequestBody PatrolReport patrolReport) {
return R.data(patrolReportService.save(patrolReport));
@@ -50,10 +51,19 @@
/**
* 编辑
*/
- @ApiOperation(value="巡查设置-编辑", notes="巡查设置-编辑")
+ @ApiOperation(value="巡查上报-编辑", notes="巡查上报-编辑")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public R edit(@RequestBody PatrolReport patrolReport) {
return R.data(patrolReportService.updateById(patrolReport));
+ }
+
+ /**
+ * 批量编辑
+ */
+ @ApiOperation(value="巡查上报-批量编辑", notes="巡查上报-批量编辑")
+ @RequestMapping(value = "/editBatch", method = {RequestMethod.PUT,RequestMethod.POST})
+ public R editBatch(@RequestBody List<PatrolReport> list){
+ return R.data(patrolReportService.customizeUpdateBatchById(list));
}
/**
@@ -62,8 +72,8 @@
* @param id
* @return
*/
- @ApiOperation(value="巡查设置-通过id删除", notes="巡查设置-通过id删除")
- @DeleteMapping(value = "/delete")
+ @ApiOperation(value="巡查上报-通过id删除", notes="巡查上报-通过id删除")
+ @PostMapping(value = "/delete")
public R delete(@RequestParam(name="id",required=true) String id) {
patrolReportService.removeById(id);
return R.data(patrolReportService.removeById(id));
@@ -75,8 +85,8 @@
* @param ids
* @return
*/
- @ApiOperation(value="巡查设置-批量删除", notes="巡查设置-批量删除")
- @DeleteMapping(value = "/deleteBatch")
+ @ApiOperation(value="巡查上报-批量删除", notes="巡查上报-批量删除")
+ @PostMapping(value = "/deleteBatch")
public R deleteBatch(@RequestParam(name="ids",required=true) String ids) {
return R.data(this.patrolReportService.removeByIds(Arrays.asList(ids.split(","))));
}
@@ -87,11 +97,24 @@
* @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) {
PatrolReport byId = patrolReportService.getById(id);
return R.data(byId);
}
+ /**
+ * 自定义查询
+ *
+ * @param patrolReport
+ * @return
+ */
+ @ApiOperation(value="巡查上报-自定义查询", notes="巡查上报-自定义查询")
+ @PostMapping(value = "/customizeGetDetail")
+ public R customizeGetDetail(PatrolReport patrolReport) {
+ PatrolReport detail = patrolReportService.getOne(Condition.getQueryWrapper(patrolReport));
+ return R.data(detail);
+ }
+
}
--
Gitblit v1.9.3