Commit 385c38c21810a445f8a6f09a1ff2cdf60823c58b
1 parent
88306e5ada
Exists in
master
and in
6 other branches
地址解析
Showing 1 changed file with 14 additions and 181 deletions
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BasicConfigService.java
View file @
385c38c
| ... | ... | @@ -12,6 +12,7 @@ |
| 12 | 12 | import com.lyms.platform.common.result.BaseObjectResponse; |
| 13 | 13 | import com.lyms.platform.common.utils.AddressUtil; |
| 14 | 14 | import com.lyms.platform.common.utils.CacheHelper; |
| 15 | +import com.lyms.platform.common.utils.SystemConfig; | |
| 15 | 16 | import com.lyms.platform.pojo.BasicConfig; |
| 16 | 17 | import com.lyms.platform.query.BasicConfigQuery; |
| 17 | 18 | import org.apache.commons.collections.CollectionUtils; |
| 18 | 19 | |
| 19 | 20 | |
| 20 | 21 | |
| ... | ... | @@ -107,15 +108,19 @@ |
| 107 | 108 | System.out.println("result = " + items); |
| 108 | 109 | |
| 109 | 110 | BasicConfigQuery regionsQuery = new BasicConfigQuery(); |
| 111 | + regionsQuery.setTypeId(SystemConfig.CHINA_TYPE_ID); | |
| 110 | 112 | regionsQuery.setYn(YnEnums.YES.getId()); |
| 113 | + | |
| 111 | 114 | if (items != null && items.size() == 4) |
| 112 | 115 | { |
| 113 | 116 | regionsQuery.setOrName(items.get(0)); |
| 114 | 117 | |
| 115 | 118 | List<BasicConfig> provinceList = queryBasicConfig(regionsQuery); |
| 119 | + | |
| 116 | 120 | if (CollectionUtils.isNotEmpty(provinceList)) |
| 117 | 121 | { |
| 118 | 122 | regionsQuery = new BasicConfigQuery(); |
| 123 | + regionsQuery.setTypeId(SystemConfig.CHINA_TYPE_ID); | |
| 119 | 124 | regionsQuery.setParentId(provinceList.get(0).getId()); |
| 120 | 125 | map.put("provinceId",provinceList.get(0).getId()); |
| 121 | 126 | |
| 122 | 127 | |
| ... | ... | @@ -129,8 +134,11 @@ |
| 129 | 134 | } |
| 130 | 135 | |
| 131 | 136 | regionsQuery = new BasicConfigQuery(); |
| 137 | + regionsQuery.setTypeId(SystemConfig.CHINA_TYPE_ID); | |
| 132 | 138 | regionsQuery.setOrName(items.get(1)); |
| 133 | 139 | regionsQuery.setParentIds(cityIds); |
| 140 | + | |
| 141 | + | |
| 134 | 142 | List<BasicConfig> area = queryBasicConfig(regionsQuery); |
| 135 | 143 | if (CollectionUtils.isNotEmpty(area)) |
| 136 | 144 | { |
| 137 | 145 | |
| ... | ... | @@ -140,10 +148,11 @@ |
| 140 | 148 | |
| 141 | 149 | regionsQuery = new BasicConfigQuery(); |
| 142 | 150 | regionsQuery.setOrName(items.get(2)); |
| 151 | + regionsQuery.setTypeId(SystemConfig.CHINA_TYPE_ID); | |
| 143 | 152 | regionsQuery.setParentId(area.get(0).getId()); |
| 144 | 153 | |
| 145 | 154 | List<BasicConfig> street = queryBasicConfig(regionsQuery); |
| 146 | - if (CollectionUtils.isNotEmpty(area)) | |
| 155 | + if (CollectionUtils.isNotEmpty(street)) | |
| 147 | 156 | { |
| 148 | 157 | map.put("streetId",street.get(0).getId()); |
| 149 | 158 | } |
| ... | ... | @@ -152,7 +161,7 @@ |
| 152 | 161 | } |
| 153 | 162 | |
| 154 | 163 | } |
| 155 | - map.put("address",items.get(items.size()-1)); | |
| 164 | + map.put("address", items.get(items.size()-1)); | |
| 156 | 165 | } |
| 157 | 166 | else if (items != null && items.size() == 5) |
| 158 | 167 | { |
| ... | ... | @@ -173,6 +182,7 @@ |
| 173 | 182 | map.put("cityId",cityList.get(0).getId()); |
| 174 | 183 | |
| 175 | 184 | regionsQuery = new BasicConfigQuery(); |
| 185 | + regionsQuery.setTypeId(SystemConfig.CHINA_TYPE_ID); | |
| 176 | 186 | regionsQuery.setOrName(items.get(2)); |
| 177 | 187 | regionsQuery.setParentId(cityList.get(0).getId()); |
| 178 | 188 | List<BasicConfig> area = queryBasicConfig(regionsQuery); |
| 179 | 189 | |
| 180 | 190 | |
| 181 | 191 | |
| 182 | 192 | |
| 183 | 193 | |
| ... | ... | @@ -180,197 +190,20 @@ |
| 180 | 190 | { |
| 181 | 191 | map.put("areaId",area.get(0).getId()); |
| 182 | 192 | regionsQuery = new BasicConfigQuery(); |
| 193 | + regionsQuery.setTypeId(SystemConfig.CHINA_TYPE_ID); | |
| 183 | 194 | regionsQuery.setOrName(items.get(3)); |
| 184 | 195 | regionsQuery.setParentId(area.get(0).getId()); |
| 185 | 196 | |
| 186 | 197 | List<BasicConfig> street = queryBasicConfig(regionsQuery); |
| 187 | - if (CollectionUtils.isNotEmpty(area)) | |
| 198 | + if (CollectionUtils.isNotEmpty(street)) | |
| 188 | 199 | { |
| 189 | 200 | map.put("streetId",street.get(0).getId()); |
| 190 | 201 | } |
| 191 | - | |
| 192 | 202 | } |
| 193 | 203 | } |
| 194 | - | |
| 195 | 204 | } |
| 196 | 205 | map.put("address",items.get(items.size()-1)); |
| 197 | - | |
| 198 | 206 | } |
| 199 | - | |
| 200 | - | |
| 201 | - | |
| 202 | -// if (items != null && items.size() >3) | |
| 203 | -// { | |
| 204 | -// BasicConfigQuery regionsQuery = new BasicConfigQuery(); | |
| 205 | -// regionsQuery.setName(items.get(items.size()-2)); | |
| 206 | -// regionsQuery.setYn(YnEnums.YES.getId()); | |
| 207 | -// | |
| 208 | -// List<BasicConfig> list = queryBasicConfig(regionsQuery); | |
| 209 | -// boolean isArea = false; | |
| 210 | -// if (CollectionUtils.isNotEmpty(list)) | |
| 211 | -// { | |
| 212 | -// for(BasicConfig bc : list) | |
| 213 | -// { | |
| 214 | -// regionsQuery = new BasicConfigQuery(); | |
| 215 | -// regionsQuery.setId(bc.getParentId()); | |
| 216 | -// regionsQuery.setYn(YnEnums.YES.getId()); | |
| 217 | -// List<BasicConfig> list1 = queryBasicConfig(regionsQuery); | |
| 218 | -// if (CollectionUtils.isNotEmpty(list1)) { | |
| 219 | -// for (BasicConfig bc1 : list1) { | |
| 220 | -// if (bc1.getName().trim().equals(items.get(items.size()-3)) || bc1.getName().trim().equals("抚宁区")) | |
| 221 | -// { | |
| 222 | -// map.put("streetId",bc.getId()); | |
| 223 | -// map.put("areaId",bc1.getId()); | |
| 224 | -// map.put("cityId",bc1.getParentId()); | |
| 225 | -// | |
| 226 | -// regionsQuery = new BasicConfigQuery(); | |
| 227 | -// regionsQuery.setId(bc1.getParentId()); | |
| 228 | -// regionsQuery.setYn(YnEnums.YES.getId()); | |
| 229 | -// List<BasicConfig> list2 = queryBasicConfig(regionsQuery); | |
| 230 | -// | |
| 231 | -// if (CollectionUtils.isNotEmpty(list2)) { | |
| 232 | -// for (BasicConfig bc2 : list2) { | |
| 233 | -// if (bc2.getName().trim().equals(items.get(0))) | |
| 234 | -// { | |
| 235 | -// map.put("provinceId",bc2.getId()); | |
| 236 | -// break; | |
| 237 | -// } | |
| 238 | -// } | |
| 239 | -// } | |
| 240 | -// isArea = true; | |
| 241 | -// break; | |
| 242 | -// } | |
| 243 | -// } | |
| 244 | -// } | |
| 245 | -// } | |
| 246 | -// if (!isArea) | |
| 247 | -// { | |
| 248 | -// if (items.size() == 5) | |
| 249 | -// { | |
| 250 | -// regionsQuery = new BasicConfigQuery(); | |
| 251 | -// regionsQuery.setName(items.get(2)); | |
| 252 | -// regionsQuery.setYn(YnEnums.YES.getId()); | |
| 253 | -// | |
| 254 | -// list = queryBasicConfig(regionsQuery); | |
| 255 | -// //area找到 | |
| 256 | -// if (CollectionUtils.isNotEmpty(list)) | |
| 257 | -// { | |
| 258 | -// for (BasicConfig bc1 : list) { | |
| 259 | -// | |
| 260 | -// regionsQuery = new BasicConfigQuery(); | |
| 261 | -// regionsQuery.setId(bc1.getParentId()); | |
| 262 | -// regionsQuery.setYn(YnEnums.YES.getId()); | |
| 263 | -// List<BasicConfig> cityList = queryBasicConfig(regionsQuery); | |
| 264 | -// | |
| 265 | -// if (CollectionUtils.isNotEmpty(cityList)) | |
| 266 | -// { | |
| 267 | -// for (BasicConfig cl : cityList) { | |
| 268 | -// if (cl.getName().trim().equals(items.get(1))) | |
| 269 | -// { | |
| 270 | -// map.put("cityId",cl.getId()); | |
| 271 | -// map.put("provinceId",cl.getParentId()); | |
| 272 | -// break; | |
| 273 | -// } | |
| 274 | -// } | |
| 275 | -// } | |
| 276 | -// } | |
| 277 | -// } | |
| 278 | -// else | |
| 279 | -// { | |
| 280 | -// regionsQuery = new BasicConfigQuery(); | |
| 281 | -// regionsQuery.setName(items.get(1)); | |
| 282 | -// regionsQuery.setYn(YnEnums.YES.getId()); | |
| 283 | -// | |
| 284 | -// list = queryBasicConfig(regionsQuery); | |
| 285 | -// //city找到 | |
| 286 | -// if (CollectionUtils.isNotEmpty(list)) { | |
| 287 | -// boolean isFind = false; | |
| 288 | -// for (BasicConfig bc1 : list) { | |
| 289 | -// if (bc1.getName().trim().equals(items.get(1))) | |
| 290 | -// { | |
| 291 | -// regionsQuery = new BasicConfigQuery(); | |
| 292 | -// regionsQuery.setId(bc1.getParentId()); | |
| 293 | -// regionsQuery.setYn(YnEnums.YES.getId()); | |
| 294 | -// List<BasicConfig> list2 = queryBasicConfig(regionsQuery); | |
| 295 | -// | |
| 296 | -// if (CollectionUtils.isNotEmpty(list2)) { | |
| 297 | -// for (BasicConfig bc2 : list2) { | |
| 298 | -// if (bc2.getName().trim().equals(items.get(0))) | |
| 299 | -// { | |
| 300 | -// map.put("cityId",bc1.getId()); | |
| 301 | -// map.put("provinceId",bc2.getId()); | |
| 302 | -// isFind = true; | |
| 303 | -// } | |
| 304 | -// } | |
| 305 | -// } | |
| 306 | -// if (isFind) | |
| 307 | -// { | |
| 308 | -// break; | |
| 309 | -// } | |
| 310 | -// } | |
| 311 | -// } | |
| 312 | -// | |
| 313 | -// } | |
| 314 | -// } | |
| 315 | -// } | |
| 316 | -// else if (items.size() == 4) | |
| 317 | -// { | |
| 318 | -// regionsQuery = new BasicConfigQuery(); | |
| 319 | -// regionsQuery.setName(items.get(1)); | |
| 320 | -// regionsQuery.setYn(YnEnums.YES.getId()); | |
| 321 | -// | |
| 322 | -// list = queryBasicConfig(regionsQuery); | |
| 323 | -// //area找到 | |
| 324 | -// if (CollectionUtils.isNotEmpty(list)) | |
| 325 | -// { | |
| 326 | -// boolean isFind = false; | |
| 327 | -// for (BasicConfig bc1 : list) { | |
| 328 | -// if (bc1.getName().trim().equals(items.get(1))) | |
| 329 | -// { | |
| 330 | -// regionsQuery = new BasicConfigQuery(); | |
| 331 | -// regionsQuery.setId(bc1.getParentId()); | |
| 332 | -// regionsQuery.setYn(YnEnums.YES.getId()); | |
| 333 | -// List<BasicConfig> list2 = queryBasicConfig(regionsQuery); | |
| 334 | -// if (CollectionUtils.isNotEmpty(list2)) { | |
| 335 | -// for (BasicConfig bc2 : list2) { | |
| 336 | -// if (bc2.getName().trim().equals(items.get(0))) | |
| 337 | -// { | |
| 338 | -// map.put("areaId",bc1.getId()); | |
| 339 | -// map.put("cityId",bc1.getParentId()); | |
| 340 | -// map.put("provinceId",bc2.getId()); | |
| 341 | -// isFind = true; | |
| 342 | -// } | |
| 343 | -// } | |
| 344 | -// } | |
| 345 | -// if (isFind) | |
| 346 | -// { | |
| 347 | -// break; | |
| 348 | -// } | |
| 349 | -// } | |
| 350 | -// } | |
| 351 | -// } | |
| 352 | -// else | |
| 353 | -// { | |
| 354 | -// regionsQuery = new BasicConfigQuery(); | |
| 355 | -// regionsQuery.setName(items.get(0)); | |
| 356 | -// regionsQuery.setYn(YnEnums.YES.getId()); | |
| 357 | -// | |
| 358 | -// list = queryBasicConfig(regionsQuery); | |
| 359 | -// //province找到 | |
| 360 | -// if (CollectionUtils.isNotEmpty(list)) { | |
| 361 | -// for (BasicConfig bc1 : list) { | |
| 362 | -// map.put("provinceId",bc1.getId()); | |
| 363 | -// break; | |
| 364 | -// } | |
| 365 | -// | |
| 366 | -// } | |
| 367 | -// } | |
| 368 | -// } | |
| 369 | -// } | |
| 370 | -// map.put("address",items.get(items.size()-1)); | |
| 371 | -// } | |
| 372 | -// } | |
| 373 | - | |
| 374 | 207 | BaseObjectResponse objectResponse = new BaseObjectResponse(); |
| 375 | 208 | objectResponse.setData(map); |
| 376 | 209 | objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); |