From fd3d6d30afb9041c2cc3099833b7683e12c7daff Mon Sep 17 00:00:00 2001
From: wangwh <2397901735@qq.com>
Date: Sun, 22 Sep 2024 10:00:36 +0800
Subject: [PATCH] 督办信息兼容新需求 查询待办任务-督办 首页-督办-我发起的 功能兼容 添加督办逻辑修改 新增全部签收接口 首页-待审核-我申请的 新增接口 办理反馈新增承办/配合部门判断 新增查询督办详情接口 查询时限接口bug修复

---
 dyh-service/dyh-sys/src/main/java/cn/huge/module/kind/service/SyRegionService.java |   60 ++++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/kind/service/SyRegionService.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/kind/service/SyRegionService.java
index b74fb2d..e77afff 100644
--- a/dyh-service/dyh-sys/src/main/java/cn/huge/module/kind/service/SyRegionService.java
+++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/kind/service/SyRegionService.java
@@ -173,32 +173,40 @@
      * @return
      */
     public QueAddrBaseDTO getQueAddrByBaiduiLngLat(String lng, String lat){
-        QueAddrBaseDTO queAddrBaseDTO = 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 = mapper.selectOne(syRegionQueryWrapper);
-            queAddrBaseDTO.setQueProv(province.getId());
-            queAddrBaseDTO.setQueProvName(province.getName());
-            // 查询市
-            syRegionQueryWrapper.eq("name", baiduMapAddrDTO.getCity());
-            SyRegion city = mapper.selectOne(syRegionQueryWrapper);
-            queAddrBaseDTO.setQueProv(city.getId());
-            queAddrBaseDTO.setQueProvName(city.getName());
-            // 查询区
-            syRegionQueryWrapper.eq("name", baiduMapAddrDTO.getDistrict());
-            SyRegion district = mapper.selectOne(syRegionQueryWrapper);
-            queAddrBaseDTO.setQueProv(district.getId());
-            queAddrBaseDTO.setQueProvName(district.getName());
-            // 查询街道
-            syRegionQueryWrapper.eq("name", baiduMapAddrDTO.getTown());
-            SyRegion town = mapper.selectOne(syRegionQueryWrapper);
-            queAddrBaseDTO.setQueProv(town.getId());
-            queAddrBaseDTO.setQueProvName(town.getName());
-        }
-        return queAddrBaseDTO;
+        try{QueAddrBaseDTO queAddrBaseDTO = 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 = mapper.selectOne(syRegionQueryWrapper);
+                queAddrBaseDTO.setQueProv(province.getId());
+                queAddrBaseDTO.setQueProvName(province.getName());
+                // 查询市
+                syRegionQueryWrapper.clear();
+                syRegionQueryWrapper.eq("name", baiduMapAddrDTO.getCity());
+                SyRegion city = mapper.selectOne(syRegionQueryWrapper);
+                queAddrBaseDTO.setQueCity(city.getId());
+                queAddrBaseDTO.setQueCityName(city.getName());
+                // 查询区
+                syRegionQueryWrapper.clear();
+                syRegionQueryWrapper.eq("name", baiduMapAddrDTO.getDistrict());
+                SyRegion district = mapper.selectOne(syRegionQueryWrapper);
+                queAddrBaseDTO.setQueArea(district.getId());
+                queAddrBaseDTO.setQueAreaName(district.getName());
+                // 查询街道
+                syRegionQueryWrapper.clear();
+                syRegionQueryWrapper.eq("name", baiduMapAddrDTO.getTown());
+                SyRegion town = mapper.selectOne(syRegionQueryWrapper);
+                queAddrBaseDTO.setQueRoad(town.getId());
+                queAddrBaseDTO.setQueRoadName(town.getName());
+            }
+            return queAddrBaseDTO;
+        }catch (Exception e){
+            log.error("[SyRegionService.getQueAddrByBaiduiLngLat]调用失败,异常信息:"+e, e);
+            throw new ServiceException("SyRegionService.getQueAddrByBaiduiLngLat", e);
+     }
+
     }
 
 

--
Gitblit v1.8.0