From beae673180dad056f7174cf8bcca12c943d1f4ed Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 22 Sep 2020 13:30:30 +0800
Subject: [PATCH] 接口请求方式更改
---
src/main/java/com/moral/controller/WebController.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/moral/controller/WebController.java b/src/main/java/com/moral/controller/WebController.java
index 1450043..5fef648 100644
--- a/src/main/java/com/moral/controller/WebController.java
+++ b/src/main/java/com/moral/controller/WebController.java
@@ -3,15 +3,16 @@
import com.auth0.jwt.exceptions.JWTDecodeException;
import com.moral.common.bean.ResultBean;
import com.moral.common.exception.WebAuthException;
-import com.moral.common.util.BeanUtils;
-import com.moral.common.util.ParameterUtils;
-import com.moral.common.util.RedisHashUtil;
-import com.moral.common.util.WebTokenUtils;
+import com.moral.common.util.*;
import com.moral.common.webAnno.UserLoginToken;
import com.moral.entity.AreaNames;
+import com.moral.entity.MonitorPoint;
import com.moral.entity.Organization;
import com.moral.service.*;
import com.moral.util.LatLngTransformation;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
import jdk.nashorn.internal.runtime.logging.Logger;
import org.springframework.web.bind.annotation.*;
@@ -42,6 +43,8 @@
RedisHashUtil redisHashUtil;
@Resource
HistoryMinutelyService historyMinutelyService;
+ @Resource
+ MonitorPointService monitorPointService;
@UserLoginToken
@GetMapping("test")
@@ -193,9 +196,10 @@
@UserLoginToken
- @PostMapping("report_avg_datas")
- public ResultBean<List<Map<String, Object>>> getMonitorPointOrDeviceAvgData(HttpServletRequest request,@RequestBody Map<String, Object> parameters)
+ @GetMapping("report_avg_datas")
+ public ResultBean<List<Map<String, Object>>> getMonitorPointOrDeviceAvgData(HttpServletRequest request)
throws Exception {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
//������������������������������������������������
ParameterUtils.getTimeType4Time(parameters);
Object sensorKey = parameters.remove("sensorKey");
@@ -212,4 +216,13 @@
}
return new ResultBean<List<Map<String, Object>>>(list);
}
+
+ @UserLoginToken
+ @GetMapping("monitorpoints-devices")
+ public ResultBean<List<MonitorPoint>> getMonitorPointsAndDevicesByRegion(HttpServletRequest request)
+ throws Exception {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ List<MonitorPoint> monitorPoints = monitorPointService.getMonitorPointsAndDevicesByRegion(parameters);
+ return new ResultBean<List<MonitorPoint>>(monitorPoints);
+ }
}
--
Gitblit v1.8.0