From c10d6358b9f014375a13821465bc978d0c0da22e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 29 May 2024 17:17:08 +0800
Subject: [PATCH] 通过E呼即办数据统计
---
src/main/java/org/springblade/modules/grid/controller/GridController.java | 79 +++++++++++++++++++++++++++++++++++++++
1 files changed, 78 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 c847023..b93abe5 100644
--- a/src/main/java/org/springblade/modules/grid/controller/GridController.java
+++ b/src/main/java/org/springblade/modules/grid/controller/GridController.java
@@ -23,16 +23,23 @@
import lombok.AllArgsConstructor;
import javax.validation.Valid;
+import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity;
+import org.springblade.modules.grid.excel.GridExcel;
+import org.springblade.modules.grid.excel.GridImporter;
+import org.springblade.modules.system.excel.UserExcel;
+import org.springblade.modules.system.excel.UserImporter;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.grid.entity.GridEntity;
import org.springblade.modules.grid.vo.GridVO;
import org.springblade.modules.grid.wrapper.GridWrapper;
import org.springblade.modules.grid.service.IGridService;
+import org.springframework.web.multipart.MultipartFile;
/**
* 网格表 控制器
@@ -57,6 +64,14 @@
public R<GridVO> detail(GridEntity grid) {
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));
}
/**
* 网格表 分页
@@ -91,6 +106,14 @@
}
/**
+ * 网格表 自定义新增或修改
+ */
+ @PostMapping("/saveOrUpdate")
+ public R saveOrUpdate(@Valid @RequestBody GridEntity grid) {
+ return R.status(gridService.saveOrUpdateGrid(grid));
+ }
+
+ /**
* 网格表 修改
*/
@PostMapping("/update")
@@ -117,8 +140,62 @@
@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)));
+ }
+
+ /**
+ * 导入网格数据
+ */
+ @PostMapping("/import-grid")
+ public R importGrid(MultipartFile file, Integer isCovered) {
+ GridImporter gridImporter = new GridImporter(gridService, isCovered == 1);
+ ExcelUtil.save(file, gridImporter, GridExcel.class);
+ return R.success("操作成功");
+ }
+
+ /**
+ * 空间分析
+ */
+ @GetMapping("/spatialAnalysis")
+ public R spatialAnalysis(DoorplateAddressEntity addressEntity) {
+ return R.data(gridService.spatialAnalysis(addressEntity));
+ }
+
+ /**
+ * 网格数据同步处理
+ */
+ @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));
+ }
+
+ /**
+ * 综治网格信息
+ */
+ @ApiOperation(value = "获取综治网格信息", notes = "传入houseCode")
+ @GetMapping("/gridInfoByHouseCode")
+ public R gridInfoByHouseCode( @RequestParam("houseCode") String houseCode) {
+ return R.data(gridService.gridInfoByHouseCode(houseCode));
}
+ /**
+ * 网格集合查询
+ * @param grid
+ * @return
+ */
+ @GetMapping("/getGridList")
+ public R getGridList(GridVO grid) {
+ return R.data(gridService.getGridList(grid));
+ }
}
--
Gitblit v1.9.3