From f2579fbd863a2e33de88c228917cf7a002dc48a5 Mon Sep 17 00:00:00 2001 From: yangfei Date: Tue, 17 Jul 2018 09:02:36 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=BD=E8=AE=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/BasicConfigController.java | 15 ++++++++ .../operate/web/facade/BasicConfigFacade.java | 42 ++++++++++++++++++---- .../operate/web/result/BasicConfigResult.java | 12 +++++++ 3 files changed, 62 insertions(+), 7 deletions(-) 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 6e8b343..adef96f 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 @@ -99,6 +99,21 @@ public class BasicConfigController extends BaseController { } /** + * 根据区域id查询所有数据 + * + * @return 返回结果 + */ + @RequestMapping(method = RequestMethod.GET, value = "/basicConfigByArea") + @ResponseBody + public BaseListResponse basicConfigByArea(BasicConfigQueryRequest basicConfigQueryRequest) { + if (null == basicConfigQueryRequest.getParentId()) { + basicConfigQueryRequest.setParentId("0"); + } + basicConfigQueryRequest.setLimit(9999); + return basicConfigFacade.basicConfigByArea(basicConfigQueryRequest); + } + + /** * 批量增加基础项配置 * * @param basicConfigRequests 批量增加请求 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 d62f92e..387e8b8 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 @@ -160,7 +160,7 @@ public class BasicConfigFacade { } } - public synchronized static void sortBasicConfig(BasicConfig basicConfig) { + public synchronized static void sortBasicConfig(BasicConfig basicConfig) { if (CollectionUtils.isNotEmpty(basicConfig.getBasicConfigs())) { for (BasicConfig bs : basicConfig.getBasicConfigs()) { if (CollectionUtils.isNotEmpty(bs.getBasicConfigs())) { @@ -438,7 +438,7 @@ public class BasicConfigFacade { return basicConfigs1; } - public String queryBaseInfoByStr(List baseIds){ + public String queryBaseInfoByStr(List baseIds) { StringBuffer subStr = new StringBuffer(); if (CollectionUtils.isNotEmpty(baseIds)) { @@ -449,19 +449,19 @@ public class BasicConfigFacade { basicConfigQuery.setId(String.valueOf(obj)); List datas = basicConfigService.queryBasicConfig(basicConfigQuery); if (CollectionUtils.isNotEmpty(datas)) { - subStr.append(datas.get(0).getName()+","); + subStr.append(datas.get(0).getName() + ","); } } } } - if(subStr.toString().endsWith(",")){ - return subStr.toString().substring(0,subStr.toString().length()-1); - }else{ + if (subStr.toString().endsWith(",")) { + return subStr.toString().substring(0, subStr.toString().length() - 1); + } else { return subStr.toString(); } } - public List queryBaseInfoByMap(List baseIds){ + public List queryBaseInfoByMap(List baseIds) { List baseMaps = new ArrayList<>(); if (CollectionUtils.isNotEmpty(baseIds)) { for (Object obj : baseIds) { @@ -494,4 +494,32 @@ public class BasicConfigFacade { } return list; } + + public BaseListResponse basicConfigByArea(BasicConfigQueryRequest basicConfigQueryRequest) { + + BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); + basicConfigQuery.setNeed("1"); + basicConfigQuery.setId(basicConfigQueryRequest.getId()); + basicConfigQuery.setPage(basicConfigQueryRequest.getPage()); + basicConfigQuery.setLimit(basicConfigQueryRequest.getLimit()); + basicConfigQuery.setYn(YnEnums.YES.getId()); + basicConfigQuery.setParentId(basicConfigQueryRequest.getParentId()); + List data = basicConfigService.queryBasicConfig(basicConfigQuery); + for (BasicConfig bs : data) { + basicConfigByArea(bs); + } + + return new BaseListResponse().setData(buildResult(data)).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(basicConfigQuery.getPageInfo()); + } + + public void basicConfigByArea(BasicConfig bas) { + BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); + basicConfigQuery.setYn(YnEnums.YES.getId()); + basicConfigQuery.setParentId(bas.getId()); + List data = basicConfigService.queryBasicConfig(basicConfigQuery); + bas.setBasicConfigs(data); + for (BasicConfig bs : data) { + basicConfigByArea(bs); + } + } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BasicConfigResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BasicConfigResult.java index 5551b82..c5bcca9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BasicConfigResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BasicConfigResult.java @@ -3,6 +3,7 @@ package com.lyms.platform.operate.web.result; import com.lyms.platform.common.base.IBasicResultConvert; import com.lyms.platform.pojo.BasicConfig; +import java.util.ArrayList; import java.util.List; public class BasicConfigResult implements IBasicResultConvert { @@ -18,6 +19,16 @@ public class BasicConfigResult implements IBasicResultConvert basicConfigs = new ArrayList<>(); + + public List getBasicConfigs() { + return basicConfigs; + } + + public void setBasicConfigs(List basicConfigs) { + this.basicConfigs = basicConfigs; + } + public String getParentName() { return parentName; } @@ -102,6 +113,7 @@ public class BasicConfigResult implements IBasicResultConvert