From 121a5b01a2461b5d9d5c188f9dd36c2e4673db9d Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 28 Sep 2020 10:41:08 +0800
Subject: [PATCH] 实时风向与因子数据从同一个websokceket获取优化
---
src/main/java/com/moral/controller/ScreenController.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index e4c4f0e..8ecf130 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -689,9 +689,9 @@
String time1= (String) parameters.get("time");
String mac1= (String) parameters.get("mac");
List<Map<String, Object>> list=null;
- if (mac1.equals("p5dnd7a0392018") && time1.substring(0,4).equals("2019") ){
+ if (mac1!=null && mac1.equals("p5dnd7a0392018") && time1.substring(0,4).equals("2019") ){
list=null;
- }else {
+ }else {
parameters.put("monitorPointId", parameters.remove("monitorPoint"));
Object sensorKey = parameters.remove("sensorKey");
parameters.put("sensors", Arrays.asList(sensorKey));
@@ -1614,6 +1614,7 @@
@RequestMapping(value = "/newMap-page", method = RequestMethod.GET)
public ModelAndView newMap(ModelAndView model, @RequestParam("areaCode") long code,
@RequestParam("accountId") int accountId) {
+
Account account = accountService.getAccountById(accountId);
List<MonitorPoint> monitorPointList = monitorPointService.getMonitorPointListByAccountId(accountId);
String regionName = areaService.queryFullNameByCode(code);
--
Gitblit v1.8.0