ctripcorp/zeus
1
1
Fork 0
mirror of https://github.com/ctripcorp/zeus.git synced 2024-09-21 08:06:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'github_dev' of https://github.com/ctripcorp/zeus into github_dev

Browse source
This commit is contained in:
fanqq 2015-12-10 19:19:49 +08:00
parent b50b1c0bb7 d4442dddb2
commit c2f68c2323
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/com/ctrip/zeus/restful/resource/GroupResource.java
View file

@ -283,9 +283,15 @@ public class GroupResource {
@Path("/group/delete")
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Authorize(name = "deleteGroup")
public Response delete(@Context HttpHeaders hh, @Context HttpServletRequest request, @QueryParam("groupId") Long groupId) throws Exception {
if (groupId == null)
throw new Exception("Missing parameter.");
public Response delete(@Context HttpHeaders hh, @Context HttpServletRequest request,
@QueryParam("groupId") Long groupId,
@QueryParam("groupName") String groupName) throws Exception {
if (groupId == null) {
if (groupName != null && !groupName.isEmpty())
groupId = groupCriteriaQuery.queryByName(groupName);
}
if (groupId == null || groupId == 0L)
throw new ValidationException("groupId is not given or does not exist.");
groupRepository.delete(groupId);
return responseHandler.handle("Group is deleted.", hh.getMediaType());
}