From f2f77f203fd6b054197ecaba0517a159e8b3ac8f Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Mon, 30 Oct 2023 15:48:24 +0800
Subject: [PATCH] fix：补偿0问题修改
---
screen-api/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java | 201 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 192 insertions(+), 9 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 c976a62..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,9 +1,13 @@
package com.moral.api.service.impl;
+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;
@@ -22,10 +26,6 @@
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.entity.Device;
-import com.moral.api.entity.GeoCoordinate;
-import com.moral.api.entity.HistoryDaily;
-import com.moral.api.entity.Organization;
import com.moral.api.mapper.DeviceMapper;
import com.moral.api.mapper.HistoryDailyMapper;
import com.moral.api.service.HistoryDailyService;
@@ -55,6 +55,12 @@
@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());
@@ -65,7 +71,10 @@
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;
}
@@ -98,6 +107,15 @@
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;
@@ -207,6 +225,79 @@
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;
}
@@ -339,6 +430,98 @@
}
@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")
@@ -366,13 +549,13 @@
result = doubleStream.sum();
} else {
if ("min".equals(type)) {
- optionalDouble = doubleStream.average();
-
- } else if ("max".equals(type)) {
optionalDouble = doubleStream.min();
- } else if ("avg".equals(type)) {
+ } else if ("max".equals(type)) {
optionalDouble = doubleStream.max();
+
+ } else if ("avg".equals(type)) {
+ optionalDouble = doubleStream.average();
}
if (optionalDouble.isPresent()) {
--
Gitblit v1.8.0