From 15e6454e4364771b77befb4368d98f1ba8cdec66 Mon Sep 17 00:00:00 2001 From: "rui.zhang" Date: Thu, 14 Apr 2016 20:37:58 +0800 Subject: [PATCH] platform permission add return pageinfo --- .../lyms/platform/biz/param/CommunityQuery.java | 18 ++++++++ .../biz/service/CommunityConfigService.java | 29 +++++------- .../common/constants/ErrorCodeConstants.java | 4 ++ .../web/controller/CommunityConfigController.java | 24 ++++------ .../operate/web/result/FrontEndResult.java | 53 ++++++++++++++++++++++ 5 files changed, 97 insertions(+), 31 deletions(-) create mode 100644 platform-biz-patient-service/src/main/java/com/lyms/platform/biz/param/CommunityQuery.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/FrontEndResult.java diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/param/CommunityQuery.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/param/CommunityQuery.java new file mode 100644 index 0000000..e489cfc --- /dev/null +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/param/CommunityQuery.java @@ -0,0 +1,18 @@ +package com.lyms.platform.biz.param; + +import com.lyms.platform.common.dao.BaseQuery; + +/** + * Created by Zhang.Rui on 2016/4/14. + */ +public class CommunityQuery extends BaseQuery { + private String keyword; + + public String getKeyword() { + return keyword; + } + + public void setKeyword(String keyword) { + this.keyword = keyword; + } +} diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CommunityConfigService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CommunityConfigService.java index a296cbb..a151eed 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CommunityConfigService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CommunityConfigService.java @@ -2,6 +2,7 @@ package com.lyms.platform.biz.service; import java.util.List; +import com.lyms.platform.biz.param.CommunityQuery; import com.lyms.platform.common.dao.BaseQuery; import com.lyms.platform.common.dao.operator.MongoQuery; import org.aspectj.apache.bcel.generic.RET; @@ -46,10 +47,10 @@ public class CommunityConfigService { } //查询区域 - public List queryArea(String keyword, Integer page, Integer limit) { + public List queryArea(CommunityQuery communityQuery) { MongoCondition mongoCondition = MongoCondition.newInstance(); - if(null != keyword) { - mongoCondition.orCondition(new MongoCondition[]{new MongoCondition("name", keyword, MongoOper.LIKE), new MongoCondition("parentId", keyword, MongoOper.LIKE), new MongoCondition("id", keyword, MongoOper.IS)}); + if(null != communityQuery.getKeyword()) { + mongoCondition.orCondition(new MongoCondition[]{new MongoCondition("name", communityQuery.getKeyword(), MongoOper.LIKE), new MongoCondition("parentId", communityQuery.getKeyword(), MongoOper.LIKE), new MongoCondition("id", communityQuery.getKeyword(), MongoOper.IS)}); } mongoCondition.andCondition(new MongoCondition("yn", YnEnums.YES.getId(), MongoOper.IS).and("type", 1, MongoOper.IS)); @@ -57,9 +58,7 @@ public class CommunityConfigService { MongoQuery mongoQuery = mongoCondition.toMongoQuery(); BaseQuery baseQuery = new BaseQuery(); - if(null != page && null != limit) { - baseQuery.setPage(page); - baseQuery.setLimit(limit); + if(null != communityQuery.getLimit()) { baseQuery.mysqlBuild((int) communityConfigDao.queryCount(mongoQuery)); mongoQuery.start(baseQuery.getOffset()).end(baseQuery.getLimit()); } @@ -68,22 +67,18 @@ public class CommunityConfigService { } //查询小区 - public List queryCommunity(String keyword, Integer page, Integer limit) { + public List queryCommunity(CommunityQuery communityQuery) { MongoCondition mongoCondition = MongoCondition.newInstance(); - if(null != keyword) { - mongoCondition.orCondition(new MongoCondition[]{new MongoCondition("name", keyword, MongoOper.LIKE), new MongoCondition("gxxq", keyword, MongoOper.LIKE)}); + if(null != communityQuery.getKeyword()) { + mongoCondition.orCondition(new MongoCondition[]{new MongoCondition("name", communityQuery.getKeyword(), MongoOper.LIKE), new MongoCondition("gxxq", communityQuery.getKeyword(), MongoOper.LIKE)}); } mongoCondition.andCondition(new MongoCondition("yn", YnEnums.YES.getId(), MongoOper.IS).and("type", 1, MongoOper.IS)); - MongoQuery mongoQuery = mongoCondition.toMongoQuery(); - BaseQuery baseQuery = new BaseQuery(); - - if(null != page && null != limit) { - baseQuery.setPage(page); - baseQuery.setLimit(limit); - baseQuery.mysqlBuild((int) communityConfigDao.queryCount(mongoQuery)); - mongoQuery.start(baseQuery.getOffset()).end(baseQuery.getLimit()); + communityQuery.setNeed("true"); + if(communityQuery.getNeed().equals("true")) { + communityQuery.mysqlBuild((int) communityConfigDao.queryCount(mongoQuery)); + mongoQuery.start(communityQuery.getOffset()).end(communityQuery.getLimit()); } return communityConfigDao.queryArea(mongoQuery); diff --git a/platform-common/src/main/java/com/lyms/platform/common/constants/ErrorCodeConstants.java b/platform-common/src/main/java/com/lyms/platform/common/constants/ErrorCodeConstants.java index 0282d3e..5c75ab2 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/constants/ErrorCodeConstants.java +++ b/platform-common/src/main/java/com/lyms/platform/common/constants/ErrorCodeConstants.java @@ -41,4 +41,8 @@ public class ErrorCodeConstants { //名称已存在 public static final int NAME_EXIST=4100; + + + //没有数据 + public static final int NO_DATA=4200; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CommunityConfigController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CommunityConfigController.java index 70b7d2a..c623ffe 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CommunityConfigController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CommunityConfigController.java @@ -4,6 +4,8 @@ import java.util.List; import javax.validation.Valid; +import com.lyms.platform.biz.param.CommunityQuery; +import com.lyms.platform.operate.web.result.FrontEndResult; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.PathVariable; @@ -84,8 +86,8 @@ public class CommunityConfigController extends RestController { //查询小区 @RequestMapping(value = "queryCommunity", method = RequestMethod.GET) @ResponseBody - public BaseListResponse queryCommunity(String keyword, Integer page, Integer limit ) { - List communityConfigList = communityConfigService.queryCommunity(keyword, page, limit); + public FrontEndResult queryCommunity(CommunityQuery communityQuery) { + List communityConfigList = communityConfigService.queryCommunity(communityQuery); if(null != communityConfigList) { for(CommunityConfig communityConfig : communityConfigList) { @@ -96,12 +98,9 @@ public class CommunityConfigController extends RestController { communityConfig.setParent(new CommunityConfig("0", "root")); } } - return new BaseListResponse().setData(communityConfigList) - .setErrorcode(ErrorCodeConstants.SUCCESS) - .setErrormsg("查询成功!"); + return FrontEndResult.ini().setData(communityConfigList).setPageInfo(communityQuery.getPageInfo()).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); } - return new BaseListResponse().setErrorcode(ErrorCodeConstants.SYSTEM_ERROR) - .setErrormsg("没有数据"); + return FrontEndResult.ini(ErrorCodeConstants.NO_DATA, "没有数据"); } @@ -150,8 +149,8 @@ public class CommunityConfigController extends RestController { //查询区域 @RequestMapping(value = "communityConfig", method = RequestMethod.GET) @ResponseBody - public BaseListResponse queryArea(String keyword, Integer page, Integer limit ) { - List communityConfigList = communityConfigService.queryArea(keyword, page, limit); + public FrontEndResult queryArea(CommunityQuery communityQuery) { + List communityConfigList = communityConfigService.queryArea(communityQuery); if(null != communityConfigList) { for(CommunityConfig communityConfig : communityConfigList) { @@ -162,12 +161,9 @@ public class CommunityConfigController extends RestController { communityConfig.setParent(new CommunityConfig("0", "root")); } } - return new BaseListResponse().setData(communityConfigList) - .setErrorcode(ErrorCodeConstants.SUCCESS) - .setErrormsg("查询成功!"); + return FrontEndResult.ini().setData(communityConfigList).setPageInfo(communityQuery.getPageInfo()).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } - return new BaseListResponse().setErrorcode(ErrorCodeConstants.SYSTEM_ERROR) - .setErrormsg("没有数据"); + return FrontEndResult.ini(ErrorCodeConstants.NO_DATA, "没有数据"); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/FrontEndResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/FrontEndResult.java new file mode 100644 index 0000000..1dc75be --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/FrontEndResult.java @@ -0,0 +1,53 @@ +package com.lyms.platform.operate.web.result; + +import com.lyms.platform.common.base.PageInfo; +import com.lyms.platform.common.dao.BaseQuery; +import com.lyms.platform.common.result.BaseResponse; + +import java.util.List; + +/** + * Created by Zhang.Rui on 2016/4/14. + */ +public class FrontEndResult extends BaseResponse { + private List data; + private PageInfo pageInfo; + + public List getData() { + return data; + } + + public FrontEndResult setData(List data) { + this.data = data; + return this; + } + + public FrontEndResult setErrormsg(String errormsg) { + return (FrontEndResult) super.setErrormsg(errormsg); + } + + public FrontEndResult setErrorcode(int errorcode) { + return (FrontEndResult) super.setErrorcode(errorcode); + } + + public PageInfo getPageInfo() { + return pageInfo; + } + + public FrontEndResult setPageInfo(PageInfo pageInfo) { + this.pageInfo = pageInfo; + return this; + } + + public static FrontEndResult ini(int code, String msg) { + FrontEndResult frontEndResult = new FrontEndResult(); + frontEndResult.setErrormsg(msg); + frontEndResult.setErrorcode(code); + return frontEndResult; + } + + public static FrontEndResult ini() { + FrontEndResult frontEndResult = new FrontEndResult(); + return frontEndResult; + } +} -- 1.8.3.1