From 5d838e14b8fe47f80c98b5949d1f3082636a2f06 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 28 Dec 2021 15:14:20 +0800
Subject: [PATCH] screen-api 更新依赖包
---
screen-api/src/main/java/com/moral/api/service/impl/ProfessionServiceImpl.java | 522 ++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 344 insertions(+), 178 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 fa708b8..104c9f0 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
@@ -13,16 +13,23 @@
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.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;
import com.moral.api.entity.CityAqi;
import com.moral.api.entity.CityAqiDaily;
import com.moral.api.entity.CityAqiMonthly;
import com.moral.api.entity.Device;
import com.moral.api.entity.HistoryDaily;
+import com.moral.api.entity.HistoryHourly;
import com.moral.api.entity.HistoryMonthly;
+import com.moral.api.entity.Organization;
import com.moral.api.entity.Sensor;
import com.moral.api.service.CityAqiDailyService;
import com.moral.api.service.CityAqiMonthlyService;
@@ -169,91 +176,111 @@
private List<Map<String, Object>> professionContributionOfYear(Integer orgId, List<String> professions, String time, String sensorCode) {
List<Map<String, Object>> result = new ArrayList<>();
+ //������������������������������
+ 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);
+
+ //���������������������������
+ QueryWrapper<CityAqiMonthly> cityAqiMonthlyQueryWrapper = new QueryWrapper<>();
+ cityAqiMonthlyQueryWrapper.select("time", "value")
+ .eq("city_code", locationLevelCode)
+ .likeRight("time", time);
+ List<Map<String, Object>> cityAqis = cityAqiMonthlyService.listMaps(cityAqiMonthlyQueryWrapper);
+ Map<String, Object> cityAqiMap = new HashMap<>();
+ if (!ObjectUtils.isEmpty(cityAqis)) {
+ for (Map<String, Object> cityAqi : cityAqis) {
+ cityAqiMap.put(cityAqi.get("time").toString().substring(0, 7), cityAqi.get("value"));
+ }
+ }
+
+
+ //���������������������������������
+ 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)));
+
+
for (String yearMonth : timeLag) {
Map<String, Object> resultMap = new HashMap<>();
- resultMap.put("time", yearMonth.split("-")[1]);
- yearMonth = yearMonth + "-01 00:00:00";
+ resultMap.put("time", yearMonth);
//������������������������������
Double allDeviceSum = null;
- QueryWrapper<HistoryMonthly> historyMonthlyQueryWrapper = new QueryWrapper<>();
- historyMonthlyQueryWrapper.select("SUM(`value`->'$." + sensorCode + "') AS result")
- .eq("time", yearMonth)
- .in("mac", allMacs);
- Map<String, Object> allDeviceSumMap = historyMonthlyService.getMap(historyMonthlyQueryWrapper);
- if (!ObjectUtils.isEmpty(allDeviceSumMap)) {
- allDeviceSum = (Double) allDeviceSumMap.get("result");
+ 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();
}
+ resultMap.put("allDeviceSum", allDeviceSum);
- //������������
+ //���������
Double cityValue = null;
- //������������������������������
- Integer locationLevelCode = organizationService.getById(orgId).getLocationLevelCode();
- QueryWrapper<CityAqiMonthly> cityAqiMonthlyQueryWrapper = new QueryWrapper<>();
- cityAqiMonthlyQueryWrapper.select("`value`->'$." + sensorCode + "' AS result")
- .eq("city_code", locationLevelCode)
- .eq("time", yearMonth);
- Map<String, Object> cityValueMap = cityAqiMonthlyService.getMap(cityAqiMonthlyQueryWrapper);
- if (!ObjectUtils.isEmpty(cityValueMap)) {
- cityValue = (Double) cityValueMap.get("result");
+ 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;
+ }
}
resultMap.put("cityValue", cityValue);
-
-
- for (String profession : professions) {
- Map<String, Object> professionMap = new HashMap<>();
-
- //���������������������
- List<Device> devices = getDevicesOfProfessions(orgId, Collections.singletonList(profession));
- List<String> professionMacs = devices.stream().map(Device::getMac).collect(Collectors.toList());
-
-
- //������������������
- Double professionSum = null;
- historyMonthlyQueryWrapper.clear();
- historyMonthlyQueryWrapper.select("SUM(`value`->'$." + sensorCode + "') AS result")
- .eq("time", yearMonth)
- .in("mac", professionMacs);
- Map<String, Object> professionSumMap = historyMonthlyService.getMap(historyMonthlyQueryWrapper);
- if (!ObjectUtils.isEmpty(professionSumMap)) {
- professionSum = (Double) professionSumMap.get("result");
- }
-
-
- //������������������
- Double professionAvg = null;
- historyMonthlyQueryWrapper.clear();
- historyMonthlyQueryWrapper.select("AVG(`value`->'$." + sensorCode + "') AS result")
- .eq("time", yearMonth)
- .in("mac", professionMacs);
- Map<String, Object> professionAvgMap = historyMonthlyService.getMap(historyMonthlyQueryWrapper);
- if (!ObjectUtils.isEmpty(professionAvgMap)) {
- professionAvg = (Double) professionAvgMap.get("result");
- }
-
- //���������������������
- String contributionRate = null;
- NumberFormat numberFormat = NumberFormat.getInstance();
- numberFormat.setMaximumFractionDigits(2);
- if (professionSum != null && allDeviceSum != null) {
- contributionRate = numberFormat.format(professionSum / allDeviceSum * 100) + "%";
- }
-
- //������������
- professionMap.put("value", professionAvg == null ? null : AmendUtils.sciCal(professionAvg, 0));
- //���������������
- professionMap.put("contributionRate", contributionRate);
-
- resultMap.put(profession, professionMap);
- }
result.add(resultMap);
}
+
+ for (String profession : professions) {
+ //���������������������
+ 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);
+ //���������
+ 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");
+ //���������������������
+ NumberFormat numberFormat = NumberFormat.getInstance();
+ numberFormat.setMaximumFractionDigits(2);
+ if (allDeviceSum != null) {
+ contributionRate = numberFormat.format(professionSum / ((Double) 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;
}
@@ -261,156 +288,225 @@
private List<Map<String, Object>> professionContributionOfMonth(Integer orgId, List<String> professions, String time, String sensorCode) {
List<Map<String, Object>> result = new ArrayList<>();
+ //������������������������������
+ 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);
+
+
+ //���������������������������
+ QueryWrapper<CityAqiDaily> cityAqiDailyQueryWrapper = new QueryWrapper<>();
+ cityAqiDailyQueryWrapper.select("time", "value")
+ .eq("city_code", locationLevelCode)
+ .likeRight("time", time);
+ List<Map<String, Object>> cityAqis = cityAqiDailyService.listMaps(cityAqiDailyQueryWrapper);
+ Map<String, Object> cityAqiMap = new HashMap<>();
+ if (!ObjectUtils.isEmpty(cityAqis)) {
+ for (Map<String, Object> cityAqi : cityAqis) {
+ cityAqiMap.put(cityAqi.get("time").toString().substring(0, 10), cityAqi.get("value"));
+ }
+ }
+
+
+ //���������������������������������
+ 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)));
+
+
for (String yearMonthDay : timeLag) {
Map<String, Object> resultMap = new HashMap<>();
- resultMap.put("time", yearMonthDay.split("-")[2]);
- yearMonthDay = yearMonthDay + " 00:00:00";
-
+ resultMap.put("time", yearMonthDay);
//������������������������������
Double allDeviceSum = null;
- QueryWrapper<HistoryDaily> historyDailyQueryWrapper = new QueryWrapper<>();
- historyDailyQueryWrapper.select("SUM(`value`->'$." + sensorCode + "') AS result")
- .eq("time", yearMonthDay)
- .in("mac", allMacs);
- Map<String, Object> allDeviceSumMap = historyDailyService.getMap(historyDailyQueryWrapper);
- if (!ObjectUtils.isEmpty(allDeviceSumMap)) {
- allDeviceSum = (Double) allDeviceSumMap.get("result");
+ 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();
}
+ resultMap.put("allDeviceSum", allDeviceSum);
- //������������
+ //���������
Double cityValue = null;
- //������������������������������
- Integer locationLevelCode = organizationService.getById(orgId).getLocationLevelCode();
- QueryWrapper<CityAqiDaily> cityAqiDailyQueryWrapper = new QueryWrapper<>();
- cityAqiDailyQueryWrapper.select("`value`->'$." + sensorCode + "' AS result")
- .eq("city_code", locationLevelCode)
- .eq("time", yearMonthDay);
- Map<String, Object> cityValueMap = cityAqiDailyService.getMap(cityAqiDailyQueryWrapper);
- if (!ObjectUtils.isEmpty(cityValueMap)) {
- cityValue = (Double) cityValueMap.get("result");
+ 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;
+ }
}
resultMap.put("cityValue", cityValue);
-
-
-
- for (String profession : professions) {
- Map<String, Object> professionMap = new HashMap<>();
-
- //���������������������
- List<Device> devices = getDevicesOfProfessions(orgId, Collections.singletonList(profession));
- List<String> professionMacs = devices.stream().map(Device::getMac).collect(Collectors.toList());
-
-
- //������������������
- Double professionSum = null;
- historyDailyQueryWrapper.clear();
- historyDailyQueryWrapper.select("SUM(`value`->'$." + sensorCode + "') AS result")
- .eq("time", yearMonthDay)
- .in("mac", professionMacs);
- Map<String, Object> professionSumMap = historyDailyService.getMap(historyDailyQueryWrapper);
- if (!ObjectUtils.isEmpty(professionSumMap)) {
- professionSum = (Double) professionSumMap.get("result");
- }
-
-
- //������������������
- Double professionAvg = null;
- historyDailyQueryWrapper.clear();
- historyDailyQueryWrapper.select("AVG(`value`->'$." + sensorCode + "') AS result")
- .eq("time", yearMonthDay)
- .in("mac", professionMacs);
- Map<String, Object> professionAvgMap = historyDailyService.getMap(historyDailyQueryWrapper);
- if (!ObjectUtils.isEmpty(professionAvgMap)) {
- professionAvg = (Double) professionAvgMap.get("result");
- }
-
-
- //���������������������
- String contributionRate = null;
- NumberFormat numberFormat = NumberFormat.getInstance();
- numberFormat.setMaximumFractionDigits(2);
- if (professionSum != null && allDeviceSum != null) {
- contributionRate = numberFormat.format(professionSum / allDeviceSum * 100) + "%";
- }
-
- //������������
- professionMap.put("value", professionAvg == null ? null : AmendUtils.sciCal(professionAvg, 0));
- //���������������
- professionMap.put("contributionRate", contributionRate);
-
- resultMap.put(profession, professionMap);
- }
result.add(resultMap);
}
+
+ for (String profession : professions) {
+ //���������������������
+ 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);
+ //���������
+ 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");
+ //���������������������
+ NumberFormat numberFormat = NumberFormat.getInstance();
+ numberFormat.setMaximumFractionDigits(2);
+ if (allDeviceSum != null) {
+ contributionRate = numberFormat.format(professionSum / ((Double) 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;
}
private List<Map<String, Object>> professionContributionOfDay(Integer orgId, List<String> professions, String time, String sensorCode) {
List<Map<String, Object>> result = new ArrayList<>();
+ //������������������������������
+ 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);
+
+
+ //������������������������������
+ QueryWrapper<CityAqi> cityAqiQueryWrapper = new QueryWrapper<>();
+ cityAqiQueryWrapper.select("time", "value")
+ .eq("city_code", locationLevelCode)
+ .likeRight("time", time);
+ List<Map<String, Object>> cityAqis = cityAqiService.listMaps(cityAqiQueryWrapper);
+ Map<String, Object> cityAqiMap = new HashMap<>();
+ if (!ObjectUtils.isEmpty(cityAqis)) {
+ for (Map<String, Object> cityAqi : cityAqis) {
+ cityAqiMap.put(cityAqi.get("time").toString().substring(0, 13), cityAqi.get("value"));
+ }
+ }
+
+
+ //������������������������������������
+ 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)));
+
+
for (String yearMonthDayHour : timeLag) {
Map<String, Object> resultMap = new HashMap<>();
- resultMap.put("time", yearMonthDayHour.split(" ")[1]);
- yearMonthDayHour = yearMonthDayHour + ":00:00";
+ resultMap.put("time", yearMonthDayHour);
//������������������������������
- Double allDeviceSum = historyHourlyService.getSensorSumByMacs(sensorCode, allMacs, 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();
+ }
+ resultMap.put("allDeviceSum", allDeviceSum);
- //������������
+ //���������
Double cityValue = null;
- //������������������������������
- Integer locationLevelCode = organizationService.getById(orgId).getLocationLevelCode();
- QueryWrapper<CityAqi> cityAqiQueryWrapper = new QueryWrapper<>();
- cityAqiQueryWrapper.select("`value`->'$." + sensorCode + "' AS result")
- .eq("city_code", locationLevelCode)
- .eq("time", yearMonthDayHour);
- Map<String, Object> cityValueMap = cityAqiService.getMap(cityAqiQueryWrapper);
- if (!ObjectUtils.isEmpty(cityValueMap)) {
- cityValue = (Double) cityValueMap.get("result");
+ 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;
+ }
}
resultMap.put("cityValue", cityValue);
-
-
- for (String profession : professions) {
- Map<String, Object> professionMap = new HashMap<>();
-
- //���������������������
- List<Device> devices = getDevicesOfProfessions(orgId, Collections.singletonList(profession));
- List<String> professionMacs = devices.stream().map(Device::getMac).collect(Collectors.toList());
-
- //���������������������������������������������������
- Double professionAvg = historyHourlyService.getSensorAvgByMacs(sensorCode, professionMacs, yearMonthDayHour);
- Double professionSum = historyHourlyService.getSensorSumByMacs(sensorCode, professionMacs, yearMonthDayHour);
-
- //���������������������
- String contributionRate = null;
- NumberFormat numberFormat = NumberFormat.getInstance();
- numberFormat.setMaximumFractionDigits(2);
- if (professionSum != null && allDeviceSum != null) {
- contributionRate = numberFormat.format(professionSum / allDeviceSum * 100) + "%";
- }
-
- //������������
- professionMap.put("value", professionAvg == null ? null : AmendUtils.sciCal(professionAvg, 0));
- //���������������
- professionMap.put("contributionRate", contributionRate);
-
- resultMap.put(profession, professionMap);
- }
result.add(resultMap);
}
+
+ for (String profession : professions) {
+ //���������������������
+ 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);
+ //���������
+ 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");
+ //���������������������
+ NumberFormat numberFormat = NumberFormat.getInstance();
+ numberFormat.setMaximumFractionDigits(2);
+ if (allDeviceSum != null) {
+ contributionRate = numberFormat.format(professionSum / ((Double) 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;
}
@@ -424,5 +520,75 @@
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();
+ }
+ } 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();
+ }
+ return result;
+ }
}
--
Gitblit v1.8.0