From 3d665d84b1a4ffd6749ca9354247838ce0622f4b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 13 Dec 2022 13:47:53 +0800
Subject: [PATCH] 修改sql语句问题
---
screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java | 108 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 90 insertions(+), 18 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
index da4cbef..4ddfbcb 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
@@ -7,18 +7,18 @@
import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments;
import com.baomidou.mybatisplus.core.conditions.segments.NormalSegmentList;
import com.moral.api.config.mybatis.MybatisPlusConfig;
-import com.moral.api.entity.Device;
-import com.moral.api.entity.HistoryFiveMinutely;
-import com.moral.api.entity.HistoryHourly;
-import com.moral.api.entity.MonitorPoint;
+import com.moral.api.entity.*;
import com.moral.api.mapper.HistoryFiveMinutelyMapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.pojo.dto.Wind.WindData;
import com.moral.api.pojo.dto.historyFiveMinutely.DeviceAndFiveMinuteDataDTO;
import com.moral.api.pojo.form.device.MonitorPointQueryForm;
import com.moral.api.pojo.form.historyFiveMinutely.QueryDeviceAndFiveMinuteDataForm;
+import com.moral.api.service.DeviceService;
import com.moral.api.service.HistoryFiveMinutelyService;
import com.moral.api.service.MonitorPointService;
+import com.moral.api.utils.UnitConvertUtils;
+import com.moral.constant.Constants;
import com.moral.constant.RedisConstants;
import com.moral.constant.SeparateTableType;
import com.moral.util.DateUtils;
@@ -48,6 +48,8 @@
RedisTemplate redisTemplate;
@Autowired
HistoryFiveMinutelyMapper historyFiveMinutelyMapper;
+ @Autowired
+ DeviceService deviceService;
@Override
public List<DeviceAndFiveMinuteDataDTO> queryDeviceAndFiveMinuteData(QueryDeviceAndFiveMinuteDataForm form) {
@@ -60,24 +62,21 @@
List<Device> devices = new ArrayList<>();
for (MonitorPoint monitorPoint : monitorPoints) {
List<Device> monitorPointDevices = monitorPoint.getDevices();
- if (!ObjectUtils.isEmpty(monitorPointDevices))
- devices.addAll(monitorPointDevices);
+ if (!ObjectUtils.isEmpty(monitorPointDevices)) {
+ //������������������
+ for (Device device : monitorPointDevices) {
+ if (!device.getState().equals(Constants.DEVICE_STATE_OFFLINE))
+ devices.add(device);
+ }
+ }
+
}
//���������������������������������
List<DeviceAndFiveMinuteDataDTO> dtos = new ArrayList<>();
for (Device device : devices) {
DeviceAndFiveMinuteDataDTO dto = new DeviceAndFiveMinuteDataDTO();
String mac = device.getMac();
- //������������������
- Map<String, Object> sensorValues = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.DATA_FIVE_MINUTES, mac);
- //������������������������������������
- if (ObjectUtils.isEmpty(sensorValues)) {
- HistoryFiveMinutely dbHistoryFiveMinutely = queryLastDataByMac(mac);
- if (ObjectUtils.isEmpty(dbHistoryFiveMinutely))
- continue;
- else
- sensorValues = JSON.parseObject(dbHistoryFiveMinutely.getValue(),Map.class);
- }
+ Map<String, Object> sensorValues = queryLastDataByMac(mac);
String dbDataStr = JSON.toJSONString(sensorValues);
sensorValues = JSON.parseObject(dbDataStr, HashMap.class);
Map<String, Object> sensorValue = new HashMap<>();
@@ -93,7 +92,12 @@
}
@Override
- public HistoryFiveMinutely queryLastDataByMac(String mac) {
+ public Map<String, Object> queryLastDataByMac(String mac) {
+ //������������������
+ Map<String, Object> sensorValues = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.DATA_FIVE_MINUTES, mac);
+ //������������������������������������
+ if (sensorValues != null)
+ return sensorValues;
QueryWrapper<HistoryFiveMinutely> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("mac", mac);
queryWrapper.orderByDesc("time");
@@ -104,7 +108,10 @@
List<HistoryFiveMinutely> datas = multiTableQuery(queryWrapper, tableNames);
if (ObjectUtils.isEmpty(datas))
return null;
- return datas.get(0);
+ HistoryFiveMinutely historyFiveMinutely = datas.get(0);
+ sensorValues = JSON.parseObject(historyFiveMinutely.getValue(), Map.class);
+ sensorValues.put("dataTime", DateUtils.dateToDateString(historyFiveMinutely.getTime(), "yyyy-MM-dd HH:mm:ss"));
+ return sensorValues;
}
@@ -117,6 +124,71 @@
return getWindData(windData);
}
+ //���������������������������
+ @Override
+ public Map<String, Object> getPopDataByMac(String mac) {
+ Map<String, Object> datas = queryLastDataByMac(mac);
+ //������������������
+ Map<String, Object> result = new HashMap<>();
+ //������������������code������
+ List<String> sensorCodes = Arrays.asList("a34004", "a34002", "a21005", "a21004", "a21026", "a05024", "a99054");
+ //������������������
+ Device device = deviceService.getDeviceUnitAlramInforByMac(mac);
+ //���������������������������
+ for (Sensor sensor : device.getVersion().getSensors()) {
+ if (!sensorCodes.contains(sensor.getCode()))
+ continue;
+ Object dataO = datas.get(sensor.getCode());
+ if (dataO != null) {
+ String data = String.valueOf(dataO);
+ //������������
+ if (!sensor.getShowUnitKey().equals(sensor.getUnitKey()) )
+ data = UnitConvertUtils.calculate(data, sensor.getFormula());
+ //������������
+ data = data +" "+ sensor.getShowUnit();
+ result.put(sensor.getCode(), data);
+ }else{
+ result.put(sensor.getCode(),"-");
+ }
+ }
+ //������������������
+ result.put("name",device.getName());
+ //������������
+ result.put("dataTime",datas.get("dataTime"));
+ //������
+ return orderSixParam(result);
+ }
+
+ //���������������������������������
+ private Map<String,Object> orderSixParam(Map<String,Object> data){
+ LinkedHashMap result = new LinkedHashMap();
+ Object PM2_5 = data.get("a34004");
+ Object PM10 = data.get("a34002");
+ Object SO2 = data.get("a21026");
+ Object NO2 = data.get("a21004");
+ Object CO = data.get("a21005");
+ Object O3 = data.get("a05024");
+ Object name = data.get("name");
+ Object time = data.get("dataTime");
+ if(name!=null)
+ result.put("������",name);
+ if(PM2_5!=null)
+ result.put("PM2.5",PM2_5);
+ if(PM10!=null)
+ result.put("PM10",PM10);
+ if(SO2!=null)
+ result.put("���������������SO������",SO2);
+ if(NO2!=null)
+ result.put("���������������NO������",NO2);
+ if(CO!=null)
+ result.put("���������������CO���",CO);
+ if(O3!=null)
+ result.put("���������O������",O3);
+ if(time!=null)
+ result.put("������",time);
+ return result;
+ }
+
/**
* ������������������������������������������
--
Gitblit v1.8.0