From 69d00365e9f099b26c4fc7a298cabeb131956d8a Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 23 Jun 2021 14:35:05 +0800
Subject: [PATCH] 定时任务，kafka
---
screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 181 +++++++++++++++++++++++++++++++++-----------
1 files changed, 134 insertions(+), 47 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
index 39190df..c1b48df 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
@@ -1,26 +1,31 @@
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.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.googlecode.aviator.AviatorEvaluator;
+import com.googlecode.aviator.Expression;
import com.moral.api.entity.*;
import com.moral.api.mapper.*;
import com.moral.api.pojo.vo.device.DeviceVO;
import com.moral.api.service.DeviceService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.api.util.AdjustDataUtils;
import com.moral.api.util.LogUtils;
import com.moral.constant.Constants;
import com.moral.constant.RedisConstants;
import com.moral.util.ConvertUtils;
import com.moral.util.DateUtils;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
@@ -28,10 +33,12 @@
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
+import java.util.stream.Collectors;
import javax.servlet.http.HttpServletRequest;
@@ -44,6 +51,7 @@
* @since 2021-05-11
*/
@Service
+@Slf4j
public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> implements DeviceService {
@Autowired
@@ -76,11 +84,14 @@
@Autowired
private VersionSensorUnitMapper versionSensorUnitMapper;
+ @Autowired
+ private AdjustDataUtils adjustDataUtils;
+
/*
* ���redis������������������
* */
private Map<String, Object> getDeviceInfoFromRedis(String mac) {
- Map<String, Object> deviceInfo = (Map<String, Object>) redisTemplate.opsForValue().get(RedisConstants.DEVICE + mac);
+ Map<String, Object> deviceInfo = (Map<String, Object>) redisTemplate.opsForValue().get(getDeviceKey(mac));
return deviceInfo;
}
@@ -105,6 +116,13 @@
return keysConnect(RedisConstants.DEVICE, mac);
}
+ /*
+ * ���redis������������������
+ * */
+ private Map<String, Object> getOrgAlarmConfigFromRedis(String orId) {
+ return null;
+ }
+
//redis key������
private String keysConnect(String... keys) {
StringBuilder key = new StringBuilder(keys[0]);
@@ -123,27 +141,7 @@
deviceMapper.insert(device);
Map<String, Object> deviceInfo = selectDeviceInfoById(device.getId());
//���������������������������
- QueryWrapper<OrganizationUnitAlarm> queryOrganizationVersionWrapper = new QueryWrapper<>();
- queryOrganizationVersionWrapper.eq("organization_id",orgId);
- queryOrganizationVersionWrapper.eq("version_id",device.getDeviceVersionId());
- queryOrganizationVersionWrapper.eq("is_delete",Constants.NOT_DELETE);
- List<OrganizationUnitAlarm> organizationUnitAlarms = organizationUnitAlarmMapper.selectList(queryOrganizationVersionWrapper);
- if(ObjectUtils.isEmpty(organizationUnitAlarms)){
- QueryWrapper<VersionSensorUnit> queryVersionSensorUnitWrapper =new QueryWrapper<>();
- queryVersionSensorUnitWrapper.eq("version_id",device.getDeviceVersionId());
- queryVersionSensorUnitWrapper.eq("is_delete",Constants.NOT_DELETE);
- List<VersionSensorUnit> versionSensorUnits = versionSensorUnitMapper.selectList(queryVersionSensorUnitWrapper);
- if(!ObjectUtils.isEmpty(versionSensorUnits)){
- for (VersionSensorUnit versionSensorUnit : versionSensorUnits) {
- OrganizationUnitAlarm organizationUnitAlarm = new OrganizationUnitAlarm();
- organizationUnitAlarm.setOrganizationId(orgId);
- organizationUnitAlarm.setVersionId(device.getDeviceVersionId());
- organizationUnitAlarm.setSensorCode(versionSensorUnit.getSensorCode());
- organizationUnitAlarm.setUnitKey(versionSensorUnit.getUnitKey());
- organizationUnitAlarmMapper.insert(organizationUnitAlarm);
- }
- }
- }
+ insertOrganizationUnitAlarm(orgId, device.getDeviceVersionId());
//������������������������redis
String mac = device.getMac();
//���redis���������������������
@@ -160,29 +158,13 @@
@Override
@Transactional
public void delete(Integer deviceId) {
+ Device device = deviceMapper.selectById(deviceId);
UpdateWrapper<Device> updateWrapper = new UpdateWrapper<>();
updateWrapper.eq("id", deviceId).set("is_delete", Constants.DELETE);
deviceMapper.update(null, updateWrapper);
- Device device = deviceMapper.selectById(deviceId);
String mac = device.getMac();
//���redis���������������������
delDeviceInfoFromRedis(mac);
- //���������������������������
- Integer versionId = device.getDeviceVersionId();
- Integer organizationId = device.getOrganizationId();
- QueryWrapper<Device> queryOrganizationVersionWrapper = new QueryWrapper<>();
- queryOrganizationVersionWrapper.eq("organization_id",organizationId);
- queryOrganizationVersionWrapper.eq("device_version_id",versionId);
- queryOrganizationVersionWrapper.eq("is_delete",Constants.NOT_DELETE);
- List<Device> devices = deviceMapper.selectList(queryOrganizationVersionWrapper);
- if(ObjectUtils.isEmpty(devices)){//������������������������������������������������������
- UpdateWrapper deleteWrapper = new UpdateWrapper();
- deleteWrapper.eq("organization_id",organizationId);
- deleteWrapper.eq("version_id",versionId);
- deleteWrapper.eq("is_delete",Constants.NOT_DELETE);
- deleteWrapper.set("is_delete",Constants.DELETE);
- organizationUnitAlarmMapper.update(null,deleteWrapper);
- }
//������������������
HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
StringBuilder content = new StringBuilder();
@@ -195,8 +177,23 @@
public void update(Device device) {
Integer deviceId = device.getId();
Device oldDevice = deviceMapper.selectById(deviceId);
+ //���������������������������������������������������������������������������������id������������
+ if (!ObjectUtils.isEmpty(device.getMonitorPointId())) {
+ MonitorPoint monitorPoint = monitorPointMapper.selectById(device.getMonitorPointId());
+ device.setOrganizationId(monitorPoint.getOrganizationId());
+ }
deviceMapper.updateById(device);
- String mac = deviceMapper.selectById(deviceId).getMac();
+ Device updateDevice = deviceMapper.selectById(deviceId);
+ String mac = updateDevice.getMac();
+ //���������������������������
+ Integer oldOrgId = oldDevice.getOrganizationId();
+ Integer newOrgId = updateDevice.getOrganizationId();
+ Integer oldVersionId = oldDevice.getDeviceVersionId();
+ Integer newVersionId = updateDevice.getDeviceVersionId();
+ if (!oldOrgId.equals(newOrgId) || !oldVersionId.equals(newVersionId)) {
+ deleteOrganizationUnitAlarm(oldOrgId, oldVersionId);
+ insertOrganizationUnitAlarm(newOrgId, newVersionId);
+ }
//���redis���������������������
delDeviceInfoFromRedis(mac);
Map<String, Object> deviceInfo = selectDeviceInfoById(deviceId);
@@ -291,13 +288,15 @@
queryWrapper.eq("monitor_point_id", mpId);
}
+ //���������������������
if (name != null) {
queryWrapper.like("name", name);
}
+
+ //mac������������
if (mac != null) {
queryWrapper.like("mac", mac);
}
-
//������������,������create_time������
if (order != null && orderType != null) {
@@ -326,7 +325,6 @@
result.put("item", items);
return result;
}
-
@Override
public Map<String, Object> selectDeviceInfoById(Integer deviceId) {
@@ -397,6 +395,9 @@
MonitorPoint monitorPoint = device.getMonitorPoint();
mpInfo.put("id", monitorPoint.getId());
mpInfo.put("name", monitorPoint.getName());
+ mpInfo.put("areaCode", monitorPoint.getAreaCode());
+ mpInfo.put("cityCode", monitorPoint.getCityCode());
+ mpInfo.put("provinceCode", monitorPoint.getProvinceCode());
deviceInfo.put("monitorPoint", mpInfo);
setDeviceInfoToRedis(mac, deviceInfo);
@@ -433,14 +434,100 @@
}
@Override
- public Map<String, Object> adjustDeviceData(Map<String, Object> deviceData, Map<String, Object> deviceInfo) {
- return null;
+ public Map<String, Object> adjustDeviceData(Map<String, Object> deviceData) {
+ return adjustDataUtils.adjust(deviceData);
}
@Override
- public Map<String, Object> judgeDeviceState(Map<String, Object> deviceData, Map<String, Object> deviceInfo) {
- return null;
+ public void judgeDeviceState(Map<String, Object> deviceData) {
+ String mac = deviceData.remove("mac").toString();
+ Device device = (Device) redisTemplate.opsForHash().get(RedisConstants.DEVICE_INFO, mac);
+ Version version = device.getVersion();
+ List<Sensor> sensors = version.getSensors();
+ Expression expression;
+ int state = 1;
+ for (Sensor sensor : sensors) {
+ //������������������
+ String alarmLevel = sensor.getAlarmLevel();
+ if (StringUtils.isEmpty(alarmLevel)) {
+ continue;
+ }
+ List<Double> list = JSONObject.parseObject(alarmLevel, List.class);
+ String sensorCode = sensor.getCode();
+ //������������
+ String formula = sensor.getFormula();
+ //������������������������
+ String sensorValue = (String) deviceData.get(sensorCode);
+ double value = Double.parseDouble(String.format("%.3f", sensorValue));
+ //������������
+ if (formula != null) {
+ //������������������
+ sensorValue = formula.replace("{0}", sensorValue);
+ expression = AviatorEvaluator.compile(sensorValue);
+ value = Double.parseDouble(String.format("%.3f", expression.execute()));
+ }
+ int sensorState = judgeState(list, value);
+ if (sensorState > state) {
+ state = sensorState;
+ }
+ }
+ //������������������
+ UpdateWrapper<Device> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.eq("id", device.getId()).set("state", state);
+ deviceMapper.update(null, updateWrapper);
}
+ //���������������������������
+ private int judgeState(List<Double> levels, Double data) {
+ int state = 1;
+ for (int i = levels.size() - 1; i >= 0; i--) {
+ Double level = levels.get(i);
+ if (data >= level) {
+ state = i + 2;
+ break;
+ }
+ }
+ return state;
+ }
+ private void insertOrganizationUnitAlarm(Integer orgId, Integer versionId) {
+ QueryWrapper<OrganizationUnitAlarm> queryOrganizationVersionWrapper = new QueryWrapper<>();
+ queryOrganizationVersionWrapper.eq("organization_id", orgId);
+ queryOrganizationVersionWrapper.eq("version_id", versionId);
+ queryOrganizationVersionWrapper.eq("is_delete", Constants.NOT_DELETE);
+ List<OrganizationUnitAlarm> organizationUnitAlarms = organizationUnitAlarmMapper.selectList(queryOrganizationVersionWrapper);
+ if (ObjectUtils.isEmpty(organizationUnitAlarms)) {
+ QueryWrapper<VersionSensorUnit> queryVersionSensorUnitWrapper = new QueryWrapper<>();
+ queryVersionSensorUnitWrapper.eq("version_id", versionId);
+ queryVersionSensorUnitWrapper.eq("is_delete", Constants.NOT_DELETE);
+ List<VersionSensorUnit> versionSensorUnits = versionSensorUnitMapper.selectList(queryVersionSensorUnitWrapper);
+ if (!ObjectUtils.isEmpty(versionSensorUnits)) {
+ for (VersionSensorUnit versionSensorUnit : versionSensorUnits) {
+ OrganizationUnitAlarm organizationUnitAlarm = new OrganizationUnitAlarm();
+ organizationUnitAlarm.setOrganizationId(orgId);
+ organizationUnitAlarm.setVersionId(versionId);
+ organizationUnitAlarm.setSensorCode(versionSensorUnit.getSensorCode());
+ organizationUnitAlarm.setUnitKey(versionSensorUnit.getUnitKey());
+ organizationUnitAlarm.setShowUnitKey(versionSensorUnit.getUnitKey());
+ organizationUnitAlarmMapper.insert(organizationUnitAlarm);
+ }
+ }
+ }
+ }
+
+ private void deleteOrganizationUnitAlarm(Integer orgId, Integer versionId) {
+ QueryWrapper<Device> queryOrganizationVersionWrapper = new QueryWrapper<>();
+ queryOrganizationVersionWrapper.eq("organization_id", orgId);
+ queryOrganizationVersionWrapper.eq("device_version_id", versionId);
+ queryOrganizationVersionWrapper.eq("is_delete", Constants.NOT_DELETE);
+ List<Device> devices = deviceMapper.selectList(queryOrganizationVersionWrapper);
+ if (ObjectUtils.isEmpty(devices)) {//������������������������������������������������������
+ UpdateWrapper deleteWrapper = new UpdateWrapper();
+ deleteWrapper.eq("organization_id", orgId);
+ deleteWrapper.eq("version_id", versionId);
+ deleteWrapper.eq("is_delete", Constants.NOT_DELETE);
+ deleteWrapper.set("is_delete", Constants.DELETE);
+ organizationUnitAlarmMapper.update(null, deleteWrapper);
+ }
+ }
}
--
Gitblit v1.8.0