From 3b29244703787dda85386167dca4126b5b0f150c Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 16 Jul 2021 13:58:34 +0800
Subject: [PATCH] screen-api 添加查询五分钟数据接口以及查询国控站位置接口
---
screen-api/src/main/java/com/moral/api/controller/GroupController.java | 5 ++---
1 files changed, 2 insertions(+), 3 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 9dacceb..302b910 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
@@ -17,7 +17,6 @@
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.moral.api.entity.Group;
import com.moral.api.service.GroupService;
@@ -115,8 +114,8 @@
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
- List<Integer> groupIds = userGroupService.getGroupIds(userId);
- return ResultMessage.ok(groupIds);
+ List<Map<String, Object>> groups = groupService.getGroupIds(userId);
+ return ResultMessage.ok(groups);
}
@ApiOperation(value = "���������������", notes = "���������������")
--
Gitblit v1.8.0