Add logs in udp/websocket send/recv interfaces
This commit is contained in:
Bingkun Li
parent
f032dab83c
commit
edd7783530
@ -463,6 +463,7 @@ public class JmJobServiceImpl implements JmJobService {
|
||||
// 通知前端任务停止
|
||||
JmJobStatusWsDTO wsVo = new JmJobStatusWsDTO(id, uav.getUavId());
|
||||
wsVo.setJobStatus(ExecStatusEnum.OVER.getValue());
|
||||
log.debug("send status:\n{}", JSON.toJSONString(wsVo));
|
||||
simpMessagingTemplate.convertAndSend(WebSocketKey.JM_JOB_STATUS, wsVo);
|
||||
});
|
||||
// 删除缓存任务信息
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
package com.zhangy.skyeye.jm.service.impl;
|
||||
|
||||
import com.alibaba.fastjson2.JSON;
|
||||
import com.zhangy.skyeye.common.extend.exception.ServiceException;
|
||||
import com.zhangy.skyeye.common.extend.util.MessageUtils;
|
||||
import com.zhangy.skyeye.jm.dto.*;
|
||||
@ -306,6 +307,7 @@ public class JmJobStatusServiceImpl implements JmJobStatusService {
|
||||
|
||||
// 4.将更新后的状态推送到前端
|
||||
wsVo.setSarStatus(curr);
|
||||
log.debug("send status:\n{}", JSON.toJSONString(wsVo));
|
||||
simpMessageingTemplate.convertAndSend(WebSocketKey.JM_JOB_STATUS, wsVo);
|
||||
}
|
||||
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
package com.zhangy.skyeye.sar.control;
|
||||
|
||||
import com.alibaba.fastjson2.JSON;
|
||||
import com.zhangy.skyeye.common.extend.exception.ServiceException;
|
||||
import com.zhangy.skyeye.common.extend.util.ObjectUtil;
|
||||
import com.zhangy.skyeye.redis.utils.RedisUtil;
|
||||
@ -108,8 +109,8 @@ public class SarControlContext {
|
||||
private void sendUdp(SarControlDTO control) {
|
||||
SarControlTypeEnum controlType = control.getControlType();
|
||||
String ip = control.getIp();
|
||||
log.debug("开始发送雷达控制指令[" + controlType + "]----------------------");
|
||||
//System.out.println(control);
|
||||
// log.debug("开始发送雷达控制指令[" + controlType + "]----------------------");
|
||||
log.debug("send control:\n{}", JSON.toJSONString(control));
|
||||
try (DatagramSocket socket = new DatagramSocket()) {
|
||||
byte[] content = pack(control);
|
||||
socket.connect(new InetSocketAddress(ip, PORT));
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
package com.zhangy.skyeye.sar.listen;
|
||||
|
||||
import com.alibaba.fastjson2.JSON;
|
||||
import com.zhangy.skyeye.sar.dto.SarImagePacketGroupDTO;
|
||||
import com.zhangy.skyeye.sar.dto.SarImagePacketDTO;
|
||||
import com.zhangy.skyeye.sar.task.CircularBufferQueue;
|
||||
@ -67,6 +68,7 @@ public class SarImageListener extends SarAbstractListener {
|
||||
String ip = packet.getAddress().getHostAddress();
|
||||
// 处理接收到的数据
|
||||
SarImagePacketDTO backPackDTO = SarImagePacketDTO.parse(packet.getData(), packet.getLength());
|
||||
log.debug("recv image:\n{}", JSON.toJSONString(backPackDTO));
|
||||
if (backPackDTO == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
package com.zhangy.skyeye.sar.listen;
|
||||
|
||||
import com.alibaba.fastjson2.JSON;
|
||||
import com.zhangy.skyeye.redis.utils.RedisUtil;
|
||||
import com.zhangy.skyeye.jm.dto.JmSarStatusDTO;
|
||||
import com.zhangy.skyeye.jm.service.JmJobStatusService;
|
||||
@ -78,6 +79,7 @@ public class SarStatusListener extends SarAbstractListener {
|
||||
String ip = packet.getAddress().getHostAddress();
|
||||
// 处理接收到的数据
|
||||
SarStatusPackDTO packDTO = SarStatusPackDTO.parse(ip, packet.getData());
|
||||
log.debug("recv status:\n{}", JSON.toJSONString(packDTO));
|
||||
if (packDTO == null) {
|
||||
if (running)
|
||||
log.warn("[" + packDTO.getPayloadIp() + "]状态包校验失败，已丢弃。错误包=" +
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
package com.zhangy.skyeye.sar.listen;
|
||||
|
||||
import com.alibaba.fastjson2.JSON;
|
||||
import com.zhangy.skyeye.sar.dto.SarWavePackDTO;
|
||||
import com.zhangy.skyeye.sar.task.CircularBufferQueue;
|
||||
import com.zhangy.skyeye.sar.task.DiscardOldestPolicyWithLog;
|
||||
@ -62,6 +63,7 @@ public class SarWaveListener extends SarAbstractListener {
|
||||
String ip = packet.getAddress().getHostAddress();
|
||||
// 处理接收到的数据
|
||||
SarWavePackDTO backPackDTO = SarWavePackDTO.parse(packet.getData());
|
||||
log.debug("recv wave:\n{}", JSON.toJSONString(backPackDTO));
|
||||
if (backPackDTO == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
package com.zhangy.skyeye.sar.service.impl;
|
||||
|
||||
import com.alibaba.fastjson2.JSON;
|
||||
import com.zhangy.skyeye.jm.dto.JmAirlineStatusDTO;
|
||||
import com.zhangy.skyeye.jm.dto.JmUavStatusDTO;
|
||||
import com.zhangy.skyeye.jm.entity.JmImage;
|
||||
@ -40,6 +41,7 @@ public class SarBackWsServiceImpl implements ISarBackWsService {
|
||||
@Override
|
||||
public void sendWave(String payloadIp, SarBackWaveFrameDTO frame, byte[] frameData) {
|
||||
JmSarWaveWsDTO wsVo = loadJobDetail(payloadIp, frame.getChannel(), frameData);
|
||||
log.debug("send wave:\n{}", JSON.toJSONString(wsVo));
|
||||
// 若载荷任务结束，sar仍然回传波形则 wsVo为空。此场景仅限sardemo，实际sar不会发生
|
||||
if (wsVo != null) {
|
||||
simpMessageingTemplate.convertAndSend(WebSocketKey.SAR_BACK_WAVE, wsVo);
|
||||
@ -48,6 +50,7 @@ public class SarBackWsServiceImpl implements ISarBackWsService {
|
||||
|
||||
@Override
|
||||
public void sendImg(JmImage imageInfo) {
|
||||
log.debug("send image:\n{}", JSON.toJSONString(imageInfo));
|
||||
simpMessageingTemplate.convertAndSend(WebSocketKey.SAR_BACK_IMAGE, imageInfo);
|
||||
}
|
||||
|
||||
|
||||
@ -12,6 +12,7 @@
|
||||
converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
|
||||
<conversionRule conversionWord="wEx"
|
||||
converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
|
||||
|
||||
<!-- Console log output -->
|
||||
<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
|
||||
<encoder>
|
||||
@ -30,7 +31,7 @@
|
||||
</rollingPolicy>
|
||||
<encoder>
|
||||
<charset>UTF-8</charset>
|
||||
<pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
|
||||
<pattern>%date [%thread] %-5level [%logger{50}] [%file:%line] - %msg%n</pattern>
|
||||
</encoder>
|
||||
</appender>
|
||||
|
||||
@ -44,7 +45,7 @@
|
||||
</rollingPolicy>
|
||||
<encoder>
|
||||
<charset>UTF-8</charset>
|
||||
<pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
|
||||
<pattern>%date [%thread] %-5level [%logger{50}] [%file:%line] - %msg%n</pattern>
|
||||
</encoder>
|
||||
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
|
||||
<level>ERROR</level>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user