From 9bc3a3862c52923b881d71fa50ab0aa0921d5a14 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Tue, 12 Apr 2016 15:31:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2yn=E4=B8=BA?= =?UTF-8?q?1=E7=9A=84=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/BasicConfigFacade.java | 67 +++++++++++----------- 1 file changed, 35 insertions(+), 32 deletions(-) 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 2fefac1..33759d2 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 @@ -1,25 +1,24 @@ package com.lyms.platform.operate.web.facade; -import java.util.ArrayList; -import java.util.List; - -import com.lyms.platform.operate.web.result.BasicConfigResult; -import org.apache.commons.collections.CollectionUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - import com.lyms.platform.biz.service.BasicConfigService; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseResponse; -import com.lyms.platform.operate.web.request.BasicConfigQueryRequest; import com.lyms.platform.operate.web.request.BasicConfigAddRequest; +import com.lyms.platform.operate.web.request.BasicConfigQueryRequest; import com.lyms.platform.operate.web.request.BasicConfigUpdateRequest; +import com.lyms.platform.operate.web.result.BasicConfigResult; import com.lyms.platform.operate.web.result.TreeNode; import com.lyms.platform.operate.web.utils.TreeHelper; import com.lyms.platform.pojo.BasicConfig; import com.lyms.platform.query.BasicConfigQuery; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.ArrayList; +import java.util.List; @Component public class BasicConfigFacade { @@ -28,9 +27,8 @@ public class BasicConfigFacade { /** * 基础项查询 - * - * @param basicConfigQueryRequest - * 基础项查询请求 + * + * @param basicConfigQueryRequest 基础项查询请求 * @return 返回结果 */ public BaseListResponse findBasicConfigList(BasicConfigQueryRequest basicConfigQueryRequest) { @@ -41,9 +39,9 @@ public class BasicConfigFacade { basicConfigQuery.setYn(YnEnums.YES.getId()); basicConfigQuery.setKeyword(basicConfigQueryRequest.getKeywords()); List data = basicConfigService.queryBasicConfig(basicConfigQuery); - List dataList =new ArrayList<>(); - if(CollectionUtils.isNotEmpty(data)){ - for(BasicConfig basicConfig:data){ + List dataList = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(data)) { + for (BasicConfig basicConfig : data) { BasicConfigResult basicConfigResult = new BasicConfigResult(); basicConfigResult.convertToResult(basicConfig); dataList.add(basicConfigResult); @@ -54,9 +52,8 @@ public class BasicConfigFacade { /** * 修改一条基础项配置 - * - * @param basicConfigUpdateRequest - * 修改基础项请求 + * + * @param basicConfigUpdateRequest 修改基础项请求 * @return 返回结果 */ public BaseResponse updateOneBasicConfig(BasicConfigUpdateRequest basicConfigUpdateRequest) { @@ -65,15 +62,22 @@ public class BasicConfigFacade { obj.setName(basicConfigUpdateRequest.getName()); obj.setId(basicConfigUpdateRequest.getId()); obj.setEnable(basicConfigUpdateRequest.getEnable()); - basicConfigService.updateBasicConfig(obj); - return new BaseResponse("成功", ErrorCodeConstants.SUCCESS); + BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); + basicConfigQuery.setId(basicConfigUpdateRequest.getId()); + basicConfigQuery.setYn(YnEnums.YES.getId()); + List data = basicConfigService.queryBasicConfig(basicConfigQuery); + if (CollectionUtils.isNotEmpty(data)) { + obj.setYn(data.get(0).getYn()); + basicConfigService.updateBasicConfig(obj); + return new BaseResponse("成功", ErrorCodeConstants.SUCCESS); + } + return new BaseResponse("数据不存在", ErrorCodeConstants.BUSINESS_ERROR); } - + /** * 删除一条基础项配置 - * + * * @param id 基础项id - * * @return 执行结果 */ public BaseResponse deleteOneBasicConfig(String id) { @@ -83,14 +87,13 @@ public class BasicConfigFacade { basicConfigService.updateBasicConfig(obj); return new BaseResponse("成功", ErrorCodeConstants.SUCCESS); } - + /** - * * 获取树形结构的数据 - * + * * @return 树形结构数据 */ - public List findAllBasicConfigWithTree(){ + public List findAllBasicConfigWithTree() { List list = new ArrayList(); List l = basicConfigService.queryParentConfig(); for (BasicConfig b : l) { @@ -101,18 +104,18 @@ public class BasicConfigFacade { } return list; } - + /** * 批量添加基础数据项 - * + * * @param basicConfigRequests * @return */ - public BaseResponse batchAddBasicConfig(List basicConfigRequests){ + public BaseResponse batchAddBasicConfig(List basicConfigRequests) { for (BasicConfigAddRequest ba : basicConfigRequests) { //转换的时候验证如果为空就跳过添加数据 - BasicConfig basicConfig =ba.convertToDataModel(); - if(null!=basicConfig){ + BasicConfig basicConfig = ba.convertToDataModel(); + if (null != basicConfig) { basicConfigService.addBasicConfig(basicConfig); } } -- 1.8.3.1