diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Organization.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Organization.java index 589054a..25bb57f 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Organization.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Organization.java @@ -2,179 +2,179 @@ package com.lyms.platform.permission.model; import java.util.Date; -public class Organization {private Integer id;private String name;private Integer type;private Integer level;private Integer areaManage;private Integer provinceId;private Integer cityId;private Integer areaId;private String address;private String description;private Integer publishId;private String publishName;private Integer yn;private Date modified;private Date created;private String shortCode; - -public Integer getId() { +public class Organization { + private Integer id; + private String name; + private Integer type; + private Integer level; + private Integer areaManage; + private Integer provinceId; + private Integer cityId; + private Integer areaId; + private String address; + private String description; + private Integer publishId; + private String publishName; + private Integer yn; + private Date modified; + private Date created; + private String shortCode; + + public Integer getId() { return id; } - public void setId(Integer id) { this.id = id; } -public String getName() { + public String getName() { return name; } - public void setName(String name) { this.name = name; } -public Integer getType() { + public Integer getType() { return type; } - public void setType(Integer type) { this.type = type; } -public Integer getLevel() { + public Integer getLevel() { return level; } - public void setLevel(Integer level) { this.level = level; } -public Integer getAreaManage() { + public Integer getAreaManage() { return areaManage; } - public void setAreaManage(Integer areaManage) { this.areaManage = areaManage; } -public Integer getProvinceId() { + public Integer getProvinceId() { return provinceId; } - public void setProvinceId(Integer provinceId) { this.provinceId = provinceId; } -public Integer getCityId() { + public Integer getCityId() { return cityId; } - public void setCityId(Integer cityId) { this.cityId = cityId; } -public Integer getAreaId() { + public Integer getAreaId() { return areaId; } - public void setAreaId(Integer areaId) { this.areaId = areaId; } -public String getAddress() { + public String getAddress() { return address; } - public void setAddress(String address) { this.address = address; } -public String getDescription() { + public String getDescription() { return description; } - public void setDescription(String description) { this.description = description; } -public Integer getPublishId() { + public Integer getPublishId() { return publishId; } - public void setPublishId(Integer publishId) { this.publishId = publishId; } -public String getPublishName() { + public String getPublishName() { return publishName; } - public void setPublishName(String publishName) { this.publishName = publishName; } -public Integer getYn() { + public Integer getYn() { return yn; } - public void setYn(Integer yn) { this.yn = yn; } -public Date getModified() { + public Date getModified() { return modified; } - public void setModified(Date modified) { this.modified = modified; } -public Date getCreated() { + public Date getCreated() { return created; } - public void setCreated(Date created) { this.created = created; } -public String getShortcode() { + public String getShortcode() { return shortCode; } - public void setShortcode(String shortCode) { this.shortCode = shortCode; diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Users.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Users.java index 46f54c3..f7a995d 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Users.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Users.java @@ -2,179 +2,179 @@ package com.lyms.platform.permission.model; import java.util.Date; -public class Users {private Integer id;private Integer type;private Integer orgId;private Integer deptId;private String name;private String account;private String pwd;private String phone;private Integer publishId;private String publishName;private Integer yn;private Integer enable;private Date modified;private Date created;private String remarks;private Date lastLoginTime; - -public Integer getId() { +public class Users { + private Integer id; + private Integer type; + private Integer orgId; + private Integer deptId; + private String name; + private String account; + private String pwd; + private String phone; + private Integer publishId; + private String publishName; + private Integer yn; + private Integer enable; + private Date modified; + private Date created; + private String remarks; + private Date lastLoginTime; + + public Integer getId() { return id; } - public void setId(Integer id) { this.id = id; } -public Integer getType() { + public Integer getType() { return type; } - public void setType(Integer type) { this.type = type; } -public Integer getOrgId() { + public Integer getOrgId() { return orgId; } - public void setOrgId(Integer orgId) { this.orgId = orgId; } -public Integer getDeptId() { + public Integer getDeptId() { return deptId; } - public void setDeptId(Integer deptId) { this.deptId = deptId; } -public String getName() { + public String getName() { return name; } - public void setName(String name) { this.name = name; } -public String getAccount() { + public String getAccount() { return account; } - public void setAccount(String account) { this.account = account; } -public String getPwd() { + public String getPwd() { return pwd; } - public void setPwd(String pwd) { this.pwd = pwd; } -public String getPhone() { + public String getPhone() { return phone; } - public void setPhone(String phone) { this.phone = phone; } -public Integer getPublishId() { + public Integer getPublishId() { return publishId; } - public void setPublishId(Integer publishId) { this.publishId = publishId; } -public String getPublishName() { + public String getPublishName() { return publishName; } - public void setPublishName(String publishName) { this.publishName = publishName; } -public Integer getYn() { + public Integer getYn() { return yn; } - public void setYn(Integer yn) { this.yn = yn; } -public Integer getEnable() { + public Integer getEnable() { return enable; } - public void setEnable(Integer enable) { this.enable = enable; } -public Date getModified() { + public Date getModified() { return modified; } - public void setModified(Date modified) { this.modified = modified; } -public Date getCreated() { + public Date getCreated() { return created; } - public void setCreated(Date created) { this.created = created; } -public String getRemarks() { + public String getRemarks() { return remarks; } - public void setRemarks(String remarks) { this.remarks = remarks; } -public Date getLastLoginTime() { + public Date getLastLoginTime() { return lastLoginTime; } - public void setLastLoginTime(Date lastLoginTime) { this.lastLoginTime = lastLoginTime; diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/ResultUtils.java b/platform-common/src/main/java/com/lyms/platform/common/utils/ResultUtils.java index dc5ed79..5057f6b 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/ResultUtils.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/ResultUtils.java @@ -15,6 +15,19 @@ public final class ResultUtils { public static final String ERROR_CODE="errorcode"; public static final String ERROR_MSG="errormsg"; + + /** + * 返回成功数据 + */ + public static void buildSuccessResultAndWrite(HttpServletResponse httpServletResponse, Object data){ + Map result= new HashMap(); + result.put(ERROR_CODE, ErrorCodeConstants.SUCCESS); + result.put(ERROR_MSG,"成功"); + result.put("list", data); + writeJson(httpServletResponse, JsonUtil.obj2JsonString(result)); + } + + /** * 返回自定义消息 */ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java index 23990f3..ba3bb26 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java @@ -5,27 +5,24 @@ import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.base.ContextHolder; import com.lyms.platform.common.base.PlatformContext; +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.permission.model.Departments; -import com.lyms.platform.permission.model.DepartmentsQuery; -import com.lyms.platform.permission.model.Users; +import com.lyms.platform.permission.model.*; import com.lyms.platform.permission.service.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.util.Date; +import java.util.List; /** * Created by zhang.rui on 2015/9/28 0028. */ @Controller -@RequestMapping("/v1") public class DepartmentsController extends BaseController { @Autowired private DepartmentsService departmentsService; @@ -70,29 +67,28 @@ public class DepartmentsController extends BaseController { /** * 修改部门 */ - @RequestMapping(value = "/departments", method = RequestMethod.PUT) + @RequestMapping(value = "/departments/{id}", method = RequestMethod.PUT) @TokenRequired public void addDepartments(HttpServletResponse response, - @RequestParam(value = "id") Integer id, + @PathVariable(value = "id") Integer id, @RequestParam(value = "pid") Integer pid, @RequestParam(value = "name") String name, @RequestParam(value = "orgId") Integer orgId, @RequestParam(value = "description") String description, @RequestParam(value = "shortCode") String shortCode) { - if (null == name || null == orgId) { + if (null == name || null == id) { ResultUtils.buildParameterErrorResultAndWrite(response); return; } - DepartmentsQuery departmentsQuery = new DepartmentsQuery(); - departmentsQuery.setName(name); - if(0 == departmentsService.queryDepartmentsCount(departmentsQuery)) { + + Departments departments = departmentsService.getDepartments(id); + if(null == departments) { ResultUtils.buildParameterErrorResultAndWrite(response,"该部门不存在"); return; } - Departments departments = new Departments(); pid = pid == null ? 0 : pid; departments.setParentId(pid); departments.setName(name); @@ -157,6 +153,34 @@ public class DepartmentsController extends BaseController { } + /** + * 获取列表 + */ + @RequestMapping(value = "/departments", method = RequestMethod.GET) + @ResponseBody + @TokenRequired + public void getPermissions(HttpServletResponse response, + @RequestParam(value = "keyword", required = false) String keyword, + @RequestParam(value = "page", required = false) Integer page, + @RequestParam(value = "limit", required = false) Integer limit, + @RequestParam(value = "orgId", required = false) Integer orgId) { + + limit = limit == null ? 10 : limit; + page = page == null ? 1 : page; + + + DepartmentsQuery departmentsQuery = new DepartmentsQuery(); + departmentsQuery.setNeed("true"); + departmentsQuery.setSort("id desc"); + departmentsQuery.setOrgId(orgId); + departmentsQuery.setPage(page); + departmentsQuery.setName(keyword); + departmentsQuery.setLimit(limit); + //TODO 这里查询未完成 模糊查询 + + List departmentses = departmentsService.queryDepartments(departmentsQuery); + ResultUtils.buildSuccessResultAndWrite(response, departmentses); + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java index 5822f64..cf6d0e8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java @@ -7,6 +7,8 @@ import com.lyms.platform.common.base.ContextHolder; import com.lyms.platform.common.base.PlatformContext; 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.result.BaseResponse; import com.lyms.platform.common.utils.ResultUtils; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.model.OrganizationQuery; @@ -15,19 +17,16 @@ import com.lyms.platform.permission.service.*; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.util.Date; +import java.util.List; /** * Created by zhang.rui on 2015/9/28 0028. */ @Controller -@RequestMapping("/v1") public class OrganizationController extends BaseController { @Autowired private UsersService usersService; @@ -66,20 +65,20 @@ public class OrganizationController extends BaseController { /** * 修改机构 */ - @RequestMapping(value = "/organization", method = RequestMethod.PUT) + @RequestMapping(value = "/organization/{id}", method = RequestMethod.PUT) @TokenRequired public void updateOrganization(HttpServletResponse response, - @RequestParam(value = "id") Integer id, - @RequestParam(value = "name") String name, - @RequestParam(value = "type") Integer type, - @RequestParam(value = "level") Integer level, - @RequestParam(value = "areaManage") Integer areaManage, - @RequestParam(value = "provinceId") Integer provinceId, - @RequestParam(value = "cityId") Integer cityId, - @RequestParam(value = "areaId") Integer areaId, - @RequestParam(value = "address") String address, - @RequestParam(value = "description") String description, - @RequestParam(value = "shortCode") String shortCode) { + @PathVariable(value = "id") Integer id, + @RequestParam(value = "name", required = false) String name, + @RequestParam(value = "type", required = false) Integer type, + @RequestParam(value = "level", required = false) Integer level, + @RequestParam(value = "areaManage", required = false) Integer areaManage, + @RequestParam(value = "provinceId", required = false) Integer provinceId, + @RequestParam(value = "cityId", required = false) Integer cityId, + @RequestParam(value = "areaId", required = false) Integer areaId, + @RequestParam(value = "address", required = false) String address, + @RequestParam(value = "description", required = false) String description, + @RequestParam(value = "shortCode", required = false) String shortCode) { if (type == null || StringUtils.isBlank(name) ) { @@ -178,13 +177,28 @@ public class OrganizationController extends BaseController { * 获取列表 */ @RequestMapping(value = "/organization", method = RequestMethod.GET) + @ResponseBody @TokenRequired - public void getPermissions(HttpServletResponse response, - @RequestParam(value = "type") Integer type, - @RequestParam(value = "page") Integer page, - @RequestParam(value = "limit") Integer limit, - @RequestParam(value = "id", required = false) Integer id) { + public void getOrganization(HttpServletResponse response, + @RequestParam(value = "keyword", required = false) String keyword, + @RequestParam(value = "page", required = false) Integer page, + @RequestParam(value = "limit", required = false) Integer limit, + @RequestParam(value = "areaId", required = false) Integer areaId) { + limit = limit == null ? 10 : limit; + page = page == null ? 1 : page; + + + OrganizationQuery organizationQuery = new OrganizationQuery(); + organizationQuery.setNeed("true"); + organizationQuery.setSort("id desc"); + organizationQuery.setName(keyword); + organizationQuery.setPage(page); + organizationQuery.setLimit(limit); + //TODO 这里查询未完成 模糊查询 + + List organizations = organizationService.queryOrganization(organizationQuery); + ResultUtils.buildSuccessResultAndWrite(response, organizations); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PermissionsController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PermissionsController.java index d8fa0b3..6a22421 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PermissionsController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PermissionsController.java @@ -25,7 +25,6 @@ import java.util.*; * Created by Administrator on 2015/9/28 0028. */ @Controller -@RequestMapping("/v1") public class PermissionsController extends BaseController { @Autowired diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java index 179d094..3e4a384 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java @@ -8,6 +8,7 @@ import com.lyms.platform.common.base.PlatformContext; import com.lyms.platform.common.constants.ConstantInterface; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.exception.BusinessException; +import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.common.utils.ResultUtils; import com.lyms.platform.permission.model.*; @@ -15,10 +16,7 @@ import com.lyms.platform.permission.service.*; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.util.*; @@ -27,7 +25,6 @@ import java.util.*; * Created by Administrator on 2015/9/29 0029. */ @Controller -@RequestMapping("/v1") public class RolesController extends BaseController { @Autowired @@ -142,12 +139,12 @@ public class RolesController extends BaseController { @RequestMapping(value = "/roles/{id}",method = RequestMethod.PUT) @TokenRequired public void updateRoles(HttpServletResponse response ,@PathVariable Integer id, - @RequestParam(value = "name")String name, - @RequestParam(value = "enable")Integer enable, - @RequestParam(value = "remarks")String remarks, - @RequestParam(value = "shortCode")String shortCode) { + @RequestParam(value = "name",required = false)String name, + @RequestParam(value = "enable",required = false)Integer enable, + @RequestParam(value = "remarks",required = false)String remarks, + @RequestParam(value = "shortCode",required = false)String shortCode) { - if ( StringUtils.isBlank(name) || null != id ) { + if ( StringUtils.isBlank(name) || null == id ) { ResultUtils.buildParameterErrorResultAndWrite(response); return; } @@ -238,17 +235,31 @@ public class RolesController extends BaseController { } /** - * 获取角色信息 + * 获取列表 */ - @RequestMapping(value = "/roles",method = RequestMethod.GET) + @RequestMapping(value = "/roles", method = RequestMethod.GET) + @ResponseBody @TokenRequired - public void getRoles(HttpServletResponse response , - @RequestParam(value = "page")Integer page, - @RequestParam(value = "limit")Integer limit, - @RequestParam(value = "id",required = false)Integer id, - @RequestParam(value = "type",required = false)Integer type, - @RequestParam(value = "parentId",required = false)Integer parentId, - @RequestParam(value = "title",required = false)String title) { - + public void getPermissions(HttpServletResponse response, + @RequestParam(value = "keyword",required = false) String keyword, + @RequestParam(value = "type",required = false) Integer type, + @RequestParam(value = "page",required = false) Integer page, + @RequestParam(value = "limit",required = false) Integer limit, + @RequestParam(value = "orgId", required = false) Integer orgId) { + + limit = limit == null ? 10 : limit; + page = page == null ? 1 : page; + + RolesQuery rolesQuery = new RolesQuery(); + rolesQuery.setNeed("true"); + rolesQuery.setSort("id desc"); + rolesQuery.setType(type); + rolesQuery.setName(keyword); + rolesQuery.setPage(page); + rolesQuery.setLimit(limit); + //TODO 这里查询未完成 模糊查询 + + List roles = rolesService.queryRoles(rolesQuery); + ResultUtils.buildSuccessResultAndWrite(response, roles); } } 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 76bbb5f..a6dc785 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 @@ -17,10 +17,7 @@ import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.text.MessageFormat; @@ -30,7 +27,6 @@ import java.util.*; * Created by Administrator on 2015/9/25 0025. */ @Controller -@RequestMapping("/v1") public class UsersController extends BaseController { @Autowired @@ -50,6 +46,47 @@ public class UsersController extends BaseController { private static final String LYMS = "龙源美生"; + + + + + + + + + /** + * 获取列表 + */ + @RequestMapping(value = "/users", method = RequestMethod.GET) + @ResponseBody + @TokenRequired + public void getPermissions(HttpServletResponse response, + @RequestParam(value = "type") Integer type, + @RequestParam(value = "keyword", required = false) String keyword, + @RequestParam(value = "rolesId", required = false) Integer rolesId, + @RequestParam(value = "page", required = false) Integer page, + @RequestParam(value = "limit", required = false) Integer limit, + @RequestParam(value = "orgId", required = false) Integer orgId) { + + limit = limit == null ? 10 : limit; + page = page == null ? 1 : page; + + UsersQuery usersQuery = new UsersQuery(); + usersQuery.setNeed("true"); + usersQuery.setSort("id desc"); + usersQuery.setName(keyword); + usersQuery.setType(type); + usersQuery.setPage(page); + usersQuery.setLimit(limit); + //TODO 这里查询未完成 模糊查询 + + List users = usersService.queryUsers(usersQuery); + ResultUtils.buildSuccessResultAndWrite(response, users); + } + + + + /** * AMS 用户请求登录,获取token */ @@ -131,6 +168,8 @@ public class UsersController extends BaseController { String code = NumberUtils.getRandomString(6); //设置缓存10分钟验证码 RedisUtils.setObj(countKey, code, TimeConstants.TEN_MINUTE); + + System.out.println(phone + "----" + code); //发送短信 MessageUtil.send(phone, ConstantInterface.SHORT_MESSAGE_PRE + MessageFormat.format("验证码{0}，您正在登录区域平台，若非本人操作，请勿泄露。", code)); @@ -203,6 +242,10 @@ public class UsersController extends BaseController { return; } + if(!usersList.get(0).getType().equals(0)) { + ResultUtils.buildParameterErrorResultAndWrite(response, "用户错误"); + } + //将已有映射设为失效 UserOrganizationMapsQuery userOrganizationMapsQuery = new UserOrganizationMapsQuery(); userOrganizationMapsQuery.setUserId(userId); @@ -328,28 +371,23 @@ public class UsersController extends BaseController { /** * 用户修改 */ - @RequestMapping(value = "/users", method = RequestMethod.PUT) + @RequestMapping(value = "/users/{id}", method = RequestMethod.PUT) @TokenRequired public void updateUsers(HttpServletResponse response, - @RequestParam(value = "id") Integer id, - @RequestParam(value = "deptId") Integer deptId, - @RequestParam(value = "orgId") Integer orgId, - @RequestParam(value = "name") String name, - @RequestParam(value = "account")String account, - @RequestParam(value = "phone") String phone, - @RequestParam(value = "enable") Integer enable, - @RequestParam(value = "remarks") String remarks, - @RequestParam(value = "roleIds") String roleIds) { + @PathVariable(value = "id") Integer id, + @RequestParam(value = "deptId",required = false) Integer deptId, + @RequestParam(value = "orgId",required = false) Integer orgId, + @RequestParam(value = "name",required = false) String name, + @RequestParam(value = "account",required = false)String account, + @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) { PlatformContext mommyBobyContext = ContextHolder.getContext(); String token = mommyBobyContext.getToken(); - if ( StringUtils.isBlank(roleIds) || deptId == null || - StringUtils.isBlank(name) /*|| StringUtils.isBlank(account) || - StringUtils.isBlank(pwd) */ || StringUtils.isBlank(phone)) { - ResultUtils.buildParameterErrorResultAndWrite(response); - return; - } + //获取登录用户ID Integer userId = Integer.valueOf(tokenService.getUserId(token)); if (userId != null) { @@ -367,7 +405,7 @@ public class UsersController extends BaseController { return; } - Users users = new Users(); + Users users = usersList.get(0); users.setId(id); users.setDeptId(deptId); users.setOrgId(orgId); @@ -385,30 +423,33 @@ public class UsersController extends BaseController { //如有角色,则对用户角色中间表先删除后新增 - Integer _userId = usersList.get(0).getId(); - UserRoleMapsQuery userRoleMapsQuery = new UserRoleMapsQuery(); - userRoleMapsQuery.setUserId(_userId); - List roleMapsList = userRoleMapsService.queryUserRoleMaps(userRoleMapsQuery); - for (UserRoleMaps userRoleMaps : roleMapsList) { - userRoleMaps.setYn(YnEnums.NO.getId()); - userRoleMapsService.updateUserRoleMaps(userRoleMaps); - } + if(null != roleIds) { + + Integer _userId = usersList.get(0).getId(); + UserRoleMapsQuery userRoleMapsQuery = new UserRoleMapsQuery(); + userRoleMapsQuery.setUserId(_userId); + List roleMapsList = userRoleMapsService.queryUserRoleMaps(userRoleMapsQuery); + for (UserRoleMaps userRoleMaps : roleMapsList) { + userRoleMaps.setYn(YnEnums.NO.getId()); + userRoleMapsService.updateUserRoleMaps(userRoleMaps); + } - UserRoleMaps userRoleMaps = new UserRoleMaps(); - String[] roleArrayIds = roleIds.split(","); - List user = usersService.queryUsers(usersQuery); - for (String tmp : roleArrayIds) { - Roles roles = rolesService.getRoles(Integer.valueOf(tmp)); - if (roles == null || roles.getYn() == YnEnums.NO.getId()) { - continue; - } + UserRoleMaps userRoleMaps = new UserRoleMaps(); + String[] roleArrayIds = roleIds.split(","); + List user = usersService.queryUsers(usersQuery); + for (String tmp : roleArrayIds) { + Roles roles = rolesService.getRoles(Integer.valueOf(tmp)); + if (roles == null || roles.getYn() == YnEnums.NO.getId()) { + continue; + } - if (user.get(0).getId() != null) { - userRoleMaps.setRoleId(Integer.valueOf(Integer.valueOf(tmp))); - userRoleMaps.setUserId(user.get(0).getId()); - userRoleMaps.setYn(YnEnums.YES.getId()); - userRoleMapsService.addUserRoleMaps(userRoleMaps); + if (user.get(0).getId() != null) { + userRoleMaps.setRoleId(Integer.valueOf(Integer.valueOf(tmp))); + userRoleMaps.setUserId(user.get(0).getId()); + userRoleMaps.setYn(YnEnums.YES.getId()); + userRoleMapsService.addUserRoleMaps(userRoleMaps); + } } } ResultUtils.buildSuccessResultAndWrite(response); @@ -453,7 +494,7 @@ public class UsersController extends BaseController { @RequestMapping(value = "/users/{id}", method = RequestMethod.DELETE) @TokenRequired public void deleteUsers(HttpServletResponse response,@PathVariable Integer id) { - if (null != id) { + if (null == id) { ResultUtils.buildIdIsNull(response); return; } @@ -493,24 +534,8 @@ public class UsersController extends BaseController { ResultUtils.buildSuccessResultAndWrite(response); } - /** - * 获取用户信息 - */ - @RequestMapping(value = "/users", method = RequestMethod.GET) - @TokenRequired - public void getUsers(HttpServletResponse response, Integer page, Integer limit, - @RequestParam(value = "id", required = false) Integer id, - @RequestParam(value = "type", required = false) Integer type, - @RequestParam(value = "parentId", required = false) Integer parentId, - @RequestParam(value = "username", required = false) String username) { - - - - - } - /** * 修改用户密码 */