From 2c4bc4b044f8ff9a912446947db70694fd48442c Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 15 Dec 2023 17:02:18 +0800
Subject: [PATCH] chore:测试提交
---
screen-api/src/main/java/com/moral/api/service/impl/ProfessionServiceImpl.java | 479 +++++++++++++++++++++++++++++------------------------------
1 files changed, 238 insertions(+), 241 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/ProfessionServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/ProfessionServiceImpl.java
index 104c9f0..18ae1e2 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/ProfessionServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/ProfessionServiceImpl.java
@@ -6,19 +6,8 @@
import org.springframework.util.ObjectUtils;
import java.text.NumberFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.OptionalDouble;
-import java.util.Set;
-import java.util.function.Supplier;
+import java.util.*;
import java.util.stream.Collectors;
-import java.util.stream.DoubleStream;
-import java.util.stream.Stream;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -31,6 +20,7 @@
import com.moral.api.entity.HistoryMonthly;
import com.moral.api.entity.Organization;
import com.moral.api.entity.Sensor;
+import com.moral.api.entity.SysDictData;
import com.moral.api.service.CityAqiDailyService;
import com.moral.api.service.CityAqiMonthlyService;
import com.moral.api.service.CityAqiService;
@@ -41,6 +31,7 @@
import com.moral.api.service.OrganizationService;
import com.moral.api.service.ProfessionService;
+import com.moral.api.service.SensorService;
import com.moral.constant.Constants;
import com.moral.constant.RedisConstants;
@@ -85,7 +76,10 @@
@Autowired
private OrganizationService organizationService;
- private static Map<String, String> senorMap = new HashMap<>();
+ @Autowired
+ private SensorService sensorService;
+
+ private static final Map<String, String> senorMap = new HashMap<>();
static {
senorMap.put(Constants.SENSOR_CODE_PM25, "PM2_5");
@@ -102,8 +96,10 @@
List<Map<String, Object>> devices = deviceService.getDevicesByOrganizationId(organizationId);
Set<Map<String, Object>> result = new HashSet<>();
for (Map<String, Object> device : devices) {
- List<Map<String, Object>> professions = (List<Map<String, Object>>) device.get("professions");
- result.addAll(professions);
+ if(Objects.nonNull(device)&&Objects.nonNull(device.get("professions"))&&device.containsKey("professions")){
+ List<Map<String, Object>> professions = (List<Map<String, Object>>) device.get("professions");
+ result.addAll(professions);
+ }
}
return result;
}
@@ -148,13 +144,13 @@
}
@Override
- public List<Map<String, Object>> professionContribution(Map<String, Object> params) {
+ public Map<String, Object> professionContribution(Map<String, Object> params) {
int orgId = Integer.parseInt(params.get("organizationId").toString());
List<String> professions = Arrays.asList(params.get("professions").toString().split(","));
String type = params.get("type").toString();
String time = params.get("time").toString();
String sensorCode = params.get("sensorCode").toString();
- List<Map<String, Object>> result = new ArrayList<>();
+ Map<String, Object> result = new HashMap<>();
switch (type) {
case "year":
@@ -173,8 +169,13 @@
}
//���������������
- private List<Map<String, Object>> professionContributionOfYear(Integer orgId, List<String> professions, String time, String sensorCode) {
- List<Map<String, Object>> result = new ArrayList<>();
+ private Map<String, Object> professionContributionOfYear(Integer orgId, List<String> professions, String time, String sensorCode) {
+ Map<String, Object> result = new HashMap<>();
+
+ //1.������������������
+ List<String> timeLag = DateUtils.getTimeLag(time);
+ result.put("time", timeLag);
+
//������������������������������
QueryWrapper<Organization> organizationQueryWrapper = new QueryWrapper<>();
@@ -182,10 +183,6 @@
.eq("id", orgId);
Integer locationLevelCode = organizationService.getOne(organizationQueryWrapper).getLocationLevelCode();
- //���������������������������
- List allMacs = getMacsByOrgId(orgId);
-
- List<String> timeLag = DateUtils.getTimeLag(time);
//���������������������������
QueryWrapper<CityAqiMonthly> cityAqiMonthlyQueryWrapper = new QueryWrapper<>();
@@ -201,104 +198,127 @@
}
- //���������������������������������
+ //���������������������������������������������������
+ List<String> allMacs = deviceService.getMacsByOrganizationId(orgId);
List<HistoryMonthly> allDeviceData = historyMonthlyService.getValueByMacs(allMacs, time);
- //���time������
Map<String, List<HistoryMonthly>> allDeviceDataMap = allDeviceData.stream()
.collect(Collectors.groupingBy(o -> DateUtils.dateToDateString(o.getTime()).substring(0, 7)));
+ //���������������������
+ Map<String, Object> resultCityDataMap = new HashMap<>();
+ List<Map<String, Object>> cityDataList = new ArrayList<>();
+ //������������������������������������
+ Map<String, Object> allDeviceSumMap = new HashMap<>();
for (String yearMonth : timeLag) {
- Map<String, Object> resultMap = new HashMap<>();
- resultMap.put("time", yearMonth);
-
-
//������������������������������
Double allDeviceSum = null;
List<HistoryMonthly> historyMonthlyList = allDeviceDataMap.get(yearMonth);
if (!ObjectUtils.isEmpty(historyMonthlyList)) {
- allDeviceSum = historyMonthlyList.stream().flatMapToDouble(v -> {
- Map<String, Object> dataValue = JSONObject.parseObject(v.getValue(), Map.class);
- Object o = dataValue.get(sensorCode);
- if (o == null) {
- return null;
- }
- double aDouble = Double.parseDouble(o.toString());
- return DoubleStream.of(aDouble);
- }).sum();
+ allDeviceSum = historyMonthlyService.calculatedValue(historyMonthlyList, sensorCode, "sum");
}
- resultMap.put("allDeviceSum", allDeviceSum);
+ allDeviceSumMap.put(yearMonth, allDeviceSum);
//���������
Double cityValue = null;
if (cityAqiMap.get(yearMonth) != null) {
Map<String, Object> dataValue = JSONObject.parseObject(cityAqiMap.get(yearMonth).toString(), Map.class);
- Object o = dataValue.get(sensorCode);
- if (o != null) {
- cityValue = (Double) o;
+ //������������aqi������������������������
+ String sensorName = senorMap.get(sensorCode);
+ if (sensorName != null) {
+ cityValue = Double.parseDouble(dataValue.get(sensorName).toString());
}
}
- resultMap.put("cityValue", cityValue);
- result.add(resultMap);
+ Map<String, Object> cityDataMap = new HashMap<>();
+ //������������
+ cityDataMap.put("value", cityValue);
+ cityDataList.add(cityDataMap);
}
+ //2.������������������
+ resultCityDataMap.put("data", cityDataList);
+ result.put("������", resultCityDataMap);
+
+
for (String profession : professions) {
- //���������������������
+ //���������������������������
+ HashMap<String, Object> professionMap = new HashMap<>();
+ List<Map<String, Object>> dataList = new ArrayList<>();
+
+
+ //������������������
+ String professionName = null;
+ Map<String, Object> dictData = (Map<String, Object>) redisTemplate.opsForValue().get(RedisConstants.DICT_DATA_KEY);
+ List<SysDictData> professionInfo = (List<SysDictData>) dictData.get("profession");
+ for (SysDictData sysDictData : professionInfo) {
+ if (sysDictData.getDataKey().equals(profession)) {
+ professionName = sysDictData.getDataValue();
+ break;
+ }
+ }
+
+
+ //������������������������������������������������������
List<Device> professionDevices = getDevicesOfProfessions(orgId, Collections.singletonList(profession));
List<String> professionMacs = professionDevices.stream().map(Device::getMac).collect(Collectors.toList());
-
-
- //������������������������������������
List<HistoryMonthly> professionDeviceData = historyMonthlyService.getValueByMacs(professionMacs, time);
- //���time������
Map<String, List<HistoryMonthly>> professionDataMap = professionDeviceData.stream()
.collect(Collectors.groupingBy(o -> DateUtils.dateToDateString(o.getTime()).substring(0, 7)));
- for (Map<String, Object> map : result) {
- Object allDeviceSum = map.get("allDeviceSum");
- String resultTime = map.get("time").toString();
- List<HistoryMonthly> historyMonthlyList = professionDataMap.get(resultTime);
+ for (String resultTime : timeLag) {
+ //���������������������
+ Map<String, Object> timeDataMap = new HashMap<>();
+ Object o = allDeviceSumMap.get(resultTime);
+ Double allDeviceSum = null;
+ if (o != null) {
+ allDeviceSum = Double.parseDouble(o.toString());
+ }
+
+ List<HistoryMonthly> professionDeviceHistoryMonthlyList = professionDataMap.get(resultTime);
//���������
String contributionRate = null;
Double professionAvg = null;
- if (!ObjectUtils.isEmpty(historyMonthlyList)) {
- Supplier<Stream<HistoryMonthly>> streamSupplier = historyMonthlyList::stream;
- professionAvg = calculatedValueOfYear(streamSupplier, sensorCode, "avg");
- Double professionSum = calculatedValueOfYear(streamSupplier, sensorCode, "sum");
+ if (!ObjectUtils.isEmpty(professionDeviceHistoryMonthlyList)) {
+ //���������������������
+ professionAvg = historyMonthlyService.calculatedValue(professionDeviceHistoryMonthlyList, sensorCode, "avg");
+ //������������������������
+ Double professionSum = historyMonthlyService.calculatedValue(professionDeviceHistoryMonthlyList, sensorCode, "sum");
//���������������������
NumberFormat numberFormat = NumberFormat.getInstance();
numberFormat.setMaximumFractionDigits(2);
- if (allDeviceSum != null) {
- contributionRate = numberFormat.format(professionSum / ((Double) allDeviceSum) * 100) + "%";
+ if (allDeviceSum != null && allDeviceSum != 0d) {
+ contributionRate = numberFormat.format(professionSum / (allDeviceSum) * 100) + "%";
}
}
- Map<String, Object> professionMap = new HashMap<>();
- professionMap.put("contributionRate", contributionRate);
- professionMap.put("value", professionAvg == null ? null : AmendUtils.sciCal(professionAvg, 0));
- map.put(profession, professionMap);
+
+ //������������
+ timeDataMap.put("value", professionAvg == null ? null : AmendUtils.sciCal(professionAvg, 0));
+ //���������
+ timeDataMap.put("name", contributionRate);
+ dataList.add(timeDataMap);
}
+ professionMap.put("data", dataList);
+ result.put(professionName, professionMap);
}
- result.forEach(map -> map.remove("allDeviceSum"));
return result;
}
//���������������
- private List<Map<String, Object>> professionContributionOfMonth(Integer orgId, List<String> professions, String time, String sensorCode) {
- List<Map<String, Object>> result = new ArrayList<>();
+ private Map<String, Object> professionContributionOfMonth(Integer orgId, List<String> professions, String time, String sensorCode) {
+ Map<String, Object> result = new HashMap<>();
+
+ //1.������������������
+ List<String> timeLag = DateUtils.getTimeLag(time);
+ result.put("time", timeLag);
+
//������������������������������
QueryWrapper<Organization> organizationQueryWrapper = new QueryWrapper<>();
organizationQueryWrapper.select("location_level_code")
.eq("id", orgId);
Integer locationLevelCode = organizationService.getOne(organizationQueryWrapper).getLocationLevelCode();
-
- //���������������������������
- List allMacs = getMacsByOrgId(orgId);
-
- //������������
- List<String> timeLag = DateUtils.getTimeLag(time);
//���������������������������
@@ -315,90 +335,120 @@
}
- //���������������������������������
+ //���������������������������������������������������
+ List<String> allMacs = deviceService.getMacsByOrganizationId(orgId);
List<HistoryDaily> allDeviceData = historyDailyService.getValueByMacs(allMacs, time);
- //���time������
Map<String, List<HistoryDaily>> allDeviceDataMap = allDeviceData.stream()
.collect(Collectors.groupingBy(o -> DateUtils.dateToDateString(o.getTime()).substring(0, 10)));
+ //���������������������
+ Map<String, Object> resultCityDataMap = new HashMap<>();
+ List<Map<String, Object>> cityDataList = new ArrayList<>();
+ //������������������������������������
+ Map<String, Object> allDeviceSumMap = new HashMap<>();
for (String yearMonthDay : timeLag) {
- Map<String, Object> resultMap = new HashMap<>();
- resultMap.put("time", yearMonthDay);
-
//������������������������������
Double allDeviceSum = null;
List<HistoryDaily> historyDailyList = allDeviceDataMap.get(yearMonthDay);
if (!ObjectUtils.isEmpty(historyDailyList)) {
- allDeviceSum = historyDailyList.stream().flatMapToDouble(v -> {
- Map<String, Object> dataValue = JSONObject.parseObject(v.getValue(), Map.class);
- Object o = dataValue.get(sensorCode);
- if (o == null) {
- return null;
- }
- double aDouble = Double.parseDouble(o.toString());
- return DoubleStream.of(aDouble);
- }).sum();
+ allDeviceSum = historyDailyService.calculatedValue(historyDailyList, sensorCode, "sum");
}
- resultMap.put("allDeviceSum", allDeviceSum);
+ allDeviceSumMap.put(yearMonthDay, allDeviceSum);
//���������
Double cityValue = null;
if (cityAqiMap.get(yearMonthDay) != null) {
Map<String, Object> dataValue = JSONObject.parseObject(cityAqiMap.get(yearMonthDay).toString(), Map.class);
- Object o = dataValue.get(sensorCode);
- if (o != null) {
- cityValue = (Double) o;
+ //������������aqi������������������������
+ String sensorName = senorMap.get(sensorCode);
+ if (sensorName != null) {
+ cityValue = Double.parseDouble(dataValue.get(sensorName).toString());
}
}
- resultMap.put("cityValue", cityValue);
- result.add(resultMap);
+ Map<String, Object> cityDataMap = new HashMap<>();
+ //������������
+ cityDataMap.put("value", cityValue);
+ cityDataList.add(cityDataMap);
}
+ //2.������������������
+ resultCityDataMap.put("data", cityDataList);
+ result.put("������", resultCityDataMap);
+
+
for (String profession : professions) {
- //���������������������
+ //���������������������������
+ HashMap<String, Object> professionMap = new HashMap<>();
+ List<Map<String, Object>> dataList = new ArrayList<>();
+
+
+ //������������������
+ String professionName = null;
+ Map<String, Object> dictData = (Map<String, Object>) redisTemplate.opsForValue().get(RedisConstants.DICT_DATA_KEY);
+ List<SysDictData> professionInfo = (List<SysDictData>) dictData.get("profession");
+ for (SysDictData sysDictData : professionInfo) {
+ if (sysDictData.getDataKey().equals(profession)) {
+ professionName = sysDictData.getDataValue();
+ break;
+ }
+ }
+
+
+ //������������������������������������������������������
List<Device> professionDevices = getDevicesOfProfessions(orgId, Collections.singletonList(profession));
List<String> professionMacs = professionDevices.stream().map(Device::getMac).collect(Collectors.toList());
-
-
- //������������������������������������
List<HistoryDaily> professionDeviceData = historyDailyService.getValueByMacs(professionMacs, time);
- //���time������
Map<String, List<HistoryDaily>> professionDataMap = professionDeviceData.stream()
.collect(Collectors.groupingBy(o -> DateUtils.dateToDateString(o.getTime()).substring(0, 10)));
- for (Map<String, Object> map : result) {
- Object allDeviceSum = map.get("allDeviceSum");
- String resultTime = map.get("time").toString();
- List<HistoryDaily> historyDailyList = professionDataMap.get(resultTime);
+ for (String resultTime : timeLag) {
+ //���������������������
+ Map<String, Object> timeDataMap = new HashMap<>();
+ Object o = allDeviceSumMap.get(resultTime);
+ Double allDeviceSum = null;
+ if (o != null) {
+ allDeviceSum = Double.parseDouble(o.toString());
+ }
+
+ List<HistoryDaily> preofessionDeviceHistoryDailyList = professionDataMap.get(resultTime);
//���������
String contributionRate = null;
Double professionAvg = null;
- if (!ObjectUtils.isEmpty(historyDailyList)) {
- Supplier<Stream<HistoryDaily>> streamSupplier = historyDailyList::stream;
- professionAvg = calculatedValueOfMonth(streamSupplier, sensorCode, "avg");
- Double professionSum = calculatedValueOfMonth(streamSupplier, sensorCode, "sum");
+ if (!ObjectUtils.isEmpty(preofessionDeviceHistoryDailyList)) {
+ //���������������������
+ professionAvg = historyDailyService.calculatedValue(preofessionDeviceHistoryDailyList, sensorCode, "avg");
+ //������������������������
+ Double professionSum = historyDailyService.calculatedValue(preofessionDeviceHistoryDailyList, sensorCode, "sum");
//���������������������
NumberFormat numberFormat = NumberFormat.getInstance();
numberFormat.setMaximumFractionDigits(2);
- if (allDeviceSum != null) {
- contributionRate = numberFormat.format(professionSum / ((Double) allDeviceSum) * 100) + "%";
+ if (allDeviceSum != null && allDeviceSum != 0d) {
+ contributionRate = numberFormat.format(professionSum / (allDeviceSum) * 100) + "%";
}
}
- Map<String, Object> professionMap = new HashMap<>();
- professionMap.put("contributionRate", contributionRate);
- professionMap.put("value", professionAvg == null ? null : AmendUtils.sciCal(professionAvg, 0));
- map.put(profession, professionMap);
+
+ //������������
+ timeDataMap.put("value", professionAvg == null ? null : AmendUtils.sciCal(professionAvg, 0));
+ //���������
+ timeDataMap.put("name", contributionRate);
+ dataList.add(timeDataMap);
}
+ professionMap.put("data", dataList);
+ result.put(professionName, professionMap);
}
- result.forEach(map -> map.remove("allDeviceSum"));
return result;
}
- private List<Map<String, Object>> professionContributionOfDay(Integer orgId, List<String> professions, String time, String sensorCode) {
- List<Map<String, Object>> result = new ArrayList<>();
+ private Map<String, Object> professionContributionOfDay(Integer orgId, List<String> professions, String time, String sensorCode) {
+ Map<String, Object> result = new HashMap<>();
+
+ //1.������������������
+ List<String> timeLag = DateUtils.getTimeLag(time);
+ result.put("time", timeLag);
+
//������������������������������
QueryWrapper<Organization> organizationQueryWrapper = new QueryWrapper<>();
@@ -406,11 +456,16 @@
.eq("id", orgId);
Integer locationLevelCode = organizationService.getOne(organizationQueryWrapper).getLocationLevelCode();
- //���������������������������
- List allMacs = getMacsByOrgId(orgId);
-
- //���������������
- List<String> timeLag = DateUtils.getTimeLag(time);
+ //���������������������
+ QueryWrapper<Sensor> sensorQueryWrapper = new QueryWrapper<>();
+ sensorQueryWrapper.select("lower", "upper").eq("code", sensorCode);
+ Sensor sensor = sensorService.getOne(sensorQueryWrapper);
+ Double sensorLower = null;
+ Double sensorUpper = null;
+ if (sensor != null) {
+ sensorLower = sensor.getLower();
+ sensorUpper = sensor.getUpper();
+ }
//������������������������������
@@ -427,167 +482,109 @@
}
- //������������������������������������
+ //������������������������������������������������������
+ List<String> allMacs = deviceService.getMacsByOrganizationId(orgId);
List<HistoryHourly> allDeviceData = historyHourlyService.getValueByMacs(allMacs, time);
- //���time������
Map<String, List<HistoryHourly>> allDeviceDataMap = allDeviceData.stream()
.collect(Collectors.groupingBy(o -> DateUtils.dateToDateString(o.getTime()).substring(0, 13)));
+ //���������������������
+ Map<String, Object> resultCityDataMap = new HashMap<>();
+ List<Map<String, Object>> cityDataList = new ArrayList<>();
+ //������������������������������������
+ Map<String, Object> allDeviceSumMap = new HashMap<>();
for (String yearMonthDayHour : timeLag) {
- Map<String, Object> resultMap = new HashMap<>();
- resultMap.put("time", yearMonthDayHour);
-
-
//������������������������������
Double allDeviceSum = null;
List<HistoryHourly> historyHourlyList = allDeviceDataMap.get(yearMonthDayHour);
if (!ObjectUtils.isEmpty(historyHourlyList)) {
- allDeviceSum = historyHourlyList.stream().flatMapToDouble(v -> {
- Map<String, Object> dataValue = JSONObject.parseObject(v.getValue(), Map.class);
- Object o = dataValue.get(sensorCode);
- if (o == null) {
- return null;
- }
- double aDouble = Double.parseDouble(o.toString());
- return DoubleStream.of(aDouble);
- }).sum();
+ allDeviceSum = historyHourlyService.calculatedValue(historyHourlyList, sensorCode, "sum", sensorLower, sensorUpper);
}
- resultMap.put("allDeviceSum", allDeviceSum);
+ allDeviceSumMap.put(yearMonthDayHour, allDeviceSum);
//���������
Double cityValue = null;
if (cityAqiMap.get(yearMonthDayHour) != null) {
Map<String, Object> dataValue = JSONObject.parseObject(cityAqiMap.get(yearMonthDayHour).toString(), Map.class);
- Object o = dataValue.get(sensorCode);
- if (o != null) {
- cityValue = (Double) o;
+ //������������aqi������������������������
+ String sensorName = senorMap.get(sensorCode);
+ if (sensorName != null) {
+ cityValue = Double.parseDouble(dataValue.get(sensorName).toString());
}
}
- resultMap.put("cityValue", cityValue);
- result.add(resultMap);
+ Map<String, Object> cityDataMap = new HashMap<>();
+ //������������
+ cityDataMap.put("value", cityValue);
+ cityDataList.add(cityDataMap);
}
+ //2.������������������
+ resultCityDataMap.put("data", cityDataList);
+ result.put("������", resultCityDataMap);
+
+
for (String profession : professions) {
- //���������������������
+ //���������������������������
+ HashMap<String, Object> professionMap = new HashMap<>();
+ List<Map<String, Object>> dataList = new ArrayList<>();
+
+
+ //������������������
+ String professionName = null;
+ Map<String, Object> dictData = (Map<String, Object>) redisTemplate.opsForValue().get(RedisConstants.DICT_DATA_KEY);
+ List<SysDictData> professionInfo = (List<SysDictData>) dictData.get("profession");
+ for (SysDictData sysDictData : professionInfo) {
+ if (sysDictData.getDataKey().equals(profession)) {
+ professionName = sysDictData.getDataValue();
+ break;
+ }
+ }
+
+
+ //������������������������������������������������������
List<Device> professionDevices = getDevicesOfProfessions(orgId, Collections.singletonList(profession));
List<String> professionMacs = professionDevices.stream().map(Device::getMac).collect(Collectors.toList());
-
-
- //���������������������������������������
List<HistoryHourly> professionDeviceData = historyHourlyService.getValueByMacs(professionMacs, time);
- //���time������
Map<String, List<HistoryHourly>> professionDataMap = professionDeviceData.stream()
.collect(Collectors.groupingBy(o -> DateUtils.dateToDateString(o.getTime()).substring(0, 13)));
- for (Map<String, Object> map : result) {
- Object allDeviceSum = map.get("allDeviceSum");
- String resultTime = map.get("time").toString();
- List<HistoryHourly> historyHourlyList = professionDataMap.get(resultTime);
+ for (String resultTime : timeLag) {
+ //���������������������
+ Map<String, Object> timeDataMap = new HashMap<>();
+ Object o = allDeviceSumMap.get(resultTime);
+ Double allDeviceSum = null;
+ if (o != null) {
+ allDeviceSum = Double.parseDouble(o.toString());
+ }
+
+ List<HistoryHourly> preofessionDeviceHistoryHourlyList = professionDataMap.get(resultTime);
//���������
String contributionRate = null;
Double professionAvg = null;
- if (!ObjectUtils.isEmpty(historyHourlyList)) {
- Supplier<Stream<HistoryHourly>> streamSupplier = historyHourlyList::stream;
- professionAvg = calculatedValueOfDay(streamSupplier, sensorCode, "avg");
- Double professionSum = calculatedValueOfDay(streamSupplier, sensorCode, "sum");
+ if (!ObjectUtils.isEmpty(preofessionDeviceHistoryHourlyList)) {
+ //���������������������
+ professionAvg = historyHourlyService.calculatedValue(preofessionDeviceHistoryHourlyList, sensorCode, "avg", sensorLower, sensorUpper);
+ //������������������������
+ Double professionSum = historyHourlyService.calculatedValue(preofessionDeviceHistoryHourlyList, sensorCode, "sum", sensorLower, sensorUpper);
//���������������������
NumberFormat numberFormat = NumberFormat.getInstance();
numberFormat.setMaximumFractionDigits(2);
- if (allDeviceSum != null) {
- contributionRate = numberFormat.format(professionSum / ((Double) allDeviceSum) * 100) + "%";
+ if (allDeviceSum != null && allDeviceSum != 0d) {
+ contributionRate = numberFormat.format(professionSum / (allDeviceSum) * 100) + "%";
}
}
- Map<String, Object> professionMap = new HashMap<>();
- professionMap.put("contributionRate", contributionRate);
- professionMap.put("value", professionAvg == null ? null : AmendUtils.sciCal(professionAvg, 0));
- map.put(profession, professionMap);
- }
- }
- result.forEach(map -> map.remove("allDeviceSum"));
- return result;
- }
- //������������id������������macs
- private List getMacsByOrgId(Integer orgId) {
- //���������������������������
- QueryWrapper<Device> deviceQueryWrapper = new QueryWrapper<>();
- deviceQueryWrapper.select("mac")
- .eq("organization_id", orgId)
- .eq("is_delete", Constants.NOT_DELETE);
- return deviceService.listObjs(deviceQueryWrapper);
- }
-
- //������������������������������
- private Double calculatedValueOfDay(Supplier<Stream<HistoryHourly>> supplier, String sensorCode, String type) {
- DoubleStream doubleStream = supplier.get()
- .flatMapToDouble(v -> {
- Map<String, Object> dataValue = JSONObject.parseObject(v.getValue(), Map.class);
- Object sensorValue = dataValue.get(sensorCode);
- if (ObjectUtils.isEmpty(sensorValue)) {
- return null;
- }
- double aDouble = Double.parseDouble(sensorValue.toString());
- return DoubleStream.of(aDouble);
- });
- Double result = null;
- if ("avg".equals(type)) {
- OptionalDouble optionalDouble = doubleStream.average();
- if (optionalDouble.isPresent()) {
- result = optionalDouble.getAsDouble();
+ //������������
+ timeDataMap.put("value", professionAvg == null ? null : AmendUtils.sciCal(professionAvg, 0));
+ //���������
+ timeDataMap.put("name", contributionRate);
+ dataList.add(timeDataMap);
}
- } else if ("sum".equals(type)) {
- result = doubleStream.sum();
- }
- return result;
- }
-
- //������������������������������
- private Double calculatedValueOfMonth(Supplier<Stream<HistoryDaily>> supplier, String sensorCode, String type) {
- DoubleStream doubleStream = supplier.get()
- .flatMapToDouble(v -> {
- Map<String, Object> dataValue = JSONObject.parseObject(v.getValue(), Map.class);
- Object sensorValue = dataValue.get(sensorCode);
- if (ObjectUtils.isEmpty(sensorValue)) {
- return null;
- }
- double aDouble = Double.parseDouble(sensorValue.toString());
- return DoubleStream.of(aDouble);
- });
- Double result = null;
- if ("avg".equals(type)) {
- OptionalDouble optionalDouble = doubleStream.average();
- if (optionalDouble.isPresent()) {
- result = optionalDouble.getAsDouble();
- }
- } else if ("sum".equals(type)) {
- result = doubleStream.sum();
- }
- return result;
- }
-
- //������������������������������
- private Double calculatedValueOfYear(Supplier<Stream<HistoryMonthly>> supplier, String sensorCode, String type) {
- DoubleStream doubleStream = supplier.get()
- .flatMapToDouble(v -> {
- Map<String, Object> dataValue = JSONObject.parseObject(v.getValue(), Map.class);
- Object sensorValue = dataValue.get(sensorCode);
- if (ObjectUtils.isEmpty(sensorValue)) {
- return null;
- }
- double aDouble = Double.parseDouble(sensorValue.toString());
- return DoubleStream.of(aDouble);
- });
- Double result = null;
- if ("avg".equals(type)) {
- OptionalDouble optionalDouble = doubleStream.average();
- if (optionalDouble.isPresent()) {
- result = optionalDouble.getAsDouble();
- }
- } else if ("sum".equals(type)) {
- result = doubleStream.sum();
+ professionMap.put("data", dataList);
+ result.put(professionName, professionMap);
}
return result;
}
--
Gitblit v1.8.0