From cc2921e1afdf95a0bc73b27d8e0a1502756ca099 Mon Sep 17 00:00:00 2001 From: "rui.zhang" Date: Fri, 29 Apr 2016 09:33:35 +0800 Subject: [PATCH] platform permission add return pageinfo --- .../platform/permission/model/Organization.java | 55 +++++++++++++++++----- .../common/enums/OrganizationLevelEnum.java | 6 ++- .../common/enums/OrganizationTypeEnum.java | 6 ++- .../lyms/platform/common/result/IdTextModel.java | 34 +++++++++++++ .../web/controller/OrganizationController.java | 13 ++++- 5 files changed, 96 insertions(+), 18 deletions(-) create mode 100644 platform-common/src/main/java/com/lyms/platform/common/result/IdTextModel.java diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Organization.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Organization.java index 729489c..051ac8e 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Organization.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Organization.java @@ -1,5 +1,7 @@ package com.lyms.platform.permission.model; +import com.lyms.platform.common.result.IdTextModel; + import java.util.Date; public class Organization { @@ -20,29 +22,58 @@ public class Organization { private Date created; private String shortCode; - private String levelStr; - private String typeStr; + private IdTextModel levelObj; + private IdTextModel typeObj; + private Regions province; + private Regions city; + private Regions area; - public String getShortCode() { - return shortCode; + public Regions getProvince() { + return province; + } + + public void setProvince(Regions province) { + this.province = province; } - public String getLevelStr() { - return levelStr; + public Regions getCity() { + return city; } - public void setLevelStr(String levelStr) { - this.levelStr = levelStr; + public void setCity(Regions city) { + this.city = city; } - public String getTypeStr() { - return typeStr; + public Regions getArea() { + return area; } - public void setTypeStr(String typeStr) { - this.typeStr = typeStr; + public void setArea(Regions area) { + this.area = area; } + public IdTextModel getLevelObj() { + return levelObj; + } + + public void setLevelObj(IdTextModel levelObj) { + this.levelObj = levelObj; + } + + public IdTextModel getTypeObj() { + return typeObj; + } + + public void setTypeObj(IdTextModel typeObj) { + this.typeObj = typeObj; + } + + public String getShortCode() { + return shortCode; + } + + + public void setShortCode(String shortCode) { this.shortCode = shortCode; } diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/OrganizationLevelEnum.java b/platform-common/src/main/java/com/lyms/platform/common/enums/OrganizationLevelEnum.java index fe140d9..20ce0a4 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/OrganizationLevelEnum.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/OrganizationLevelEnum.java @@ -1,5 +1,7 @@ package com.lyms.platform.common.enums; +import com.lyms.platform.common.result.IdTextModel; + import java.util.HashMap; /** @@ -36,10 +38,10 @@ public enum OrganizationLevelEnum { this.text = text; } - public static String getById(int id) { + public static IdTextModel getById(int id) { for (OrganizationLevelEnum e : OrganizationLevelEnum.values()) { if(e.getId().equals(id)) { - return e.getText(); + return new IdTextModel(e.getId().toString(), e.getText()); } } return null; diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/OrganizationTypeEnum.java b/platform-common/src/main/java/com/lyms/platform/common/enums/OrganizationTypeEnum.java index 1a38c57..d54e6da 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/OrganizationTypeEnum.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/OrganizationTypeEnum.java @@ -1,5 +1,7 @@ package com.lyms.platform.common.enums; +import com.lyms.platform.common.result.IdTextModel; + /** * 机构类型 * Created by Zhang.Rui on 2016/4/7. @@ -35,10 +37,10 @@ public enum OrganizationTypeEnum { this.text = text; } - public static String getById(int id) { + public static IdTextModel getById(int id) { for (OrganizationTypeEnum e : OrganizationTypeEnum.values()) { if(e.getId().equals(id)) { - return e.getText(); + return new IdTextModel(e.getId().toString(), e.getText()); } } return null; diff --git a/platform-common/src/main/java/com/lyms/platform/common/result/IdTextModel.java b/platform-common/src/main/java/com/lyms/platform/common/result/IdTextModel.java new file mode 100644 index 0000000..6151588 --- /dev/null +++ b/platform-common/src/main/java/com/lyms/platform/common/result/IdTextModel.java @@ -0,0 +1,34 @@ +package com.lyms.platform.common.result; + +/** + * Created by Zhang.Rui on 2016/4/29. + */ +public class IdTextModel { + private String id; + private String text; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getText() { + return text; + } + + public void setText(String text) { + this.text = text; + } + + public IdTextModel(String id, String text) { + this.id = id; + this.text = text; + } + + public IdTextModel() { + + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java index c262e9d..495c8c0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java @@ -221,8 +221,17 @@ public class OrganizationController extends BaseController { List organizations = organizationService.queryOrganization(organizationQuery); for(Organization organization : organizations) { - organization.setTypeStr(OrganizationLevelEnum.getById(organization.getLevel())); - organization.setLevelStr(OrganizationTypeEnum.getById(organization.getType())); + organization.setTypeObj(OrganizationLevelEnum.getById(organization.getLevel())); + organization.setLevelObj(OrganizationTypeEnum.getById(organization.getType())); + if(null != organization.getProvinceId()) { + organization.setProvince(regionsService.getRegions(organization.getProvinceId())); + } + if(null != organization.getCityId()) { + organization.setCity(regionsService.getRegions(organization.getCityId())); + } + if(null != organization.getAreaId()) { + organization.setArea(regionsService.getRegions(organization.getAreaId())); + } } FrontEndResult frontEndResult = new FrontEndResult(); -- 1.8.3.1