From 99de75de811efed36da1d37bcf5442ae96384f6e Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Sat, 21 Sep 2024 20:08:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test

---
 dyh-service/dyh-sys/src/main/java/cn/huge/module/kind/controller/client/SyregionClientController.java |   28 ++--------------------------
 1 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/kind/controller/client/SyregionClientController.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/kind/controller/client/SyregionClientController.java
index 04481ea..286e328 100644
--- a/dyh-service/dyh-sys/src/main/java/cn/huge/module/kind/controller/client/SyregionClientController.java
+++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/kind/controller/client/SyregionClientController.java
@@ -45,32 +45,8 @@
     @GetMapping("/getQueAddrByBaiduiLngLat")
     public Object getQueAddrByBaiduiLngLat(@RequestParam(value = "lng") String lng, @RequestParam(value = "lat") String lat) {
         try {
-            QueAddrBaseDTO syRegionBaseDTO = new QueAddrBaseDTO();
-            BaiduMapAddrDTO baiduMapAddrDTO = BaiduMapUtils.getAddrByLngLat(lng, lat, BaiduMapUtils.coordtype_bd09ll);
-            if (ObjectUtils.isNotEmpty(baiduMapAddrDTO)) {
-                QueryWrapper<SyRegion> syRegionQueryWrapper = new QueryWrapper<>();
-                // 查询省
-                syRegionQueryWrapper.eq("name", baiduMapAddrDTO.getProvince());
-                SyRegion province = service.getOne(syRegionQueryWrapper);
-                syRegionBaseDTO.setQueProv(province.getId());
-                syRegionBaseDTO.setQueProvName(province.getName());
-                // 查询市
-                syRegionQueryWrapper.eq("name", baiduMapAddrDTO.getCity());
-                SyRegion city = service.getOne(syRegionQueryWrapper);
-                syRegionBaseDTO.setQueProv(city.getId());
-                syRegionBaseDTO.setQueProvName(city.getName());
-                // 查询区
-                syRegionQueryWrapper.eq("name", baiduMapAddrDTO.getDistrict());
-                SyRegion district = service.getOne(syRegionQueryWrapper);
-                syRegionBaseDTO.setQueProv(district.getId());
-                syRegionBaseDTO.setQueProvName(district.getName());
-                // 查询街道
-                syRegionQueryWrapper.eq("name", baiduMapAddrDTO.getTown());
-                SyRegion town = service.getOne(syRegionQueryWrapper);
-                syRegionBaseDTO.setQueProv(town.getId());
-                syRegionBaseDTO.setQueProvName(town.getName());
-            }
-            return ReturnSucUtils.getRepInfo(syRegionBaseDTO);
+            QueAddrBaseDTO queAddrBaseDTO = service.getQueAddrByBaiduiLngLat(lng, lat);
+            return ReturnSucUtils.getRepInfo(queAddrBaseDTO);
         } catch (Exception e) {
             return ReturnFailUtils.getRepInfo();
         }

--
Gitblit v1.8.0