From a5fac95408a43ad43de9d88c30d06c0918c7bc8f Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 29 May 2024 11:14:44 +0800
Subject: [PATCH] 配置调整
---
src/main/java/org/springblade/modules/system/controller/RegionController.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 52 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/controller/RegionController.java b/src/main/java/org/springblade/modules/system/controller/RegionController.java
index cc96841..2f3eda8 100644
--- a/src/main/java/org/springblade/modules/system/controller/RegionController.java
+++ b/src/main/java/org/springblade/modules/system/controller/RegionController.java
@@ -16,6 +16,7 @@
*/
package org.springblade.modules.system.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -34,6 +35,7 @@
import org.springblade.modules.system.excel.RegionExcel;
import org.springblade.modules.system.excel.RegionImporter;
import org.springblade.modules.system.service.IRegionService;
+import org.springblade.modules.system.vo.RegionParamVO;
import org.springblade.modules.system.vo.RegionVO;
import org.springblade.modules.system.wrapper.RegionWrapper;
import org.springframework.web.bind.annotation.*;
@@ -113,6 +115,41 @@
}
/**
+ * 树列表(包含省市县三级)
+ *
+ * @return
+ */
+ @GetMapping("/getBaseTree")
+ public R getBaseTree() {
+ return R.data(regionService.getBaseTree());
+ }
+
+ /**
+ * 树列表
+ *
+ * @param region
+ * @return
+ */
+ @GetMapping("/tree")
+ @ApiOperation(value = "树列表", notes = "传入menu")
+ public R getTree(RegionParamVO region) {
+ return R.data(regionService.getTree(region));
+ }
+
+
+ /**
+ * 树列表(获取当前树）
+ *
+ * @param code
+ * @return
+ */
+ @GetMapping("/getTownTree")
+ @ApiOperation(value = "树列表", notes = "传入menu")
+ public R getTownTree(String code) {
+ return R.data(regionService.getTownTree(code));
+ }
+
+ /**
* 新增 行政区划表
*/
@PostMapping("/save")
@@ -159,8 +196,12 @@
@GetMapping("/select")
@ApiOperationSupport(order = 9)
@ApiOperation(value = "下拉数据源", notes = "传入tenant")
- public R<List<Region>> select(@RequestParam(required = false, defaultValue = "00") String code) {
- List<Region> list = regionService.list(Wrappers.<Region>query().lambda().eq(Region::getParentCode, code));
+ public R<List<Region>> select(@RequestParam(required = false, defaultValue = "000000000000") String code, Integer level) {
+ LambdaQueryWrapper<Region> wrapper = Wrappers.<Region>query().lambda().eq(Region::getParentCode, code);
+ if (null != level) {
+ wrapper.eq(Region::getRegionLevel, level);
+ }
+ List<Region> list = regionService.list(wrapper);
return R.data(list);
}
@@ -199,5 +240,14 @@
ExcelUtil.export(response, "行政区划模板", "行政区划表", list, RegionExcel.class);
}
+ /**
+ * 区划数据处理
+ */
+ @ApiOperation(value = "区划数据处理")
+ @GetMapping("/regionDataHandle")
+ public void regionDataHandle() {
+ regionService.regionDataHandle();
+ }
+
}
--
Gitblit v1.9.3