From 229cdb3d5692219b8ddd3ebcf13873d3a0bc703a Mon Sep 17 00:00:00 2001
From: huangh <hshgjzd5@163.com>
Date: Thu, 26 Sep 2024 10:34:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test
---
dyh-service/dyh-sys/src/main/java/cn/huge/module/kind/service/SyRegionService.java | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 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 e77afff..fefe1c0 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
@@ -9,6 +9,7 @@
import cn.huge.module.kind.domain.dto.RegionSelectJSDTO;
import cn.huge.module.kind.domain.po.SyRegion;
import cn.huge.module.sys.dto.QueAddrBaseDTO;
+import cn.huge.module.sys.dto.QueAreaDTO;
import cn.huge.module.utils.BaiduMapAddrDTO;
import cn.huge.module.utils.BaiduMapUtils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -25,6 +26,7 @@
import javax.annotation.PostConstruct;
import javax.swing.plaf.synth.Region;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -178,25 +180,25 @@
if (ObjectUtils.isNotEmpty(baiduMapAddrDTO)) {
QueryWrapper<SyRegion> syRegionQueryWrapper = new QueryWrapper<>();
// 查询省
- syRegionQueryWrapper.eq("name", baiduMapAddrDTO.getProvince());
+ syRegionQueryWrapper.like("name", baiduMapAddrDTO.getProvince());
SyRegion province = mapper.selectOne(syRegionQueryWrapper);
queAddrBaseDTO.setQueProv(province.getId());
queAddrBaseDTO.setQueProvName(province.getName());
// 查询市
syRegionQueryWrapper.clear();
- syRegionQueryWrapper.eq("name", baiduMapAddrDTO.getCity());
+ syRegionQueryWrapper.like("name", baiduMapAddrDTO.getCity());
SyRegion city = mapper.selectOne(syRegionQueryWrapper);
queAddrBaseDTO.setQueCity(city.getId());
queAddrBaseDTO.setQueCityName(city.getName());
// 查询区
syRegionQueryWrapper.clear();
- syRegionQueryWrapper.eq("name", baiduMapAddrDTO.getDistrict());
+ syRegionQueryWrapper.like("name", baiduMapAddrDTO.getDistrict());
SyRegion district = mapper.selectOne(syRegionQueryWrapper);
queAddrBaseDTO.setQueArea(district.getId());
queAddrBaseDTO.setQueAreaName(district.getName());
// 查询街道
syRegionQueryWrapper.clear();
- syRegionQueryWrapper.eq("name", baiduMapAddrDTO.getTown());
+ syRegionQueryWrapper.like("name", baiduMapAddrDTO.getTown());
SyRegion town = mapper.selectOne(syRegionQueryWrapper);
queAddrBaseDTO.setQueRoad(town.getId());
queAddrBaseDTO.setQueRoadName(town.getName());
@@ -209,6 +211,21 @@
}
-
+ public List<QueAreaDTO> listByParentId(String parentId){
+ List<QueAreaDTO> list = new ArrayList<>();
+ QueryWrapper<SyRegion> queryWrapper = new QueryWrapper();
+ queryWrapper.eq("parent_id", parentId);
+ List<SyRegion> syRegions = mapper.selectList(queryWrapper);
+ if(ObjectUtils.isNotEmpty(syRegions)){
+ for (SyRegion syRegion : syRegions) {
+ QueAreaDTO queAreaDTO = new QueAreaDTO();
+ queAreaDTO.setAreaCode(syRegion.getId());
+ queAreaDTO.setAreaName(syRegion.getName());
+ queAreaDTO.setParentId(syRegion.getParentId());
+ list.add(queAreaDTO);
+ }
+ }
+ return list;
+ }
}
--
Gitblit v1.8.0