From e4ebf74baef4faab3fa794c042e2921437525e6e Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 12 Aug 2021 10:40:52 +0800
Subject: [PATCH] update
---
screen-api/src/main/java/com/moral/api/controller/GroupController.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/GroupController.java b/screen-api/src/main/java/com/moral/api/controller/GroupController.java
index 302b910..eb3efcc 100644
--- a/screen-api/src/main/java/com/moral/api/controller/GroupController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/GroupController.java
@@ -12,6 +12,7 @@
import javax.servlet.http.HttpServletRequest;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -102,20 +103,19 @@
return ResultMessage.ok(pageResult);
}
- @ApiOperation(value = "���������������������ids", notes = "���������������������ids")
+ @ApiOperation(value = "���������������������������", notes = "���������������������������")
@ApiImplicitParams({
@ApiImplicitParam(name = "userId", value = "������id", required = true, paramType = "query", dataType = "int"),
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
})
- @RequestMapping(value = "getGroupIds", method = RequestMethod.GET)
- public ResultMessage getGroupIds(Integer userId) {
- System.out.println(userId);
- if (userId == null) {
+ @RequestMapping(value = "getGroup", method = RequestMethod.GET)
+ public ResultMessage getGroup(Integer userId) {
+ if (ObjectUtils.isEmpty(userId)) {
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
- List<Map<String, Object>> groups = groupService.getGroupIds(userId);
- return ResultMessage.ok(groups);
+ Map<String, Object> group = groupService.getGroup(userId);
+ return ResultMessage.ok(group);
}
@ApiOperation(value = "���������������", notes = "���������������")
--
Gitblit v1.8.0