From fdef922f0f8adea77cfaee8194033b2947575fd2 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 16 Oct 2023 09:32:43 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb
---
screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
index cd1b80c..19a3c4e 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
@@ -223,7 +223,12 @@
data = data + " " + sensor.getShowUnit();
result.put(sensor.getCode(), data);
} else {
- result.put(sensor.getCode(), "-");
+ if (sensor.getCode().equals("a01008") ||sensor.getCode().equals("a01007")){
+ result.put(sensor.getCode(), "-");
+ }else {
+ result.put(sensor.getCode(), "0"+" "+sensor.getShowUnit());
+ }
+
}
}
//������������������
--
Gitblit v1.8.0