From 57b29a43e4d1505d44e1ac82ed61ef640ba49e8c Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 27 Sep 2023 19:16:33 +0800
Subject: [PATCH] ci:持续修改
---
screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 358 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 347 insertions(+), 11 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 3a68890..bd62813 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,29 +1,33 @@
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.Sensor;
+import com.moral.api.config.mybatis.MybatisPlusConfig;
+import com.moral.api.entity.*;
import com.moral.api.mapper.DeviceMapper;
+import com.moral.api.mapper.HistoryFiveMinutelyMapper;
+import com.moral.api.mapper.HistoryHourlyMapper;
+import com.moral.api.mapper.OrganizationUnitAlarmMapper;
+import com.moral.api.mapper.UnitConversionMapper;
import com.moral.api.service.DeviceService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.api.service.SensorService;
+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>
@@ -42,11 +46,36 @@
@Autowired
private RedisTemplate redisTemplate;
+ @Autowired
+ OrganizationUnitAlarmMapper organizationUnitAlarmMapper;
+
+ @Autowired
+ SensorService sensorService;
+
+ @Autowired
+ UnitConversionService unitConversionService;
+
+ @Autowired
+ HistoryHourlyMapper historyHourlyMapper;
+
+ @Autowired
+ HistoryFiveMinutelyMapper historyFiveMinutelyMapper;
+
@Override
public List<Device> getDevicesByMonitorPointId(Integer monitorPointId) {
QueryWrapper<Device> wrapper = new QueryWrapper();
wrapper.eq("monitor_point_id", monitorPointId);
wrapper.eq("is_delete", Constants.NOT_DELETE);
+ wrapper.orderByAsc("dev_num");
+ return deviceMapper.selectList(wrapper);
+ }
+
+ @Override
+ public List<Device> getDevicesByMonitorPointId(List<Integer> monitorPointId) {
+ QueryWrapper<Device> wrapper = new QueryWrapper();
+ wrapper.in("monitor_point_id", monitorPointId);
+ wrapper.eq("is_delete", Constants.NOT_DELETE);
+ wrapper.orderByAsc("dev_num");
return deviceMapper.selectList(wrapper);
}
@@ -150,7 +179,7 @@
for (Device device : devices) {
Map<String, Object> valueMap = new HashMap<>();
valueMap.put("name", device.getName());
- valueMap.put("sensorValue", "");
+ valueMap.put("sensorValue", "0.0");
for (Map<String, Object> map : list) {
Object time = map.get("time");
Object sensorValue = map.get(sensorCode);
@@ -165,6 +194,244 @@
result.add(resultMap);
}
}
+ return result;
+ }
+
+ @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);
+ queryWrapper.orderByAsc("dev_num","name","id");
+ 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());
+ List<HistoryHourly> distinctHistoryHourlies = new ArrayList<>();
+ Map<String, Object> disMap = new HashMap<>();
+ for (HistoryHourly historyHourly:historyHourlies) {
+ Date time = historyHourly.getTime();
+ String timeStr = DateUtils.dateToDateString(time,DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
+ if (!disMap.containsKey(timeStr)){
+ distinctHistoryHourlies.add(historyHourly);
+ disMap.put(timeStr,true);
+ }
+ }
+ for (HistoryHourly historyHourly:distinctHistoryHourlies) {
+ Map<String,Object> historyHourlyMap = new HashMap<>();
+ historyHourlyMap.put("mac",mac);
+ JSONObject value= JSONObject.parseObject(historyHourly.getValue());
+ Double sensorValue = Objects.nonNull(value)&&Objects.nonNull(value.get(sensorCode))?Double.parseDouble(value.get(sensorCode).toString()):0d;
+ 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 if ("month".equals(type)){
+ 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);
+ }
+ }else {
+ Date startDate = DateUtils.getDate(startTime,DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
+ Date endDate = DateUtils.getDate(endTime,DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
+ List<String> tableNames = MybatisPLUSUtils.getTableNamesByWrapper(startDate, endDate, SeparateTableType.MONTH);
+ for (String mac:macs) {
+ QueryWrapper<HistoryFiveMinutely> wrapper = new QueryWrapper<>();
+ wrapper.eq("mac", mac);
+ wrapper.between("time", startDate, endDate);
+ List<HistoryFiveMinutely> HistoryFiveMinutelys = FiveMinuteTableQuery(wrapper, tableNames);
+ HistoryFiveMinutelys = HistoryFiveMinutelys.stream().distinct().collect(Collectors.toList());
+ List<HistoryFiveMinutely> distinctHistoryHourlies = new ArrayList<>();
+ Map<String, Object> disMap = new HashMap<>();
+ for (HistoryFiveMinutely historyFiveMinutely:HistoryFiveMinutelys) {
+ Date time = historyFiveMinutely.getTime();
+ String timeStr = DateUtils.dateToDateString(time,DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
+ if (!disMap.containsKey(timeStr)){
+ distinctHistoryHourlies.add(historyFiveMinutely);
+ disMap.put(timeStr,true);
+ }
+ }
+ for (HistoryFiveMinutely historyFiveMinutely:distinctHistoryHourlies) {
+ Map<String,Object> historyHourlyMap = new HashMap<>();
+ historyHourlyMap.put("mac",mac);
+ JSONObject value = JSONObject.parseObject(historyFiveMinutely.getValue());
+ if (value.get(sensorCode)==null){
+ historyHourlyMap.put(sensorCode,0.0);
+ }else {
+ Double sensorValue = Double.parseDouble(value.get(sensorCode).toString());
+ historyHourlyMap.put(sensorCode,sensorValue);
+ }
+// Double sensorValue = Double.parseDouble(value.get(sensorCode).toString());
+// historyHourlyMap.put(sensorCode,sensorValue);
+ Date time = historyFiveMinutely.getTime();
+ String timeStr = DateUtils.dateToDateString(time, DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
+ historyHourlyMap.put("time",timeStr);
+ list.add(historyHourlyMap);
+ }
+ }
+ }
+ 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);
+ Collections.sort(deviceData, (map1,map2) -> {
+ String name1 = map1.get("name").toString();//name1���������list������������������������
+ String name2 = map2.get("name").toString(); //name1���������list���������������������������name
+ return name1.compareTo(name2);
+ });
+ resultMap.put("deviceData",deviceData);
+ //result.add(resultMap);
+ flag = false;
+ break;
+ }
+ }
+ if (flag){
+ List<Map<String,Object>> deviceData = new ArrayList<>();
+ deviceData.add(deviceMap);
+ Collections.sort(deviceData, (map1,map2) -> {
+ String name1 = map1.get("name").toString();//name1���������list������������������������
+ String name2 = map2.get("name").toString(); //name1���������list���������������������������name
+ return name1.compareTo(name2);
+ });
+ 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);
+ Collections.sort(deviceData, (map1,map2) -> {
+ String name1 = map1.get("name").toString();//name1���������list������������������������
+ String name2 = map2.get("name").toString(); //name1���������list���������������������������name
+ return name1.compareTo(name2);
+ });
+ 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;
}
@@ -218,6 +485,46 @@
return deviceMapper.selectObjs(queryWrapper);
}
+ @Override
+ public Device getDeviceUnitAlramInforByMac(String mac) {
+ Device device = (Device) redisTemplate.opsForHash().get(RedisConstants.DEVICE_INFO,mac);
+ if(device==null)
+ return getDeviceUnitAlramInforByMacFromDb(mac);
+ return device;
+ }
+
+ private Device getDeviceUnitAlramInforByMacFromDb(String mac){
+ QueryWrapper<Device> wrapper = new QueryWrapper<>();
+ wrapper.eq("mac",mac);
+ wrapper.eq("is_delete",Constants.NOT_DELETE);
+ Device device = deviceMapper.selectOne(wrapper);
+ if(device==null)
+ return null;
+ QueryWrapper<OrganizationUnitAlarm> unitAlarmQueryWrapper = new QueryWrapper<>();
+ unitAlarmQueryWrapper.eq("organization_id",device.getOrganizationId());
+ unitAlarmQueryWrapper.eq("version_id",device.getDeviceVersionId());
+ unitAlarmQueryWrapper.eq("is_delete",Constants.NOT_DELETE);
+ List<OrganizationUnitAlarm> organizationUnitAlarms = organizationUnitAlarmMapper.selectList(unitAlarmQueryWrapper);
+ Version version = new Version();
+ version.setId(device.getDeviceVersionId());
+ List<Sensor> sensors = new ArrayList<>();
+ for (OrganizationUnitAlarm organizationUnitAlarm : organizationUnitAlarms) {
+ Sensor sensor = sensorService.getSensorByCode(organizationUnitAlarm.getSensorCode());
+ sensor.setUnit(organizationUnitAlarm.getUnitKey());
+ sensor.setShowUnit(organizationUnitAlarm.getShowUnitKey());
+ sensor.setShowUnitKey(organizationUnitAlarm.getShowUnitKey());
+ sensor.setUnitKey(organizationUnitAlarm.getUnitKey());
+ sensor.setAlarmLevel(organizationUnitAlarm.getAlarmLevel());
+ String formula = unitConversionService.getFormula(Integer.valueOf(organizationUnitAlarm.getUnitKey()), Integer.valueOf(organizationUnitAlarm.getShowUnitKey()),sensor.getCode());
+ sensor.setFormula(formula);
+ sensors.add(sensor);
+ }
+ version.setSensors(sensors);
+ device.setVersion(version);
+ redisTemplate.opsForHash().put(RedisConstants.DEVICE_INFO,mac,device);
+ return device;
+ }
+
private Device getDeviceByMacFromDB(String mac) {
QueryWrapper<Device> wrapper = new QueryWrapper<>();
wrapper.eq("mac", mac);
@@ -225,5 +532,34 @@
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;
+ }
+
+ private List<HistoryFiveMinutely> FiveMinuteTableQuery(QueryWrapper<HistoryFiveMinutely> wrapper, List<String> tableNames) {
+ List<HistoryFiveMinutely> result = new ArrayList<>();
+ for (String tableName : tableNames) {
+ MybatisPlusConfig.tableName.set(tableName);
+ List<HistoryFiveMinutely> datas = historyFiveMinutelyMapper.selectList(wrapper);
+ result.addAll(datas);
+ }
+ MybatisPlusConfig.tableName.remove();
+ return result;
+ }
+
}
--
Gitblit v1.8.0