From af84b11004953e0274461cb16b75d060eec089bf Mon Sep 17 00:00:00 2001 From: "rui.zhang" Date: Thu, 14 Apr 2016 20:55:55 +0800 Subject: [PATCH] platform permission add return pageinfo --- .../lyms/platform/biz/param/AssayConfigQuery.java | 38 +++++++ .../lyms/platform/biz/param/ReferConfigQuery.java | 123 ++++++++++++++++++++ .../platform/biz/service/AssayConfigService.java | 4 +- .../biz/service/CommunityConfigService.java | 5 +- .../platform/biz/service/ReferConfigService.java | 2 +- .../com/lyms/platform/params/AssayConfigParam.java | 39 ------- .../com/lyms/platform/query/ReferConfigQuery.java | 124 --------------------- .../web/controller/AssayConfigController.java | 13 +-- .../web/controller/ReferConfigController.java | 10 +- 9 files changed, 174 insertions(+), 184 deletions(-) create mode 100644 platform-biz-patient-service/src/main/java/com/lyms/platform/biz/param/AssayConfigQuery.java create mode 100644 platform-biz-patient-service/src/main/java/com/lyms/platform/biz/param/ReferConfigQuery.java delete mode 100644 platform-dal/src/main/java/com/lyms/platform/params/AssayConfigParam.java delete mode 100644 platform-dal/src/main/java/com/lyms/platform/query/ReferConfigQuery.java diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/param/AssayConfigQuery.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/param/AssayConfigQuery.java new file mode 100644 index 0000000..0816b61 --- /dev/null +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/param/AssayConfigQuery.java @@ -0,0 +1,38 @@ +package com.lyms.platform.biz.param; + +import com.lyms.platform.common.core.annotation.form.Form; +import com.lyms.platform.common.dao.BaseQuery; + +@Form +public class AssayConfigQuery extends BaseQuery { + + private String hospitalId; + //1.按项目名称查询 2.项目代码 3.标准代码 + private int type; + private String keywords; + + + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } + + public int getType() { + return type; + } + + public void setType(int type) { + this.type = type; + } + + public String getKeywords() { + return keywords; + } + + public void setKeywords(String keywords) { + this.keywords = keywords; + } +} \ No newline at end of file diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/param/ReferConfigQuery.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/param/ReferConfigQuery.java new file mode 100644 index 0000000..70f828b --- /dev/null +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/param/ReferConfigQuery.java @@ -0,0 +1,123 @@ +package com.lyms.platform.biz.param; + +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 javax.validation.constraints.NotNull; + +/** + * Created by Zhang.Rui on 2016/3/17. + * 参考值查询对象 + */ +public class ReferConfigQuery extends BaseQuery { + @NotNull(message = "医院ID不能为空") + private Integer hospitalId; + private String id; + private Integer codeType;//1:项目代码2:标准代码 3:项目名称 + private String keyword; + private Integer referVal;//1已设置2未设置3全部 + private Integer emergencyVal;//1已设置2未设置3全部 + private Integer yn; + + + + public MongoQuery convertToQuery() { + MongoCondition condition = MongoCondition.newInstance(); + + if (null != hospitalId) { + condition.and("hospitalId", hospitalId, MongoOper.IS); + } + if (null != codeType && null != keyword) { + if(1 == codeType) { + condition.and("code", keyword, MongoOper.LIKE); + } else if(2 == codeType) { + condition.and("standardCode", keyword, MongoOper.LIKE); + } else if(3 == codeType) { + condition.and("name", keyword, MongoOper.LIKE); + } + } + if (null != referVal) { + if(1 == referVal) { + condition.and("charRefer", null, MongoOper.NE); + } else if(2 == referVal) { + condition.and("charRefer", null, MongoOper.IS); + } + } + if (null != emergencyVal) { + if(1 == emergencyVal) { + condition.and("emergencyChar", null, MongoOper.NE); + } else if(2 == emergencyVal) { + condition.and("emergencyChar", null, MongoOper.IS); + } + } + + if(null != yn) { + condition.and("yn", yn, MongoOper.IS); + } + if(null != id) { + condition.and("id", id, MongoOper.IS); + } + + return condition.toMongoQuery(); + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public Integer getYn() { + return yn; + } + + public void setYn(Integer yn) { + this.yn = yn; + } + + public Integer getHospitalId() { + return hospitalId; + } + + public void setHospitalId(Integer hospitalId) { + this.hospitalId = hospitalId; + } + + public Integer getCodeType() { + return codeType; + } + + public void setCodeType(Integer codeType) { + this.codeType = codeType; + } + + public String getKeyword() { + return keyword; + } + + public void setKeyword(String keyword) { + this.keyword = keyword; + } + + public Integer getReferVal() { + return referVal; + } + + public void setReferVal(Integer referVal) { + this.referVal = referVal; + } + + public Integer getEmergencyVal() { + return emergencyVal; + } + + public void setEmergencyVal(Integer emergencyVal) { + this.emergencyVal = emergencyVal; + } +} + + diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AssayConfigService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AssayConfigService.java index 7d9ace0..183470d 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AssayConfigService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AssayConfigService.java @@ -3,6 +3,7 @@ package com.lyms.platform.biz.service; import java.util.List; +import com.lyms.platform.biz.param.AssayConfigQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -10,7 +11,6 @@ import com.lyms.platform.biz.dal.AssayConfigDao; 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.params.AssayConfigParam; import com.lyms.platform.pojo.AssayConfig; //化验项配置 @@ -19,7 +19,7 @@ public class AssayConfigService { @Autowired AssayConfigDao assayConfigDao; - public List query(AssayConfigParam assayConfigRequest) { + public List query(AssayConfigQuery assayConfigRequest) { MongoCondition mongoCondition = MongoCondition.newInstance(); if(1 == assayConfigRequest.getType()) { 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 a151eed..22763ae 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 @@ -56,11 +56,10 @@ public class CommunityConfigService { MongoQuery mongoQuery = mongoCondition.toMongoQuery(); - BaseQuery baseQuery = new BaseQuery(); if(null != communityQuery.getLimit()) { - baseQuery.mysqlBuild((int) communityConfigDao.queryCount(mongoQuery)); - mongoQuery.start(baseQuery.getOffset()).end(baseQuery.getLimit()); + communityQuery.mysqlBuild((int) communityConfigDao.queryCount(mongoQuery)); + mongoQuery.start(communityQuery.getOffset()).end(communityQuery.getLimit()); } return communityConfigDao.queryArea(mongoQuery); diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/ReferConfigService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/ReferConfigService.java index c3e0e81..f4b3cf4 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/ReferConfigService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/ReferConfigService.java @@ -2,6 +2,7 @@ package com.lyms.platform.biz.service; import java.util.List; +import com.lyms.platform.biz.param.ReferConfigQuery; import com.lyms.platform.common.dao.operator.MongoQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -11,7 +12,6 @@ import com.lyms.platform.common.dao.operator.MongoCondition; import com.lyms.platform.common.dao.operator.MongoOper; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.pojo.ReferValue; -import com.lyms.platform.query.ReferConfigQuery; /** * Created by Zhang.Rui on 2016/3/17. diff --git a/platform-dal/src/main/java/com/lyms/platform/params/AssayConfigParam.java b/platform-dal/src/main/java/com/lyms/platform/params/AssayConfigParam.java deleted file mode 100644 index 97eff8c..0000000 --- a/platform-dal/src/main/java/com/lyms/platform/params/AssayConfigParam.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.lyms.platform.params; - -import com.lyms.platform.common.core.annotation.form.Form; -import com.lyms.platform.common.dao.BaseQuery; -import org.hibernate.validator.constraints.NotEmpty; - -@Form -public class AssayConfigParam extends BaseQuery { - - private String hospitalId; - //1.按项目名称查询 2.项目代码 3.标准代码 - private int type; - private String keywords; - - - public String getHospitalId() { - return hospitalId; - } - - public void setHospitalId(String hospitalId) { - this.hospitalId = hospitalId; - } - - public int getType() { - return type; - } - - public void setType(int type) { - this.type = type; - } - - public String getKeywords() { - return keywords; - } - - public void setKeywords(String keywords) { - this.keywords = keywords; - } -} \ No newline at end of file diff --git a/platform-dal/src/main/java/com/lyms/platform/query/ReferConfigQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/ReferConfigQuery.java deleted file mode 100644 index 2052eb0..0000000 --- a/platform-dal/src/main/java/com/lyms/platform/query/ReferConfigQuery.java +++ /dev/null @@ -1,124 +0,0 @@ -package com.lyms.platform.query; - -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 org.hibernate.validator.constraints.NotEmpty; - -import javax.validation.constraints.NotNull; - -/** - * Created by Zhang.Rui on 2016/3/17. - * 参考值查询对象 - */ -public class ReferConfigQuery extends BaseQuery { - @NotNull(message = "医院ID不能为空") - private Integer hospitalId; - private String id; - private Integer codeType;//1:项目代码2:标准代码 3:项目名称 - private String keyword; - private Integer referVal;//1已设置2未设置3全部 - private Integer emergencyVal;//1已设置2未设置3全部 - private Integer yn; - - - - public MongoQuery convertToQuery() { - MongoCondition condition = MongoCondition.newInstance(); - - if (null != hospitalId) { - condition.and("hospitalId", hospitalId, MongoOper.IS); - } - if (null != codeType && null != keyword) { - if(1 == codeType) { - condition.and("code", keyword, MongoOper.LIKE); - } else if(2 == codeType) { - condition.and("standardCode", keyword, MongoOper.LIKE); - } else if(3 == codeType) { - condition.and("name", keyword, MongoOper.LIKE); - } - } - if (null != referVal) { - if(1 == referVal) { - condition.and("charRefer", null, MongoOper.NE); - } else if(2 == referVal) { - condition.and("charRefer", null, MongoOper.IS); - } - } - if (null != emergencyVal) { - if(1 == emergencyVal) { - condition.and("emergencyChar", null, MongoOper.NE); - } else if(2 == emergencyVal) { - condition.and("emergencyChar", null, MongoOper.IS); - } - } - - if(null != yn) { - condition.and("yn", yn, MongoOper.IS); - } - if(null != id) { - condition.and("id", id, MongoOper.IS); - } - - return condition.toMongoQuery(); - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public Integer getYn() { - return yn; - } - - public void setYn(Integer yn) { - this.yn = yn; - } - - public Integer getHospitalId() { - return hospitalId; - } - - public void setHospitalId(Integer hospitalId) { - this.hospitalId = hospitalId; - } - - public Integer getCodeType() { - return codeType; - } - - public void setCodeType(Integer codeType) { - this.codeType = codeType; - } - - public String getKeyword() { - return keyword; - } - - public void setKeyword(String keyword) { - this.keyword = keyword; - } - - public Integer getReferVal() { - return referVal; - } - - public void setReferVal(Integer referVal) { - this.referVal = referVal; - } - - public Integer getEmergencyVal() { - return emergencyVal; - } - - public void setEmergencyVal(Integer emergencyVal) { - this.emergencyVal = emergencyVal; - } -} - - diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AssayConfigController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AssayConfigController.java index 3c4b711..84a508d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AssayConfigController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AssayConfigController.java @@ -1,20 +1,19 @@ package com.lyms.platform.operate.web.controller; +import com.lyms.platform.biz.param.AssayConfigQuery; import com.lyms.platform.biz.service.AssayConfigService; import com.lyms.platform.common.annotation.TokenRequired; 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.utils.ResultUtils; -import com.lyms.platform.params.AssayConfigParam; +import com.lyms.platform.operate.web.result.FrontEndResult; import com.lyms.platform.pojo.AssayConfig; -import org.jboss.netty.handler.codec.http.HttpResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.List; @@ -28,13 +27,9 @@ public class AssayConfigController { @RequestMapping(method = RequestMethod.GET, value = "/assayconfig") @ResponseBody @TokenRequired - public BaseListResponse assayConfig(AssayConfigParam assayConfigParam) { + public FrontEndResult assayConfig(AssayConfigQuery assayConfigParam) { List data = assayConfigService.query(assayConfigParam); - BaseListResponse baseListResponse = new BaseListResponse(); - baseListResponse.setData(data); - baseListResponse.setErrorcode(ErrorCodeConstants.SUCCESS); - baseListResponse.setErrormsg("成功"); - return baseListResponse; + return FrontEndResult.ini().setData(data).setPageInfo(assayConfigParam.getPageInfo()).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } @RequestMapping(method = RequestMethod.PUT, value = "/assayconfig") diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReferConfigController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReferConfigController.java index ce4b7ae..656c004 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReferConfigController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReferConfigController.java @@ -4,9 +4,10 @@ import java.util.List; import javax.validation.Valid; +import com.lyms.platform.biz.param.ReferConfigQuery; import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.enums.YnEnums; -import com.lyms.platform.pojo.AssayConfig; +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; @@ -21,7 +22,6 @@ import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.pojo.ReferValue; -import com.lyms.platform.query.ReferConfigQuery; /** * Created by Zhang.Rui on 2016/3/17. @@ -40,12 +40,10 @@ public class ReferConfigController extends RestController{ @ResponseBody @TokenRequired @RequestMapping(value = "/referConfig",method = RequestMethod.GET) - public BaseListResponse queryRefer( @Valid ReferConfigQuery referConfigQuery) { + public FrontEndResult queryRefer( @Valid ReferConfigQuery referConfigQuery) { referConfigQuery.setYn(YnEnums.YES.getId()); List referValueList = referConfigService.queryRefer(referConfigQuery); - BaseListResponse baseListResponse = new BaseListResponse(); - baseListResponse.setData(referValueList).setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS); - return baseListResponse; + return FrontEndResult.ini().setData(referValueList).setPageInfo(referConfigQuery.getPageInfo()).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } @RequestMapping(value = "/referConfig",method = RequestMethod.POST) -- 1.8.3.1