From ba55d44ea9f61a007f5c63fb8689488cc35d48ee Mon Sep 17 00:00:00 2001
From: chen_xi <276999030@qq.com>
Date: Mon, 26 Sep 2022 15:05:56 +0800
Subject: [PATCH] 多站单参接口修改
---
screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 214 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 202 insertions(+), 12 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
index 9e5155f..85c0244 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
@@ -1,12 +1,12 @@
package com.moral.api.service.impl;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.moral.api.entity.Device;
-import com.moral.api.entity.OrganizationUnitAlarm;
-import com.moral.api.entity.Sensor;
-import com.moral.api.entity.Version;
+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.mapper.OrganizationUnitAlarmMapper;
import com.moral.api.mapper.UnitConversionMapper;
import com.moral.api.service.DeviceService;
@@ -15,22 +15,18 @@
import com.moral.api.service.UnitConversionService;
import com.moral.constant.Constants;
import com.moral.constant.RedisConstants;
+import com.moral.constant.SeparateTableType;
import com.moral.util.DateUtils;
+import com.moral.util.MybatisPLUSUtils;
import org.apache.kafka.streams.state.internals.metrics.Sensors;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
-import java.util.ArrayList;
-
-import java.util.Arrays;
-import java.util.HashMap;
-
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* <p>
@@ -57,6 +53,9 @@
@Autowired
UnitConversionService unitConversionService;
+
+ @Autowired
+ HistoryHourlyMapper historyHourlyMapper;
@Override
public List<Device> getDevicesByMonitorPointId(Integer monitorPointId) {
@@ -185,6 +184,180 @@
}
@Override
+ public List<Map<String, Object>> getTrendChartDataV2(Map<String, Object> params) {
+ Object type = params.get("type");
+ //������mac
+ List<String> macs = (List<String>) params.remove("macs");
+
+ QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
+ queryWrapper.select("mac", "name").in("mac", macs);
+ List<Device> devices = deviceMapper.selectList(queryWrapper);
+ Map<String,Object> devicesInfo = new HashMap<>();
+ for (Device device:devices) {
+ devicesInfo.put(device.getMac(),device.getName());
+ }
+
+ //������������
+ List<String> times = (List<String>) params.remove("times");
+ String startTime = times.get(0);
+ String endTime = times.get(1);
+ //������code
+ String sensorCode = params.get("sensorCode").toString();
+ String end;
+ String timeUnits;
+ String dateFormat;
+ //���������������,time=data
+ List<Map<String, Object>> result = new ArrayList<>();
+ List<Map<String, Object>> list = new ArrayList<>();
+ if ("hour".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<String> tableNames = MybatisPLUSUtils.getTableNamesByWrapper(startDate, endDate, SeparateTableType.MONTH);
+ for (String mac:macs) {
+ QueryWrapper<HistoryHourly> wrapper = new QueryWrapper<>();
+ wrapper.eq("mac", mac);
+ wrapper.between("time", startDate, endDate);
+ List<HistoryHourly> historyHourlies = multiTableQuery(wrapper, tableNames);
+ historyHourlies = historyHourlies.stream().distinct().collect(Collectors.toList());
+ for (HistoryHourly historyHourly:historyHourlies) {
+ Map<String,Object> historyHourlyMap = new HashMap<>();
+ historyHourlyMap.put("mac",mac);
+ JSONObject value = JSONObject.parseObject(historyHourly.getValue());
+ Double sensorValue = Double.parseDouble(value.get(sensorCode).toString());
+ historyHourlyMap.put(sensorCode,sensorValue);
+ Date time = historyHourly.getTime();
+ String timeStr = DateUtils.dateToDateString(time, DateUtils.yyyy_MM_dd_HH_EN);
+ historyHourlyMap.put("time",timeStr);
+ list.add(historyHourlyMap);
+ }
+ }
+ Date middleDate = DateUtils.getDate(startTime,DateUtils.yyyy_MM_dd_HH_EN);
+ while (DateUtils.compareDateStr(endTime,DateUtils.dateToDateString(middleDate,DateUtils.yyyy_MM_dd_HH_EN),DateUtils.yyyy_MM_dd_HH_EN)<=0){
+ for (String mac:macs) {
+ boolean flag = true;
+ for (Map map:list) {
+ if (map.get("time").equals(DateUtils.dateToDateString(middleDate, DateUtils.yyyy_MM_dd_HH_EN)) && map.get("mac").toString().equals(mac.toString())){
+ flag = false;
+ }
+ }
+ if (flag){
+ Map<String,Object> historyHourlyMap = new HashMap<>();
+ historyHourlyMap.put("mac",mac);
+ historyHourlyMap.put(sensorCode,"0.0");
+ historyHourlyMap.put("time",DateUtils.dateToDateString(middleDate,DateUtils.yyyy_MM_dd_HH_EN));
+ list.add(historyHourlyMap);
+ }
+ }
+ middleDate = DateUtils.addHours(middleDate,1);
+ }
+ } else if ("day".equals(type)) {
+ end = DateUtils.getDateAddDay(endTime,1);
+ timeUnits = "daily";
+ dateFormat = "%Y-%m-%d";
+ params.put("timeUnits", timeUnits);
+ params.put("start", startTime);
+ params.put("end", end);
+ params.put("macs", macs);
+ params.put("dateFormat", dateFormat);
+ //���������������������������������
+ list = deviceMapper.getTrendChartData(params);
+ Date middleDate = DateUtils.getDate(startTime,DateUtils.yyyy_MM_dd_EN);
+ while (DateUtils.compareDateStr(endTime,DateUtils.dateToDateString(middleDate,DateUtils.yyyy_MM_dd_EN),DateUtils.yyyy_MM_dd_EN)<=0){
+ for (String mac:macs) {
+ boolean flag = true;
+ for (Map map:list) {
+ if (map.get("time").equals(DateUtils.dateToDateString(middleDate, DateUtils.yyyy_MM_dd_EN)) && map.get("mac").toString().equals(mac.toString())){
+ flag = false;
+ }
+ }
+ if (flag){
+ Map<String,Object> historyDailyMap = new HashMap<>();
+ historyDailyMap.put("mac",mac);
+ historyDailyMap.put(sensorCode,"0.0");
+ historyDailyMap.put("time",DateUtils.dateToDateString(middleDate,DateUtils.yyyy_MM_dd_EN));
+ list.add(historyDailyMap);
+ }
+ }
+ middleDate = DateUtils.addDays(middleDate,1);
+ }
+ } else {
+ end = DateUtils.getDateAddMonth(endTime, 1);
+ timeUnits = "monthly";
+ dateFormat = "%Y-%m";
+ params.put("timeUnits", timeUnits);
+ params.put("start", startTime);
+ params.put("end", end);
+ params.put("macs", macs);
+ params.put("dateFormat", dateFormat);
+ //���������������������������������
+ list = deviceMapper.getTrendChartData(params);
+ Date middleDate = DateUtils.getDate(startTime,DateUtils.yyyy_MM_EN);
+ while (DateUtils.compareDateStr(endTime,DateUtils.dateToDateString(middleDate,DateUtils.yyyy_MM_EN),DateUtils.yyyy_MM_EN)<=0){
+ for (String mac:macs) {
+ boolean flag = true;
+ for (Map map:list) {
+ if (map.get("time").equals(DateUtils.dateToDateString(middleDate, DateUtils.yyyy_MM_EN)) && map.get("mac").toString().equals(mac.toString())){
+ flag = false;
+ }
+ }
+ if (flag){
+ Map<String,Object> historyMonthlyMap = new HashMap<>();
+ historyMonthlyMap.put("mac",mac);
+ historyMonthlyMap.put(sensorCode,"0.0");
+ historyMonthlyMap.put("time",DateUtils.dateToDateString(middleDate,DateUtils.yyyy_MM_EN));
+ list.add(historyMonthlyMap);
+ }
+ }
+ middleDate = DateUtils.addMonths(middleDate,1);
+ }
+ }
+ for (Map map:list) {
+ String time = map.get("time").toString();
+ Map<String,Object> deviceMap = new HashMap<>();
+ deviceMap.put("name",devicesInfo.get(map.get("mac")));
+ deviceMap.put("sensorValue",map.get(sensorCode));
+ if (result.size()>0){
+ boolean flag = true;
+ for (Map resultMap:result) {
+ if (resultMap.get("time").toString().equals(time)){
+ List<Map<String,Object>> deviceData = new ArrayList<>();
+ deviceData = (List<Map<String,Object>>)resultMap.get("deviceData");
+ deviceData.add(deviceMap);
+ resultMap.put("deviceData",deviceData);
+ //result.add(resultMap);
+ flag = false;
+ break;
+ }
+ }
+ if (flag){
+ List<Map<String,Object>> deviceData = new ArrayList<>();
+ deviceData.add(deviceMap);
+ Map<String,Object> resultMap = new HashMap<>();
+ resultMap.put("deviceData",deviceData);
+ resultMap.put("time",time);
+ result.add(resultMap);
+ }
+ }else {
+ List<Map<String,Object>> deviceData = new ArrayList<>();
+ deviceData.add(deviceMap);
+ Map<String,Object> resultMap = new HashMap<>();
+ resultMap.put("deviceData",deviceData);
+ resultMap.put("time",time);
+ result.add(resultMap);
+ }
+ }
+ Collections.sort(result, new Comparator<Map<String, Object>>() {
+ public int compare(Map<String, Object> o1, Map<String, Object> o2) {
+ String id1 = (String) o1.get("time");
+ String id2 = (String) o2.get("time");
+ return id1.compareTo(id2);
+ }
+
+ });
+ return result;
+ }
+
+ @Override
public Device getDeviceByMac(String mac) {
Map<String, Object> deviceMap = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.DEVICE, mac);
Device device = JSON.parseObject(JSON.toJSONString(deviceMap), Device.class);
@@ -281,6 +454,23 @@
return deviceMapper.selectOne(wrapper);
}
+ /**
+ * @Description: ������������������������������������������������wrapper���������������
+ * @Param: [wrapper, tableNames]
+ * @return: java.util.List<com.moral.api.entity.HistoryHourly>
+ * @Author: ���������
+ * @Date: 2021/9/23
+ */
+ private List<HistoryHourly> multiTableQuery(QueryWrapper<HistoryHourly> wrapper, List<String> tableNames) {
+ List<HistoryHourly> result = new ArrayList<>();
+ for (String tableName : tableNames) {
+ MybatisPlusConfig.tableName.set(tableName);
+ List<HistoryHourly> datas = historyHourlyMapper.selectList(wrapper);
+ result.addAll(datas);
+ }
+ MybatisPlusConfig.tableName.remove();
+ return result;
+ }
}
--
Gitblit v1.8.0