diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PoiController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PoiController.java index b02d7ea4b..f2cb3aa94 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PoiController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PoiController.java @@ -17,6 +17,7 @@ import com.fangjia.service.api.AmapPoiService; import com.fangjia.service.bo.Point; import com.fangjia.service.datastore.DistrictService; import com.fangjia.service.mongo.fangjia.CbmRegionService; +import com.fangjia.service.open.AdministrativeMappingService; import net.sf.json.JSONObject; import org.apache.commons.lang.StringUtils; import org.apache.commons.codec.binary.Base64; @@ -31,6 +32,8 @@ public class PoiController { private CbmRegionService cbmRegionService; private AddressParserService addressParserService; private DistrictService districtService; + + private AdministrativeMappingService administrativeMappingService; private static final String[] PROPERTY_SEARCH_API_FIELDS = {"address", "city", "region", "name", "addrAlias"}; private static final String ES_USER = "developer"; private static final String ES_PASSWORD = "5e8edd851d2fdfbd7415232c67367cc3"; @@ -273,7 +276,7 @@ public class PoiController { public Object facilitiesAction(AddressModel model) { RestfulModelAndView mav = new RestfulModelAndView(); - String city = model.getCity(); + String city = administrativeMappingService.findCityByCityShort(model.getCity()); String lngStr = model.getLng(); String latStr = model.getLat(); String numberPattern = "-?\\d+(\\.\\d+)?"; // 匹配整数或浮点数 @@ -388,4 +391,8 @@ public class PoiController { public void setDistrictService(DistrictService districtService) { this.districtService = districtService; } + + public void setAdministrativeMappingService(AdministrativeMappingService administrativeMappingService) { + this.administrativeMappingService = administrativeMappingService; + } } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/open/AdministrativeMappingService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/open/AdministrativeMappingService.java new file mode 100644 index 000000000..a0fc680e1 --- /dev/null +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/open/AdministrativeMappingService.java @@ -0,0 +1,19 @@ +package com.fangjia.service.open; + +import com.fangjia.dal.QueryParam; +import com.fangjia.dal.mongo.dao.AdministrativeMappingDao; +import com.fangjia.dal.mongo.model.AdministrativeMapping; +import org.apache.commons.lang.StringUtils; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +public interface AdministrativeMappingService { + + + + public String findCityCodeByCityShort(String cityShort); + public String findCityByCityShort(String cityShort) ; + +} diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/open/AdministrativeMappingServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/open/AdministrativeMappingServiceImpl.java new file mode 100644 index 000000000..521b1e5ef --- /dev/null +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/open/AdministrativeMappingServiceImpl.java @@ -0,0 +1,97 @@ +package com.fangjia.service.open; + +import com.fangjia.dal.QueryParam; +import com.fangjia.dal.mongo.dao.AdministrativeMappingDao; +import com.fangjia.dal.mongo.model.AdministrativeMapping; +import org.apache.commons.lang.StringUtils; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +public class AdministrativeMappingServiceImpl implements AdministrativeMappingService { + private AdministrativeMappingDao administrativeMappingDao; + private List CITY_SHORT = new ArrayList(Arrays.asList( + "五家渠", "图木舒克", "石河子", "吐鲁番", "中卫", "石嘴山", "海北州", + "张掖", "天水", "铜川", "山南", "昌都", "拉萨", "咸阳", "迪庆州", + "楚雄", "白银", "榆林", "普洱", "丽江", "昆明", "玉树州", "甘孜州", + "阿坝州", "银川", "雅安", "文山州", "西双版纳州", "琼中", "保亭", "乐东", + "昌江", "白沙", "临高", "陇南", "定安", "万宁", "宝鸡", "三亚", "来宾", + "贺州", "怒江州", "河池", "贵港", "防城港", "梧州", "柳州", "中山", "清远", + "定西", "临沧", "德宏州", "琼海", "崇左", "鹤岗", "安阳", "宿迁", + "泰州", "盐城", "齐齐哈尔", "淮安", "澄迈", "营口", "宿州", "甘南", "泰安", + "无锡", "鄂州", "吴忠", "玉林", "鄂尔多斯", "湖州", "辽源", "邯郸", "六安", + "海口", "双鸭山", "抚顺", "白城", "贵阳", "运城", "徐州", "蚌埠", + "白山", "延安", "通化", "牡丹江", "临汾", "云浮", "朝阳", "保山", + "铁岭", "淮南", "金华", "长治", "克孜勒苏", "四平", "太原", "梅州", + "北京", "阜新", "晋中", "阿拉善盟", "晋城", "石家庄", "五指山", "鸡西", + "抚州", "果洛州", "驻马店", "芜湖", "呼和浩特", "邢台", "黑河", "七台河", + "承德", "龙岩", "镇江", "苏州", "衡水", "安康", "南宁", "包头", + "赤峰", "济源", "绍兴", "张家口", "大同", "阳泉", "吕梁", "乌海", + "河源", "通辽", "滁州", "东莞", "杭州", "巴彦淖尔", "常州", "乌兰察布", + "新余", "延边", "九江", "临夏", "湘西", "保定", "林芝", "沧州", + "阜阳", "临沂", "乌鲁木齐", "锡林郭勒盟", "本溪", "德州", "扬州", + "鞍山", "松原", "丽水", "衢州", "合肥", "屯昌", "黄山", "武威", + "亳州", "宣城", "三明", "绥化", "湘潭", "衡阳", "南平", "沈阳", + "辽阳", "南昌", "景德镇", "鹰潭", "赣州", "兴安盟", "吉安", + "庆阳", "宜春", "上饶", "潍坊", "济南", "淄博", "哈尔滨", + "枣庄", "忻州", "济宁", "日照", "韶关", "开封", "商丘", "大理", + "菏泽", "西宁", "郑州", "神农架", "平顶山", "朔州", "鹤壁", + "新乡", "东方", "焦作", "伊春", "萍乡", "常德", "周口", + "渭南", "张家界", "阿里", "桂林", "大庆", "长沙", "益阳", + "株洲", "邵阳", "郴州", "永州", "娄底", "胡杨河", "昆玉", + "嘉峪关", "北屯", "塔城", "巴音郭楞", "博尔塔拉", "昌吉", + "阿拉尔", "克拉玛依", "海西州", "黄南州", "酒泉", "平凉", + "汉中", "昭通", "黔西南", "铜仁", "遵义", "资阳", "巴中", + "广安", "宜宾", "眉山", "南充", "毕节", "乐山", "达州", + "遂宁", "广元", "绵阳", "德阳", "伊犁", "成都", "安顺", + "重庆", "陵水", "红河", "可克达拉", "文昌", "儋州", "百色", + "北海", "揭阳", "潮州", "阳江", "汕尾", "双河", "肇庆", + "湛江", "汕头", "深圳", "内江", "广州", "台州", "嘉兴", + "茂名", "宁波", "三沙", "南通", "和田", "舟山", "连云港", + "喀什", "南京", "锦州", "长春", "固原", "温州", "上海", + "佛山", "钦州", "六盘水", "潜江", "葫芦岛", "岳阳", "曲靖", + "佳木斯", "大兴安岭", "濮阳", "信阳", "烟台", "安庆", + "秦皇岛", "天津", "廊坊", "黔南", "那曲", "海南州", + "日喀则", "武汉", "怀化", "三门峡", "海东", "兰州", + "聊城", "凉山州", "泸州", "南阳", "黔东南", "吉林", + "阿克苏", "滨州", "唐山", "铜陵", "金昌", "丹东", + "玉溪", "白杨", "呼伦贝尔", "铁门关", "仙桃", "随州", + "淮北", "商洛", "江门", "池州", "盘锦", "厦门", + "西安", "自贡", "莆田", "泉州", "漳州", "福州", + "马鞍山", "宁德", "大连", "孝感", "十堰", "青岛", + "攀枝花", "东营", "威海", "新星", "洛阳", "黄石", + "阿勒泰", "许昌", "漯河", "宜昌", "哈密", "襄阳", + "荆门", "荆州", "黄冈", "恩施", "天门", "咸宁", + "惠州", "珠海" + )); + + + public String findCityCodeByCityShort(String cityShort) { + ArrayList params = new ArrayList(); + params.add(new QueryParam("cityShort", cityShort)); + params.add(new QueryParam("type", "城市")); + AdministrativeMapping firstByParams = administrativeMappingDao.findFirstByParams(params); + if (firstByParams != null && StringUtils.isNotBlank(firstByParams.getMzbCityCode())) { + return firstByParams.getMzbCityCode(); + } + return null; + } + + public String findCityByCityShort(String cityShort) { + if (CITY_SHORT.contains(cityShort)) { + ArrayList params = new ArrayList(); + params.add(new QueryParam("cityShort", cityShort)); + params.add(new QueryParam("type", "城市")); + AdministrativeMapping firstByParams = administrativeMappingDao.findFirstByParams(params); + if (firstByParams != null && StringUtils.isNotBlank(firstByParams.getMzbCityCode())) { + return firstByParams.getCity(); + } + } + return cityShort; + } + + public void setAdministrativeMappingDao(AdministrativeMappingDao administrativeMappingDao) { + this.administrativeMappingDao = administrativeMappingDao; + } +}