From d12ac03f6df79a15f75350a604c221f2f7b321f7 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Sun, 1 May 2016 14:14:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=BA=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/permission/model/Organization.java | 18 ++++---- .../web/controller/OrganizationController.java | 53 ++++++++++++++-------- .../platform/operate/web/utils/CommonsHelper.java | 18 ++++++++ 3 files changed, 61 insertions(+), 28 deletions(-) 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 db08175..7bab3ce 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 @@ -28,9 +28,9 @@ public class Organization { private IdTextModel levelObj; private IdTextModel typeObj; - private BasicConfig province; - private BasicConfig city; - private BasicConfig area; + private Object province; + private Object city; + private Object area; private String foreignId; Map departmentsMap = new HashMap<>(); @@ -51,27 +51,27 @@ public class Organization { this.foreignId = foreignId; } - public BasicConfig getProvince() { + public Object getProvince() { return province; } - public void setProvince(BasicConfig province) { + public void setProvince(Object province) { this.province = province; } - public BasicConfig getCity() { + public Object getCity() { return city; } - public void setCity(BasicConfig city) { + public void setCity(Object city) { this.city = city; } - public BasicConfig getArea() { + public Object getArea() { return area; } - public void setArea(BasicConfig area) { + public void setArea(Object area) { this.area = area; } 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 9feb337..a3a4adc 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 @@ -12,6 +12,7 @@ import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.utils.ResultUtils; import com.lyms.platform.common.utils.SystemConfig; import com.lyms.platform.operate.web.result.FrontEndResult; +import com.lyms.platform.operate.web.utils.CommonsHelper; import com.lyms.platform.permission.model.*; import com.lyms.platform.permission.service.*; import com.lyms.platform.pojo.BasicConfig; @@ -22,8 +23,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.util.Date; -import java.util.List; +import java.util.*; /** * Created by zhang.rui on 2015/9/28 0028. @@ -203,12 +203,13 @@ public class OrganizationController extends RestController { @RequestMapping(value = "/organization", method = RequestMethod.GET) @ResponseBody @TokenRequired - public FrontEndResult getOrganization(HttpServletResponse response, + public FrontEndResult getOrganization( @RequestParam(value = "id", required = false) Integer id, @RequestParam(value = "keyword", required = false) String keyword, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "limit", required = false) Integer limit, - @RequestParam(value = "areaId", required = false) String areaId) { + @RequestParam(value = "areaId", required = false) String areaId, + @RequestParam(value = "lite", required = false) String f) { limit = limit == null ? 10 : limit; page = page == null ? 1 : page; @@ -243,30 +244,44 @@ public class OrganizationController extends RestController { } List organizations = organizationService.queryOrganization(organizationQuery); - + List data = new ArrayList<>(); + boolean falg =StringUtils.isNotEmpty(f); for(Organization organization : organizations) { organization.setTypeObj(OrganizationLevelEnum.getById(organization.getLevel())); organization.setLevelObj(OrganizationTypeEnum.getById(organization.getType())); - if(null != organization.getProvinceId()) { - organization.setProvince(basicConfigService.getOneBasicConfigById(organization.getProvinceId())); - } - if(null != organization.getCityId()) { - organization.setCity(basicConfigService.getOneBasicConfigById(organization.getCityId())); - } - if(null != organization.getAreaId()) { - organization.setArea(basicConfigService.getOneBasicConfigById(organization.getAreaId())); + if(null != organization.getProvinceId()) { + organization.setProvince(CommonsHelper.convterToMap(basicConfigService.getOneBasicConfigById(organization.getProvinceId()),falg)); + } + if(null != organization.getCityId()) { + organization.setCity(CommonsHelper.convterToMap(basicConfigService.getOneBasicConfigById(organization.getCityId()),falg)); + } + if(null != organization.getAreaId()) { + organization.setArea(CommonsHelper.convterToMap(basicConfigService.getOneBasicConfigById(organization.getAreaId()),falg)); + } + Object obj = organization; + if(falg){ + obj = convert(organization); } + data.add(obj); } FrontEndResult frontEndResult = new FrontEndResult(); - frontEndResult.setData(organizations); + frontEndResult.setData(data); frontEndResult.setPageInfo(organizationQuery.getPageInfo()); frontEndResult.setErrorcode(ErrorCodeConstants.SUCCESS); return frontEndResult; -// ResultUtils.buildSuccessResultAndWrite(response, frontEndResult); } - - - -} + private Map convert(Organization organization){ + Map map = new HashMap<>(); + map.put("id",organization.getId()); + map.put("name",organization.getName()); + map.put("areaId",organization.getAreaId()); + map.put("area",organization.getArea()); + map.put("city",organization.getCity()); + map.put("cityId",organization.getCityId()); + map.put("province",organization.getProvince()); + map.put("provinceId",organization.getProvinceId()); + return map; + } +} \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CommonsHelper.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CommonsHelper.java index c73bbcd..e0224b3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CommonsHelper.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CommonsHelper.java @@ -7,10 +7,28 @@ import com.lyms.platform.pojo.BabyModel; import com.lyms.platform.pojo.BasicConfig; import com.lyms.platform.pojo.Patients; +import java.util.HashMap; +import java.util.Map; + /** * Created by Administrator on 2016/5/1 0001. */ public final class CommonsHelper { + + + + + public static Object convterToMap(BasicConfig basicConfig,boolean sample){ + if(sample&&null!=basicConfig){ + Map map = new HashMap<>(); + map.put("id",basicConfig.getId()); + map.put("name",basicConfig.getName()); + map.put("code",basicConfig.getCode()); + return map; + } + return basicConfig; + } + /** * 填充地址信息 * -- 1.8.3.1