From 3a355771834c39d38a628132031ce1c52bc64478 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 17 七月 2024 18:25:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/web/src/main/java/com/doumee/api/web/CommonApi.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/server/web/src/main/java/com/doumee/api/web/CommonApi.java b/server/web/src/main/java/com/doumee/api/web/CommonApi.java
index 3404a88..4fd3597 100644
--- a/server/web/src/main/java/com/doumee/api/web/CommonApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/CommonApi.java
@@ -4,6 +4,7 @@
import com.doumee.biz.zbom.ZbomZhongTaiService;
import com.doumee.biz.zbom.model.zhongtai.ZTAreaListRequest;
import com.doumee.biz.zbom.model.zhongtai.response.ZTAreaInfoResponse;
+import com.doumee.biz.zbom.model.zhongtai.response.ZTAreaTreeResponse;
import com.doumee.config.annotation.LoginRequired;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.model.ApiResponse;
@@ -45,6 +46,9 @@
@Autowired
private ZbomZhongTaiService zbomZhongTaiService;
+ @Autowired
+ private GetZhongTaiDataService getZhongTaiDataService;
+
@ApiOperation(value = "鑾峰彇鍖哄垝淇℃伅", notes = "瀹㈡埛绔皬绋嬪簭")
@PostMapping("/getArea")
public ApiResponse<List<ZTAreaInfoResponse>> getArea(@RequestBody ZTAreaListRequest ztAreaListRequest) {
@@ -56,7 +60,17 @@
}
-
-
+ @ApiOperation(value = "鑾峰彇鍖哄垝鍏ㄩ噺鏍戝舰淇℃伅", notes = "瀹㈡埛绔皬绋嬪簭")
+ @PostMapping("/getAreaTree")
+ public ApiResponse<List<ZTAreaTreeResponse>> getAreaTree(@RequestBody ZTAreaListRequest ztAreaListRequest) {
+ if(StringUtils.isBlank(ztAreaListRequest.getPid())){
+ ztAreaListRequest.setPid("1");
+ }
+ if(StringUtils.isBlank(ztAreaListRequest.getLevel())){
+ ztAreaListRequest.setLevel("5");
+ }
+ List<ZTAreaTreeResponse> ztAreaInfoResponses = getZhongTaiDataService.getZhongTaiAreaTree(ztAreaListRequest);
+ return ApiResponse.success(ztAreaInfoResponses);
+ }
}
--
Gitblit v1.9.3