diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/ConfigTypeEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/ConfigTypeEnums.java new file mode 100644 index 0000000..a4e1830 --- /dev/null +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/ConfigTypeEnums.java @@ -0,0 +1,52 @@ +package com.lyms.platform.common.enums; + + +import com.lyms.platform.common.utils.SystemConfig; + +/** + * Created by lqy on 2016/06/20 + */ +public enum ConfigTypeEnums { + + + CERT_TYPE("cert",SystemConfig.CERTE_TYPE_ID), + COUNTRY_TYPE("country",SystemConfig.COUNTRY_TYPE_ID), + NATION_TYPE("nation",SystemConfig.NATION_TYPE_ID), + PROFESSION_TYPE("profession",SystemConfig.PROFESSION_TYPE_ID), + CENSUS_TYPE("census",SystemConfig.CENSUS_TYPE_ID), + LIVE_TYPE("live",SystemConfig.LIVE_TYPE_ID), + LEVEL_TYPE("level",SystemConfig.LEVEL_TYPE_ID); + + + private ConfigTypeEnums(String type,String value){ + this.type=type; + this.value = value; + } + private String type; + private String value; + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + public static String getTypeParentId(String ctype){ + for(ConfigTypeEnums s : ConfigTypeEnums.values()) { + if(ctype.equals(s.getType())){ + return s.getValue(); + } + } + return ""; + } + +} diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/ServiceTypeEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/ServiceTypeEnums.java index 263a7db..9828d49 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/ServiceTypeEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/ServiceTypeEnums.java @@ -33,7 +33,7 @@ public enum ServiceTypeEnums { List> list = new ArrayList<>(); for(ServiceTypeEnums s : ServiceTypeEnums.values()) { Map map = new HashMap<>(); - map.put("id", s.getId()+""); + map.put("id", String.valueOf(s.getId())); map.put("name", s.getTitle()); list.add(map); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BasicConfigController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BasicConfigController.java index 3d55eb5..0448bfa 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BasicConfigController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BasicConfigController.java @@ -3,6 +3,7 @@ package com.lyms.platform.operate.web.controller; import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.result.BaseListResponse; +import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.operate.web.facade.BasicConfigFacade; import com.lyms.platform.operate.web.request.BasicConfigAddRequest; @@ -125,4 +126,18 @@ public class BasicConfigController extends BaseController { basicConfigFacade.batchAddBasicConfig(list); return 1; } + + + /** + * + * 查询基础数据根据类型 + * + * @return 返回结果 + */ + @RequestMapping(method = RequestMethod.GET, value = "/getBaseConfigByType") + @ResponseBody + public BaseObjectResponse getBaseConfigByType(@RequestParam("type") String type) { + return basicConfigFacade.getBaseConfigByType(type); + } + } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BookbuildingController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BookbuildingController.java index d56fe19..37f15f5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BookbuildingController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BookbuildingController.java @@ -21,7 +21,7 @@ import com.lyms.platform.operate.web.request.YunBookbuildingAddRequest; /* - *儿童、孕妇建档 + *孕妇建档 * lqy * 2016-06-15 */ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java index 98b9b5b..d729faf 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java @@ -121,6 +121,22 @@ public class EnumsController { return list; } + /** + * 获取服务类型接口 + */ + @RequestMapping(value = "/getServiceType", method = RequestMethod.GET) + @ResponseBody + public List getServiceType() { + List> list = new ArrayList<>(); + for(ServiceTypeEnums s : ServiceTypeEnums.values()) { + Map map = new HashMap<>(); + map.put("id", String.valueOf(s.getId())); + map.put("name", s.getTitle()); + list.add(map); + } + return list; + } + public static void main(String a[]) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java index 3453e34..fd736a6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java @@ -2,9 +2,13 @@ package com.lyms.platform.operate.web.facade; import com.lyms.platform.biz.service.BasicConfigService; import com.lyms.platform.common.constants.ErrorCodeConstants; +import com.lyms.platform.common.enums.ConfigTypeEnums; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseListResponse; +import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.common.utils.StringUtils; +import com.lyms.platform.common.utils.SystemConfig; import com.lyms.platform.operate.web.request.BasicConfigAddRequest; import com.lyms.platform.operate.web.request.BasicConfigQueryRequest; import com.lyms.platform.operate.web.request.BasicConfigUpdateRequest; @@ -171,4 +175,29 @@ public class BasicConfigFacade { } return provincesResults; } + + /** + * 根据类型查询响应的 基础数据 + * @param type + * @return + */ + public BaseObjectResponse getBaseConfigByType(String type) { + + BaseObjectResponse objectResponse = new BaseObjectResponse(); + + List results = new ArrayList<>(); + + String parentId = ConfigTypeEnums.getTypeParentId(type); + + if (!StringUtils.isEmpty(parentId)) + { + results = getBaseicConfigByParentId(parentId); + } + objectResponse.setData(results); + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + objectResponse.setErrormsg("成功"); + return objectResponse; + } + + } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java new file mode 100644 index 0000000..71b3779 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java @@ -0,0 +1,43 @@ +package com.lyms.platform.operate.web.request; + +/** + * Created by lqy on 2016/6/17. + */ +public class BabyManageRequest { + //孕妇名称 + private String name; + + //服务类型 + private Integer serviceType; + + //身份证号 + private String cardNo; + + + //儿童管理类型 0全部 1高危 + private Integer babyType; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getCardNo() { + return cardNo; + } + + public void setCardNo(String cardNo) { + this.cardNo = cardNo; + } + + public Integer getServiceType() { + return serviceType; + } + + public void setServiceType(Integer serviceType) { + this.serviceType = serviceType; + } +} diff --git a/platform-resource/resources/config-dev.properties b/platform-resource/resources/config-dev.properties index b08fb18..7c81f99 100644 --- a/platform-resource/resources/config-dev.properties +++ b/platform-resource/resources/config-dev.properties @@ -1,12 +1,12 @@ -mongo.db.host=localhost -mongo.db.port=27017 -mongo.db.dbname=platform1 +mongo.db.host=119.90.57.26 +mongo.db.port=10001 +mongo.db.dbname=platform mongo.db.username=platform mongo.db.password=platform123 mongo.socketTimeout=1000 mongo.connectionsPerHost=20 mongo.threadsAllowedToBlockForConnectionMultiplier=10 -mongo.connectTimeout=1000 +mongo.connectTimeout=10000 mongo.maxWaitTime=2000 mongo.autoConnectRetry=true mongo.socketKeepAlive=true