From 5236663d1e40ca9ed0cbc0885cbc67a67c47943f Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 14 Mar 2022 16:27:23 +0800
Subject: [PATCH] screen-api 增加获取简报接口
---
screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 87 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 84 insertions(+), 3 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 b289309..f5994b4 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
@@ -3,14 +3,21 @@
import com.alibaba.fastjson.JSON;
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.mapper.DeviceMapper;
+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.util.DateUtils;
+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;
@@ -18,8 +25,10 @@
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -40,6 +49,15 @@
@Autowired
private RedisTemplate redisTemplate;
+ @Autowired
+ OrganizationUnitAlarmMapper organizationUnitAlarmMapper;
+
+ @Autowired
+ SensorService sensorService;
+
+ @Autowired
+ UnitConversionService unitConversionService;
+
@Override
public List<Device> getDevicesByMonitorPointId(Integer monitorPointId) {
QueryWrapper<Device> wrapper = new QueryWrapper();
@@ -50,6 +68,20 @@
@Override
public Map<String, Object> getSensorsByMac(Map<String, Object> params) {
+ List<String> sensorCodes = Arrays.asList(Constants.SENSOR_CODE_PM25
+ , Constants.SENSOR_CODE_PM10
+ , Constants.SENSOR_CODE_SO2
+ , Constants.SENSOR_CODE_NO2
+ , Constants.SENSOR_CODE_CO
+ , Constants.SENSOR_CODE_O3
+ , Constants.SENSOR_CODE_TEMP
+ , "a01002"
+ , Constants.SENSOR_CODE_WIND_SPEED
+ , Constants.SENSOR_CODE_WIND_DIR
+ , "a01006"
+ , "a00e12"
+ );
+
//������mac
List<String> macs = (List<String>) params.remove("macs");
List<Map<String, Object>> elementLists = new ArrayList<>();
@@ -67,13 +99,21 @@
elementLists.add(map);
}
- Map<String, Object> map = elementLists.parallelStream()
+ Map<String, Object> map = elementLists.stream()
.filter(elementList -> elementList.size() != 0)
.reduce((a, b) -> {
a.keySet().retainAll(b.keySet());
return a;
}).orElse(new HashMap<>());
- return map;
+ Map<String, Object> result = new LinkedHashMap<>();
+ sensorCodes.forEach(sensorCode -> {
+ Object o = map.remove(sensorCode);
+ if (o != null) {
+ result.put(sensorCode, o);
+ }
+ });
+ result.putAll(map);
+ return result;
}
@Override
@@ -185,7 +225,7 @@
}
@Override
- public List getMacsByOrgIdAndRegionCode(Integer organizationId,Integer regionCode) {
+ public List getMacsByOrgIdAndRegionCode(Integer organizationId, Integer regionCode) {
QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
queryWrapper.select("mac")
.eq("organization_id", organizationId)
@@ -194,6 +234,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);
@@ -202,4 +282,5 @@
}
+
}
--
Gitblit v1.8.0