From a48221b7377fc843f3e9fd9afadcc9e0db3e0394 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 23 Jan 2026 14:44:22 +0800
Subject: [PATCH] 机构和区划接口优化
---
drone-service/drone-system/src/main/java/org/sxkj/system/controller/RegionController.java | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/drone-service/drone-system/src/main/java/org/sxkj/system/controller/RegionController.java b/drone-service/drone-system/src/main/java/org/sxkj/system/controller/RegionController.java
index 388f6ad..b08107a 100644
--- a/drone-service/drone-system/src/main/java/org/sxkj/system/controller/RegionController.java
+++ b/drone-service/drone-system/src/main/java/org/sxkj/system/controller/RegionController.java
@@ -29,10 +29,13 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.DateUtil;
import org.sxkj.system.entity.Region;
import org.sxkj.system.excel.RegionExcel;
import org.sxkj.system.excel.RegionImporter;
+import org.sxkj.system.param.RegionAddParam;
+import org.sxkj.system.param.RegionPageParam;
import org.sxkj.system.service.IRegionService;
import org.sxkj.system.vo.RegionVO;
import org.sxkj.system.vo.TreeVo;
@@ -46,6 +49,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
/**
* 行政区划表 控制器
@@ -84,6 +88,17 @@
}
/**
+ * 行政区划表 自定义分页
+ */
+ @GetMapping("/page")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "分页", notes = " ")
+ public R<IPage<RegionVO>> page(RegionPageParam regionPageParam, Query query) {
+ IPage<RegionVO> pages = regionService.selectRegionPage(Condition.getPage(query), regionPageParam);
+ return R.data(pages);
+ }
+
+ /**
* 懒加载列表
*/
@GetMapping("/lazy-list")
@@ -116,13 +131,14 @@
/**
* 新增 行政区划表
*/
- @PostMapping("/save")
- @ApiOperationSupport(order = 5)
- @ApiOperation(value = "新增", notes = "传入region")
- @ApiLog("行政区划数据新增")
- public R save(@Valid @RequestBody Region region) {
- return R.status(regionService.save(region));
- }
+ // @PostMapping("/save")
+ // @ApiOperationSupport(order = 5)
+ // @ApiOperation(value = "新增", notes = "传入region")
+ // @ApiLog("行政区划数据新增")
+ // public R save(@Valid @RequestBody RegionAddParam region) {
+ // Region regionEntity = Objects.requireNonNull(BeanUtil.copy(region, Region.class));
+ // return R.status(regionService.save(regionEntity));
+ // }
/**
* 修改 行政区划表
@@ -142,8 +158,9 @@
@ApiOperationSupport(order = 7)
@ApiOperation(value = "新增或修改", notes = "传入region")
@ApiLog("行政区划数据新增或修改")
- public R submit(@Valid @RequestBody Region region) {
- return R.status(regionService.submit(region));
+ public R submit(@Valid @RequestBody RegionAddParam region) {
+ Region regionEntity = Objects.requireNonNull(BeanUtil.copy(region, Region.class));
+ return R.status(regionService.submit(regionEntity));
}
--
Gitblit v1.9.3