From a0ed561cc639097ad88742acf30ffa1023e2f2d7 Mon Sep 17 00:00:00 2001 From: "rui.zhang" Date: Fri, 29 Apr 2016 16:47:07 +0800 Subject: [PATCH] platform permission add return pageinfo --- .../biz/service/CommunityConfigService.java | 2 +- .../common/constants/ErrorCodeConstants.java | 2 + .../com/lyms/platform/common/utils/LoginUtil.java | 4 +- .../web/controller/CommunityConfigController.java | 18 +++- .../operate/web/controller/UsersController.java | 29 +++--- .../operate/web/facade/BasicConfigFacade.java | 2 + .../web/request/BasicConfigQueryRequest.java | 14 ++- .../src/main/webapp/WEB-INF/web.xml | 4 +- .../src/main/webapp/WEB-INF/web.xml_ | 116 +++++++++++++++++++++ .../src/main/webapp/clientaccesspolicy.xml | 13 +++ .../src/main/webapp/crossdomain.xml | 0 11 files changed, 183 insertions(+), 21 deletions(-) create mode 100644 platform-operate-api/src/main/webapp/WEB-INF/web.xml_ create mode 100644 platform-operate-api/src/main/webapp/clientaccesspolicy.xml create mode 100644 platform-operate-api/src/main/webapp/crossdomain.xml 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 9145f32..33ece14 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 @@ -66,7 +66,7 @@ public class CommunityConfigService { 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)}); + 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()) { 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 5c75ab2..25501eb 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 @@ -45,4 +45,6 @@ public class ErrorCodeConstants { //没有数据 public static final int NO_DATA=4200; + //不能删除 + public static final int DONT_DELETE=4201; } diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/LoginUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/LoginUtil.java index fb10778..1e4edb6 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/LoginUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/LoginUtil.java @@ -11,7 +11,7 @@ import java.security.NoSuchAlgorithmException; public class LoginUtil { - public static Integer register(String phone, String token, String typeId) { + public static LoginContext register(String phone, String token, String typeId) { HttpClient client = new HttpClient(); PostMethod post = new MessageUtil.UTF8PostMethod("http://passport.healthbaby.com.cn/v1/register.action"); NameValuePair[] data = { @@ -27,7 +27,7 @@ public class LoginUtil { post.releaseConnection(); if(200 == statusCode) { LoginContext loginState = JsonUtil.str2Obj(result, LoginContext.class); - return loginState.getId(); + return loginState; } } catch (Exception e) { e.printStackTrace(); 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 a60ff53..172cb45 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 @@ -5,8 +5,13 @@ import java.util.List; 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.operate.web.facade.PuerperaManagerFacade; +import com.lyms.platform.operate.web.request.PuerperaManagerQueryRequest; import com.lyms.platform.operate.web.result.FrontEndResult; +import com.lyms.platform.pojo.Patients; +import com.lyms.platform.query.PatientsQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.PathVariable; @@ -31,7 +36,8 @@ import com.lyms.platform.pojo.CommunityConfig; public class CommunityConfigController extends RestController { @Autowired private CommunityConfigService communityConfigService; - + @Autowired + private PatientsService patientsService; // //新增小区 // @RequestMapping(value = "addCommunity", method = RequestMethod.POST) @@ -81,7 +87,6 @@ public class CommunityConfigController extends RestController { CommunityConfig communityConfig = new CommunityConfig(); communityConfig.setId(id); communityConfig.setGxxq(""); - communityConfigService.updateArea(communityConfig); return new BaseResponse() @@ -134,6 +139,13 @@ public class CommunityConfigController extends RestController { @ResponseBody @TokenRequired public BaseResponse deleteArea(@PathVariable String id) { + PatientsQuery patientsQuery = new PatientsQuery(); + patientsQuery.setCommunityId(id); + List q = patientsService.queryPatient(patientsQuery); + if(0 < q.size()) { + return new BaseResponse().setErrorcode(ErrorCodeConstants.DONT_DELETE).setErrormsg("该社区下有产妇数据不能删除！"); + } + CommunityConfig communityConfig = new CommunityConfig(); communityConfig.setId(id); communityConfigService.deleteArea(communityConfig); @@ -170,7 +182,7 @@ public class CommunityConfigController extends RestController { if(null != communityConfig.getParentId()) { communityConfig.setParent(communityConfigService.queryAreaById(communityConfig.getParentId())); } else { - communityConfig.setParent(new CommunityConfig("0", "root")); +// communityConfig.setParent(new CommunityConfig("0", "root")); } } return FrontEndResult.ini().setData(communityConfigList).setPageInfo(communityQuery.getPageInfo()).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java index aa7649d..1e9939e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java @@ -84,7 +84,7 @@ public class UsersController extends BaseController { //设置用户角色信息 for(Users user : users) { user.setRoles(this.getUserRoles(user.getId())); - user.setOrganization(organizationService.getOrganization(user.getId())); + user.setOrganization(organizationService.getOrganization(user.getOrgId())); user.setDepartmentses(departmentsService.getDepartments(user.getDeptId())); } @@ -133,7 +133,7 @@ public class UsersController extends BaseController { //设置用户角色信息 for(Users user : users) { user.setRoles(this.getUserRoles(user.getId())); - user.setOrganization(organizationService.getOrganization(user.getId())); + user.setOrganization(organizationService.getOrganization(user.getOrgId())); user.setDepartmentses(departmentsService.getDepartments(user.getDeptId())); } @@ -423,12 +423,13 @@ public class UsersController extends BaseController { // users.setPwd(LoginUtil.md5(NumberUtils.getRandomString(6))); //关联登录中心ID - Integer loginCenterId = LoginUtil.register(phone, token, typeId); - if(null == loginCenterId) { - ResultUtils.buildResultAndWrite(response, ErrorCodeConstants.SYSTEM_ERROR, "服务器内部错误"); + LoginContext loginContext = LoginUtil.register(phone, token, typeId); + if(!loginContext.getErrorcode().equals(0)) { + ResultUtils.buildResultAndWrite(response, ErrorCodeConstants.SYSTEM_ERROR, loginContext.getErrormsg()); return; } - users.setLogincenterId(loginCenterId); + users.setLogincenterId(loginContext.getId()); + usersService.addUsers(users); @@ -504,7 +505,7 @@ public class UsersController extends BaseController { //准备添加数据 Users users = new Users(); - users.setType(1); //1管理员 + users.setType(1); //1普通用户 users.setDeptId(deptId); users.setOrgId(orgId); users.setName(name); @@ -522,12 +523,12 @@ public class UsersController extends BaseController { // users.setPwd(LoginUtil.md5(NumberUtils.getRandomString(6))); //关联登录中心ID - Integer loginCenterId = LoginUtil.register(phone, token, typeId); - if(null == loginCenterId) { - ResultUtils.buildResultAndWrite(response, ErrorCodeConstants.SYSTEM_ERROR, "服务器内部错误"); + LoginContext loginContext = LoginUtil.register(phone, token, typeId); + if(!loginContext.getErrorcode().equals(0)) { + ResultUtils.buildResultAndWrite(response, ErrorCodeConstants.SYSTEM_ERROR, loginContext.getErrormsg()); return; } - users.setLogincenterId(loginCenterId); + users.setLogincenterId(loginContext.getId()); usersService.addUsers(users); @@ -665,7 +666,9 @@ public class UsersController extends BaseController { @RequestParam(value = "phone",required = false) String phone, @RequestParam(value = "enable",required = false) Integer enable, @RequestParam(value = "remarks",required = false) String remarks, - @RequestParam(value = "roleIds",required = false) String roleIds) { + @RequestParam(value = "roleIds",required = false) String roleIds, + @RequestParam(value = "orgId",required = false) Integer orgId, + @RequestParam(value = "deptId",required = false) Integer deptId) { @@ -695,6 +698,8 @@ public class UsersController extends BaseController { users.setEnable(enable); users.setRemarks(remarks); users.setModified(new Date()); + users.setDeptId(deptId); + users.setOrgId(orgId); // users.setPwd(LoginUtil.md5(NumberUtils.getRandomString(6))); usersService.updateUsers(users); 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 4d1ebaa..4b68d6a 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 @@ -35,6 +35,8 @@ public class BasicConfigFacade { BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); basicConfigQuery.setNeed("1"); + basicConfigQuery.setId(basicConfigQueryRequest.getId()); + basicConfigQuery.setParentId(basicConfigQueryRequest.getParentId()); basicConfigQuery.setPage(basicConfigQueryRequest.getPage()); basicConfigQuery.setLimit(basicConfigQueryRequest.getLimit()); basicConfigQuery.setYn(YnEnums.YES.getId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigQueryRequest.java index d505008..f3a2030 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigQueryRequest.java @@ -19,8 +19,12 @@ public class BasicConfigQueryRequest extends BaseQuery { @FormParam private String keywords; - @FormParam private String id; + private String parentId; + + public static long getSerialVersionUID() { + return serialVersionUID; + } public String getId() { return id; @@ -30,6 +34,14 @@ public class BasicConfigQueryRequest extends BaseQuery { this.id = id; } + public String getParentId() { + return parentId; + } + + public void setParentId(String parentId) { + this.parentId = parentId; + } + public String getKeywords() { return keywords; } diff --git a/platform-operate-api/src/main/webapp/WEB-INF/web.xml b/platform-operate-api/src/main/webapp/WEB-INF/web.xml index 3f16d74..e9d47b2 100644 --- a/platform-operate-api/src/main/webapp/WEB-INF/web.xml +++ b/platform-operate-api/src/main/webapp/WEB-INF/web.xml @@ -13,7 +13,7 @@ version="2.5" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - + default *.xml diff --git a/platform-operate-api/src/main/webapp/WEB-INF/web.xml_ b/platform-operate-api/src/main/webapp/WEB-INF/web.xml_ new file mode 100644 index 0000000..3f16d74 --- /dev/null +++ b/platform-operate-api/src/main/webapp/WEB-INF/web.xml_ @@ -0,0 +1,116 @@ + + + + + + + default + *.xml + + + + + + contextConfigLocation + + classpath*:/spring/applicationContext.xml + + + + + 60 + + + log4jConfigLocation + classpath:log4j_config.xml + + + log4jRefreshInterval + 60000 + + + dispatcher + org.springframework.web.servlet.DispatcherServlet + + contextConfigLocation + classpath*:/spring/applicationContext-mvc.xml + + 1 + + + dispatcher + / + + + HttpMethodFilter + org.springframework.web.filter.HttpPutFormContentFilter + + + HttpMethodFilter + /* + + + encodingFilter + org.springframework.web.filter.CharacterEncodingFilter + + encoding + UTF-8 + + + + + encodingFilter + /* + + + org.springframework.web.context.ContextLoaderListener + + + org.springframework.web.util.Log4jConfigListener + + diff --git a/platform-operate-api/src/main/webapp/clientaccesspolicy.xml b/platform-operate-api/src/main/webapp/clientaccesspolicy.xml new file mode 100644 index 0000000..509cf5c --- /dev/null +++ b/platform-operate-api/src/main/webapp/clientaccesspolicy.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/platform-operate-api/src/main/webapp/crossdomain.xml b/platform-operate-api/src/main/webapp/crossdomain.xml new file mode 100644 index 0000000..e69de29 -- 1.8.3.1