From 1a6a37323323039af782749f447600de21c8fdc4 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Tue, 22 Sep 2020 08:57:03 +0800
Subject: [PATCH] 获取传感器均值接口update
---
src/main/java/com/moral/controller/ScreenController.java | 4 ++--
1 files changed, 2 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..677a1a8 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));
--
Gitblit v1.8.0