From 2f5f60384a5f469787edbe333aaa265fae58bf2d Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 28 Nov 2023 17:21:27 +0800
Subject: [PATCH] 网格，网格员相关修改
---
src/main/java/org/springblade/modules/grid/controller/GridController.java | 36 +++++++++++++++++++++++++++++++++++-
1 files changed, 35 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/grid/controller/GridController.java b/src/main/java/org/springblade/modules/grid/controller/GridController.java
index 5a79eed..894fbf5 100644
--- a/src/main/java/org/springblade/modules/grid/controller/GridController.java
+++ b/src/main/java/org/springblade/modules/grid/controller/GridController.java
@@ -64,6 +64,14 @@
GridEntity detail = gridService.getOne(Condition.getQueryWrapper(grid));
return R.data(GridWrapper.build().entityVO(detail));
}
+
+ /**
+ * 网格表 自定义详情
+ */
+ @GetMapping("/getGridDetail")
+ public R getGridDetail(GridVO grid) {
+ return R.data(gridService.getGridDetail(grid));
+ }
/**
* 网格表 分页
*/
@@ -97,6 +105,14 @@
}
/**
+ * 网格表 自定义新增或修改
+ */
+ @PostMapping("/saveOrUpdate")
+ public R saveOrUpdate(@Valid @RequestBody GridEntity grid) {
+ return R.status(gridService.saveOrUpdateGrid(grid));
+ }
+
+ /**
* 网格表 修改
*/
@PostMapping("/update")
@@ -123,7 +139,7 @@
@ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
- return R.status(gridService.removeByIds(Func.toLongList(ids)));
+ return R.status(gridService.removeByIds(Func.toIntList(ids)));
}
/**
@@ -144,5 +160,23 @@
return R.data(gridService.spatialAnalysis());
}
+ /**
+ * 网格数据同步处理
+ */
+ @GetMapping("/asyncGridDept")
+ public R asyncGridDept() {
+ return R.data(gridService.asyncGridDept());
+ }
+
+ /**
+ * 网格树
+ * @param grid
+ * @return
+ */
+ @GetMapping("/getGridTree")
+ public R getGridTree(GridVO grid) {
+ return R.data(gridService.getGridTree(grid));
+ }
+
}
--
Gitblit v1.9.3