地市问题加县区

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

@@ -6,14 +6,16 @@ import com.miaxis.common.constant.Constants;
 import com.miaxis.common.core.controller.BaseController;
 import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.sms.MD5Utils;
-import com.miaxis.dict.domain.DictCity;
 import com.miaxis.dict.service.IDictCityService;
+import com.miaxis.dict.vo.DictCityVo;
 import com.miaxis.feign.service.IWxMapService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -64,21 +66,12 @@ public class WxMapController extends BaseController {
             JSONObject addressComponent = (JSONObject) resultNode.get("address_component");
             String province = addressComponent.get("province").toString();
             String city = addressComponent.get("city").toString();
+            String county = addressComponent.get("district").toString();
             System.out.println("province = " + province);
             System.out.println("city = " + city);
-            DictCity dictCity = dictCityService.getDictCityByName(city);
-            System.out.println("parentCcode = " + dictCity.getParentcode());
-            System.out.println("code = " + dictCity.getCode());
-
-            //   List<Map<String,Object>> resultList = new ArrayList<>();
-
-            Map<String, Object> map = new HashMap<String, Object>();
-            map.put("province", province);
-            map.put("city", city);
-            map.put("provinceCode", dictCity.getParentcode());
-            map.put("cityCode", dictCity.getCode());
-            System.out.println(map);
-            return Response.success(map);
+            System.out.println("county = " + county);
+            DictCityVo dictCityVo = dictCityService.getDictGrandByName(county);
+            return Response.success(dictCityVo);
         } else {
             Response response = new Response(502, "腾讯地图接口请求错误");
             return response;

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

@@ -3,20 +3,18 @@ package com.miaxis.test;
 import com.alibaba.fastjson.JSONObject;
 import com.miaxis.NbjkApplication;
 import com.miaxis.common.sms.MD5Utils;
-import com.miaxis.dict.domain.DictCity;
 import com.miaxis.dict.service.IDictCityService;
+import com.miaxis.dict.vo.DictCityVo;
 import com.miaxis.feign.service.IWxMapService;
-import com.miaxis.wx.dto.WxMaterialList;
-import com.miaxis.wx.service.IWxGzhService;
-import com.miaxis.wx.service.IWxService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import java.io.IOException;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.TreeMap;
 
 @SpringBootTest(classes = NbjkApplication.class)
 @RunWith(SpringRunner.class)
@@ -57,20 +55,12 @@ public class WxMapTest {
             JSONObject addressComponent = (JSONObject) resultNode.get("address_component");
             String province = addressComponent.get("province").toString();
             String city = addressComponent.get("city").toString();
+            String county = addressComponent.get("district").toString();
             System.out.println("province = " + province);
             System.out.println("city = " + city);
-            DictCity dictCity = dictCityService.getDictCityByName(city);
-            System.out.println("parentCcode = " + dictCity.getParentcode());
-            System.out.println("code = " + dictCity.getCode());
-
-         //   List<Map<String,Object>> resultList = new ArrayList<>();
-
-            Map<String,Object> map = new HashMap<String,Object>();
-            map.put("province",province);
-            map.put("city",city);
-            map.put("provinceCode",dictCity.getParentcode());
-            map.put("cityCode",dictCity.getCode());
-            System.out.println(map);
+            System.out.println("county = " + county);
+            DictCityVo cityVo = dictCityService.getDictGrandByName(county);
+            System.out.println(cityVo);
 
         } else {
 

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

@@ -2,6 +2,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 java.util.List;
 
@@ -23,4 +24,6 @@ public interface DictCityMapper extends BaseMapper<DictCity> {
     DictCity getDictCityByCode(String code);
 
     DictCity getDictCityByName(String name);
+
+    DictCityVo getDictGrandByName(String name);
 }

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

@@ -1,14 +1,10 @@
 package com.miaxis.dict.service;
 
-import java.util.List;
-
-import com.miaxis.common.core.domain.Response;
-import com.miaxis.dict.domain.DictCity;
 import com.baomidou.mybatisplus.extension.service.IService;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
+import com.miaxis.dict.domain.DictCity;
+import com.miaxis.dict.vo.DictCityVo;
+
+import java.util.List;
 
 /**
  * 全国城市Service接口
@@ -41,4 +37,12 @@ public interface IDictCityService extends IService<DictCity>{
      */
     public DictCity getDictCityByName(String name);
 
+    /**
+     * 根据获取父类祖父类地区编号
+     * @param name 地区名称
+     * @return 城市
+     */
+    public DictCityVo getDictGrandByName(String name);
+
+
 }

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

@@ -1,16 +1,14 @@
 package com.miaxis.dict.service.impl;
 
-import java.util.List;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.miaxis.common.core.domain.Response;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.apache.commons.lang3.StringUtils;
-import com.miaxis.dict.mapper.DictCityMapper;
 import com.miaxis.dict.domain.DictCity;
+import com.miaxis.dict.mapper.DictCityMapper;
 import com.miaxis.dict.service.IDictCityService;
+import com.miaxis.dict.vo.DictCityVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * 全国城市Service业务层处理
@@ -44,4 +42,9 @@ public class DictCityServiceImpl extends ServiceImpl<DictCityMapper, DictCity> i
     public DictCity getDictCityByName(String name) {
         return dictCityMapper.getDictCityByName(name);
     }
+
+    @Override
+    public DictCityVo getDictGrandByName(String name) {
+        return dictCityMapper.getDictGrandByName(name);
+    }
 }

nbjk-service/src/main/java/com/miaxis/dict/vo/DictCityVo.java

@@ -0,0 +1,29 @@
+package com.miaxis.dict.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class DictCityVo {
+
+    @ApiModelProperty(value = "省级编号")
+    private String proviceCode;
+
+    @ApiModelProperty(value = "省级名称")
+    private String province;
+
+    @ApiModelProperty(value = "城市编号")
+    private String cityCode;
+
+    @ApiModelProperty(value = "城市名称")
+    private String city;
+
+    @ApiModelProperty(value = "区县编号")
+    private String countyCode;
+
+    @ApiModelProperty(value = "区县名称")
+    private String county;
+
+
+
+}

nbjk-service/src/main/java/com/miaxis/exam/domain/ExamInfo.java

@@ -62,6 +62,19 @@ public class ExamInfo extends BaseBusinessEntity{
     private String city;
 
 
+    /** 区县ID */
+    @Excel(name = "区县ID")
+    @TableField("county_id")
+    @ApiModelProperty(value = "区县ID")
+    private String countyId;
+
+    /** 区县名称 */
+    @Excel(name = "区县名称")
+    @TableField("county")
+    @ApiModelProperty(value = "区县名称")
+    private String county;
+
+
     /** 城市名称 */
     @Excel(name = "价格")
     @TableField("price")

nbjk-service/src/main/java/com/miaxis/vip/domain/VipExamVideo.java

@@ -72,24 +72,40 @@ public class VipExamVideo extends BaseBusinessEntity{
     @ApiModelProperty(value = "省份ID")
     private String provinceId;
 
-    /** 地区ID */
-    @Excel(name = "地区ID")
-    @TableField("city_id")
-    @ApiModelProperty(value = "地区ID")
-    private String cityId;
-
     /** 省份名称 */
     @Excel(name = "省份名称")
     @TableField("province")
     @ApiModelProperty(value = "省份名称")
     private String province;
 
-    /** 地区名称 */
-    @Excel(name = "地区名称")
+    /** 地市ID */
+    @Excel(name = "地区ID")
+    @TableField("city_id")
+    @ApiModelProperty(value = "地区ID")
+    private String cityId;
+
+
+    /** 地市名称 */
+    @Excel(name = "地市名称")
     @TableField("city")
-    @ApiModelProperty(value = "地区名称")
+    @ApiModelProperty(value = "地市名称")
     private String city;
 
+
+    /** 区县ID */
+    @Excel(name = "区县ID")
+    @TableField("county_id")
+    @ApiModelProperty(value = "区县ID")
+    private String countyId;
+
+
+    /** 区县名称 */
+    @Excel(name = "区县名称")
+    @TableField("county")
+    @ApiModelProperty(value = "区县名称")
+    private String county;
+
+
     /** 考场编号 */
     @Excel(name = "考场编号")
     @TableField("exam_id")

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

@@ -38,4 +38,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select * from dict_city where name = #{name}
     </select>
 
+
+    <select id="getDictGrandByName" resultType="com.miaxis.dict.vo.DictCityVo">
+        SELECT
+            parent.parentCode AS proviceCode,
+            province.name AS province,
+            parent.code AS cityCode,
+            parent.name AS city,
+            child.code AS countyCode,
+            child.name AS county
+        FROM
+            dict_city AS child
+        JOIN
+          dict_city AS parent ON child.parentCode = parent.code
+                    JOIN
+                    dict_city AS province ON parent.parentCode = province.code
+                WHERE
+                    child.name = #{name}
+    </select>
+
+
 </mapper>