From cc120d54e26f64753e99b349599875cf6911a0af Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 18 Oct 2023 08:26:19 +0800
Subject: [PATCH] chore:小程序测试提交

---
 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