From dd2a6eacd93aa7a76139a121a097409012afec80 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Tue, 4 Jul 2017 15:39:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=88=86=E5=B8=B8=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/query/BasicConfigQuery.java | 14 +++++- .../operate/web/controller/EnumsController.java | 18 ++++++- .../operate/web/facade/BasicConfigFacade.java | 55 ++++++++++++++++------ .../operate/web/result/BasicConfigResult.java | 10 ++++ 4 files changed, 79 insertions(+), 18 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BasicConfigQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BasicConfigQuery.java index f22a460..3b20d42 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BasicConfigQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BasicConfigQuery.java @@ -30,6 +30,16 @@ public class BasicConfigQuery extends BaseQuery implements IConvertToNativeQuery private Integer enable; private String typeId; + // + private Boolean existweight; + + public Boolean getExistweight() { + return existweight; + } + + public void setExistweight(Boolean existweight) { + this.existweight = existweight; + } public Integer getEnable() { return enable; @@ -76,7 +86,9 @@ public class BasicConfigQuery extends BaseQuery implements IConvertToNativeQuery if(null!=enable){ condition = condition.and("enable", enable, MongoOper.IS); } - + if(null!=existweight){ + condition = condition.and("weight", existweight, MongoOper.EXISTS); + } if (null != keyword) { MongoCondition con1= MongoCondition.newInstance("code", keyword, MongoOper.LIKE); 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 c2f2744..75c3a50 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 @@ -3,10 +3,13 @@ package com.lyms.platform.operate.web.controller; import com.lyms.platform.common.enums.*; import com.lyms.platform.common.utils.ExceptionUtils; import com.lyms.platform.common.utils.JsonUtil; +import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.common.utils.SystemConfig; import com.lyms.platform.operate.web.facade.BasicConfigFacade; import com.lyms.platform.operate.web.result.BasicConfigResult; import com.lyms.platform.permission.model.Organization; +import com.lyms.platform.pojo.BasicConfig; +import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.PathVariable; @@ -366,8 +369,19 @@ public class EnumsController { @RequestMapping(value = "/getjws", method = RequestMethod.GET) public void geJws(HttpServletResponse response) { int cacheTime =30000; - String json = JsonUtil.array2JsonString(basicConfigFacade.getBaseicConfigByParentId(SystemConfig.JIWANGSHI_ID)); - writeJsonWithCache(response,json,cacheTime); + List data = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.JIWANGSHI_ID); + + + if (CollectionUtils.isNotEmpty(data)) { + for (BasicConfigResult basicConfig :data){ + //常用 + basicConfig.setChildConfigs(basicConfigFacade.getBaseicConfigByParentIdWithWight(basicConfig.getId(),true)); + + basicConfig.setLeastUse(basicConfigFacade.getBaseicConfigByParentIdWithWight(basicConfig.getId(),false)); + } + } + String json = JsonUtil.array2JsonString(data); + writeJsonWithCache(response, json, cacheTime); } public void writeJsonWithCache(HttpServletResponse response, String json,int cacheTime) { 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 8a9885f..702b7ed 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 @@ -158,7 +158,6 @@ public class BasicConfigFacade { */ public List getBaseicConfigByParentId(String parentId) { BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); -// basicConfigQuery.setNeed("1"); basicConfigQuery.setYn(YnEnums.YES.getId()); basicConfigQuery.setParentId(parentId); List datas = basicConfigService.queryBasicConfig(basicConfigQuery); @@ -172,15 +171,44 @@ public class BasicConfigFacade { br.setName(data.getName()); br.setParentId(data.getParentId()); br.setWeight(data.getWeight()); + configResults.add(br); } } return configResults; } + /** + * 查询基础数据通过parentId + * + * @param parentId + * @return + */ + public List getBaseicConfigByParentIdWithWight(String parentId,boolean wight) { + BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); + basicConfigQuery.setYn(YnEnums.YES.getId()); + basicConfigQuery.setParentId(parentId); + basicConfigQuery.setExistweight(wight); + List datas = basicConfigService.queryBasicConfig(basicConfigQuery); + List configResults = new ArrayList<>(); + if (datas != null) { + for (BasicConfig data : datas) { + BasicConfigResult br = new BasicConfigResult(); + br.setId(data.getId()); + br.setCode(data.getCode()); + br.setEnable(data.getEnable()); + br.setName(data.getName()); + br.setParentId(data.getParentId()); + br.setWeight(data.getWeight()); + configResults.add(br); + } + } + return configResults; + } /** * 根据类型查询响应的 基础数据 - *[[ycs],[jws]] + * [[ycs],[jws]] + * * @param type * @return */ @@ -195,14 +223,11 @@ public class BasicConfigFacade { if (!StringUtils.isEmpty(parentId)) { results = getBaseicConfigByParentId(parentId); - if ("jws".equals(ConfigTypeEnums.JWS.getType())) - { + if ("jws".equals(ConfigTypeEnums.JWS.getType())) { - for(BasicConfigResult result : results) - { - if (results != null && StringUtils.isNotEmpty(result.getId())) - { - List childConfigs = getBaseicConfigByParentId(result.getId()); + for (BasicConfigResult result : results) { + if (results != null && StringUtils.isNotEmpty(result.getId())) { + List childConfigs = getBaseicConfigByParentId(result.getId()); result.setChildConfigs(childConfigs); } } @@ -226,14 +251,14 @@ public class BasicConfigFacade { basicConfigQuery.setParentId(basicConfig.getId()); List basicConfigs2 = basicConfigService.queryBasicConfig(basicConfigQuery); if (CollectionUtils.isNotEmpty(basicConfigs2)) { - for (BasicConfig bc:basicConfigs2) { - bc.setColor("risk_"+ RiskDefaultTypeEnum.getColor(basicConfig.getName())); + for (BasicConfig bc : basicConfigs2) { + bc.setColor("risk_" + RiskDefaultTypeEnum.getColor(basicConfig.getName())); } basicConfigs1.addAll(basicConfigs2); } } } - return basicConfigs1; + return basicConfigs1; } @@ -249,14 +274,14 @@ public class BasicConfigFacade { basicConfigQuery.setParentId(basicConfig.getId()); List basicConfigs2 = basicConfigService.queryBasicConfig(basicConfigQuery); if (CollectionUtils.isNotEmpty(basicConfigs2)) { - for (BasicConfig bc:basicConfigs2) { - bc.setColor("risk_"+ RiskDefaultTypeEnum.getColor(basicConfig.getName())); + for (BasicConfig bc : basicConfigs2) { + bc.setColor("risk_" + RiskDefaultTypeEnum.getColor(basicConfig.getName())); } basicConfigs1.addAll(basicConfigs2); } } } - return basicConfigs1; + return basicConfigs1; } 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 6f2f282..874f7c0 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 @@ -15,6 +15,16 @@ public class BasicConfigResult implements IBasicResultConvert