From 98e8cacdb51b5e31ce2e6670100fcf6408b9c8d9 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Fri, 08 Oct 2021 09:47:39 +0800
Subject: [PATCH] 调整queryGovMonitorPointHourlyDataByGuidsAndOrgid接口 站点顺序
---
screen-api/src/main/java/com/moral/api/service/impl/GovMonitorPointServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/GovMonitorPointServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/GovMonitorPointServiceImpl.java
index 56d7241..2a3c803 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/GovMonitorPointServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/GovMonitorPointServiceImpl.java
@@ -105,7 +105,6 @@
govMonitorPoint_avg.setId(0);
govMonitorPoint_avg.setName("");
govMonitorPoint_avg.setGuid("");
- govMonitorPointList.add(govMonitorPoint_avg);
List<Map<String,Object>> data = new ArrayList<>();
Map<String,Object> hour_1 = new HashMap<>();
Map<String,Object> hour_2 = new HashMap<>();
@@ -546,7 +545,7 @@
hour_22.put("time","22���");
hour_23.put("time","23���");
hour_24.put("time","0���");
- hour_AVG.put("time","avg");
+ hour_AVG.put("time","������");
data.add(hour_1);
data.add(hour_2);
data.add(hour_3);
@@ -574,6 +573,7 @@
data.add(hour_AVG);
resultMap.put("title",date+"������");
resultMap.put("data",data);
+ govMonitorPointList.add(govMonitorPoint_avg);
resultMap.put("govMonitorPoint",govMonitorPointList);
return resultMap;
}catch (Exception e){
--
Gitblit v1.8.0