From d3a61734039d827dfba22511b5da7d3eefd62de7 Mon Sep 17 00:00:00 2001
From: cjl <chenjl@deyt.cn>
Date: Tue, 04 Jul 2023 21:11:35 +0800
Subject: [PATCH] 日期排序提交
---
screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java | 211 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 170 insertions(+), 41 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java
index 57fff86..a010fc9 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java
@@ -1,30 +1,35 @@
package com.moral.api.service.impl;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.google.common.reflect.TypeToken;
+import com.google.gson.Gson;
import com.moral.api.entity.*;
import com.moral.api.mapper.DeviceMapper;
+import com.moral.api.mapper.HistoryMonthlyMapper;
import com.moral.api.mapper.MonitorPointMapper;
import com.moral.api.mapper.SensorMapper;
import com.moral.api.pojo.form.device.MonitorPointQueryForm;
import com.moral.api.service.DeviceService;
+import com.moral.api.service.HistoryDailyService;
import com.moral.api.service.HistoryHourlyService;
+import com.moral.api.service.HistoryMonthlyService;
import com.moral.api.service.MonitorPointService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.service.OrganizationService;
import com.moral.constant.Constants;
import com.moral.util.DateUtils;
import com.moral.util.RegionCodeUtils;
-
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import org.springframework.util.unit.DataUnit;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
+import java.lang.reflect.Type;
+import java.math.BigDecimal;
+import java.text.DateFormat;
import java.util.*;
+import java.util.stream.Collectors;
/**
* <p>
@@ -53,15 +58,26 @@
@Autowired
HistoryHourlyService historyHourlyService;
+ @Autowired
+ HistoryDailyService historyDailyService;
+
+ @Autowired
+ HistoryMonthlyService historyMonthlyService;
+ @Autowired
+ HistoryMonthlyMapper historyMonthlyMapper;
+
@Override
public List<MonitorPoint> queryByOrgIdAndRegionCode(MonitorPointQueryForm form) {
//������
Integer organizationId = form.getOrganizationId();
Integer regionCode = form.getRegionCode();
String region = null;
- if (regionCode != null) {
+ if (regionCode != null && organizationId!=24) {
region = RegionCodeUtils.regionCodeConvertToName(regionCode);
}
+// if (regionCode != null) {
+// region = RegionCodeUtils.regionCodeConvertToName(regionCode);
+// }
//���������������
List<Organization> childrenOrganization = organizationService.getChildrenOrganizationsById(organizationId);
@@ -170,6 +186,11 @@
@Override
public List<Map<String, Object>> getHourlyDataDataV3(Map<String, Object> params) {
List<String> macs = (List<String>) params.remove("macs");
+ List<String> times = (List<String>) params.remove("times");
+ String type = params.get("type").toString();
+ String startTime = times.get(0);
+ String endTime = times.get(1);
+
// String[] macs = params.remove("macs").toString().split(",");
// List<String> macsList = Arrays.asList(macs);
QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
@@ -181,49 +202,157 @@
}
String[] sensors = params.remove("sensors").toString().split(",");
List<String> sensorsList = Arrays.asList(sensors);
-// List<String> sensorsList = (List<String>) params.remove("sensors");
- String startTime = params.get("startTime").toString();
- String endTime = params.get("endTime").toString();
- Date startDate = DateUtils.getDate(startTime,DateUtils.yyyy_MM_dd_HH_EN);
- Date endDate = DateUtils.getDate(endTime,DateUtils.yyyy_MM_dd_HH_EN);
List<Map<String,Object>> resultList = new ArrayList<>();
- for (Device device:devices) {
- List<HistoryHourly> hourlies = historyHourlyService.getValueByMacAndTime(device.getMac(), DateUtils.getDate(params.get("startTime").toString(), DateUtils.yyyy_MM_dd_HH_EN), DateUtils.getDate(params.get("endTime").toString(), DateUtils.yyyy_MM_dd_HH_EN));
- for (String sensor:sensorsList) {
- Map<String, Object> timeValueMap = new LinkedHashMap<>();//key���time���value������������json
- QueryWrapper<MonitorPoint> monitorPointQueryWrapper = new QueryWrapper<>();
- monitorPointQueryWrapper.eq("is_delete",Constants.NOT_DELETE);
- monitorPointQueryWrapper.eq("id",device.getMonitorPointId());
- MonitorPoint monitorPoint = monitorPointMapper.selectOne(monitorPointQueryWrapper);
- timeValueMap.put("������������",monitorPoint.getName());
- timeValueMap.put("name",device.getName());
- QueryWrapper<Sensor> sensorQueryWrapper = new QueryWrapper<>();
- sensorQueryWrapper.eq("is_delete",Constants.NOT_DELETE);
- sensorQueryWrapper.eq("code",sensor);
- Sensor sensorEntity = sensorMapper.selectOne(sensorQueryWrapper);
- timeValueMap.put("sensor",sensorEntity.getName());
- for (HistoryHourly historyHourly : hourlies) {
- Date time = historyHourly.getTime();
- String dateStr = DateUtils.dateToDateString(time, "yyyy-MM-dd HH");
- String value = historyHourly.getValue();
- JSONObject jsonObject = JSONObject.parseObject(value);
- if (jsonObject.containsKey(sensor)){
- timeValueMap.put(dateStr, jsonObject.get(sensor).toString());
+
+// List<String> sensorsList = (List<String>) params.remove("sensors");
+// String startTime = params.get("startTime").toString();
+// String endTime = params.get("endTime").toString();
+ if (type.equals("hours")){
+ Date startDate = DateUtils.getDate(startTime,DateUtils.yyyy_MM_dd_HH_EN);
+ Date endDate = DateUtils.getDate(endTime,DateUtils.yyyy_MM_dd_HH_EN);
+ for (Device device:devices) {
+ List<HistoryHourly> hourlies = historyHourlyService.getValueByMacAndTime(device.getMac(), DateUtils.getDate(startTime, DateUtils.yyyy_MM_dd_HH_EN), DateUtils.getDate(endTime, DateUtils.yyyy_MM_dd_HH_EN));
+ for (String sensor:sensorsList) {
+ Map<String, Object> timeValueMap = new LinkedHashMap<>();//key���time���value������������json
+ QueryWrapper<MonitorPoint> monitorPointQueryWrapper = new QueryWrapper<>();
+ monitorPointQueryWrapper.eq("is_delete",Constants.NOT_DELETE);
+ monitorPointQueryWrapper.eq("id",device.getMonitorPointId());
+ MonitorPoint monitorPoint = monitorPointMapper.selectOne(monitorPointQueryWrapper);
+ timeValueMap.put("������������",monitorPoint.getName());
+ timeValueMap.put("name",device.getName());
+ QueryWrapper<Sensor> sensorQueryWrapper = new QueryWrapper<>();
+ sensorQueryWrapper.eq("is_delete",Constants.NOT_DELETE);
+ sensorQueryWrapper.eq("code",sensor);
+ Sensor sensorEntity = sensorMapper.selectOne(sensorQueryWrapper);
+ timeValueMap.put("sensor",sensorEntity.getName());
+ for (HistoryHourly historyHourly : hourlies) {
+ Date time = historyHourly.getTime();
+ String dateStr = DateUtils.dateToDateString(time, "yyyy-MM-dd HH");
+ String value = historyHourly.getValue();
+ JSONObject jsonObject = JSONObject.parseObject(value);
+ if (jsonObject.containsKey(sensor)){
+ timeValueMap.put(dateStr, jsonObject.get(sensor).toString());
+ }
}
+ //���������������������
+ Date middleDate = startDate;
+ while (DateUtils.compareDateStr(DateUtils.dateToDateString(endDate,DateUtils.yyyy_MM_dd_HH_EN),DateUtils.dateToDateString(middleDate,DateUtils.yyyy_MM_dd_HH_EN),DateUtils.yyyy_MM_dd_HH_EN)<=0){
+ if (timeValueMap.get(DateUtils.dateToDateString(middleDate,DateUtils.yyyy_MM_dd_HH_EN)) == null)
+ timeValueMap.put(DateUtils.dateToDateString(middleDate,DateUtils.yyyy_MM_dd_HH_EN), null);
+ middleDate = DateUtils.addHours(middleDate,1);
+ }
+ resultList.add(timeValueMap);
}
- //���������������������
- Date middleDate = startDate;
- while (DateUtils.compareDateStr(DateUtils.dateToDateString(endDate,DateUtils.yyyy_MM_dd_HH_EN),DateUtils.dateToDateString(middleDate,DateUtils.yyyy_MM_dd_HH_EN),DateUtils.yyyy_MM_dd_HH_EN)<=0){
- if (timeValueMap.get(DateUtils.dateToDateString(middleDate,DateUtils.yyyy_MM_dd_HH_EN)) == null)
- timeValueMap.put(DateUtils.dateToDateString(middleDate,DateUtils.yyyy_MM_dd_HH_EN), null);
- middleDate = DateUtils.addHours(middleDate,1);
+ }
+ } else if("day".equals(type)){
+ Date startDate = DateUtils.getDate(startTime,DateUtils.yyyy_MM_dd_HH_EN);
+ Date endDate = DateUtils.getDate(endTime,DateUtils.yyyy_MM_dd_HH_EN);
+ List<HistoryDaily> historyDailyByMacAndTimeSlot = historyDailyService.getHistoryDailyByMacAndTimeSlot(macs, startDate, endDate);
+ Map<String,Map<String,Object>> map = resultMap(historyDailyByMacAndTimeSlot);
+ Map<Integer,String> pointMap = new HashMap<>();
+ Map<String,String> sensorMap = new HashMap<>();
+ QueryWrapper<MonitorPoint> monitorPointQueryWrapper = new QueryWrapper<>();
+ monitorPointQueryWrapper.eq("is_delete",Constants.NOT_DELETE);
+ monitorPointQueryWrapper.in("id",devices.stream().map(Device::getMonitorPointId).collect(Collectors.toList()));
+ monitorPointMapper.selectList(monitorPointQueryWrapper).forEach(it->pointMap.put(it.getId(),it.getName()));
+ QueryWrapper<Sensor> sensorQueryWrapper = new QueryWrapper<>();
+ sensorQueryWrapper.eq("is_delete",Constants.NOT_DELETE);
+ sensorQueryWrapper.in("code",sensorsList);
+ sensorMapper.selectList(sensorQueryWrapper).forEach(it->sensorMap.put(it.getCode(),it.getName()));
+
+
+ for (Device device:devices) {
+ for (String sensor:sensorsList) {
+ Date ks = DateUtils.getDate(startTime,"yyyy-MM-dd");
+ Date js = DateUtils.getDateOfDay(DateUtils.getDate(endTime,"yyyy-MM-dd"),1);
+ Map<String, Object> timeValueMap = new LinkedHashMap<>();//key���time���value������������json
+ /*QueryWrapper<MonitorPoint> monitorPointQueryWrapper = new QueryWrapper<>();
+ monitorPointQueryWrapper.eq("is_delete",Constants.NOT_DELETE);
+ monitorPointQueryWrapper.in("id",device.getMonitorPointId());
+ MonitorPoint monitorPoint = monitorPointMapper.selectOne(monitorPointQueryWrapper);*/
+ timeValueMap.put("������������",pointMap.get(device.getMonitorPointId()));
+ timeValueMap.put("name",device.getName());
+ /*QueryWrapper<Sensor> sensorQueryWrapper = new QueryWrapper<>();
+ sensorQueryWrapper.eq("is_delete",Constants.NOT_DELETE);
+ sensorQueryWrapper.eq("code",sensor);
+ Sensor sensorEntity = sensorMapper.selectOne(sensorQueryWrapper);*/
+ timeValueMap.put("sensor",sensorMap.get(sensor));
+ ArrayList<Double> doubleArrayList = new ArrayList<>();
+ while (DateUtils.isTimeBefor(js,ks)){
+ String c = DateUtils.dateToDateString(ks,"yyyy-MM-dd");
+ String k = c+"_"+device.getMac();
+ if(map.containsKey(k)){
+ Object o = map.get(k).get(sensor);
+ timeValueMap.put(c,Objects.nonNull(o)?Double.valueOf(o.toString()):0);
+ }else {
+ timeValueMap.put(c,0);
+ }
+ ks = DateUtils.getDateOfDay(ks,1);
+ }
+
+ /*for (HistoryDaily historyDaily : historyDailyByMacAndTimeSlot) {
+ Date time = historyDaily.getTime();
+ String dateStr = DateUtils.dateToDateString(time, "yyyy-MM-dd");
+ String value = historyDaily.getValue();
+ JSONObject jsonObject = JSONObject.parseObject(value);
+ doubleArrayList.add(Objects.nonNull(jsonObject)&&Objects.nonNull(jsonObject.get(sensor))?Double.parseDouble(jsonObject.get(sensor).toString()):0);
+ if (jsonObject.containsKey(sensor)){
+ timeValueMap.put(dateStr, jsonObject.get(sensor).toString());
+ }
+ }*/
+ Double ListAvg = doubleArrayList.stream().collect(Collectors.averagingDouble(Double::doubleValue));
+ double rsAvg = new BigDecimal(ListAvg).setScale(3, BigDecimal.ROUND_HALF_UP).doubleValue();
+ timeValueMap.put("���������",rsAvg);
+ resultList.add(timeValueMap);
}
- resultList.add(timeValueMap);
+ }
+ }else {
+ for (Device device:devices) {
+ QueryWrapper<HistoryMonthly> HistoryMonthlyWrapper = new QueryWrapper<>();
+ HistoryMonthlyWrapper.eq("mac",device.getMac());
+ HistoryMonthlyWrapper.between("time",startTime,endTime);
+ List<HistoryMonthly> historyMonthlyList = historyMonthlyMapper.selectList(HistoryMonthlyWrapper);
+ for (String sensor:sensorsList) {
+ Map<String, Object> timeValueMap = new LinkedHashMap<>();//key���time���value������������json
+ QueryWrapper<MonitorPoint> monitorPointQueryWrapper = new QueryWrapper<>();
+ monitorPointQueryWrapper.eq("is_delete",Constants.NOT_DELETE);
+ monitorPointQueryWrapper.eq("id",device.getMonitorPointId());
+ MonitorPoint monitorPoint = monitorPointMapper.selectOne(monitorPointQueryWrapper);
+ timeValueMap.put("������������",monitorPoint.getName());
+ timeValueMap.put("name",device.getName());
+ QueryWrapper<Sensor> sensorQueryWrapper = new QueryWrapper<>();
+ sensorQueryWrapper.eq("is_delete",Constants.NOT_DELETE);
+ sensorQueryWrapper.eq("code",sensor);
+ Sensor sensorEntity = sensorMapper.selectOne(sensorQueryWrapper);
+ timeValueMap.put("sensor",sensorEntity.getName());
+ for (HistoryMonthly historyMonthly : historyMonthlyList) {
+ Date time = historyMonthly.getTime();
+ String dateStr = DateUtils.dateToDateString(time, "yyyy-MM");
+ String value = historyMonthly.getValue();
+ JSONObject jsonObject = JSONObject.parseObject(value);
+ if (jsonObject.containsKey(sensor)){
+ timeValueMap.put(dateStr, jsonObject.get(sensor).toString());
+ }
+ }
+ resultList.add(timeValueMap);
+ }
}
}
return resultList;
}
+
+ private Map<String,Map<String,Object>> resultMap(List<HistoryDaily> list ){
+ Map<String,Map<String,Object>> map = new HashMap<>();
+ for(HistoryDaily h : list){
+ String dateStr = DateUtils.dateToDateString( h.getTime(), "yyyy-MM-dd")+"_"+h.getMac();
+ Map<String,Object> jsonMap = new HashMap<>();
+ JSONObject jsonObject = JSONObject.parseObject(h.getValue());
+ jsonMap = jsonObject.getInnerMap();
+ map.put(dateStr,jsonMap);
+ }
+ return map;
+ }
}
--
Gitblit v1.8.0