From 296d509996b9500c35be0b81860fa14c1d275048 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 01 Dec 2020 10:47:51 +0800
Subject: [PATCH] 更改五分钟数据接口，添加界面左侧站点设备信息接口
---
src/main/java/com/moral/controller/WebController.java | 46 ++++++++++++++++++++++++++++++++++++----------
src/main/java/com/moral/common/util/WebTokenUtils.java | 1 +
src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java | 11 ++++++-----
3 files changed, 43 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/moral/common/util/WebTokenUtils.java b/src/main/java/com/moral/common/util/WebTokenUtils.java
index 5ca7ccf..f0d33fe 100644
--- a/src/main/java/com/moral/common/util/WebTokenUtils.java
+++ b/src/main/java/com/moral/common/util/WebTokenUtils.java
@@ -2,6 +2,7 @@
import com.auth0.jwt.JWT;
import com.auth0.jwt.interfaces.Claim;
+import org.springframework.stereotype.Component;
import java.util.Map;
diff --git a/src/main/java/com/moral/controller/WebController.java b/src/main/java/com/moral/controller/WebController.java
index 36087ea..6924c97 100644
--- a/src/main/java/com/moral/controller/WebController.java
+++ b/src/main/java/com/moral/controller/WebController.java
@@ -66,6 +66,7 @@
MapPathService mapPathService;
+
@GetMapping("test")
public ResultBean<List<WebProvince>> add(HttpServletRequest request) {
String token = request.getHeader("token");
@@ -206,17 +207,29 @@
@GetMapping("fiveMinuteAvgData")
public ResultBean<Map<String, Object>> getSensorFiveMinuteAvgData(HttpServletRequest request) {
- //���������������������������monitorpointId
+ //���������������������������regionCode
Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
- if ((!parameters.containsKey("sensorKey")) || (!parameters.containsKey("monitorPointId")))
+ if ((!parameters.containsKey("sensorKey")) || (!parameters.containsKey("regionCode")))
return ResultBean.fail("���������null");
String sensorKey = (String) parameters.get("sensorKey");
- Integer monitorPointId = Integer.parseInt((String) parameters.get("monitorPointId"));
+ String regionCode = (String) parameters.get("regionCode");
+ String token = request.getHeader("token");
- //������monitorpointId������������������������������mac������
- List<Device> devices = deviceService.getDevicesByMonitorPointId(monitorPointId);
+ //������orgId������������������������������mac������
+ String accountId = WebTokenUtils.getIdBytoken(token);
+ Account account = accountService.getAccountById(Integer.parseInt(accountId));
+ parameters.put("organizationId",account.getOrganizationId());
+ List<MonitorPoint> monitorPoints = monitorPointService.getMonitorPointsAndDevicesByRegion(parameters);
+ if(ObjectUtils.isEmpty(monitorPoints))
+ return ResultBean.fail("������������������������������");
+
+ List<Device> devices = new ArrayList<>();
+ for (MonitorPoint monitorPoint : monitorPoints) {
+ devices.addAll(monitorPoint.getDevices());
+ }
if (ObjectUtils.isEmpty(devices))
- return ResultBean.fail("���������������������monitorPointId������");
+ return ResultBean.fail("������������������������������");
+
List<String> macs = new ArrayList<>();
devices.forEach(p -> {
macs.add(p.getMac());
@@ -241,9 +254,7 @@
//������monitorPointId���������������������
List<Map<String, Object>> coordinate = new ArrayList<>();
- MonitorPoint monitorPoint = monitorPointService.queryMonitorPointById(monitorPointId);
- Integer orgId = monitorPoint.getOrganizationId();
- List<MonitorPoint> monitorPoints = monitorPointService.getMonitorPointsByOrganizationId(orgId);
+ Integer orgId = account.getOrganizationId();
monitorPoints.forEach(value -> {
if ("���������".equals(value.getDescription())) {
List list = LatLngTransformation.Convert_BD09_To_GCJ02(value.getLatitude(), value.getLongitude());
@@ -412,7 +423,7 @@
@UserLoginToken
@GetMapping("mapPath")
- public ResultBean<List<WebProvince>> mapPath(HttpServletRequest request) {
+ public ResultBean<List<WebProvince>> getMapPath(HttpServletRequest request) {
String token = request.getHeader("token");
List<WebProvince> mapPath = mapPathService.getMapPath(token);
if (ObjectUtils.isEmpty(mapPath))
@@ -420,6 +431,21 @@
return new ResultBean<>(mapPath);
}
+ @UserLoginToken
+ @GetMapping("monitor-points")
+ public ResultBean<List<MonitorPoint>> getmMnitorPoints(HttpServletRequest request){
+ String accountId = WebTokenUtils.getIdBytoken(request.getHeader("token"));
+ Account account = accountService.getAccountById(Integer.parseInt(accountId));
+ String regionCode = request.getParameter("regionCode");
+ Map<String,Object> paramMap = new HashMap<>();
+ paramMap.put("organizationId",account.getOrganizationId());
+ paramMap.put("regionCode",regionCode);
+ List<MonitorPoint> monitorPoints = monitorPointService.getMonitorPointsAndDevicesByRegion(paramMap);
+ if (ObjectUtils.isEmpty(monitorPoints))
+ return new ResultBean<>("���������������������������", ResultBean.FAIL);
+ return new ResultBean<>(monitorPoints);
+ }
+
/**
* @Description: ���������������������������������������state
diff --git a/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java b/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java
index 8efeff3..9c8e26e 100644
--- a/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java
@@ -42,6 +42,7 @@
import org.apache.commons.collections.CollectionUtils;
import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
import tk.mybatis.mapper.entity.Example;
import tk.mybatis.mapper.entity.Example.Criteria;
@@ -811,11 +812,11 @@
//������������������������
List<Device> deviceList = deviceService.getDeviceById2(monitPointId);
- params.put("longitudeCompany",monitorPoint.getLongitude());
- params.put("latitudeCompany",monitorPoint.getLatitude());
- params.put("latitudeCompany",monitorPoint.getLatitude());
- params.put("monitPointId",monitPointId);
- params.put("deviceList",deviceList);
+ params.put("longitudeCompany", monitorPoint.getLongitude());
+ params.put("latitudeCompany", monitorPoint.getLatitude());
+ params.put("latitudeCompany", monitorPoint.getLatitude());
+ params.put("monitPointId", monitPointId);
+ params.put("deviceList", deviceList);
return params;
}
--
Gitblit v1.8.0