地区BUG处理

nbjk-admin/src/main/java/com/miaxis/app/controller/wx/WxMapController.java

@@ -70,7 +70,7 @@ public class WxMapController extends BaseController {
             System.out.println("province = " + province);
             System.out.println("city = " + city);
             System.out.println("county = " + county);
-            DictCityVo dictCityVo = dictCityService.getDictGrandByName(county);
+            DictCityVo dictCityVo = dictCityService.getDictGrandByName(county,city);
             return Response.success(dictCityVo);
         } else {
             Response response = new Response(502, "腾讯地图接口请求错误");

nbjk-admin/src/test/java/com/miaxis/test/WxMapTest.java

@@ -59,7 +59,7 @@ public class WxMapTest {
             System.out.println("province = " + province);
             System.out.println("city = " + city);
             System.out.println("county = " + county);
-            DictCityVo cityVo = dictCityService.getDictGrandByName(county);
+            DictCityVo cityVo = dictCityService.getDictGrandByName(county,city);
             System.out.println(cityVo);
 
         } else {

nbjk-service/src/main/java/com/miaxis/dict/mapper/DictCityMapper.java

@@ -3,6 +3,7 @@ package com.miaxis.dict.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.miaxis.dict.domain.DictCity;
 import com.miaxis.dict.vo.DictCityVo;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -25,5 +26,5 @@ public interface DictCityMapper extends BaseMapper<DictCity> {
 
     List<DictCity> getDictCityByName(String name);
 
-    DictCityVo getDictGrandByName(String name);
+    DictCityVo getDictGrandByName(@Param("county")String county, @Param("city")String city);
 }

nbjk-service/src/main/java/com/miaxis/dict/service/IDictCityService.java

@@ -39,10 +39,11 @@ public interface IDictCityService extends IService<DictCity>{
 
     /**
      * 根据获取父类祖父类地区编号
-     * @param name 地区名称
+     * @param county 地区名称
+     * @param city 地市名称
      * @return 城市
      */
-    public DictCityVo getDictGrandByName(String name);
+    public DictCityVo getDictGrandByName(String county,String city);
 
 
 }

nbjk-service/src/main/java/com/miaxis/dict/service/impl/DictCityServiceImpl.java

@@ -28,7 +28,7 @@ public class DictCityServiceImpl extends ServiceImpl<DictCityMapper, DictCity> i
      * @return 全国城市
      */
     @Override
-    public List<DictCity> selectDictCityList(DictCity dictCity){
+    public List<DictCity> selectDictCityList(DictCity dictCity) {
         return dictCityMapper.selectDictCityList(dictCity);
     }
 
@@ -44,7 +44,7 @@ public class DictCityServiceImpl extends ServiceImpl<DictCityMapper, DictCity> i
     }
 
     @Override
-    public DictCityVo getDictGrandByName(String name) {
-        return dictCityMapper.getDictGrandByName(name);
+    public DictCityVo getDictGrandByName(String county, String city) {
+        return dictCityMapper.getDictGrandByName(county, city);
     }
 }

nbjk-service/src/main/resources/mapper/dict/DictCityMapper.xml

@@ -54,7 +54,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     JOIN
                     dict_city AS province ON parent.parentCode = province.code
                 WHERE
-                    child.name = #{name}
+                    child.name = #{county}
+                    and
+                    parent.name = #{city}
     </select>