From 68e22957db996437fa20a9a4aa5ff37c54d4056f Mon Sep 17 00:00:00 2001 From: jinpengyong <jpy123456> Date: Wed, 27 Sep 2023 15:22:25 +0800 Subject: [PATCH] chore:补充提交 --- screen-api/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java | 541 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 533 insertions(+), 8 deletions(-) diff --git a/screen-api/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java index 5c1316e..b1d5996 100644 --- a/screen-api/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java +++ b/screen-api/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java @@ -1,18 +1,39 @@ package com.moral.api.service.impl; -import com.moral.api.entity.HistoryDaily; -import com.moral.api.mapper.HistoryDailyMapper; -import com.moral.api.service.HistoryDailyService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.moral.constant.Constants; -import com.moral.util.DateUtils; - +import com.moral.api.entity.*; +import com.moral.api.mapper.ServicesScopeDeviceMapper; +import com.moral.api.mapper.ServicesScopeMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; +import java.math.BigDecimal; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Collections; +import java.util.Date; import java.util.HashMap; +import java.util.List; import java.util.Map; +import java.util.OptionalDouble; +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.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.moral.api.mapper.DeviceMapper; +import com.moral.api.mapper.HistoryDailyMapper; +import com.moral.api.service.HistoryDailyService; +import com.moral.api.service.OrganizationService; +import com.moral.api.utils.GetCenterPointFromListOfCoordinates; +import com.moral.constant.Constants; +import com.moral.util.DateUtils; +import com.moral.util.PollutantUtils; /** * <p> @@ -28,6 +49,18 @@ @Autowired private HistoryDailyMapper historyDailyMapper; + @Autowired + private DeviceMapper deviceMapper; + + @Autowired + private OrganizationService organizationService; + + @Autowired + private ServicesScopeMapper servicesScopeMapper; + + @Autowired + private ServicesScopeDeviceMapper servicesScopeDeviceMapper; + @Override public Map<String, Object> getMonthAvg(Map<String, Object> params) { params.put("start", DateUtils.getFirstDayOfCurrMonth()); @@ -38,7 +71,499 @@ result.put("avg", Constants.NULL_VALUE); return result; } - result.put("avg", data.get(params.get("sensorCode"))); + double aDouble = Double.parseDouble(data.get(params.get("sensorCode")).toString()); + double v = new BigDecimal(aDouble).setScale(1, BigDecimal.ROUND_HALF_UP).doubleValue(); +// result.put("avg", data.get(params.get("sensorCode"))); + result.put("avg", ""+v); return result; } + + @Override + public HistoryDaily getHistoryDailyByMacAndDate(String mac, Date date) { + QueryWrapper<HistoryDaily> wrapper = new QueryWrapper<>(); + wrapper.eq("mac", mac); + wrapper.eq("time", date); + List<HistoryDaily> historyDailies = historyDailyMapper.selectList(wrapper); + if (ObjectUtils.isEmpty(historyDailies)) + return null; + return historyDailies.get(0); + } + + + @Override + public Map<String, HistoryDaily> getHistoryDailyByMacsAndDate(List<String> mac, Date date) { + QueryWrapper<HistoryDaily> wrapper = new QueryWrapper<>(); + wrapper.in("mac", mac); + wrapper.eq("time", date); + List<HistoryDaily> historyDailies = historyDailyMapper.selectList(wrapper); + Map<String, HistoryDaily> map = new HashMap<>(); + for (HistoryDaily historyDaily : historyDailies) { + map.put(historyDaily.getMac(), historyDaily); + } + return map; + } + + @Override + public List<HistoryDaily> getHistoryDailyByMacAndTimeSlot(String mac, Date startDate, Date endDate) { + QueryWrapper<HistoryDaily> wrapper = new QueryWrapper<>(); + wrapper.in("mac", mac); + wrapper.between("time", startDate, endDate); + List<HistoryDaily> historyDailies = historyDailyMapper.selectList(wrapper); + return historyDailies; + } + + @Override + public List<HistoryDaily> getHistoryDailyByMacAndTimeSlot( List<String> macs, Date startDate, Date endDate) { + QueryWrapper<HistoryDaily> wrapper = new QueryWrapper<>(); + wrapper.in("mac", macs); + wrapper.between("time", startDate, endDate); + List<HistoryDaily> historyDailies = historyDailyMapper.selectList(wrapper); + return historyDailies; + } + + @Override + public Map<String, Object> getThermodynamicDiagramDataByOrgIdSensorCodeTime(Map<String, Object> parameters) { + Map<String, Object> resultMap = new HashMap<>(); + int orgId = Integer.parseInt(parameters.get("organization_id").toString()); + //���������������������������������id + List<Integer> allOrgId = new ArrayList<>(); + allOrgId.add(orgId); + //������������ + //��������������� + List<Organization> allChildrenOrganization = organizationService.getChildrenOrganizationsById(orgId); + if (!ObjectUtils.isEmpty(allChildrenOrganization) || allChildrenOrganization.size() < 1) { + for (Organization organization : allChildrenOrganization) { + allOrgId.add(organization.getId()); + } + } + //������������ + List<Integer> allOrgIdWithoutDuplicates = allOrgId.stream().distinct().collect(Collectors.toList()); + //������������list���������������mac + List<String> deviceMacList = new ArrayList<>(); + //������������map���Mac������key���device������value + Map<String, Device> deviceMap = new HashMap<>(); + List<Double> longitudeList = new ArrayList<>(); + List<Double> latitudeList = new ArrayList<>(); + for (Integer orgIdWithoutDuplicates : allOrgIdWithoutDuplicates) { + //������id������������������ + QueryWrapper<Device> wrapper_device = new QueryWrapper<>(); + wrapper_device.eq("is_delete", Constants.NOT_DELETE).eq("organization_id", orgIdWithoutDuplicates); + List<Device> devices = new ArrayList<>(); + devices = deviceMapper.selectList(wrapper_device); + if (devices.size() > 0) { + for (Device device : devices) { + String mac = device.getMac(); + deviceMacList.add(mac); + deviceMap.put(mac, device); + double longitude = device.getLongitude(); + double latitude = device.getLatitude(); + longitudeList.add(longitude); + latitudeList.add(latitude); + } + } else { + continue; + } + } + //������������ + String time = parameters.get("time").toString().substring(0, 10) + " 00:00:00"; + resultMap.put("time", time); + QueryWrapper<HistoryDaily> historyDailyQueryWrapper = new QueryWrapper<>(); + historyDailyQueryWrapper.eq("time", time); + historyDailyQueryWrapper.in("mac", deviceMacList); + List<HistoryDaily> historyDailies = historyDailyMapper.selectList(historyDailyQueryWrapper); + List<Object> list = new ArrayList<>(); + for (HistoryDaily historyDailyData : historyDailies) { + List<Object> list1 = new ArrayList<>(); + String mac = historyDailyData.getMac(); + Device device = deviceMap.get(mac); + double longitude = device.getLongitude(); + double latitude = device.getLatitude(); + JSONObject value = JSONObject.parseObject(historyDailyData.getValue()); + double num = Double.parseDouble(value.get(parameters.get("sensor_code")).toString()); + int level = PollutantUtils.pollutantLevel(num, (parameters.get("sensor_code")).toString()); + list1.add(longitude); + list1.add(latitude); + list1.add(level); + list.add(list1); + } + resultMap.put("list", list); + double latitudeMin = Collections.min(latitudeList) - 0.0018; + double latitudeMax = Collections.max(latitudeList) + 0.0018; + double longitudeMin = Collections.min(longitudeList) - 0.2 / (111 * Math.cos(latitudeMin)); + double longitudeMax = Collections.max(longitudeList) + 0.2 / (111 * Math.cos(latitudeMin)); + List<Double> bound = new ArrayList<>(); + bound.add(longitudeMin); + bound.add(latitudeMin); + bound.add(longitudeMax); + bound.add(latitudeMax); + resultMap.put("bound", bound); + List<List> bound1 = new ArrayList<>(); + List<Double> left_up = new ArrayList<>(); + left_up.add(latitudeMax); + left_up.add(longitudeMin); + List<Double> right_up = new ArrayList<>(); + right_up.add(latitudeMax); + right_up.add(longitudeMax); + List<Double> left_down = new ArrayList<>(); + left_down.add(latitudeMin); + left_down.add(longitudeMin); + List<Double> right_down = new ArrayList<>(); + right_down.add(latitudeMin); + right_down.add(longitudeMax); + bound1.add(left_up); + bound1.add(right_up); + bound1.add(right_down); + bound1.add(left_down); + List<GeoCoordinate> geoCoordinates = new ArrayList<>(); + for (List bo : bound1) { + GeoCoordinate g = new GeoCoordinate(); + g.setLatitude(Double.parseDouble(bo.get(0).toString())); + g.setLongitude(Double.parseDouble(bo.get(1).toString())); + geoCoordinates.add(g); + } + GeoCoordinate centerPoint400 = GetCenterPointFromListOfCoordinates.getCenterPoint400(geoCoordinates); + List centerPoint = new ArrayList(); + centerPoint.add(centerPoint400.getLongitude()); + centerPoint.add(centerPoint400.getLatitude()); + resultMap.put("centerPoint", centerPoint); + return resultMap; + } + + @Override + public Map<String, Object> getThermodynamicDiagramDataByOrgIdSensorCodeTimeV2(Map<String, Object> parameters) { + Map<String, Object> resultMap = new HashMap<>(); + int servicesScopeId = Integer.parseInt(parameters.get("servicesScopeId").toString()); + QueryWrapper<ServicesScopeDevice> servicesScopeDeviceQueryWrapper = new QueryWrapper<>(); + servicesScopeDeviceQueryWrapper.eq("is_delete",Constants.NOT_DELETE); + servicesScopeDeviceQueryWrapper.eq("services_scope_id",servicesScopeId); + List<ServicesScopeDevice> servicesScopeDevices = servicesScopeDeviceMapper.selectList(servicesScopeDeviceQueryWrapper); + List<Integer> deviceIds = servicesScopeDevices.stream().map(p -> p.getDeviceId()).collect(Collectors.toList()); + //������������list���������������mac + List<String> deviceMacList = new ArrayList<>(); + //������������map���Mac������key���device������value + Map<String, Device> deviceMap = new HashMap<>(); + //������id������������������ + QueryWrapper<Device> wrapper_device = new QueryWrapper<>(); + wrapper_device.eq("is_delete", Constants.NOT_DELETE); + wrapper_device.in("id",deviceIds); + List<Device> devices = new ArrayList<>(); + devices = deviceMapper.selectList(wrapper_device); + if (devices.size() > 0) { + for (Device device : devices) { + String mac = device.getMac(); + deviceMacList.add(mac); + deviceMap.put(mac, device); + } + } + //������������ + String time = parameters.get("time").toString().substring(0, 10) + " 00:00:00"; + resultMap.put("time", time); + QueryWrapper<HistoryDaily> historyDailyQueryWrapper = new QueryWrapper<>(); + historyDailyQueryWrapper.eq("time", time); + historyDailyQueryWrapper.in("mac", deviceMacList); + List<HistoryDaily> historyDailies = historyDailyMapper.selectList(historyDailyQueryWrapper); + List<Object> list = new ArrayList<>(); + for (HistoryDaily historyDailyData : historyDailies) { + List<Object> list1 = new ArrayList<>(); + String mac = historyDailyData.getMac(); + Device device = deviceMap.get(mac); + double longitude = device.getLongitude(); + double latitude = device.getLatitude(); + JSONObject value = JSONObject.parseObject(historyDailyData.getValue()); + double num = Double.parseDouble(value.get(parameters.get("sensor_code")).toString()); + int level = PollutantUtils.pollutantLevel(num, (parameters.get("sensor_code")).toString()); + list1.add(longitude); + list1.add(latitude); + list1.add(level); + list.add(list1); + } + resultMap.put("list", list); + ServicesScope servicesScope = servicesScopeMapper.selectById(servicesScopeId); + String boundary = servicesScope.getBoundary(); + String[] boundary_points = boundary.split(";"); + List boundary_pointList = new ArrayList(); + List bound = new ArrayList(); + for (String boundary_point:boundary_points) { + List boundary_point_one = new ArrayList(); + String[] boundary_point_one_array = boundary_point.split(","); + boundary_point_one.add(Double.parseDouble(boundary_point_one_array[0])); + boundary_point_one.add(Double.parseDouble(boundary_point_one_array[1])); + boundary_pointList.add(boundary_point_one); + } + if (boundary_pointList.size()>0){ + boundary_pointList.add(boundary_pointList.get(0)); + } + bound.add(boundary_pointList); + resultMap.put("bound", bound); + List centerPoint = new ArrayList(); + centerPoint.add(servicesScope.getCenterLongitude()); + centerPoint.add(servicesScope.getCenterLatitude()); + resultMap.put("centerPoint", centerPoint); + return resultMap; + } + + @Override + public List<Map<String, Object>> getThermodynamicDiagramDataByOrgIdSensorCodeTimeSlot(Map<String, Object> parameters) { + int orgId = Integer.parseInt(parameters.get("organization_id").toString()); + //���������������������������������id + List<Integer> allOrgId = new ArrayList<>(); + allOrgId.add(orgId); + //������������ + //��������������� + List<Organization> allChildrenOrganization = organizationService.getChildrenOrganizationsById(orgId); + if (!ObjectUtils.isEmpty(allChildrenOrganization) || allChildrenOrganization.size() < 1) { + for (Organization organization : allChildrenOrganization) { + allOrgId.add(organization.getId()); + } + } + //������������ + List<Integer> allOrgIdWithoutDuplicates = allOrgId.stream().distinct().collect(Collectors.toList()); + //������������list���������������mac + List<String> deviceMacList = new ArrayList<>(); + //������������map���Mac������key���device������value + Map<String, Device> deviceMap = new HashMap<>(); + List<Double> longitudeList = new ArrayList<>(); + List<Double> latitudeList = new ArrayList<>(); + for (Integer orgIdWithoutDuplicates : allOrgIdWithoutDuplicates) { + //������id������������������ + QueryWrapper<Device> wrapper_device = new QueryWrapper<>(); + wrapper_device.eq("is_delete", Constants.NOT_DELETE).eq("organization_id", orgIdWithoutDuplicates); + List<Device> devices = new ArrayList<>(); + devices = deviceMapper.selectList(wrapper_device); + if (devices.size() > 0) { + for (Device device : devices) { + String mac = device.getMac(); + deviceMacList.add(mac); + deviceMap.put(mac, device); + double longitude = device.getLongitude(); + double latitude = device.getLatitude(); + longitudeList.add(longitude); + latitudeList.add(latitude); + } + } else { + continue; + } + } + double latitudeMin = Collections.min(latitudeList) - 0.0018; + double latitudeMax = Collections.max(latitudeList) + 0.0018; + double longitudeMin = Collections.min(longitudeList) - 0.2 / (111 * Math.cos(latitudeMin)); + double longitudeMax = Collections.max(longitudeList) + 0.2 / (111 * Math.cos(latitudeMin)); + List<Double> bound = new ArrayList<>(); + bound.add(longitudeMin); + bound.add(latitudeMin); + bound.add(longitudeMax); + bound.add(latitudeMax); + List<List> bound1 = new ArrayList<>(); + List<Double> left_up = new ArrayList<>(); + left_up.add(latitudeMax); + left_up.add(longitudeMin); + List<Double> right_up = new ArrayList<>(); + right_up.add(latitudeMax); + right_up.add(longitudeMax); + List<Double> left_down = new ArrayList<>(); + left_down.add(latitudeMin); + left_down.add(longitudeMin); + List<Double> right_down = new ArrayList<>(); + right_down.add(latitudeMin); + right_down.add(longitudeMax); + bound1.add(left_up); + bound1.add(right_up); + bound1.add(right_down); + bound1.add(left_down); + List<GeoCoordinate> geoCoordinates = new ArrayList<>(); + for (List bo : bound1) { + GeoCoordinate g = new GeoCoordinate(); + g.setLatitude(Double.parseDouble(bo.get(0).toString())); + g.setLongitude(Double.parseDouble(bo.get(1).toString())); + geoCoordinates.add(g); + } + GeoCoordinate centerPoint400 = GetCenterPointFromListOfCoordinates.getCenterPoint400(geoCoordinates); + List centerPoint = new ArrayList(); + centerPoint.add(centerPoint400.getLongitude()); + centerPoint.add(centerPoint400.getLatitude()); + List<Map<String, Object>> resultList = new ArrayList<>(); + //������������ + String endTime = parameters.get("endTime").toString().substring(0, 10) + " 00:00:00"; + //������������ + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); + int days = Integer.parseInt(parameters.get("days").toString()); + Date newEndTime = new Date(); + for (int i = days; i >= 0; i--) { + Map<String, Object> resultMap = new HashMap<>(); + //������������������������������ + resultMap.put("centerPoint", centerPoint); + resultMap.put("bound", bound); + Calendar calendar = Calendar.getInstance(); + try { + newEndTime = df.parse(endTime); + } catch (ParseException e) { + e.printStackTrace(); + } + calendar.setTime(newEndTime); + calendar.set(Calendar.DAY_OF_MONTH, calendar.get(Calendar.DAY_OF_MONTH) - i); + String time = df.format(calendar.getTime()) + " 00:00:00"; + //������������ + resultMap.put("time", time); + QueryWrapper<HistoryDaily> historyDailyQueryWrapper = new QueryWrapper<>(); + historyDailyQueryWrapper.eq("time", time); + historyDailyQueryWrapper.in("mac", deviceMacList); + List<HistoryDaily> historyDailies = historyDailyMapper.selectList(historyDailyQueryWrapper); + List<Object> list = new ArrayList<>(); + for (HistoryDaily historyDailyData : historyDailies) { + List<Object> list1 = new ArrayList<>(); + String mac = historyDailyData.getMac(); + Device device = deviceMap.get(mac); + double longitude = device.getLongitude(); + double latitude = device.getLatitude(); + JSONObject value = JSONObject.parseObject(historyDailyData.getValue()); + double num = Double.parseDouble(value.get(parameters.get("sensor_code")).toString()); + int level = PollutantUtils.pollutantLevel(num, (parameters.get("sensor_code")).toString()); + list1.add(longitude); + list1.add(latitude); + list1.add(level); + list.add(list1); + } + resultMap.put("list", list); + resultList.add(resultMap); + } + return resultList; + } + + @Override + public List<Map<String, Object>> getThermodynamicDiagramDataByOrgIdSensorCodeTimeSlotV2(Map<String, Object> parameters) { + int servicesScopeId = Integer.parseInt(parameters.get("servicesScopeId").toString()); + QueryWrapper<ServicesScopeDevice> servicesScopeDeviceQueryWrapper = new QueryWrapper<>(); + servicesScopeDeviceQueryWrapper.eq("is_delete",Constants.NOT_DELETE); + servicesScopeDeviceQueryWrapper.eq("services_scope_id",servicesScopeId); + List<ServicesScopeDevice> servicesScopeDevices = servicesScopeDeviceMapper.selectList(servicesScopeDeviceQueryWrapper); + List<Integer> deviceIds = servicesScopeDevices.stream().map(p -> p.getDeviceId()).collect(Collectors.toList()); + //������������list���������������mac + List<String> deviceMacList = new ArrayList<>(); + //������������map���Mac������key���device������value + Map<String, Device> deviceMap = new HashMap<>(); + //������id������������������ + QueryWrapper<Device> wrapper_device = new QueryWrapper<>(); + wrapper_device.eq("is_delete", Constants.NOT_DELETE); + wrapper_device.in("id",deviceIds); + List<Device> devices = new ArrayList<>(); + devices = deviceMapper.selectList(wrapper_device); + if (devices.size() > 0) { + for (Device device : devices) { + String mac = device.getMac(); + deviceMacList.add(mac); + deviceMap.put(mac, device); + } + } + ServicesScope servicesScope = servicesScopeMapper.selectById(servicesScopeId); + String boundary = servicesScope.getBoundary(); + String[] boundary_points = boundary.split(";"); + List boundary_pointList = new ArrayList(); + List bound = new ArrayList(); + for (String boundary_point:boundary_points) { + List boundary_point_one = new ArrayList(); + String[] boundary_point_one_array = boundary_point.split(","); + boundary_point_one.add(Double.parseDouble(boundary_point_one_array[0])); + boundary_point_one.add(Double.parseDouble(boundary_point_one_array[1])); + boundary_pointList.add(boundary_point_one); + } + if (boundary_pointList.size()>0){ + boundary_pointList.add(boundary_pointList.get(0)); + } + bound.add(boundary_pointList); + List centerPoint = new ArrayList(); + centerPoint.add(servicesScope.getCenterLongitude()); + centerPoint.add(servicesScope.getCenterLatitude()); + List<Map<String, Object>> resultList = new ArrayList<>(); + //������������ + String endTime = parameters.get("endTime").toString().substring(0, 10) + " 00:00:00"; + //������������ + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); + int days = Integer.parseInt(parameters.get("days").toString()); + Date newEndTime = new Date(); + for (int i = days; i >= 0; i--) { + Map<String, Object> resultMap = new HashMap<>(); + //������������������������������ + resultMap.put("centerPoint", centerPoint); + resultMap.put("bound", bound); + Calendar calendar = Calendar.getInstance(); + try { + newEndTime = df.parse(endTime); + } catch (ParseException e) { + e.printStackTrace(); + } + calendar.setTime(newEndTime); + calendar.set(Calendar.DAY_OF_MONTH, calendar.get(Calendar.DAY_OF_MONTH) - i); + String time = df.format(calendar.getTime()) + " 00:00:00"; + //������������ + resultMap.put("time", time); + QueryWrapper<HistoryDaily> historyDailyQueryWrapper = new QueryWrapper<>(); + historyDailyQueryWrapper.eq("time", time); + historyDailyQueryWrapper.in("mac", deviceMacList); + List<HistoryDaily> historyDailies = historyDailyMapper.selectList(historyDailyQueryWrapper); + List<Object> list = new ArrayList<>(); + for (HistoryDaily historyDailyData : historyDailies) { + List<Object> list1 = new ArrayList<>(); + String mac = historyDailyData.getMac(); + Device device = deviceMap.get(mac); + double longitude = device.getLongitude(); + double latitude = device.getLatitude(); + JSONObject value = JSONObject.parseObject(historyDailyData.getValue()); + double num = Double.parseDouble(value.get(parameters.get("sensor_code")).toString()); + int level = PollutantUtils.pollutantLevel(num, (parameters.get("sensor_code")).toString()); + list1.add(longitude); + list1.add(latitude); + list1.add(level); + list.add(list1); + } + resultMap.put("list", list); + resultList.add(resultMap); + } + return resultList; + } + + @Override + public List<HistoryDaily> getValueByMacs(List<String> macs, String time) { + QueryWrapper<HistoryDaily> queryWrapper = new QueryWrapper<>(); + queryWrapper.select("time", "value") + .likeRight("time", time) + .in("mac", macs); + return historyDailyMapper.selectList(queryWrapper); + } + + @Override + public Double calculatedValue(List<HistoryDaily> list, String sensorCode, String type) { + Supplier<Stream<HistoryDaily>> supplier = list::stream; + 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; + OptionalDouble optionalDouble = null; + if ("sum".equals(type)) { + result = doubleStream.sum(); + } else { + if ("min".equals(type)) { + optionalDouble = doubleStream.min(); + + } else if ("max".equals(type)) { + optionalDouble = doubleStream.max(); + + } else if ("avg".equals(type)) { + optionalDouble = doubleStream.average(); + } + + if (optionalDouble.isPresent()) { + result = optionalDouble.getAsDouble(); + } + } + return result; + } + + } -- Gitblit v1.8.0