From e93aad02d2dd2a6e624e81ea0adb3611a8fc43e5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 26 十二月 2024 17:16:19 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RegionController.java | 31 +++++++++++++++----------------
1 files changed, 15 insertions(+), 16 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 c01da9f..05c2cc2 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,38 +7,37 @@
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.List;
@RestController
@RequestMapping("/region")
-@Api("地区")
+@Api(tags = "地区")
public class RegionController {
@Resource
private RegionService regionService;
/**
- * 获取省份列表
+ * 省市区级联
*/
@GetMapping("/getProvinceList")
- @ApiOperation("获取省份列表")
- public R<List<Region>> getProvinceList() {
+ @ApiOperation("省市区级联")
+ public R<List<Region>> getProvinceList(@ApiParam("父级id") @RequestParam Long parentId) {
return R.ok(regionService.list(new LambdaQueryWrapper<Region>()
- .eq(Region::getParentId, 0)));
+ .eq(Region::getParentId, parentId)));
}
-
+
+
/**
- * 获取下级地区列表
+ * 根据城市编号获取数据
+ * @param code
+ * @return
*/
- @GetMapping("/getNextRegionList")
- @ApiOperation("获取下级地区列表")
- public R<List<Region>> getNextRegionList(@ApiParam("父级id") @RequestParam Long id) {
- return R.ok(regionService.list(new LambdaQueryWrapper<Region>()
- .eq(Region::getParentId, id)));
+ @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