From 85dba01ea5021d83487c3ed2d60706f516a0774b Mon Sep 17 00:00:00 2001 From: jinpengyong <jpy123456> Date: Wed, 05 Jan 2022 14:40:28 +0800 Subject: [PATCH] 贡献率数据格式修改 --- screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java | 641 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 618 insertions(+), 23 deletions(-) diff --git a/screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java index e3f2037..734b4dd 100644 --- a/screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java +++ b/screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java @@ -1,24 +1,44 @@ package com.moral.api.service.impl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.util.ObjectUtils; + +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.moral.api.config.mybatis.MybatisPlusConfig; -import com.moral.api.entity.HistoryFiveMinutely; +import com.moral.api.entity.Device; +import com.moral.api.entity.GeoCoordinate; import com.moral.api.entity.HistoryHourly; +import com.moral.api.entity.Organization; +import com.moral.api.mapper.DeviceMapper; import com.moral.api.mapper.HistoryHourlyMapper; import com.moral.api.service.HistoryHourlyService; +import com.moral.api.service.OrganizationService; +import com.moral.api.service.SensorService; +import com.moral.api.utils.GetCenterPointFromListOfCoordinates; import com.moral.constant.Constants; import com.moral.constant.SeparateTableType; import com.moral.pojo.AQI; import com.moral.util.AQIUtils; import com.moral.util.DateUtils; - import com.moral.util.MybatisPLUSUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.ObjectUtils; - -import java.util.*; +import com.moral.util.PollutantUtils; /** * <p> @@ -33,6 +53,12 @@ @Autowired private HistoryHourlyMapper historyHourlyMapper; + + @Autowired + private DeviceMapper deviceMapper; + + @Autowired + private OrganizationService organizationService; @Override public Map<String, Object> getHourlyAqiByMac(String mac) { @@ -56,30 +82,599 @@ } /** - * @Description: ���������������������������mac��������� - * @Param: [mac, startDate, endDate] - * @return: java.util.List<com.moral.api.entity.HistoryHourly> - * @Author: ��������� - * @Date: 2021/9/23 - */ + * @Description: ������������id������������������������������������������ + * @Param: [map] + * @return: java.util.Map<java.lang.String, java.lang.Object> + * @Author: lizijie + * @Date: 2021/12/7 10:07 + **/ @Override - public List<HistoryHourly> getValueByMacAndTime(String mac,Date startDate,Date endDate){ + public Map<String, Object> getLastHourDataByOrgIdAndSensorCode(Map 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<>(); + 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); + } + } else { + continue; + } + } + //������������ + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH"); + Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, calendar.get(Calendar.HOUR_OF_DAY) - 1); + String time = df.format(calendar.getTime()) + ":00:00"; + resultMap.put("time", time); + String timeUnits = DateUtils.dateToDateString(calendar.getTime(), DateUtils.yyyyMM_EN); + List<Map<String, Object>> historyHourlyDatas = new ArrayList<>(); + historyHourlyDatas = historyHourlyMapper.selectDataByMacsAndTime(timeUnits, deviceMacList, time); + List<Object> list = new ArrayList<>(); + List<Double> longitudeList = new ArrayList<>(); + List<Double> latitudeList = new ArrayList<>(); + for (Map historyHourlyData : historyHourlyDatas) { + List<Object> list1 = new ArrayList<>(); + String mac = historyHourlyData.get("mac").toString(); + Device device = deviceMap.get(mac); + double longitude = device.getLongitude(); + double latitude = device.getLatitude(); + longitudeList.add(longitude); + latitudeList.add(latitude); + JSONObject value = JSONObject.parseObject(historyHourlyData.get("value").toString()); + 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(latitudeMax); + bound.add(longitudeMax); + bound.add(latitudeMin); + 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> getLastTwelveHourDataByOrgIdAndSensorCode(Map 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; + } + } + List<Object> list = new ArrayList<>(); + //������������ + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH"); + for (int i = 12; i > 0; i--) { + Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, calendar.get(Calendar.HOUR_OF_DAY) - i); + String time = df.format(calendar.getTime()) + ":00:00"; + String timeUnits = DateUtils.dateToDateString(calendar.getTime(), DateUtils.yyyyMM_EN); + List<Map<String, Object>> historyHourlyDatas = new ArrayList<>(); + historyHourlyDatas = historyHourlyMapper.selectDataByMacsAndTime(timeUnits, deviceMacList, time); + List<Object> oneHourlyList = new ArrayList<>(); + for (Map historyHourlyData : historyHourlyDatas) { + List<Object> list1 = new ArrayList<>(); + String mac = historyHourlyData.get("mac").toString(); + Device device = deviceMap.get(mac); + double longitude = device.getLongitude(); + double latitude = device.getLatitude(); + JSONObject value = JSONObject.parseObject(historyHourlyData.get("value").toString()); + 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); + oneHourlyList.add(list1); + } + list.add(oneHourlyList); + } + 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(latitudeMax); + bound.add(longitudeMax); + bound.add(latitudeMin); + bound.add(longitudeMin); + 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> 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, 13) + ":00:00"; + resultMap.put("time", time); + String timeUnits = DateUtils.stringToDateString(time, DateUtils.yyyy_MM_dd_HH_mm_ss_EN, DateUtils.yyyyMM_EN); + List<Map<String, Object>> historyHourlyDatas = new ArrayList<>(); + historyHourlyDatas = historyHourlyMapper.selectDataByMacsAndTime(timeUnits, deviceMacList, time); + List<Object> list = new ArrayList<>(); + for (Map historyHourlyData : historyHourlyDatas) { + List<Object> list1 = new ArrayList<>(); + String mac = historyHourlyData.get("mac").toString(); + Device device = deviceMap.get(mac); + double longitude = device.getLongitude(); + double latitude = device.getLatitude(); + JSONObject value = JSONObject.parseObject(historyHourlyData.get("value").toString()); + 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 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>> list = new ArrayList<>(); + //������������ + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH"); + String endTime = parameters.get("endTime").toString(); + int hour = Integer.parseInt(parameters.get("hour").toString()); + Date newEndTime = new Date(); + for (int i = hour; 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.HOUR_OF_DAY, calendar.get(Calendar.HOUR_OF_DAY) - i); + String time = df.format(calendar.getTime()) + ":00:00"; + //������������ + resultMap.put("time", time); + String timeUnits = DateUtils.dateToDateString(calendar.getTime(), DateUtils.yyyyMM_EN); + List<Map<String, Object>> historyHourlyDatas = new ArrayList<>(); + historyHourlyDatas = historyHourlyMapper.selectDataByMacsAndTime(timeUnits, deviceMacList, time); + List<Object> oneHourlyList = new ArrayList<>(); + for (Map historyHourlyData : historyHourlyDatas) { + List<Object> list1 = new ArrayList<>(); + String mac = historyHourlyData.get("mac").toString(); + Device device = deviceMap.get(mac); + double longitude = device.getLongitude(); + double latitude = device.getLatitude(); + JSONObject value = JSONObject.parseObject(historyHourlyData.get("value").toString()); + 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); + oneHourlyList.add(list1); + } + resultMap.put("list", oneHourlyList); + list.add(resultMap); + } + return list; + } + + @Override + public List<Map<String, Object>> getHourCompleteDataByMacSensorCodeDate(Map<String, Object> map) { + String mac = map.get("mac").toString(); + String sensorCode = map.get("sensor_code").toString(); + String date = map.get("date").toString(); + String dateTime = date.replace("-", ""); + String timeUnits = dateTime.substring(0, 6) + "_complete"; + Map<String, Object> params = new HashMap<>(); + params.put("timeUnits", timeUnits); + params.put("mac", mac); + List resultList = new ArrayList(); + for (int i = 0; i < 24; i++) { + Map<String, Object> oneHourDateMap = new HashMap<>(); + String j; + if (i < 10) { + j = " 0" + i + ":00:00"; + } else { + j = " " + i + ":00:00"; + } + String time = date + j; + params.put("time", time); + String resultTime = time.substring(0, 13); + if (ObjectUtils.isEmpty(historyHourlyMapper.selectHourlyData(params))) { + oneHourDateMap.put("time", resultTime); + oneHourDateMap.put("values", new ArrayList<>()); + resultList.add(oneHourDateMap); + continue; + } + String oneHourlyData = null; + oneHourlyData = historyHourlyMapper.selectHourlyData(params); + JSONObject js = JSONObject.parseObject(oneHourlyData); + String sensorDate = js.get(sensorCode).toString(); + sensorDate = sensorDate.replace("[", ""); + sensorDate = sensorDate.replace("]", ""); + String[] split = sensorDate.split(","); + oneHourDateMap.put("time", resultTime); + oneHourDateMap.put("values", split); + resultList.add(oneHourDateMap); + } + return resultList; + } + + /** + * @Description: ���������������������������mac��������� + * @Param: [mac, startDate, endDate] + * @return: java.util.List<com.moral.api.entity.HistoryHourly> + * @Author: ��������� + * @Date: 2021/9/23 + */ + @Override + public List<HistoryHourly> getValueByMacAndTime(String mac, Date startDate, Date endDate) { QueryWrapper<HistoryHourly> wrapper = new QueryWrapper<>(); - wrapper.eq("mac",mac); - wrapper.between("time",startDate,endDate); + wrapper.eq("mac", mac); + wrapper.between("time", startDate, endDate); List<String> tableNames = MybatisPLUSUtils.getTableNamesByWrapper(startDate, endDate, SeparateTableType.MONTH); List<HistoryHourly> datas = multiTableQuery(wrapper, tableNames); return datas; } + @Override + public List<HistoryHourly> getValueByMacs(List<String> macs, String time) { + QueryWrapper<HistoryHourly> queryWrapper = new QueryWrapper<>(); + queryWrapper.select("time", "value") + .likeRight("time", time) + .in("mac", macs); + Date date = DateUtils.getDate(time, DateUtils.yyyy_MM_dd_EN); + List<String> tableNames = MybatisPLUSUtils.getTableNamesByWrapper(date, date, SeparateTableType.MONTH); + return multiTableQuery(queryWrapper, tableNames); + } + + @Override + public Double calculatedValue(List<HistoryHourly> list, String sensorCode, String type, Double lower, Double upper) { + Supplier<Stream<HistoryHourly>> 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; + } + + //��������������������� + Object flag = dataValue.get(sensorCode + "-" + Constants.MARKER_BIT_KEY); + if (!Constants.MARKER_BIT_TRUE.equals(flag)) { + return null; + } + + double aDouble = Double.parseDouble(sensorValue.toString()); + + //������������������������������ + if (!ObjectUtils.isEmpty(lower)) { + if (aDouble < lower) { + return null; + } + } + if (!ObjectUtils.isEmpty(upper)) { + if (aDouble > upper) { + return null; + } + } + + 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; + } + /** - * @Description: ������������������������������������������������wrapper��������������� - * @Param: [wrapper, tableNames] - * @return: java.util.List<com.moral.api.entity.HistoryHourly> - * @Author: ��������� - * @Date: 2021/9/23 - */ - private List<HistoryHourly> multiTableQuery(QueryWrapper<HistoryHourly> wrapper,List<String> tableNames){ + * @Description: ������������������������������������������������wrapper��������������� + * @Param: [wrapper, tableNames] + * @return: java.util.List<com.moral.api.entity.HistoryHourly> + * @Author: ��������� + * @Date: 2021/9/23 + */ + private List<HistoryHourly> multiTableQuery(QueryWrapper<HistoryHourly> wrapper, List<String> tableNames) { List<HistoryHourly> result = new ArrayList<>(); for (String tableName : tableNames) { MybatisPlusConfig.tableName.set(tableName); -- Gitblit v1.8.0