From dbc664b7b328809818bd070e152248249ff2f939 Mon Sep 17 00:00:00 2001 From: kaiyu <404897439@qq.com> Date: Tue, 01 Dec 2020 16:04:13 +0800 Subject: [PATCH] 获取用户信息添加站点id --- src/main/java/com/moral/controller/WebController.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/moral/controller/WebController.java b/src/main/java/com/moral/controller/WebController.java index 6b6bd26..f92d917 100644 --- a/src/main/java/com/moral/controller/WebController.java +++ b/src/main/java/com/moral/controller/WebController.java @@ -205,6 +205,7 @@ * @Date: 2020/10/19 */ + @UserLoginToken @GetMapping("fiveMinuteAvgDataNew") public ResultBean<Map<String, Object>> getSensorFiveMinuteAvgDataNew(HttpServletRequest request) { //���������������������������regionCode @@ -501,14 +502,13 @@ List<MonitorPoint> monitorPoints = monitorPointService.getMonitorPointsAndDevicesByRegion(paramMap); if (ObjectUtils.isEmpty(monitorPoints)) return new ResultBean<>("���������������������������", ResultBean.FAIL); - return new ResultBean<>(monitorPoints); + return new ResultBean<List<MonitorPoint>>(monitorPoints); } /** * @Description: ���������������������������������������state * @Param: [datas, devices] - * @return: java.util.List<java.util.Map < java.lang.String , java.lang.Object>> * @Author: ������������ * @Date: 2020/10/19 */ -- Gitblit v1.8.0