From b9903ead016b8b1aa68eb04b48fca3b53fdab0d3 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期一, 30 十二月 2024 10:42:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4
---
src/main/java/com/mzl/flower/web/system/ProvinceController.java | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/mzl/flower/web/system/ProvinceController.java b/src/main/java/com/mzl/flower/web/system/ProvinceController.java
index 1d9c307..ec2fa4e 100644
--- a/src/main/java/com/mzl/flower/web/system/ProvinceController.java
+++ b/src/main/java/com/mzl/flower/web/system/ProvinceController.java
@@ -2,6 +2,8 @@
import com.mzl.flower.base.BaseController;
import com.mzl.flower.base.R;
+import com.mzl.flower.service.district.DistrictService;
+import com.mzl.flower.service.district.DistrictTengxunService;
import com.mzl.flower.service.system.ProvinceService;
import com.mzl.flower.utils.LocalUtil;
import io.swagger.annotations.Api;
@@ -23,6 +25,18 @@
@Autowired
private ProvinceService provinceService;
+
+ /**
+ * 腾讯地图获取中国省市区数据
+ */
+ @Autowired
+ private DistrictTengxunService districtTengxunService;
+
+ /**
+ * 高德地图获取中国省市区数据
+ */
+ @Autowired
+ private DistrictService districtService;
@ApiOperation(value = "获取省份")
@GetMapping("/provinces")
@@ -58,13 +72,20 @@
@ApiOperation(value = "获取中国省市区数据")
@GetMapping("/area/json")
public ResponseEntity<String> getChineseArea() {
- return returnData(R.SUCCESS.getCode(), provinceService.getChineseArea());
+
+ // 高德地图
+// return returnData(R.SUCCESS.getCode(), districtService.getChineseArea());
+ // 腾讯地图
+ return returnData(R.SUCCESS.getCode(), districtTengxunService.getChineseArea());
+// return returnData(R.SUCCESS.getCode(), provinceService.getChineseArea());
}
@ApiOperation(value = "刷新中国省市区数据缓存")
@GetMapping("/area/json/refresh")
public ResponseEntity<String> refresh() {
- provinceService.refreshChineseData();
+// provinceService.refreshChineseData();
+// districtService.clearChineseDataCache();
+ districtTengxunService.clearChineseDataCache();
return returnData(R.SUCCESS.getCode(), null);
}
}
--
Gitblit v1.9.3