From 5615e56cc5e89d3b1233fe8f5fb4532a2a613844 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 14 Jan 2022 14:42:48 +0800
Subject: [PATCH] screen-api

---
 screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
index 6715169..734b4dd 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
@@ -651,13 +651,13 @@
             result = doubleStream.sum();
         } else {
             if ("min".equals(type)) {
-                optionalDouble = doubleStream.average();
-
-            } else if ("max".equals(type)) {
                 optionalDouble = doubleStream.min();
 
-            } else if ("avg".equals(type)) {
+            } else if ("max".equals(type)) {
                 optionalDouble = doubleStream.max();
+
+            } else if ("avg".equals(type)) {
+                optionalDouble = doubleStream.average();
             }
 
             if (optionalDouble.isPresent()) {

--
Gitblit v1.8.0