update
This commit is contained in:
@@ -1,6 +1,17 @@
|
||||
package com.maibu.controller;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import java.time.LocalDate;
|
||||
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import com.maibu.core.business.DevicePlan;
|
||||
import com.maibu.core.controller.BaseController;
|
||||
import com.maibu.core.domain.AjaxResult;
|
||||
@@ -13,12 +24,6 @@ import com.maibu.memory.GlobalMemory;
|
||||
import com.maibu.memory.SiteMemory;
|
||||
import com.maibu.service.DeviceTaskService;
|
||||
import com.maibu.utils.SecurityUtils;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.time.LocalDate;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/iot/deviceTask")
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.maibu.dto;
|
||||
|
||||
import com.maibu.core.business.alarm_center.AlarmMessage;
|
||||
import com.maibu.core.enums.RespondCode;
|
||||
import lombok.Data;
|
||||
|
||||
@@ -8,7 +9,7 @@ import java.util.List;
|
||||
@Data
|
||||
public class DeviceErrorPushDTO {
|
||||
|
||||
private List<DeviceErrorPushDetail> details;
|
||||
private List<AlarmMessage> details;
|
||||
|
||||
private long time;
|
||||
|
||||
|
||||
@@ -7,6 +7,8 @@ public class DeviceErrorPushDetail {
|
||||
|
||||
private String errorName;
|
||||
|
||||
private String errorCode;
|
||||
|
||||
private String description;
|
||||
|
||||
private String range;
|
||||
|
||||
@@ -18,11 +18,13 @@ import org.springframework.util.CollectionUtils;
|
||||
import com.maibu.constant.FastBeeConstant;
|
||||
import com.maibu.core.business.DevicePlan;
|
||||
import com.maibu.core.business.DevicePlanTask;
|
||||
import com.maibu.core.business.DeviceRunParam;
|
||||
import com.maibu.core.domain.entity.SysSite;
|
||||
import com.maibu.core.enums.DeviceTaskStaus;
|
||||
import com.maibu.influxdb.util.InfluxDBUtil;
|
||||
import com.maibu.mapper.DevicePlanMapper;
|
||||
import com.maibu.mapper.DevicePlanTaskMapper;
|
||||
import com.maibu.mapper.DeviceRunParamMapper;
|
||||
import com.maibu.mapper.SysSiteMapper;
|
||||
import com.maibu.memory.GlobalMemory;
|
||||
import com.maibu.memory.SiteMemory;
|
||||
@@ -59,6 +61,9 @@ public class InitThread implements ApplicationRunner {
|
||||
@Autowired
|
||||
private SysSiteMapper sysSiteMapper;
|
||||
|
||||
@Autowired
|
||||
private DeviceRunParamMapper deviceRunParamMapper;
|
||||
|
||||
@Value("${influxdb.url}")
|
||||
private String influxDBUrl;
|
||||
|
||||
@@ -127,9 +132,6 @@ public class InitThread implements ApplicationRunner {
|
||||
* 恢复内存
|
||||
*/
|
||||
public void recoverMemory() {
|
||||
// todo 启动时清除当前登录记录
|
||||
// System.out.println("开始清除登录信息");
|
||||
// sysUserClientMapper.clearDeviceName();
|
||||
List<SysSite> siteList = sysSiteMapper.selectList();
|
||||
if (!CollectionUtils.isEmpty(siteList)) {
|
||||
siteList.forEach(x -> {
|
||||
@@ -138,10 +140,23 @@ public class InitThread implements ApplicationRunner {
|
||||
SiteMemory siteMemory = GlobalMemory.getSiteMemory(orgId, siteId);
|
||||
if (siteMemory == null) {
|
||||
siteMemory = new SiteMemory();
|
||||
siteMemory.setSiteId(siteId);
|
||||
siteMemory.setSysSite(x);
|
||||
GlobalMemory.addSiteMemory(orgId, siteId, siteMemory);
|
||||
}
|
||||
});
|
||||
}
|
||||
List<DeviceRunParam> deviceRunParamList = deviceRunParamMapper.selectList();
|
||||
if (!CollectionUtils.isEmpty(deviceRunParamList)) {
|
||||
deviceRunParamList.forEach(x -> {
|
||||
Long orgId = x.getOrgId();
|
||||
Long siteId = x.getId();
|
||||
SiteMemory siteMemory = GlobalMemory.getSiteMemory(orgId, siteId);
|
||||
if (siteMemory != null) {
|
||||
siteMemory.saveDeviceRunParam(x);
|
||||
}
|
||||
});
|
||||
}
|
||||
// 未执行完的重复计划
|
||||
LambdaQueryWrapperX<DevicePlan> query = new LambdaQueryWrapperX<>();
|
||||
List<String> list = Arrays.asList(DeviceTaskStaus.NEW.getCode(), DeviceTaskStaus.EXECUTING.getCode(),
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
package com.maibu.mapper;
|
||||
|
||||
import com.maibu.core.business.ErrorIdentificationStandard;
|
||||
import com.maibu.mybatis.mapper.BaseMapperX;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* 设备历史状态
|
||||
*/
|
||||
@Repository
|
||||
public interface ErrorIdentificationStandardMapper extends BaseMapperX<ErrorIdentificationStandard> {
|
||||
|
||||
}
|
||||
@@ -289,6 +289,7 @@ public class DeviceConnectHandler extends SimpleChannelInboundHandler<String> {
|
||||
NettyDevice slaveDevice = sessionManager.getDevice(data);
|
||||
if (slaveDevice != null) {
|
||||
slaveDevice.setOnlineStatus(1);
|
||||
slaveDevice.setDevice(device);
|
||||
}
|
||||
// 推送json 找到设备绑定的主机进行推送
|
||||
List<NettyDevice> controlMasters = sessionManager.getAllSlaveControl(device.getSerialNumber());
|
||||
|
||||
@@ -0,0 +1,158 @@
|
||||
package com.maibu.service;
|
||||
|
||||
import java.io.UnsupportedEncodingException;
|
||||
import java.net.URLEncoder;
|
||||
import java.security.InvalidKeyException;
|
||||
import java.security.NoSuchAlgorithmException;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
import javax.crypto.Mac;
|
||||
import javax.crypto.spec.SecretKeySpec;
|
||||
|
||||
import org.apache.commons.codec.binary.Base64;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.util.CollectionUtils;
|
||||
|
||||
import com.dingtalk.api.DefaultDingTalkClient;
|
||||
import com.dingtalk.api.DingTalkClient;
|
||||
import com.dingtalk.api.request.OapiRobotSendRequest;
|
||||
import com.dingtalk.api.response.OapiRobotSendResponse;
|
||||
import com.maibu.core.business.alarm_center.Alarm;
|
||||
import com.maibu.core.business.alarm_center.AlarmMessage;
|
||||
import com.maibu.core.business.device.NettyDevice;
|
||||
import com.maibu.dto.DeviceErrorPushDTO;
|
||||
import com.maibu.dto.DeviceErrorPushDetail;
|
||||
import com.maibu.manager.DeviceSessionManager;
|
||||
import com.maibu.memory.GlobalMemory;
|
||||
import com.maibu.memory.SiteMemory;
|
||||
import com.maibu.service.impl.AlarmServiceImpl;
|
||||
import com.maibu.utils.DingTalkTemplate;
|
||||
import com.maibu.utils.SecurityUtils;
|
||||
import com.taobao.api.ApiException;
|
||||
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
@Service
|
||||
@Slf4j
|
||||
public class AlertPushService {
|
||||
|
||||
@Autowired
|
||||
private DeviceSessionManager sessionManager;
|
||||
|
||||
@Autowired
|
||||
private AlarmServiceImpl alarmService;
|
||||
|
||||
public void messagePushHandler(String deviceId, List<DeviceErrorPushDTO> dtos) {
|
||||
NettyDevice nettyDevice = sessionManager.getDevice(deviceId);
|
||||
if (nettyDevice != null && nettyDevice.getDevice() != null) {
|
||||
Long siteId = nettyDevice.getDevice().getSiteId();
|
||||
Long orgId = nettyDevice.getDevice().getOrgId();
|
||||
SiteMemory siteMemory = GlobalMemory.getSiteMemory(orgId, siteId);
|
||||
if (siteMemory != null) {
|
||||
Integer dingTalkPush = siteMemory.getSysSite().getDingTalkPush();
|
||||
Integer emailPush = siteMemory.getSysSite().getEmailPush();
|
||||
Integer alertPush = siteMemory.getSysSite().getAlertPush();
|
||||
String secret = siteMemory.getSysSite().getDingTalkSecret();
|
||||
String token = siteMemory.getSysSite().getDingTalkToken();
|
||||
dtos.forEach(dto -> {
|
||||
if (!CollectionUtils.isEmpty(dto.getDetails())) {
|
||||
dto.getDetails().forEach(detail -> {
|
||||
if (dingTalkPush == 1) {
|
||||
pushDingTalkMessage(secret, token, DingTalkTemplate.buildText(detail));
|
||||
}
|
||||
if (emailPush == 1) {
|
||||
pushEmailMessage(null, null);
|
||||
}
|
||||
});
|
||||
if (alertPush == 1) {
|
||||
alarmService.pushAlertMes(dto.getDetails());
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void pushDingTalkMessage(String secret, String token, String alertMessage) {
|
||||
try {
|
||||
Long timestamp = System.currentTimeMillis();
|
||||
String stringToSign = timestamp + "\n" + secret;
|
||||
Mac mac = Mac.getInstance("HmacSHA256");
|
||||
mac.init(new SecretKeySpec(secret.getBytes("UTF-8"), "HmacSHA256"));
|
||||
byte[] signData = mac.doFinal(stringToSign.getBytes("UTF-8"));
|
||||
String sign = URLEncoder.encode(new String(Base64.encodeBase64(signData)), "UTF-8");
|
||||
|
||||
// sign字段和timestamp字段必须拼接到请求URL上,否则会出现 310000 的错误信息
|
||||
DingTalkClient client = new DefaultDingTalkClient(
|
||||
"https://oapi.dingtalk.com/robot/send?sign=" + sign + "×tamp=" + timestamp);
|
||||
OapiRobotSendRequest req = new OapiRobotSendRequest();
|
||||
// 定义文本内容
|
||||
OapiRobotSendRequest.Text text = new OapiRobotSendRequest.Text();
|
||||
text.setContent(alertMessage);
|
||||
// 定义 @ 对象
|
||||
// OapiRobotSendRequest.At at = new OapiRobotSendRequest.At();
|
||||
// at.setAtUserIds(Arrays.asList(USER_ID));
|
||||
// 设置消息类型
|
||||
req.setMsgtype("text");
|
||||
req.setText(text);
|
||||
// req.setAt(at);
|
||||
client.execute(req, token);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
log.error("发送钉钉消息失败:{}", e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
public void pushEmailMessage(String deviceId, String errorMessage) {
|
||||
// Implement the logic to push error messages to the appropriate channels
|
||||
// This could involve sending notifications, logging errors, etc.
|
||||
System.out.println("Error for device " + deviceId + ": " + errorMessage);
|
||||
}
|
||||
|
||||
public static void main(String[] args) {
|
||||
try {
|
||||
Long timestamp = System.currentTimeMillis();
|
||||
System.out.println(timestamp);
|
||||
String secret = "SEC6e538cab506df2efda5d327dfe582f8fd12ac55b77664d662031e90d2a3a3887";
|
||||
String stringToSign = timestamp + "\n" + secret;
|
||||
Mac mac = Mac.getInstance("HmacSHA256");
|
||||
mac.init(new SecretKeySpec(secret.getBytes("UTF-8"), "HmacSHA256"));
|
||||
byte[] signData = mac.doFinal(stringToSign.getBytes("UTF-8"));
|
||||
String sign = URLEncoder.encode(new String(Base64.encodeBase64(signData)), "UTF-8");
|
||||
System.out.println(sign);
|
||||
|
||||
// sign字段和timestamp字段必须拼接到请求URL上,否则会出现 310000 的错误信息
|
||||
DingTalkClient client = new DefaultDingTalkClient(
|
||||
"https://oapi.dingtalk.com/robot/send?sign=" + sign + "×tamp=" + timestamp);
|
||||
OapiRobotSendRequest req = new OapiRobotSendRequest();
|
||||
/**
|
||||
* 发送文本消息
|
||||
*/
|
||||
// 定义文本内容
|
||||
OapiRobotSendRequest.Text text = new OapiRobotSendRequest.Text();
|
||||
text.setContent("昀姐牛逼");
|
||||
// 定义 @ 对象
|
||||
OapiRobotSendRequest.At at = new OapiRobotSendRequest.At();
|
||||
// at.setAtUserIds(Arrays.asList(USER_ID));
|
||||
// 设置消息类型
|
||||
req.setMsgtype("text");
|
||||
req.setText(text);
|
||||
req.setAt(at);
|
||||
OapiRobotSendResponse rsp = client.execute(req,
|
||||
"8bfdf609c7edeff5f31c6a243088d2a4f6672221afc86c008ad8622156a58407");
|
||||
System.out.println(rsp.getBody());
|
||||
} catch (ApiException e) {
|
||||
e.printStackTrace();
|
||||
} catch (UnsupportedEncodingException e) {
|
||||
throw new RuntimeException(e);
|
||||
} catch (NoSuchAlgorithmException e) {
|
||||
throw new RuntimeException(e);
|
||||
} catch (InvalidKeyException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -2,9 +2,6 @@ package com.maibu.service;
|
||||
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.LinkedList;
|
||||
import java.util.Queue;
|
||||
|
||||
@Service
|
||||
public class DevicePathService {
|
||||
|
||||
|
||||
@@ -1,32 +1,45 @@
|
||||
package com.maibu.service;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.maibu.core.business.*;
|
||||
import com.maibu.core.business.device.NettyDevice;
|
||||
import com.maibu.core.domain.entity.SysSite;
|
||||
import com.maibu.core.domain.model.LoginUser;
|
||||
import com.maibu.core.enums.DeviceTaskStaus;
|
||||
import com.maibu.dto.*;
|
||||
import com.maibu.manager.DeviceSessionManager;
|
||||
import com.maibu.mapper.*;
|
||||
import com.maibu.memory.GlobalMemory;
|
||||
import com.maibu.memory.SiteMemory;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.util.CollectionUtils;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import java.util.Random;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.util.CollectionUtils;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.maibu.core.business.Device;
|
||||
import com.maibu.core.business.DevicePlan;
|
||||
import com.maibu.core.business.DevicePlanTask;
|
||||
import com.maibu.core.business.DeviceTaskPlanRule;
|
||||
import com.maibu.core.business.WorkRecord;
|
||||
import com.maibu.core.business.device.NettyDevice;
|
||||
import com.maibu.core.domain.entity.SysSite;
|
||||
import com.maibu.core.domain.model.LoginUser;
|
||||
import com.maibu.core.enums.DeviceTaskStaus;
|
||||
import com.maibu.dto.DevicePlanStatisticsDTO;
|
||||
import com.maibu.dto.DevicePlanTaskStatisticsDTO;
|
||||
import com.maibu.dto.DeviceTaskCommandDTO;
|
||||
import com.maibu.dto.DeviceTaskQueryDTO;
|
||||
import com.maibu.dto.DeviceWorkStatisticsDTO;
|
||||
import com.maibu.manager.DeviceSessionManager;
|
||||
import com.maibu.mapper.DeviceMapper;
|
||||
import com.maibu.mapper.DevicePlanMapper;
|
||||
import com.maibu.mapper.DevicePlanTaskMapper;
|
||||
import com.maibu.mapper.SysSiteMapper;
|
||||
import com.maibu.mapper.WorkRecordMapper;
|
||||
import com.maibu.memory.GlobalMemory;
|
||||
import com.maibu.memory.SiteMemory;
|
||||
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
@Service
|
||||
@Slf4j
|
||||
public class DeviceTaskService {
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
package com.maibu.service;
|
||||
|
||||
|
||||
import cn.hutool.core.io.IoUtil;
|
||||
import com.alibaba.fastjson2.JSON;
|
||||
import com.maibu.common.CommandConstant;
|
||||
@@ -8,21 +7,29 @@ import com.maibu.common.NettyCacheKey;
|
||||
import com.maibu.core.business.DeviceRunningStatusHistory;
|
||||
import com.maibu.core.business.DeviceStatusRecordDTO;
|
||||
import com.maibu.core.enums.CompareEnum;
|
||||
import com.maibu.core.enums.ErrorSource;
|
||||
import com.maibu.core.enums.RespondCode;
|
||||
import com.maibu.core.redis.RedisCache;
|
||||
import com.maibu.dto.DeviceErrorPushDTO;
|
||||
import com.maibu.dto.DeviceErrorPushDetail;
|
||||
import com.maibu.core.business.device.NettyDevice;
|
||||
import com.maibu.core.business.inter.WebsocketMesDispather;
|
||||
import com.maibu.core.business.ErrorIdentificationStandard;
|
||||
import com.maibu.core.business.alarm_center.AlarmMessage;
|
||||
import com.maibu.manager.DeviceSessionManager;
|
||||
import com.maibu.mapper.ErrorIdentificationStandardMapper;
|
||||
import com.maibu.memory.GlobalMemory;
|
||||
import com.maibu.memory.SiteMemory;
|
||||
import com.maibu.mqtt.MqttTopic;
|
||||
import com.maibu.utils.CommandUtils;
|
||||
import com.maibu.utils.CompareUtils;
|
||||
import com.maibu.utils.json.JsonUtils;
|
||||
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import io.netty.buffer.Unpooled;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.eclipse.paho.client.mqttv3.MqttException;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.core.io.Resource;
|
||||
import org.springframework.core.io.ResourceLoader;
|
||||
@@ -31,10 +38,12 @@ import org.springframework.util.CollectionUtils;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.lang.reflect.Field;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.Executors;
|
||||
import java.util.concurrent.ScheduledExecutorService;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
@@ -58,6 +67,11 @@ public class DeviceThreadService {
|
||||
@Autowired
|
||||
private ErrorIdentificationStandardMapper standardMapper;
|
||||
|
||||
@Autowired
|
||||
private WebsocketMesDispather websocketMesDispather;
|
||||
|
||||
@Autowired
|
||||
private AlertPushService alertPushService;
|
||||
|
||||
public void deviceErrorMonitor() throws InterruptedException, IOException {
|
||||
initStandard();
|
||||
@@ -68,12 +82,15 @@ public class DeviceThreadService {
|
||||
String key = NettyCacheKey.deviceRunningStatusKey;
|
||||
Collection<String> keys = redisCache.getListKeyByPrefix(key);
|
||||
if (!CollectionUtils.isEmpty(keys)) {
|
||||
List<DeviceErrorPushDTO> pushList = new ArrayList<>();
|
||||
keys.forEach(k -> {
|
||||
DeviceStatusRecordDTO recordDTO = redisCache.getCacheObject(k);
|
||||
if (recordDTO != null && !CollectionUtils.isEmpty(recordDTO.getHistories())) {
|
||||
recordDTO.getHistories().sort(Comparator.comparing(DeviceRunningStatusHistory::getCreateTime).reversed());
|
||||
recordDTO.getHistories()
|
||||
.sort(Comparator.comparing(DeviceRunningStatusHistory::getCreateTime).reversed());
|
||||
DeviceRunningStatusHistory history = recordDTO.getHistories().get(0);
|
||||
List<DeviceErrorPushDetail> compared = compareErrorStandard(history, siteMemory.standard);
|
||||
List<AlarmMessage> compared = compareErrorStandard(history,
|
||||
siteMemory.standards.get(ErrorSource.MOWER));
|
||||
|
||||
String[] parts = k.split(":");
|
||||
String deviceId = parts[1];
|
||||
@@ -83,10 +100,18 @@ public class DeviceThreadService {
|
||||
pushDTO.setTime(System.currentTimeMillis());
|
||||
pushDTO.setDetails(compared);
|
||||
pushDTO.setEvent(RespondCode.device_error_push);
|
||||
//todo push 推送到前端
|
||||
pushErrorMessage(deviceId, JSON.toJSONString(pushDTO));
|
||||
pushList.add(pushDTO);
|
||||
}
|
||||
});
|
||||
// 按实际deviceId分组,推送错误信息
|
||||
Map<String, List<DeviceErrorPushDTO>> pushMap = pushList.stream()
|
||||
.collect(java.util.stream.Collectors.groupingBy(DeviceErrorPushDTO::getDeviceId));
|
||||
pushMap.forEach((deviceId, dtos) -> {
|
||||
// pushErrorMessage(deviceId, JSON.toJSONString(dtos));
|
||||
// todo 判断错误级别,是否需要推送邮件 或者钉钉。
|
||||
// 找到这个设备的场站 添加场站是否开启关闭 钉钉或者邮件推送,推送邮件 添加人员是否订阅邮件,钉钉是加入钉钉群
|
||||
alertPushService.messagePushHandler(deviceId, dtos);
|
||||
});
|
||||
}
|
||||
} catch (Exception e) {
|
||||
log.error("执行监测错误线程错误:{}", e.getMessage());
|
||||
@@ -95,35 +120,56 @@ public class DeviceThreadService {
|
||||
}
|
||||
|
||||
public void initStandard() throws IOException {
|
||||
if (siteMemory.standard == null) {
|
||||
List<ErrorIdentificationStandard> standards = standardMapper.selectList();
|
||||
if (CollectionUtils.isEmpty(standards)) {
|
||||
if (siteMemory.standards == null) {
|
||||
List<ErrorIdentificationStandard> list = standardMapper.selectList();
|
||||
if (CollectionUtils.isEmpty(list)) {
|
||||
// 读取resource目录下的device-config.json文件
|
||||
Resource resource = resourceLoader.getResource("classpath:errorStandard.json");
|
||||
// 使用fastjson2转换为DeviceConfig对象
|
||||
String jsonContent = IoUtil.readUtf8(resource.getInputStream());
|
||||
siteMemory.standard = JSON.parseArray(jsonContent, ErrorIdentificationStandard.class);
|
||||
List<ErrorIdentificationStandard> newStandards = JSON.parseArray(jsonContent,
|
||||
ErrorIdentificationStandard.class);
|
||||
if (!CollectionUtils.isEmpty(newStandards)) {
|
||||
standardMapper.insertBatch(newStandards);
|
||||
siteMemory.standards = newStandards.stream()
|
||||
.collect(java.util.stream.Collectors
|
||||
.groupingBy(ErrorIdentificationStandard::getErrorSource));
|
||||
}
|
||||
} else {
|
||||
siteMemory.standard = standards;
|
||||
siteMemory.standards = list.stream()
|
||||
.collect(java.util.stream.Collectors.groupingBy(ErrorIdentificationStandard::getErrorSource));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void pushErrorMessage(String deviceId, String dto) {
|
||||
NettyDevice device = sessionManager.getDevice(deviceId);
|
||||
if (device != null) {
|
||||
ByteBuf buf = Unpooled.buffer();
|
||||
CommandUtils.buildCommand(buf, dto, CommandConstant.interaction);
|
||||
if (device.getChannel() != null && device.getChannel().isActive()) {
|
||||
device.getChannel().writeAndFlush(buf);
|
||||
// NettyDevice device = sessionManager.getDevice(deviceId);
|
||||
// if (device != null) {
|
||||
// ByteBuf buf = Unpooled.buffer();
|
||||
// CommandUtils.buildCommand(buf, dto, CommandConstant.interaction);
|
||||
// if (device.getChannel() != null && device.getChannel().isActive()) {
|
||||
// device.getChannel().writeAndFlush(buf);
|
||||
// }
|
||||
// }
|
||||
try {
|
||||
GlobalMemory.mqttClientUtil.publish(String.format(MqttTopic.DEVICE_ERROR_PUSH_TOPIC, deviceId), dto);
|
||||
List<NettyDevice> controlMasters = sessionManager.getAllSlaveControl(deviceId);
|
||||
if (!CollectionUtils.isEmpty(controlMasters)) {
|
||||
controlMasters.forEach(x -> {
|
||||
websocketMesDispather.dispather(x.getConnectorId(), dto);
|
||||
log.info("推送错误信息 device:{},content:{}", deviceId, dto);
|
||||
});
|
||||
}
|
||||
} catch (MqttException e) {
|
||||
log.error("推送错误信息失败 device:{}error:{}", deviceId, e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public List<DeviceErrorPushDetail> compareErrorStandard(DeviceRunningStatusHistory history, List<ErrorIdentificationStandard> standards) {
|
||||
if (history == null || CollectionUtils.isEmpty(standards)) return null;
|
||||
List<DeviceErrorPushDetail> list = new ArrayList<>();
|
||||
public List<AlarmMessage> compareErrorStandard(DeviceRunningStatusHistory history,
|
||||
List<ErrorIdentificationStandard> standards) {
|
||||
if (history == null || CollectionUtils.isEmpty(standards))
|
||||
return null;
|
||||
List<AlarmMessage> list = new ArrayList<>();
|
||||
standards.forEach(standard -> {
|
||||
String fieldName = standard.getField();
|
||||
String compareValues = standard.getCompareValues();
|
||||
@@ -132,19 +178,24 @@ public class DeviceThreadService {
|
||||
if (!StringUtils.isEmpty(compareValues) && !StringUtils.isEmpty(targetValue)) {
|
||||
boolean result = CompareUtils.compare(compareType, compareValues, targetValue);
|
||||
if (!result) {
|
||||
DeviceErrorPushDetail detail = new DeviceErrorPushDetail();
|
||||
detail.setErrorName(standard.getErrorName());
|
||||
detail.setDescription(standard.getErrorDescription());
|
||||
detail.setValue(targetValue);
|
||||
detail.setRange(compareValues);
|
||||
list.add(detail);
|
||||
AlarmMessage alarm = new AlarmMessage();
|
||||
alarm.setContent(standard.getErrorDescription());
|
||||
alarm.setDeviceSn(history.getDeviceId());
|
||||
alarm.setDeviceName(history.getDeviceId());
|
||||
alarm.setLevel(standard.getErrorLevel());
|
||||
alarm.setLocation(history.getLatitude() + "," + history.getLongitude());
|
||||
alarm.setName(standard.getErrorName());
|
||||
alarm.setNo(standard.getErrorCode());
|
||||
alarm.setSuggestion(standard.getSuggestion());
|
||||
alarm.setStatus("未处理");
|
||||
alarm.setTime(LocalDateTime.now());
|
||||
list.add(alarm);
|
||||
}
|
||||
}
|
||||
});
|
||||
return list;
|
||||
}
|
||||
|
||||
|
||||
private static String knownClassFieldFinding(String fieldName, DeviceRunningStatusHistory history) {
|
||||
try {
|
||||
// 1. 获取类的Class对象
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
package com.maibu.utils;
|
||||
|
||||
import com.maibu.core.business.alarm_center.AlarmMessage;
|
||||
|
||||
public class DingTalkTemplate {
|
||||
|
||||
public static String buildText(AlarmMessage alarm) {
|
||||
return String.format(
|
||||
"【系统告警通知】\n\n" +
|
||||
"⚠️ 告警等级:%s\n\n" +
|
||||
"告警名称:%s\n\n" +
|
||||
"告警时间:%s\n\n" +
|
||||
"设备名称:%s\n\n" +
|
||||
"设备编号:%s\n\n" +
|
||||
"告警内容:\n%s\n\n" +
|
||||
"发生位置:\n%s\n\n" +
|
||||
"处理建议:\n%s\n\n" +
|
||||
"状态:%s",
|
||||
alarm.getLevel(),
|
||||
alarm.getName(),
|
||||
alarm.getTime(),
|
||||
alarm.getDeviceName(),
|
||||
alarm.getDeviceSn(),
|
||||
alarm.getContent(),
|
||||
alarm.getLocation(),
|
||||
alarm.getSuggestion(),
|
||||
alarm.getStatus());
|
||||
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user