From c798e8ad78073ef106c79a83f39a2f2eba22e461 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 06 Jul 2023 11:25:11 +0800
Subject: [PATCH] 测试提交
---
screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java | 294 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 283 insertions(+), 11 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 2222d8a..f2aa5c0 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,27 +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.moral.api.entity.Device;
-import com.moral.api.entity.MonitorPoint;
-import com.moral.api.entity.Organization;
+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 java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
+import java.lang.reflect.Type;
+import java.math.BigDecimal;
+import java.text.DateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* <p>
@@ -41,15 +49,35 @@
@Autowired
DeviceService deviceService;
+ @Autowired
+ DeviceMapper deviceMapper;
+
+ @Autowired
+ SensorMapper sensorMapper;
+
+ @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);
@@ -77,7 +105,251 @@
return monitorPoints;
}
+ @Override
+ public List<MonitorPoint> queryAllMonitorPoints(Integer organizationId) {
+ //���������������
+ List<Organization> childrenOrganization = organizationService.getChildrenOrganizationsById(organizationId);
+ List<Integer> organizationIds = new ArrayList<>();
+ for (Organization organization : childrenOrganization) {
+ organizationIds.add(organization.getId());
+ }
+ organizationIds.add(organizationId);
+ //������������
+ QueryWrapper<MonitorPoint> queryMonitorPointsWrapper = new QueryWrapper<>();
+ queryMonitorPointsWrapper.select("id","name");
+ queryMonitorPointsWrapper.in("organization_id",organizationIds);
+ queryMonitorPointsWrapper.eq("is_delete", Constants.NOT_DELETE);
+ List<MonitorPoint> monitorPoints = monitorPointMapper.selectList(queryMonitorPointsWrapper);
+ return monitorPoints;
+ }
+ @Override
+ public List<Map<String, Object>> getHourlyDataByMonitorPoint(Map map) {
+ int monitorPointId = Integer.parseInt(map.get("monitorPointId").toString());
+ QueryWrapper<MonitorPoint> monitorPointQueryWrapper = new QueryWrapper<>();
+ monitorPointQueryWrapper.eq("is_delete",Constants.NOT_DELETE);
+ monitorPointQueryWrapper.eq("id",monitorPointId);
+ MonitorPoint monitorPoint = monitorPointMapper.selectOne(monitorPointQueryWrapper);
+ QueryWrapper<Device> deviceQueryWrapper = new QueryWrapper<>();
+ deviceQueryWrapper.eq("is_delete",Constants.NOT_DELETE);
+ deviceQueryWrapper.eq("monitor_point_id",monitorPointId);
+ List<Device> devices = deviceMapper.selectList(deviceQueryWrapper);
+ if (devices.size()<=0){
+ return null;
+ }
+ String[] sensors = map.remove("sensors").toString().split(",");
+ List<String> sensorsList = Arrays.asList(sensors);
+ String startTime = map.get("startTime").toString();
+ String endTime = map.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(map.get("startTime").toString(), DateUtils.yyyy_MM_dd_HH_EN), DateUtils.getDate(map.get("endTime").toString(), DateUtils.yyyy_MM_dd_HH_EN));
+ for (String sensor:sensorsList) {
+ Map<String, Object> timeValueMap = new LinkedHashMap<>();//key���time���value������������json
+ 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);
+ }
+ }
+ return resultList;
+ }
+
+ /**
+ * ������������������������
+ *
+ * @param params
+ * @return
+ */
+ @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<>();
+ queryWrapper.eq("is_delete",Constants.NOT_DELETE);
+ queryWrapper.in("mac", macs);
+ List<Device> devices = deviceMapper.selectList(queryWrapper);
+ if (devices.size()<=0){
+ return null;
+ }
+ String[] sensors = params.remove("sensors").toString().split(",");
+ List<String> sensorsList = Arrays.asList(sensors);
+ List<Map<String,Object>> resultList = new ArrayList<>();
+
+// 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);
+ }
+ }
+ } 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,new ArrayList<>());
+ Map<Integer,String> pointMap = pointMap(devices);
+ Map<String,String> sensorMap = sensorMap(sensorsList);
+ 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
+ timeValueMap.put("������������",pointMap.get(device.getMonitorPointId()));
+ timeValueMap.put("name",device.getName());
+ 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);
+ if(Objects.nonNull(o)){
+ doubleArrayList.add(Double.valueOf(o.toString()));
+ }
+ }else {
+ timeValueMap.put(c,0);
+ }
+ ks = DateUtils.getDateOfDay(ks,1);
+ }
+ 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);
+ }
+ }
+ }else {
+ QueryWrapper<HistoryMonthly> HistoryMonthlyWrapper = new QueryWrapper<>();
+ HistoryMonthlyWrapper.in("mac",devices.stream().map(Device::getMac).collect(Collectors.toList()));
+ HistoryMonthlyWrapper.between("time",startTime,endTime);
+ List<HistoryMonthly> historyMonthlyList = historyMonthlyMapper.selectList(HistoryMonthlyWrapper);
+ Map<String,Map<String,Object>> map = resultMap(new ArrayList<>(),historyMonthlyList);
+ Map<Integer,String> pointMap = pointMap(devices);
+ Map<String,String> sensorMap = sensorMap(sensorsList);
+ for (Device device:devices) {
+ for (String sensor:sensorsList) {
+ Date ks = DateUtils.getDate(startTime,"yyyy-MM");
+ Date js = DateUtils.addMonths(DateUtils.getDate(endTime,"yyyy-MM"),1);
+ Map<String, Object> timeValueMap = new LinkedHashMap<>();//key���time���value������������json
+ timeValueMap.put("������������",pointMap.get(device.getMonitorPointId()));
+ timeValueMap.put("name",device.getName());
+ timeValueMap.put("sensor",sensorMap.get(sensor));
+ while (DateUtils.isTimeBefor(js,ks)){
+ String c = DateUtils.dateToDateString(ks,"yyyy-MM");
+ 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.addMonths(ks,1);
+ }
+ resultList.add(timeValueMap);
+ }
+ }
+ }
+ return resultList;
+ }
+
+ private Map<String,Map<String,Object>> resultMap(List<HistoryDaily> list ,List<HistoryMonthly> historyMonthlyList){
+ 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);
+ }
+ for(HistoryMonthly h : historyMonthlyList){
+ String dateStr = DateUtils.dateToDateString( h.getTime(), "yyyy-MM")+"_"+h.getMac();
+ Map<String,Object> jsonMap = new HashMap<>();
+ JSONObject jsonObject = JSONObject.parseObject(h.getValue());
+ jsonMap = jsonObject.getInnerMap();
+ map.put(dateStr,jsonMap);
+ }
+
+ return map;
+ }
+ private Map<String,String> sensorMap(List<String> sensorsList){
+ Map<String,String> map = new HashMap<>();
+ QueryWrapper<Sensor> sensorQueryWrapper = new QueryWrapper<>();
+ sensorQueryWrapper.eq("is_delete",Constants.NOT_DELETE);
+ sensorQueryWrapper.in("code",sensorsList);
+ sensorMapper.selectList(sensorQueryWrapper).forEach(it->map.put(it.getCode(),it.getName()));
+ return map;
+ }
+
+ private Map<Integer,String> pointMap(List<Device> devices){
+ Map<Integer,String> map = 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->map.put(it.getId(),it.getName()));
+ return map;
+ }
}
--
Gitblit v1.8.0