From 21a047d752bd116901d7883ab38468c33e4cd0d2 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Tue, 12 Apr 2016 14:59:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9F=BA=E7=A1=80=E9=A1=B9?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=98=AF=E5=90=A6=E5=90=AF=E7=94=A8=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/pojo/BasicConfig.java | 13 +++++-- .../com/lyms/platform/query/BasicConfigQuery.java | 4 ++- .../operate/web/facade/BasicConfigFacade.java | 14 ++++++-- .../web/request/BasicConfigUpdateRequest.java | 10 ++++++ .../operate/web/result/BasicConfigResult.java | 41 +++++++++++++++++----- 5 files changed, 69 insertions(+), 13 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BasicConfig.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BasicConfig.java index 6c6e4b5..7c80756 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BasicConfig.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BasicConfig.java @@ -20,8 +20,17 @@ public class BasicConfig extends BaseModel { private String code; private String name; - - + + private int enable; + + public int getEnable() { + return enable; + } + + public void setEnable(int enable) { + this.enable = enable; + } + public String getName() { return name; } 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 e878c2a..74d74fb 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 @@ -5,6 +5,7 @@ import com.lyms.platform.common.dao.BaseQuery; import com.lyms.platform.common.dao.operator.MongoCondition; import com.lyms.platform.common.dao.operator.MongoOper; import com.lyms.platform.common.dao.operator.MongoQuery; +import com.lyms.platform.common.enums.YnEnums; public class BasicConfigQuery extends BaseQuery implements IConvertToNativeQuery { @@ -18,9 +19,10 @@ public class BasicConfigQuery extends BaseQuery implements IConvertToNativeQuery private String keyword; + public MongoQuery convertToQuery() { // MongoCondition condition = MongoCondition.newInstance("1","1",MongoOper.IS); - MongoCondition condition = MongoCondition.newInstance(); + MongoCondition condition = MongoCondition.newInstance("yn", YnEnums.YES.getId(),MongoOper.IS); if (null != id) { condition = condition.and("id", id, MongoOper.IS); } 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 cecf7c8..2fefac1 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 @@ -3,6 +3,8 @@ 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; @@ -39,8 +41,15 @@ public class BasicConfigFacade { basicConfigQuery.setYn(YnEnums.YES.getId()); basicConfigQuery.setKeyword(basicConfigQueryRequest.getKeywords()); List data = basicConfigService.queryBasicConfig(basicConfigQuery); - - return new BaseListResponse().setData(data).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + List dataList =new ArrayList<>(); + if(CollectionUtils.isNotEmpty(data)){ + for(BasicConfig basicConfig:data){ + BasicConfigResult basicConfigResult = new BasicConfigResult(); + basicConfigResult.convertToResult(basicConfig); + dataList.add(basicConfigResult); + } + } + return new BaseListResponse().setData(dataList).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } /** @@ -55,6 +64,7 @@ public class BasicConfigFacade { obj.setCode(basicConfigUpdateRequest.getCode()); obj.setName(basicConfigUpdateRequest.getName()); obj.setId(basicConfigUpdateRequest.getId()); + obj.setEnable(basicConfigUpdateRequest.getEnable()); basicConfigService.updateBasicConfig(obj); return new BaseResponse("成功", ErrorCodeConstants.SUCCESS); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigUpdateRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigUpdateRequest.java index aeee853..c3562bf 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigUpdateRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigUpdateRequest.java @@ -16,6 +16,16 @@ public class BasicConfigUpdateRequest { @FormParam @NotEmpty(message = "code不能为空.") private String code; + @FormParam + private int enable; + + public int getEnable() { + return enable; + } + + public void setEnable(int enable) { + this.enable = enable; + } public String getId() { return id; 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 1c9302e..b0f420a 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 @@ -1,10 +1,24 @@ package com.lyms.platform.operate.web.result; -public class BasicConfigResult { +import com.lyms.platform.common.base.IBasicResultConvert; +import com.lyms.platform.pojo.BasicConfig; +import com.lyms.platform.pojo.PuerperaModel; + +public class BasicConfigResult implements IBasicResultConvert { private String id; private String code; - private int yn; + private int enable; private String parentId; + private String name; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + public String getId() { return id; } @@ -17,16 +31,27 @@ public class BasicConfigResult { public void setCode(String code) { this.code = code; } - public int getYn() { - return yn; - } - public void setYn(int yn) { - this.yn = yn; - } public String getParentId() { return parentId; } public void setParentId(String parentId) { this.parentId = parentId; } + + public int getEnable() { + return enable; + } + + public void setEnable(int enable) { + this.enable = enable; + } + @Override + public BasicConfigResult convertToResult(BasicConfig destModel) { + setCode(destModel.getCode()); + setId(destModel.getId()); + setEnable(destModel.getEnable()); + setName(destModel.getName()); + setParentId(destModel.getParentId()); + return this; + } } \ No newline at end of file -- 1.8.3.1