From 621c0260c04a2293e1a19c69efd0bcee48a36314 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 07 Jul 2023 11:53:03 +0800
Subject: [PATCH] ci:导出格式提交
---
screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java | 31 ++++++++++++++++++++++++++++---
screen-manage/src/main/java/com/moral/api/util/CacheUtils.java | 2 ++
2 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java
index 27bd715..3632a25 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java
@@ -378,10 +378,15 @@
for (Device device:devices) {
Date ks = DateUtils.getDate(startTime,"yyyy-MM-dd");
Date js = DateUtils.getDateOfDay(DateUtils.getDate(endTime,"yyyy-MM-dd"),1);
+ String nameSite = pointMap.get(device.getMonitorPointId());
+ String name = device.getName();
+ Map<String, Object> timeValueMap = new LinkedHashMap<>();
+ Map<String,ArrayList<Double>> listMap = new HashMap<>();
+ int numCount = 0;
while (DateUtils.isTimeBefor(js,ks)){
- Map<String, Object> timeValueMap = new LinkedHashMap<>();//key���time���value������������json
- timeValueMap.put("������������",pointMap.get(device.getMonitorPointId()));
- timeValueMap.put("name",device.getName());
+ timeValueMap = new LinkedHashMap<>();//key���time���value������������json
+ timeValueMap.put("������������",nameSite);
+ timeValueMap.put("name",name);
String c = DateUtils.dateToDateString(ks,"yyyy-MM-dd");
timeValueMap.put("������",c);
for (String sensor:sensorsList) {
@@ -390,12 +395,32 @@
if(map.containsKey(k)){
Object o = map.get(k).get(sensor);
num = Objects.nonNull(o)?Double.valueOf(o.toString()):0d;
+ if(Objects.nonNull(num)){
+ ArrayList<Double> doubleArrayList = Objects.isNull(listMap.get(numCount+"_"+sensorMap.get(sensor)))?new ArrayList<>():listMap.get(numCount+"_"+sensorMap.get(sensor));
+ doubleArrayList.add(num);
+ listMap.put(numCount+"_"+sensorMap.get(sensor),doubleArrayList);
+ }
}
timeValueMap.put(sensorMap.get(sensor),num);
}
resultList.add(timeValueMap);
ks = DateUtils.getDateOfDay(ks,1);
}
+ timeValueMap = new LinkedHashMap<>();
+ timeValueMap.put("������������",nameSite);
+ timeValueMap.put("name",name);
+ timeValueMap.put("������","���������");
+ for(int z = 0 ;z< sensorsList.size();z++){
+ double rsAvg = 0L;
+ String son = numCount+"_"+sensorMap.get(sensorsList.get(z));
+ if(listMap.containsKey(numCount+"_"+sensorMap.get(sensorsList.get(z)))){
+ Double ListAvg = listMap.get(numCount+"_"+sensorMap.get(sensorsList.get(z))).stream().collect(Collectors.averagingDouble(Double::doubleValue));
+ rsAvg = new BigDecimal(ListAvg).setScale(3, BigDecimal.ROUND_HALF_UP).doubleValue();
+ }
+ timeValueMap.put(sensorMap.get(sensorsList.get(z)),rsAvg);
+ }
+ resultList.add(timeValueMap);
+ numCount++;
}
}else {
diff --git a/screen-manage/src/main/java/com/moral/api/util/CacheUtils.java b/screen-manage/src/main/java/com/moral/api/util/CacheUtils.java
index 5f292cf..4d6e791 100644
--- a/screen-manage/src/main/java/com/moral/api/util/CacheUtils.java
+++ b/screen-manage/src/main/java/com/moral/api/util/CacheUtils.java
@@ -89,7 +89,9 @@
Map<String, SysDictData> unitMap = sysDictDataService.getDictDatasByType("unit");
//���������������������������������������������
Map<String,Device> result = new HashMap<>();
+ int i = 0;
for (Device device : devices) {
+ System.out.println(">>>>>>>>>>>:"+(i++));
Version version = device.getVersion();
List<Sensor> sensors = version.getSensors();
for (Sensor sensor : sensors) {
--
Gitblit v1.8.0