From 4450dd41e8d5828e5da4d277c86e54551a6b6c15 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 16 Dec 2021 09:06:28 +0800
Subject: [PATCH] 设备新增，修改是工艺字段可以为多个，修改mapper,sql
---
screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java | 249 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 246 insertions(+), 3 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 846ca66..49f8672 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
@@ -3,21 +3,27 @@
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.HistoryHourly;
+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.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.SimpleDateFormat;
import java.util.*;
+import java.util.stream.Collectors;
/**
* <p>
@@ -32,6 +38,12 @@
@Autowired
private HistoryHourlyMapper historyHourlyMapper;
+
+ @Autowired
+ private DeviceMapper deviceMapper;
+
+ @Autowired
+ private OrganizationService organizationService;
@Override
public Map<String, Object> getHourlyAqiByMac(String mac) {
@@ -49,8 +61,237 @@
return result;
}
Map<String, Object> data = JSONObject.parseObject(value, Map.class);
- result.put("AQI", AQIUtils.hourlyAqi(data));
+ AQI aqi = AQIUtils.hourlyAQI(data);
+ result.put("AQI", aqi.getAQIValue());
return result;
+ }
+
+ /**
+ *@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) {
+ 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;
}
/**
@@ -60,6 +301,7 @@
* @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);
@@ -83,6 +325,7 @@
List<HistoryHourly> datas = historyHourlyMapper.selectList(wrapper);
result.addAll(datas);
}
+ MybatisPlusConfig.tableName.remove();
return result;
}
--
Gitblit v1.8.0