From d1cab4b2f2690d1331f12f0d9de78bbbf926f390 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 16 一月 2025 14:27:51 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RegionController.java | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RegionController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RegionController.java
index caeefba..b0954d3 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RegionController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RegionController.java
@@ -7,13 +7,12 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
@RestController
@RequestMapping("/region")
@@ -26,10 +25,42 @@
* 省市区级联
*/
@GetMapping("/getProvinceList")
- @ApiOperation("省市区级联")
+ @ApiOperation(value = "省市区级联", tags = "管理后台")
public R<List<Region>> getProvinceList(@ApiParam("父级id") @RequestParam Long parentId) {
return R.ok(regionService.list(new LambdaQueryWrapper<Region>()
.eq(Region::getParentId, parentId)));
}
+
+ /**
+ * 省市区级联
+ */
+ @GetMapping("/getProvinceList1")
+ @ApiOperation(value = "省市区级联",tags = {"小程序"})
+ public R<List<Region>> getProvinceList1() {
+ List<Region> list = regionService.list();
+ List<Region> collect = list.stream().filter(s -> s.getParentId() == 0).collect(Collectors.toList());
+ for (Region region : collect) {
+ List<Region> collect1 = list.stream().filter(s -> s.getParentId().equals(region.getId())).collect(Collectors.toList());
+ for (Region region1 : collect1) {
+ List<Region> collect2 = list.stream().filter(s -> s.getParentId().equals(region1.getId())).collect(Collectors.toList());
+ region1.setChilds(collect2);
+ }
+ region.setChilds(collect1);
+ }
+ return R.ok(collect);
+ }
+
+
+
+ /**
+ * 根据城市编号获取数据
+ * @param code
+ * @return
+ */
+ @PostMapping("/getRegionBiCode")
+ public R<Region> getRegionBiCode(@RequestParam("code") String code){
+ Region one = regionService.getOne(new LambdaQueryWrapper<Region>().eq(Region::getCode, code));
+ return R.ok(one);
+ }
}
--
Gitblit v1.7.1