From 385c38c21810a445f8a6f09a1ff2cdf60823c58b Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 22 Dec 2017 15:58:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9D=80=E8=A7=A3=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/biz/service/BasicConfigService.java | 195 ++------------------- 1 file changed, 14 insertions(+), 181 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BasicConfigService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BasicConfigService.java index 1603f12..9ef8b07 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BasicConfigService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BasicConfigService.java @@ -12,6 +12,7 @@ import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.utils.AddressUtil; import com.lyms.platform.common.utils.CacheHelper; +import com.lyms.platform.common.utils.SystemConfig; import com.lyms.platform.pojo.BasicConfig; import com.lyms.platform.query.BasicConfigQuery; import org.apache.commons.collections.CollectionUtils; @@ -107,15 +108,19 @@ public class BasicConfigService implements InitializingBean { System.out.println("result = " + items); BasicConfigQuery regionsQuery = new BasicConfigQuery(); + regionsQuery.setTypeId(SystemConfig.CHINA_TYPE_ID); regionsQuery.setYn(YnEnums.YES.getId()); + if (items != null && items.size() == 4) { regionsQuery.setOrName(items.get(0)); List provinceList = queryBasicConfig(regionsQuery); + if (CollectionUtils.isNotEmpty(provinceList)) { regionsQuery = new BasicConfigQuery(); + regionsQuery.setTypeId(SystemConfig.CHINA_TYPE_ID); regionsQuery.setParentId(provinceList.get(0).getId()); map.put("provinceId",provinceList.get(0).getId()); @@ -129,8 +134,11 @@ public class BasicConfigService implements InitializingBean { } regionsQuery = new BasicConfigQuery(); + regionsQuery.setTypeId(SystemConfig.CHINA_TYPE_ID); regionsQuery.setOrName(items.get(1)); regionsQuery.setParentIds(cityIds); + + List area = queryBasicConfig(regionsQuery); if (CollectionUtils.isNotEmpty(area)) { @@ -140,10 +148,11 @@ public class BasicConfigService implements InitializingBean { regionsQuery = new BasicConfigQuery(); regionsQuery.setOrName(items.get(2)); + regionsQuery.setTypeId(SystemConfig.CHINA_TYPE_ID); regionsQuery.setParentId(area.get(0).getId()); List street = queryBasicConfig(regionsQuery); - if (CollectionUtils.isNotEmpty(area)) + if (CollectionUtils.isNotEmpty(street)) { map.put("streetId",street.get(0).getId()); } @@ -152,7 +161,7 @@ public class BasicConfigService implements InitializingBean { } } - map.put("address",items.get(items.size()-1)); + map.put("address", items.get(items.size()-1)); } else if (items != null && items.size() == 5) { @@ -173,6 +182,7 @@ public class BasicConfigService implements InitializingBean { map.put("cityId",cityList.get(0).getId()); regionsQuery = new BasicConfigQuery(); + regionsQuery.setTypeId(SystemConfig.CHINA_TYPE_ID); regionsQuery.setOrName(items.get(2)); regionsQuery.setParentId(cityList.get(0).getId()); List area = queryBasicConfig(regionsQuery); @@ -180,197 +190,20 @@ public class BasicConfigService implements InitializingBean { { map.put("areaId",area.get(0).getId()); regionsQuery = new BasicConfigQuery(); + regionsQuery.setTypeId(SystemConfig.CHINA_TYPE_ID); regionsQuery.setOrName(items.get(3)); regionsQuery.setParentId(area.get(0).getId()); List street = queryBasicConfig(regionsQuery); - if (CollectionUtils.isNotEmpty(area)) + if (CollectionUtils.isNotEmpty(street)) { map.put("streetId",street.get(0).getId()); } - } } - } map.put("address",items.get(items.size()-1)); - } - - - -// if (items != null && items.size() >3) -// { -// BasicConfigQuery regionsQuery = new BasicConfigQuery(); -// regionsQuery.setName(items.get(items.size()-2)); -// regionsQuery.setYn(YnEnums.YES.getId()); -// -// List list = queryBasicConfig(regionsQuery); -// boolean isArea = false; -// if (CollectionUtils.isNotEmpty(list)) -// { -// for(BasicConfig bc : list) -// { -// regionsQuery = new BasicConfigQuery(); -// regionsQuery.setId(bc.getParentId()); -// regionsQuery.setYn(YnEnums.YES.getId()); -// List list1 = queryBasicConfig(regionsQuery); -// if (CollectionUtils.isNotEmpty(list1)) { -// for (BasicConfig bc1 : list1) { -// if (bc1.getName().trim().equals(items.get(items.size()-3)) || bc1.getName().trim().equals("抚宁区")) -// { -// map.put("streetId",bc.getId()); -// map.put("areaId",bc1.getId()); -// map.put("cityId",bc1.getParentId()); -// -// regionsQuery = new BasicConfigQuery(); -// regionsQuery.setId(bc1.getParentId()); -// regionsQuery.setYn(YnEnums.YES.getId()); -// List list2 = queryBasicConfig(regionsQuery); -// -// if (CollectionUtils.isNotEmpty(list2)) { -// for (BasicConfig bc2 : list2) { -// if (bc2.getName().trim().equals(items.get(0))) -// { -// map.put("provinceId",bc2.getId()); -// break; -// } -// } -// } -// isArea = true; -// break; -// } -// } -// } -// } -// if (!isArea) -// { -// if (items.size() == 5) -// { -// regionsQuery = new BasicConfigQuery(); -// regionsQuery.setName(items.get(2)); -// regionsQuery.setYn(YnEnums.YES.getId()); -// -// list = queryBasicConfig(regionsQuery); -// //area找到 -// if (CollectionUtils.isNotEmpty(list)) -// { -// for (BasicConfig bc1 : list) { -// -// regionsQuery = new BasicConfigQuery(); -// regionsQuery.setId(bc1.getParentId()); -// regionsQuery.setYn(YnEnums.YES.getId()); -// List cityList = queryBasicConfig(regionsQuery); -// -// if (CollectionUtils.isNotEmpty(cityList)) -// { -// for (BasicConfig cl : cityList) { -// if (cl.getName().trim().equals(items.get(1))) -// { -// map.put("cityId",cl.getId()); -// map.put("provinceId",cl.getParentId()); -// break; -// } -// } -// } -// } -// } -// else -// { -// regionsQuery = new BasicConfigQuery(); -// regionsQuery.setName(items.get(1)); -// regionsQuery.setYn(YnEnums.YES.getId()); -// -// list = queryBasicConfig(regionsQuery); -// //city找到 -// if (CollectionUtils.isNotEmpty(list)) { -// boolean isFind = false; -// for (BasicConfig bc1 : list) { -// if (bc1.getName().trim().equals(items.get(1))) -// { -// regionsQuery = new BasicConfigQuery(); -// regionsQuery.setId(bc1.getParentId()); -// regionsQuery.setYn(YnEnums.YES.getId()); -// List list2 = queryBasicConfig(regionsQuery); -// -// if (CollectionUtils.isNotEmpty(list2)) { -// for (BasicConfig bc2 : list2) { -// if (bc2.getName().trim().equals(items.get(0))) -// { -// map.put("cityId",bc1.getId()); -// map.put("provinceId",bc2.getId()); -// isFind = true; -// } -// } -// } -// if (isFind) -// { -// break; -// } -// } -// } -// -// } -// } -// } -// else if (items.size() == 4) -// { -// regionsQuery = new BasicConfigQuery(); -// regionsQuery.setName(items.get(1)); -// regionsQuery.setYn(YnEnums.YES.getId()); -// -// list = queryBasicConfig(regionsQuery); -// //area找到 -// if (CollectionUtils.isNotEmpty(list)) -// { -// boolean isFind = false; -// for (BasicConfig bc1 : list) { -// if (bc1.getName().trim().equals(items.get(1))) -// { -// regionsQuery = new BasicConfigQuery(); -// regionsQuery.setId(bc1.getParentId()); -// regionsQuery.setYn(YnEnums.YES.getId()); -// List list2 = queryBasicConfig(regionsQuery); -// if (CollectionUtils.isNotEmpty(list2)) { -// for (BasicConfig bc2 : list2) { -// if (bc2.getName().trim().equals(items.get(0))) -// { -// map.put("areaId",bc1.getId()); -// map.put("cityId",bc1.getParentId()); -// map.put("provinceId",bc2.getId()); -// isFind = true; -// } -// } -// } -// if (isFind) -// { -// break; -// } -// } -// } -// } -// else -// { -// regionsQuery = new BasicConfigQuery(); -// regionsQuery.setName(items.get(0)); -// regionsQuery.setYn(YnEnums.YES.getId()); -// -// list = queryBasicConfig(regionsQuery); -// //province找到 -// if (CollectionUtils.isNotEmpty(list)) { -// for (BasicConfig bc1 : list) { -// map.put("provinceId",bc1.getId()); -// break; -// } -// -// } -// } -// } -// } -// map.put("address",items.get(items.size()-1)); -// } -// } - BaseObjectResponse objectResponse = new BaseObjectResponse(); objectResponse.setData(map); objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); -- 1.8.3.1