diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CommunityConfigService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CommunityConfigService.java index f3459ba..66dfedc 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CommunityConfigService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CommunityConfigService.java @@ -2,6 +2,7 @@ package com.lyms.platform.biz.service; import java.util.List; +import org.aspectj.apache.bcel.generic.RET; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -40,9 +41,23 @@ public class CommunityConfigService { MongoCondition mongoCondition = MongoCondition.newInstance(); if(null != keyword) { mongoCondition.orCondition(new MongoCondition[]{new MongoCondition("name", keyword, MongoOper.LIKE), new MongoCondition("parentId", keyword, MongoOper.LIKE)}); + mongoCondition.andCondition(new MongoCondition("yn", YnEnums.YES.getId(), MongoOper.IS)); } return communityConfigDao.queryArea(mongoCondition.toMongoQuery()); } + + //查询区域根据ID + public CommunityConfig queryAreaById(String id) { + if(null == id) return null; + + MongoCondition mongoCondition = MongoCondition.newInstance().and("id", id, MongoOper.IS).and("yn", YnEnums.YES.getId(), MongoOper.IS); + + List communityConfigs = communityConfigDao.queryArea(mongoCondition.toMongoQuery()); + if(null != communityConfigs && 1 == communityConfigs.size()) { + return communityConfigs.get(0); + } + return null; + } } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/CommunityConfig.java b/platform-dal/src/main/java/com/lyms/platform/pojo/CommunityConfig.java index 0d0ae6b..6d7870a 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/CommunityConfig.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/CommunityConfig.java @@ -11,6 +11,16 @@ public class CommunityConfig { private String parentId; private Integer yn; + private CommunityConfig parent; + + public CommunityConfig getParent() { + return parent; + } + + public void setParent(CommunityConfig parent) { + this.parent = parent; + } + public CommunityConfig(String parentId, String tmp) { this.parentId = parentId; this.yn = YnEnums.YES.getId(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CommunityConfigController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CommunityConfigController.java index 1a78d8f..3aedf12 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CommunityConfigController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CommunityConfigController.java @@ -74,11 +74,21 @@ public class CommunityConfigController extends RestController { @ResponseBody public BaseListResponse queryArea(String keyword ) { List communityConfigList = communityConfigService.queryArea(keyword); + + for(CommunityConfig communityConfig : communityConfigList) { + if(null != communityConfig.getParentId()) { + communityConfig.setParent(communityConfigService.queryAreaById(communityConfig.getParentId())); + } else { + communityConfig.setParent(new CommunityConfig("0", "root")); + } + } + return new BaseListResponse().setData(communityConfigList) .setErrorcode(ErrorCodeConstants.SUCCESS) .setErrormsg("查询成功!"); } + // @RequestMapping(value = "communityConfigTest", method = RequestMethod.GET) @ResponseBody diff --git a/platform-operate-api/src/main/resources/database.properties b/platform-operate-api/src/main/resources/database.properties index 907beea..b821e6e 100644 --- a/platform-operate-api/src/main/resources/database.properties +++ b/platform-operate-api/src/main/resources/database.properties @@ -2,7 +2,7 @@ #mongo.db.port=27017 #mongo.db.dbname=platform -mongo.db.host=localhost +mongo.db.host=192.168.5.223 mongo.db.port=27017 mongo.db.dbname=platform mongo.db.username=root