From d2b21bc8fd32da4ac29518a0c07f95c140f287b3 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 15 Oct 2020 14:47:07 +0800
Subject: [PATCH] update
---
src/main/java/com/moral/controller/WebController.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/controller/WebController.java b/src/main/java/com/moral/controller/WebController.java
index c031c2a..43a14aa 100644
--- a/src/main/java/com/moral/controller/WebController.java
+++ b/src/main/java/com/moral/controller/WebController.java
@@ -6,6 +6,7 @@
import com.moral.common.util.*;
import com.moral.common.webAnno.UserLoginToken;
import com.moral.entity.AreaNames;
+import com.moral.entity.Device;
import com.moral.entity.MonitorPoint;
import com.moral.entity.Organization;
import com.moral.service.*;
@@ -45,6 +46,9 @@
HistoryMinutelyService historyMinutelyService;
@Resource
MonitorPointService monitorPointService;
+ @Resource
+ DeviceService deviceService;
+
@UserLoginToken
@GetMapping("test")
@@ -167,4 +171,12 @@
List<MonitorPoint> monitorPoints = monitorPointService.getMonitorPointsAndDevicesByRegion(parameters);
return new ResultBean<List<MonitorPoint>>(monitorPoints);
}
+
+ /* @UserLoginToken*/
+ @GetMapping("coordinates")
+ public ResultBean<List<Device>> getDeviceCoordinatesAndState(HttpServletRequest request){
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ ParameterUtils.getRegionType4RegionCode(parameters);
+ return new ResultBean<List<Device>>(deviceService.queryDevice(parameters));
+ }
}
--
Gitblit v1.8.0