From b89b3253952db1572fd6a93d1f56edca6aa62475 Mon Sep 17 00:00:00 2001 From: "rui.zhang" Date: Sat, 30 Apr 2016 10:21:52 +0800 Subject: [PATCH] platform permission add return pageinfo --- .../lyms/platform/biz/param/CommunityQuery.java | 9 ++ .../biz/service/CommunityConfigService.java | 81 ++++----------- .../com/lyms/platform/pojo/CommunityConfig.java | 54 +++++----- .../web/controller/CommunityConfigController.java | 110 ++++++++++----------- .../operate/web/facade/BabyManagerFacade.java | 2 +- .../platform/operate/web/facade/PatientFacade.java | 2 +- .../web/request/CommunityConfigRequest.java | 32 ++++-- 7 files changed, 129 insertions(+), 161 deletions(-) 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 index ca689ce..307251e 100644 --- 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 @@ -8,6 +8,15 @@ import com.lyms.platform.common.dao.BaseQuery; public class CommunityQuery extends BaseQuery { private String keyword; private String id; + private String level; + + public String getLevel() { + return level; + } + + public void setLevel(String level) { + this.level = level; + } public String getId() { return id; 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 33ece14..9dd02d3 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 @@ -10,6 +10,7 @@ import com.lyms.platform.pojo.CommunityConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.swing.plaf.synth.Region; import java.util.List; /** @@ -20,38 +21,38 @@ public class CommunityConfigService { @Autowired private CommunityConfigDao communityConfigDao; - //添加小区 - public void appendCommunity(CommunityConfig communityConfig) { - communityConfig.setType(2); - communityConfigDao.addArea(communityConfig); - } - //添加区域 - public void appendArea(CommunityConfig communityConfig) { - communityConfig.setType(1); + + //添加社区 + public void appendCommunity(CommunityConfig communityConfig) { communityConfigDao.addArea(communityConfig); } - //删除区域 - public void deleteArea(CommunityConfig communityConfig) { + //删除社区 + public void deleteCommunity(CommunityConfig communityConfig) { communityConfig.setYn(YnEnums.NO.getId()); communityConfigDao.updateArea(MongoCondition.newInstance("id", communityConfig.getId(), MongoOper.IS).toMongoQuery(), communityConfig); } - //更新区域 - public void updateArea(CommunityConfig communityConfig) { + //更新社区 + public void updateCommunity(CommunityConfig communityConfig) { communityConfigDao.updateArea(MongoCondition.newInstance("id", communityConfig.getId(), MongoOper.IS).toMongoQuery(), communityConfig); } - //查询区域 - public List queryArea(CommunityQuery communityQuery) { + //查询社区 + public List queryCommunity(CommunityQuery communityQuery) { MongoCondition mongoCondition = MongoCondition.newInstance(); if(null != communityQuery.getKeyword()) { - mongoCondition.orCondition(new MongoCondition[]{new MongoCondition("name", communityQuery.getKeyword(), MongoOper.LIKE), new MongoCondition("parentId", communityQuery.getKeyword(), MongoOper.IS), new MongoCondition("id", communityQuery.getKeyword(), MongoOper.IS)}); + mongoCondition = mongoCondition.orCondition(new MongoCondition[]{new MongoCondition("name", communityQuery.getKeyword(), MongoOper.LIKE), new MongoCondition("gxxq", communityQuery.getKeyword(), MongoOper.LIKE)}); + } + mongoCondition.and("yn", YnEnums.YES.getId(), MongoOper.IS); + if(null != communityQuery.getLevel() && communityQuery.getLevel().equals("3")) { + mongoCondition = mongoCondition.andCondition(new MongoCondition("areaId", Integer.parseInt(communityQuery.getId()), MongoOper.IS)); + } else if(null != communityQuery.getLevel() && communityQuery.getLevel().equals("2")) { + mongoCondition = mongoCondition.andCondition(new MongoCondition("cityId", Integer.parseInt(communityQuery.getId()), MongoOper.IS)); + } else if(null != communityQuery.getLevel() && communityQuery.getLevel().equals("1")) { + mongoCondition = mongoCondition.andCondition(new MongoCondition("provinceId", Integer.parseInt(communityQuery.getId()), MongoOper.IS)); } - mongoCondition.andCondition(new MongoCondition("yn", YnEnums.YES.getId(), MongoOper.IS).and("type", 1, MongoOper.IS)); - - MongoQuery mongoQuery = mongoCondition.toMongoQuery(); if(null != communityQuery.getLimit()) { @@ -62,34 +63,13 @@ public class CommunityConfigService { return communityConfigDao.queryArea(mongoQuery); } - //查询小区 - public List queryCommunity(CommunityQuery communityQuery) { - MongoCondition mongoCondition = MongoCondition.newInstance(); - if(null != communityQuery.getKeyword()) { - mongoCondition.orCondition(new MongoCondition[]{new MongoCondition("name", communityQuery.getKeyword(), MongoOper.LIKE), new MongoCondition("gxxq", communityQuery.getKeyword(), MongoOper.LIKE), new MongoCondition("parentId", communityQuery.getKeyword(), MongoOper.IS), new MongoCondition("id", communityQuery.getKeyword(), MongoOper.IS)}); - } - - if(null == communityQuery.getId()) { - mongoCondition.andCondition(new MongoCondition("yn", YnEnums.YES.getId(), MongoOper.IS).and("type", 1, MongoOper.IS)); - } else { - mongoCondition.andCondition(new MongoCondition("yn", YnEnums.YES.getId(), MongoOper.IS).and("type", 1, MongoOper.IS).and("id", communityQuery.getId(), MongoOper.IS)); - } - - MongoQuery mongoQuery = mongoCondition.toMongoQuery(); - 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); - } //查询小区根据ID public CommunityConfig getCommunityById(String id) { MongoCondition mongoCondition = MongoCondition.newInstance(); - mongoCondition.andCondition(new MongoCondition("yn", YnEnums.YES.getId(), MongoOper.IS).and("type", 1, MongoOper.IS).and("id", id, MongoOper.IS)); + mongoCondition.andCondition(new MongoCondition("yn", YnEnums.YES.getId(), MongoOper.IS).and("id", id, MongoOper.IS)); MongoQuery mongoQuery = mongoCondition.toMongoQuery(); List communityConfigs = communityConfigDao.queryArea(mongoQuery); @@ -100,26 +80,5 @@ public class CommunityConfigService { } - //查询区域根据PID - public List queryAreaByParentId(String pid) { - if(null == pid) return null; - MongoCondition mongoCondition = MongoCondition.newInstance().and("parentId", pid, MongoOper.IS).and("yn", YnEnums.YES.getId(), MongoOper.IS); - List communityConfigs = communityConfigDao.queryArea(mongoCondition.toMongoQuery()); - return communityConfigs; - } - - - //查询区域根据ID - public CommunityConfig queryAreaById(String id) { - if(null == id) return null; - - MongoCondition mongoCondition = MongoCondition.newInstance().and("id", id, MongoOper.IS).and("yn", YnEnums.YES.getId(), MongoOper.IS); - - List communityConfigs = communityConfigDao.queryArea(mongoCondition.toMongoQuery()); - if(null != communityConfigs && 1 == communityConfigs.size()) { - return communityConfigs.get(0); - } - return null; - } } \ No newline at end of file diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/CommunityConfig.java b/platform-dal/src/main/java/com/lyms/platform/pojo/CommunityConfig.java index bb8169b..d685e62 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/CommunityConfig.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/CommunityConfig.java @@ -1,6 +1,7 @@ package com.lyms.platform.pojo; import com.lyms.platform.common.enums.YnEnums; +import org.springframework.data.mongodb.core.mapping.Document; import java.util.List; @@ -8,53 +9,50 @@ import java.util.List; * Created by Zhang.Rui on 2016/3/18. * */ +@Document(collection="lyms_communityConfig") public class CommunityConfig { private String id; private String name; - private String parentId; private Integer yn; - private Integer type; //1 地名, 2 社区 - private CommunityConfig parent; - private List nodes; private String gxxq; //管辖小区 + private Integer provinceId; + private Integer cityId; + private Integer areaId; - public String getGxxq() { - return gxxq; - } - public void setGxxq(String gxxq) { - this.gxxq = gxxq; + public Integer getProvinceId() { + return provinceId; } - public List getNodes() { - return nodes; + public void setProvinceId(Integer provinceId) { + this.provinceId = provinceId; } - public void setNodes(List nodes) { - this.nodes = nodes; + public Integer getCityId() { + return cityId; } - public CommunityConfig getParent() { - return parent; + public void setCityId(Integer cityId) { + this.cityId = cityId; } - public void setParent(CommunityConfig parent) { - this.parent = parent; + public Integer getAreaId() { + return areaId; } - public Integer getType() { - return type; + public void setAreaId(Integer areaId) { + this.areaId = areaId; } - public void setType(Integer type) { - this.type = type; + public String getGxxq() { + return gxxq; } - public CommunityConfig(String parentId, String tmp) { - this.parentId = parentId; - this.yn = YnEnums.YES.getId(); - this.name = tmp; + public void setGxxq(String gxxq) { + this.gxxq = gxxq; } + + public CommunityConfig() {} @@ -74,13 +72,7 @@ public class CommunityConfig { this.name = name; } - public String getParentId() { - return parentId; - } - public void setParentId(String parentId) { - this.parentId = parentId; - } public Integer getYn() { return yn; 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 172cb45..72f4c4e 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 @@ -7,6 +7,7 @@ import javax.validation.Valid; import com.lyms.platform.biz.param.CommunityQuery; import com.lyms.platform.biz.service.PatientsService; import com.lyms.platform.common.annotation.TokenRequired; +import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.operate.web.facade.PuerperaManagerFacade; import com.lyms.platform.operate.web.request.PuerperaManagerQueryRequest; import com.lyms.platform.operate.web.result.FrontEndResult; @@ -39,22 +40,10 @@ public class CommunityConfigController extends RestController { @Autowired private PatientsService patientsService; -// //新增小区 -// @RequestMapping(value = "addCommunity", method = RequestMethod.POST) -// @ResponseBody -// public BaseResponse addCommunity(@RequestBody @Valid CommunityConfigRequest communityConfigRequest) { -// CommunityConfig communityConfig = null; -// for(String tmp : communityConfigRequest.getNames()) { -// communityConfig = new CommunityConfig(communityConfigRequest.getParentId(), tmp); -// communityConfigService.appendCommunity(communityConfig); -// } -// return new BaseResponse() -// .setErrorcode(ErrorCodeConstants.SUCCESS) -// .setErrormsg("添加成功!"); -// } - //新增小区 + + //添加管辖区域 @RequestMapping(value = "addCommunity", method = RequestMethod.POST) @ResponseBody @TokenRequired @@ -69,9 +58,14 @@ public class CommunityConfigController extends RestController { if(null == communityConfig) return null; communityConfig.setId(communityConfigRequest.getId()); - communityConfig.setGxxq(communityConfig.getGxxq() + ", " + names.substring(1, names.length())); + if(null != communityConfig.getGxxq() && 0 < communityConfig.getGxxq().length() ) { + communityConfig.setGxxq(communityConfig.getGxxq() + ", " + names.substring(1, names.length())); + } else { + communityConfig.setGxxq( names.substring(1, names.length())); + } + - communityConfigService.updateArea(communityConfig); + communityConfigService.updateCommunity(communityConfig); return new BaseResponse() .setErrorcode(ErrorCodeConstants.SUCCESS) @@ -79,7 +73,7 @@ public class CommunityConfigController extends RestController { } - //删除小区 + //删除管辖区域 @RequestMapping(value = "delCommunity/{id}", method = RequestMethod.DELETE) @ResponseBody @TokenRequired @@ -87,7 +81,7 @@ public class CommunityConfigController extends RestController { CommunityConfig communityConfig = new CommunityConfig(); communityConfig.setId(id); communityConfig.setGxxq(""); - communityConfigService.updateArea(communityConfig); + communityConfigService.updateCommunity(communityConfig); return new BaseResponse() .setErrorcode(ErrorCodeConstants.SUCCESS) @@ -95,8 +89,8 @@ public class CommunityConfigController extends RestController { } - //查询小区 - @RequestMapping(value = "queryCommunity", method = RequestMethod.GET) + //查询社区 + @RequestMapping(value = "communityConfig", method = RequestMethod.GET) @ResponseBody @TokenRequired public FrontEndResult queryCommunity(CommunityQuery communityQuery) { @@ -104,12 +98,7 @@ public class CommunityConfigController extends RestController { if(null != communityConfigList) { for(CommunityConfig communityConfig : communityConfigList) { - communityConfig.setNodes(communityConfigService.queryAreaByParentId(communityConfig.getId())); - if(null != communityConfig.getParentId()) { - communityConfig.setParent(communityConfigService.queryAreaById(communityConfig.getParentId())); - } else { -// communityConfig.setParent(new CommunityConfig("0", "root")); - } + } return FrontEndResult.ini().setData(communityConfigList).setPageInfo(communityQuery.getPageInfo()).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); } @@ -119,22 +108,27 @@ public class CommunityConfigController extends RestController { - //新增区域 + //新增社区 @RequestMapping(value = "communityConfig", method = RequestMethod.POST) @ResponseBody @TokenRequired public BaseResponse appendArea(@RequestBody @Valid CommunityConfigRequest communityConfigRequest) { CommunityConfig communityConfig = null; for(String tmp : communityConfigRequest.getNames()) { - communityConfig = new CommunityConfig(communityConfigRequest.getParentId(), tmp); - communityConfigService.appendArea(communityConfig); + communityConfig = new CommunityConfig(); + communityConfig.setYn(YnEnums.YES.getId()); + communityConfig.setName(tmp); + communityConfig.setProvinceId(communityConfigRequest.getProvinceId()); + communityConfig.setCityId(communityConfigRequest.getCityId()); + communityConfig.setAreaId(communityConfigRequest.getAreaId()); + communityConfigService.appendCommunity(communityConfig); } return new BaseResponse() .setErrorcode(ErrorCodeConstants.SUCCESS) .setErrormsg("添加成功!"); } - //删除区域 + //删除社区 @RequestMapping(value = "communityConfig/{id}", method = RequestMethod.DELETE) @ResponseBody @TokenRequired @@ -148,48 +142,47 @@ public class CommunityConfigController extends RestController { CommunityConfig communityConfig = new CommunityConfig(); communityConfig.setId(id); - communityConfigService.deleteArea(communityConfig); + communityConfigService.deleteCommunity(communityConfig); return new BaseResponse() .setErrorcode(ErrorCodeConstants.SUCCESS) .setErrormsg("删除成功!"); } - //更新区域 + //更新社区 @RequestMapping(value = "communityConfig/{id}", method = RequestMethod.PUT) @ResponseBody @TokenRequired - public BaseResponse updateArea(@RequestParam(required=true) String name,@RequestParam(required=true) String parentId, @PathVariable String id) { + public BaseResponse updateArea(@RequestParam(required=true) String name, @PathVariable String id) { CommunityConfig communityConfig = new CommunityConfig(); - communityConfig.setParentId(parentId); communityConfig.setId(id); communityConfig.setName(name); - communityConfigService.updateArea(communityConfig); + communityConfigService.updateCommunity(communityConfig); return new BaseResponse() .setErrorcode(ErrorCodeConstants.SUCCESS) .setErrormsg("更新成功!"); } - //查询区域 - @RequestMapping(value = "communityConfig", method = RequestMethod.GET) - @ResponseBody - @TokenRequired - public FrontEndResult queryArea(CommunityQuery communityQuery) { - List communityConfigList = communityConfigService.queryArea(communityQuery); - - if(null != communityConfigList) { - for(CommunityConfig communityConfig : communityConfigList) { - communityConfig.setNodes(communityConfigService.queryAreaByParentId(communityConfig.getId())); - if(null != communityConfig.getParentId()) { - communityConfig.setParent(communityConfigService.queryAreaById(communityConfig.getParentId())); - } else { -// communityConfig.setParent(new CommunityConfig("0", "root")); - } - } - return FrontEndResult.ini().setData(communityConfigList).setPageInfo(communityQuery.getPageInfo()).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); - } - return FrontEndResult.ini(ErrorCodeConstants.NO_DATA, "没有数据"); - - } +// //查询区域 +// @RequestMapping(value = "communityConfig", method = RequestMethod.GET) +// @ResponseBody +// @TokenRequired +// public FrontEndResult queryArea(CommunityQuery communityQuery) { +// List communityConfigList = communityConfigService.queryArea(communityQuery); +// +// if(null != communityConfigList) { +// for(CommunityConfig communityConfig : communityConfigList) { +// communityConfig.setNodes(communityConfigService.queryAreaByParentId(communityConfig.getId())); +// if(null != communityConfig.getParentId()) { +// communityConfig.setParent(communityConfigService.queryAreaById(communityConfig.getParentId())); +// } else { +//// communityConfig.setParent(new CommunityConfig("0", "root")); +// } +// } +// return FrontEndResult.ini().setData(communityConfigList).setPageInfo(communityQuery.getPageInfo()).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); +// } +// return FrontEndResult.ini(ErrorCodeConstants.NO_DATA, "没有数据"); +// +// } @@ -197,10 +190,7 @@ public class CommunityConfigController extends RestController { @RequestMapping(value = "communityConfigTest", method = RequestMethod.GET) @ResponseBody public Integer communityConfigTest() { - CommunityConfig communityConfig = new CommunityConfig(null, "河北省"); - communityConfigService.appendArea(communityConfig); - communityConfig = new CommunityConfig(null, "四川省"); - communityConfigService.appendArea(communityConfig); + return 1; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyManagerFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyManagerFacade.java index 6b95c5b..1c6283e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyManagerFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyManagerFacade.java @@ -207,7 +207,7 @@ public class BabyManagerFacade { babyResult.setCommunityId(StringUtils.isEmpty(patients.getCommunityId()) ? "" : patients.getCommunityId()); String comm="未分配"; if(StringUtils.isNotEmpty(patients.getCommunityId())){ - CommunityConfig communityConfig = communityConfigService.queryAreaById(patients.getCommunityId()); + CommunityConfig communityConfig = communityConfigService.getCommunityById(patients.getCommunityId()); if(null!=communityConfig){ comm= communityConfig.getName(); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 2bfce96..af14331 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -100,7 +100,7 @@ public class PatientFacade { PuerperaResult result = new PuerperaResult(); String comm = "未分配"; if (StringUtils.isNotEmpty(model.getCommunityId())) { - CommunityConfig communityConfig = communityConfigService.queryAreaById(model.getCommunityId()); + CommunityConfig communityConfig = communityConfigService.getCommunityById(model.getCommunityId()); if (null != communityConfig) { comm = communityConfig.getName(); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CommunityConfigRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CommunityConfigRequest.java index d84ef8c..4bd0dca 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CommunityConfigRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CommunityConfigRequest.java @@ -9,11 +9,13 @@ import javax.validation.constraints.NotNull; */ @Form public class CommunityConfigRequest { - @NotNull(message = "父ID不能为空") - private String parentId; + + private String id; + private Integer provinceId; + private Integer cityId; + private Integer areaId; @NotNull(message = "添加内容不能为空") private String[] names; - private String id; public String getId() { return id; @@ -23,12 +25,28 @@ public class CommunityConfigRequest { this.id = id; } - public String getParentId() { - return parentId; + public Integer getProvinceId() { + return provinceId; + } + + public void setProvinceId(Integer provinceId) { + this.provinceId = provinceId; + } + + public Integer getCityId() { + return cityId; + } + + public void setCityId(Integer cityId) { + this.cityId = cityId; + } + + public Integer getAreaId() { + return areaId; } - public void setParentId(String parentId) { - this.parentId = parentId; + public void setAreaId(Integer areaId) { + this.areaId = areaId; } public String[] getNames() { -- 1.8.3.1