From 28776b56db3bbd2fbbfd64394e40aa11a6b7ea29 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 15 Nov 2023 17:30:53 +0800
Subject: [PATCH] fix：补充提交
---
screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java | 590 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 468 insertions(+), 122 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 e842633..745c803 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,30 +1,41 @@
package com.moral.api.service.impl;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import com.moral.api.entity.*;
+import com.moral.api.mapper.ServicesScopeDeviceMapper;
+import com.moral.api.mapper.ServicesScopeMapper;
+import com.moral.api.vo.HistoryHourlyVo;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+
+import java.text.DecimalFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+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.*;
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 com.moral.util.PollutantUtils;
-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.*;
-import java.util.stream.Collectors;
/**
* <p>
@@ -46,10 +57,17 @@
@Autowired
private OrganizationService organizationService;
+ @Autowired
+ private ServicesScopeMapper servicesScopeMapper;
+
+ @Autowired
+ private ServicesScopeDeviceMapper servicesScopeDeviceMapper;
+
@Override
public Map<String, Object> getHourlyAqiByMac(String mac) {
Date now = new Date();
- String time = DateUtils.dateToDateString(now, DateUtils.yyyy_MM_dd_HH_EN) + ":00:00";
+// String time = DateUtils.dateToDateString(now, DateUtils.yyyy_MM_dd_HH_EN) + ":00:00";
+ String time = DateUtils.dateToDateString(DateUtils.addHours(now, -1), DateUtils.yyyy_MM_dd_HH_EN) + ":00:00";
//������������������
Map<String, Object> params = new HashMap<>();
params.put("timeUnits", DateUtils.dateToDateString(now, DateUtils.yyyyMM_EN));
@@ -68,11 +86,11 @@
}
/**
- *@Description: ������������id������������������������������������������
- *@Param: [map]
- *@return: java.util.Map<java.lang.String,java.lang.Object>
- *@Author: lizijie
- *@Date: 2021/12/7 10:07
+ * @Description: ������������id������������������������������������������
+ * @Param: [map]
+ * @return: java.util.Map<java.lang.String, java.lang.Object>
+ * @Author: lizijie
+ * @Date: 2021/12/7 10:07
**/
@Override
public Map<String, Object> getLastHourDataByOrgIdAndSensorCode(Map parameters) {
@@ -84,8 +102,8 @@
//������������
//���������������
List<Organization> allChildrenOrganization = organizationService.getChildrenOrganizationsById(orgId);
- if (!ObjectUtils.isEmpty(allChildrenOrganization) || allChildrenOrganization.size() < 1){
- for (Organization organization:allChildrenOrganization) {
+ if (!ObjectUtils.isEmpty(allChildrenOrganization) || allChildrenOrganization.size() < 1) {
+ for (Organization organization : allChildrenOrganization) {
allOrgId.add(organization.getId());
}
}
@@ -94,36 +112,36 @@
//������������list���������������mac
List<String> deviceMacList = new ArrayList<>();
//������������map���Mac������key���device������value
- Map<String,Device> deviceMap = new HashMap<>();
- for (Integer orgIdWithoutDuplicates:allOrgIdWithoutDuplicates) {
+ 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);
+ 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) {
+ if (devices.size() > 0) {
+ for (Device device : devices) {
String mac = device.getMac();
deviceMacList.add(mac);
- deviceMap.put(mac,device);
+ deviceMap.put(mac, device);
}
- }else {
+ } 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<>();
+ 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) {
+ for (Map historyHourlyData : historyHourlyDatas) {
List<Object> list1 = new ArrayList<>();
String mac = historyHourlyData.get("mac").toString();
Device device = deviceMap.get(mac);
@@ -139,17 +157,17 @@
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));
+ 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);
+ resultMap.put("bound", bound);
List<List> bound1 = new ArrayList<>();
List<Double> left_up = new ArrayList<>();
left_up.add(latitudeMax);
@@ -168,7 +186,7 @@
bound1.add(right_down);
bound1.add(left_down);
List<GeoCoordinate> geoCoordinates = new ArrayList<>();
- for (List bo:bound1) {
+ for (List bo : bound1) {
GeoCoordinate g = new GeoCoordinate();
g.setLatitude(Double.parseDouble(bo.get(0).toString()));
g.setLongitude(Double.parseDouble(bo.get(1).toString()));
@@ -178,7 +196,7 @@
List centerPoint = new ArrayList();
centerPoint.add(centerPoint400.getLongitude());
centerPoint.add(centerPoint400.getLatitude());
- resultMap.put("centerPoint",centerPoint);
+ resultMap.put("centerPoint", centerPoint);
return resultMap;
}
@@ -192,8 +210,8 @@
//������������
//���������������
List<Organization> allChildrenOrganization = organizationService.getChildrenOrganizationsById(orgId);
- if (!ObjectUtils.isEmpty(allChildrenOrganization) || allChildrenOrganization.size() < 1){
- for (Organization organization:allChildrenOrganization) {
+ if (!ObjectUtils.isEmpty(allChildrenOrganization) || allChildrenOrganization.size() < 1) {
+ for (Organization organization : allChildrenOrganization) {
allOrgId.add(organization.getId());
}
}
@@ -202,41 +220,41 @@
//������������list���������������mac
List<String> deviceMacList = new ArrayList<>();
//������������map���Mac������key���device������value
- Map<String,Device> deviceMap = new HashMap<>();
+ Map<String, Device> deviceMap = new HashMap<>();
List<Double> longitudeList = new ArrayList<>();
List<Double> latitudeList = new ArrayList<>();
- for (Integer orgIdWithoutDuplicates:allOrgIdWithoutDuplicates) {
+ for (Integer orgIdWithoutDuplicates : allOrgIdWithoutDuplicates) {
//������id������������������
QueryWrapper<Device> wrapper_device = new QueryWrapper<>();
- wrapper_device.eq("is_delete",Constants.NOT_DELETE).eq("organization_id",orgIdWithoutDuplicates);
+ 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) {
+ if (devices.size() > 0) {
+ for (Device device : devices) {
String mac = device.getMac();
deviceMacList.add(mac);
- deviceMap.put(mac,device);
+ deviceMap.put(mac, device);
double longitude = device.getLongitude();
double latitude = device.getLatitude();
longitudeList.add(longitude);
latitudeList.add(latitude);
}
- }else {
+ } else {
continue;
}
}
List<Object> list = new ArrayList<>();
//������������
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH");
- for (int i=12;i>0;i--){
+ 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<>();
+ 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) {
+ for (Map historyHourlyData : historyHourlyDatas) {
List<Object> list1 = new ArrayList<>();
String mac = historyHourlyData.get("mac").toString();
Device device = deviceMap.get(mac);
@@ -252,17 +270,17 @@
}
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));
+ 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);
+ resultMap.put("bound", bound);
List<List> bound1 = new ArrayList<>();
List<Double> left_up = new ArrayList<>();
left_up.add(latitudeMax);
@@ -281,7 +299,7 @@
bound1.add(right_down);
bound1.add(left_down);
List<GeoCoordinate> geoCoordinates = new ArrayList<>();
- for (List bo:bound1) {
+ for (List bo : bound1) {
GeoCoordinate g = new GeoCoordinate();
g.setLatitude(Double.parseDouble(bo.get(0).toString()));
g.setLongitude(Double.parseDouble(bo.get(1).toString()));
@@ -291,7 +309,7 @@
List centerPoint = new ArrayList();
centerPoint.add(centerPoint400.getLongitude());
centerPoint.add(centerPoint400.getLatitude());
- resultMap.put("centerPoint",centerPoint);
+ resultMap.put("centerPoint", centerPoint);
return resultMap;
}
@@ -305,8 +323,8 @@
//������������
//���������������
List<Organization> allChildrenOrganization = organizationService.getChildrenOrganizationsById(orgId);
- if (!ObjectUtils.isEmpty(allChildrenOrganization) || allChildrenOrganization.size() < 1){
- for (Organization organization:allChildrenOrganization) {
+ if (!ObjectUtils.isEmpty(allChildrenOrganization) || allChildrenOrganization.size() < 1) {
+ for (Organization organization : allChildrenOrganization) {
allOrgId.add(organization.getId());
}
}
@@ -315,37 +333,37 @@
//������������list���������������mac
List<String> deviceMacList = new ArrayList<>();
//������������map���Mac������key���device������value
- Map<String,Device> deviceMap = new HashMap<>();
+ Map<String, Device> deviceMap = new HashMap<>();
List<Double> longitudeList = new ArrayList<>();
List<Double> latitudeList = new ArrayList<>();
- for (Integer orgIdWithoutDuplicates:allOrgIdWithoutDuplicates) {
+ for (Integer orgIdWithoutDuplicates : allOrgIdWithoutDuplicates) {
//������id������������������
QueryWrapper<Device> wrapper_device = new QueryWrapper<>();
- wrapper_device.eq("is_delete",Constants.NOT_DELETE).eq("organization_id",orgIdWithoutDuplicates);
+ 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) {
+ if (devices.size() > 0) {
+ for (Device device : devices) {
String mac = device.getMac();
deviceMacList.add(mac);
- deviceMap.put(mac,device);
+ deviceMap.put(mac, device);
double longitude = device.getLongitude();
double latitude = device.getLatitude();
longitudeList.add(longitude);
latitudeList.add(latitude);
}
- }else {
+ } 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<>();
+ 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) {
+ for (Map historyHourlyData : historyHourlyDatas) {
List<Object> list1 = new ArrayList<>();
String mac = historyHourlyData.get("mac").toString();
Device device = deviceMap.get(mac);
@@ -359,17 +377,17 @@
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));
+ 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);
+ resultMap.put("bound", bound);
List<List> bound1 = new ArrayList<>();
List<Double> left_up = new ArrayList<>();
left_up.add(latitudeMax);
@@ -388,7 +406,7 @@
bound1.add(right_down);
bound1.add(left_down);
List<GeoCoordinate> geoCoordinates = new ArrayList<>();
- for (List bo:bound1) {
+ for (List bo : bound1) {
GeoCoordinate g = new GeoCoordinate();
g.setLatitude(Double.parseDouble(bo.get(0).toString()));
g.setLongitude(Double.parseDouble(bo.get(1).toString()));
@@ -398,7 +416,79 @@
List centerPoint = new ArrayList();
centerPoint.add(centerPoint400.getLongitude());
centerPoint.add(centerPoint400.getLatitude());
- resultMap.put("centerPoint",centerPoint);
+ 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, 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);
+ 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;
}
@@ -411,8 +501,8 @@
//������������
//���������������
List<Organization> allChildrenOrganization = organizationService.getChildrenOrganizationsById(orgId);
- if (!ObjectUtils.isEmpty(allChildrenOrganization) || allChildrenOrganization.size() < 1){
- for (Organization organization:allChildrenOrganization) {
+ if (!ObjectUtils.isEmpty(allChildrenOrganization) || allChildrenOrganization.size() < 1) {
+ for (Organization organization : allChildrenOrganization) {
allOrgId.add(organization.getId());
}
}
@@ -421,33 +511,33 @@
//������������list���������������mac
List<String> deviceMacList = new ArrayList<>();
//������������map���Mac������key���device������value
- Map<String,Device> deviceMap = new HashMap<>();
+ Map<String, Device> deviceMap = new HashMap<>();
List<Double> longitudeList = new ArrayList<>();
List<Double> latitudeList = new ArrayList<>();
- for (Integer orgIdWithoutDuplicates:allOrgIdWithoutDuplicates) {
+ for (Integer orgIdWithoutDuplicates : allOrgIdWithoutDuplicates) {
//������id������������������
QueryWrapper<Device> wrapper_device = new QueryWrapper<>();
- wrapper_device.eq("is_delete",Constants.NOT_DELETE).eq("organization_id",orgIdWithoutDuplicates);
+ 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) {
+ if (devices.size() > 0) {
+ for (Device device : devices) {
String mac = device.getMac();
deviceMacList.add(mac);
- deviceMap.put(mac,device);
+ deviceMap.put(mac, device);
double longitude = device.getLongitude();
double latitude = device.getLatitude();
longitudeList.add(longitude);
latitudeList.add(latitude);
}
- }else {
+ } 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));
+ 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);
@@ -471,7 +561,7 @@
bound1.add(right_down);
bound1.add(left_down);
List<GeoCoordinate> geoCoordinates = new ArrayList<>();
- for (List bo:bound1) {
+ for (List bo : bound1) {
GeoCoordinate g = new GeoCoordinate();
g.setLatitude(Double.parseDouble(bo.get(0).toString()));
g.setLongitude(Double.parseDouble(bo.get(1).toString()));
@@ -487,11 +577,11 @@
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--){
+ for (int i = hour; i >= 0; i--) {
Map<String, Object> resultMap = new HashMap<>();
//������������������������������
- resultMap.put("centerPoint",centerPoint);
- resultMap.put("bound",bound);
+ resultMap.put("centerPoint", centerPoint);
+ resultMap.put("bound", bound);
Calendar calendar = Calendar.getInstance();
try {
newEndTime = df.parse(endTime);
@@ -499,15 +589,15 @@
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";
+ 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<>();
+ 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) {
+ for (Map historyHourlyData : historyHourlyDatas) {
List<Object> list1 = new ArrayList<>();
String mac = historyHourlyData.get("mac").toString();
Device device = deviceMap.get(mac);
@@ -521,10 +611,130 @@
list1.add(level);
oneHourlyList.add(list1);
}
- resultMap.put("list",oneHourlyList);
+ resultMap.put("list", oneHourlyList);
list.add(resultMap);
}
return list;
+ }
+
+ @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>> 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 startTime = map.get("startTime").toString();
+ String endTime = map.get("endTime").toString();
+ String dateTime = startTime.replace("-", "");
+ String timeUnits = dateTime.substring(0, 6) + "_complete";
+ Map<String, Object> params = new HashMap<>();
+ params.put("timeUnits", timeUnits);
+ params.put("mac", mac);
+ params.put("startTime",startTime);
+ params.put("endTime",endTime);
+ List resultList = new ArrayList();
+ List<Map<String, Object>> maps = historyHourlyMapper.selectHourlyListData(params);
+ for (Map<String, Object> stringObjectMap : maps) {
+ Map<String, Object> oneHourDateMap = new HashMap<>();
+ Object value = stringObjectMap.get("value");
+ JSONObject js = JSONObject.parseObject(value.toString());
+ String sensorDate = js.get(sensorCode).toString();
+ sensorDate = sensorDate.replace("[", "");
+ sensorDate = sensorDate.replace("]", "");
+ String[] split = sensorDate.split(",");
+ oneHourDateMap.put("time",stringObjectMap.get("time").toString().substring(0,13));
+ oneHourDateMap.put("values", split);
+ resultList.add(oneHourDateMap);
+ }
+ return resultList;
}
/**
@@ -536,24 +746,100 @@
*/
@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);
+ Map<String, Object> mapParams = new HashMap<>();
+ mapParams.put("startDate",startDate);
+ mapParams.put("endDate",endDate);
+ mapParams.put("mac",mac);
List<String> tableNames = MybatisPLUSUtils.getTableNamesByWrapper(startDate, endDate, SeparateTableType.MONTH);
- List<HistoryHourly> datas = multiTableQuery(wrapper, tableNames);
+ List<HistoryHourly> datas = multiTableQuery(mapParams, tableNames);
+ return datas;
+ }
+ @Override
+ public List<HistoryHourly> getValueByMacAndTime(List<String> mac, Date startDate, Date endDate) {
+
+ Map<String, Object> mapParams = new HashMap<>();
+ mapParams.put("startDate",startDate);
+ mapParams.put("endDate",endDate);
+ mapParams.put("macs",mac);
+ List<String> tableNames = MybatisPLUSUtils.getTableNamesByWrapper(startDate, endDate, SeparateTableType.MONTH);
+ List<HistoryHourly> datas = multiTableQuery(mapParams, tableNames);
return datas;
}
@Override
- public Double getSensorSumByMacs(String sensorCode, List macs, String time) {
- String timeUnits = time.substring(0, 7).replace("-", "");
- return historyHourlyMapper.getSensorSumByMacs(sensorCode, macs, time, timeUnits);
+ public List<HistoryHourly> getValueByMacs(List<String> macs, String time) {
+ Map<String, Object> mapParams = new HashMap<>();
+ mapParams.put("time",time);
+ mapParams.put("macs",macs);
+ Date date = DateUtils.getDate(time, DateUtils.yyyy_MM_dd_EN);
+ List<String> tableNames = MybatisPLUSUtils.getTableNamesByWrapper(date, date, SeparateTableType.MONTH);
+ return multiTableQueryLike(mapParams, tableNames);
}
@Override
- public Double getSensorAvgByMacs(String sensorCode, List macs, String time) {
- String timeUnits = time.substring(0, 7).replace("-", "");
- return historyHourlyMapper.getSensorAvgByMacs(sensorCode, macs, time, timeUnits);
+ public List<HistoryHourly> getHourlyDataByMacs(List<String> macs, String time) {
+ Map<String, Object> mapParams = new HashMap<>();
+ mapParams.put("time",time);
+ mapParams.put("macs",macs);
+ Date date = DateUtils.getDate(time, DateUtils.yyyy_MM_dd_EN);
+ List<String> tableNames = MybatisPLUSUtils.getTableNamesByWrapper(date, date, SeparateTableType.MONTH);
+ return multiTableQueryLike(mapParams, 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;
}
/**
@@ -563,15 +849,75 @@
* @Author: ���������
* @Date: 2021/9/23
*/
- private List<HistoryHourly> multiTableQuery(QueryWrapper<HistoryHourly> wrapper, List<String> tableNames) {
+ private List<HistoryHourly> multiTableQuery(Map<String, Object> params, List<String> tableNames) {
List<HistoryHourly> result = new ArrayList<>();
for (String tableName : tableNames) {
- MybatisPlusConfig.tableName.set(tableName);
- List<HistoryHourly> datas = historyHourlyMapper.selectList(wrapper);
+ params.put("table",tableName);
+ List<HistoryHourly> datas = historyHourlyMapper.listResult(params);
result.addAll(datas);
}
- MybatisPlusConfig.tableName.remove();
+ return result;
+ }
+ private List<HistoryHourly> multiTableQueryLike(Map<String, Object> params, List<String> tableNames) {
+ List<HistoryHourly> result = new ArrayList<>();
+ for (String tableName : tableNames) {
+ params.put("table",tableName);
+ List<HistoryHourly> datas = historyHourlyMapper.listLikeResult(params);
+ result.addAll(datas);
+ }
return result;
}
+// @Override
+// public String getTVOCByMac(String mac, String time, String sensor,String yearAndMonth) {
+// return historyHourlyMapper.getTVOCByMac(mac,time,sensor,yearAndMonth);
+//
+// }
+//
+// @Override
+// public String getPressureByMac(String mac, String time,String yearAndMonth) {
+// return historyHourlyMapper.getPressureByMac(mac,time,yearAndMonth);
+// }
+//
+// @Override
+// public Map<String, Object> getDataByMac(String mac, String time,String yearAndMonth) {
+// return historyHourlyMapper.getDataByMac(mac,time,yearAndMonth);
+// }
+
+
+ @Override
+ public boolean historyHourly(HistoryHourlyVo historyHourlyVo) {
+ String time = historyHourlyVo.getTime();
+ String table = historyHourlyVo.getTable();
+ String timeEnd = historyHourlyVo.getTimeEnd();
+ String tableEnd =historyHourlyVo.getTableEnd();
+ List<String> macList = deviceMapper.deviceMacs(historyHourlyVo.getOrganizationId());
+ if(CollectionUtils.isEmpty(macList)){
+ return false;
+ }
+ List<Map<String,Object>> listMap = historyHourlyMapper.selectDataByMacsAndTime(table, macList, time);
+ for (Map historyHourlyData : listMap) {
+ String mac = historyHourlyData.get("mac").toString();
+ Map<String, Object> data = JSON.parseObject(historyHourlyData.get("value").toString(), Map.class);
+ Map<String, Object> dataResult = new HashMap<>();
+ dataResult = data;
+ //a34004:pm2.5 a34002:pm10 a05024:O3 a21005:CO a21026:So2 a21004:NO2 a99054:tovc
+ dataResult.put("a34004",Objects.isNull(data.get("a34004"))||data.get("a34004").toString().equals("0")?0d:Double.parseDouble(String.format("%.4f",Double.parseDouble(data.get("a34004").toString())+historyHourlyVo.getA34004())));
+ dataResult.put("a34002",Objects.isNull(data.get("a34002"))||data.get("a34002").toString().equals("0")?0d:Double.parseDouble(String.format("%.4f",Double.parseDouble(data.get("a34002").toString())+historyHourlyVo.getA34002())));
+ dataResult.put("a05024",Objects.isNull(data.get("a05024"))||data.get("a05024").toString().equals("0")?0d:Double.parseDouble(String.format("%.4f",Double.parseDouble(data.get("a05024").toString())+historyHourlyVo.getA05024())));
+ dataResult.put("a21005",Objects.isNull(data.get("a21005"))||data.get("a21005").toString().equals("0")?0d:Double.parseDouble(String.format("%.4f",Double.parseDouble(data.get("a21005").toString())+historyHourlyVo.getA21005())));
+ dataResult.put("a21026",Objects.isNull(data.get("a21026"))||data.get("a21026").toString().equals("0")?0d:Double.parseDouble(String.format("%.4f",Double.parseDouble(data.get("a21026").toString())+historyHourlyVo.getA21026())));
+ dataResult.put("a21004",Objects.isNull(data.get("a21004"))||data.get("a21004").toString().equals("0")?0d:Double.parseDouble(String.format("%.4f",Double.parseDouble(data.get("a21004").toString())+historyHourlyVo.getA21004())));
+ dataResult.put("a99054",Objects.isNull(data.get("a99054"))||data.get("a99054").toString().equals("0")?0d:Double.parseDouble(String.format("%.4f",Double.parseDouble(data.get("a99054").toString())+historyHourlyVo.getA99054())));
+ Map<String, Object> map = new HashMap<>();
+ map.put("timeUnits",tableEnd);
+ map.put("time",timeEnd);
+ map.put("value",JSONObject.toJSONString(dataResult));
+ map.put("version","35");
+ map.put("mac",mac);
+ // historyHourlyMapper.insertHistoryHourly(map);
+ historyHourlyMapper.updateHistoryHourly(map);
+ }
+ return true;
+ }
}
--
Gitblit v1.8.0