ClientApps/CN_Gather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码调整

Browse Source
This commit is contained in:
hongawen
2025-08-11 16:31:26 +08:00
parent 09d2911c4c
commit fe5040c7af
4 changed files with 94 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java
View File

@@ -857,7 +857,7 @@ public class SocketDevResponseService {
webSocketVO.setData(JSON.toJSONString(map));
webSocketVO.setRequestId(SourceOperateCodeEnum.YJC_XYJY.getValue());
webSocketVO.setOperateCode(SourceOperateCodeEnum.VERIFY_MAPPING$01.getValue());
webSocketVO.setCode(SourceResponseCodeEnum.SUCCESS.getCode());
webSocketVO.setCode(SourceResponseCodeEnum.FAIL.getCode());
WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(webSocketVO));
CnSocketUtil.quitSend(param);
break;

3
detection/src/main/java/com/njcn/gather/detection/service/impl/PreDetectionServiceImpl.java
View File

@@ -236,8 +236,9 @@ public class PreDetectionServiceImpl implements PreDetectionService {
xuMsg.setData(JSON.toJSONString(sourceIssues));
xuMsg.setRequestId(SourceOperateCodeEnum.FORMAL_REAL.getValue() + "&&" + sourceIssues.getType());
SocketManager.sendMsg(param.getUserPageId() + DetectionCommunicateConstant.SOURCE, JSON.toJSONString(xuMsg));
// Resume_Success
} else {
//TODO 是否最终检测完成需要推送给用户
//TODO 是否最终检测完成需要推送给用户 检测完成
PqScriptCheckDataParam checkDataParam = new PqScriptCheckDataParam();
checkDataParam.setScriptId(param.getScriptId());
checkDataParam.setIsValueTypeName(false);

28
detection/src/main/java/com/njcn/gather/detection/util/socket/cilent/NettyDevClientHandler.java
View File

@@ -51,19 +51,29 @@ import java.util.stream.Collectors;
@RequiredArgsConstructor
public class NettyDevClientHandler extends SimpleChannelInboundHandler<String> {
/** 闪变检测超时时间：20分钟（1300秒） */
/**
* 闪变检测超时时间：20分钟（1300秒）
*/
private static final long FLICKER_TIMEOUT = 1300L;
/** 统计数据检测超时时间：3分钟（180秒） */
/**
* 统计数据检测超时时间：3分钟（180秒）
*/
private static final long STATISTICS_TIMEOUT = 180L;
/** 实时数据检测超时时间：1分钟（60秒） */
/**
* 实时数据检测超时时间：1分钟（60秒）
*/
private static final long REALTIME_TIMEOUT = 60L;
/** 暂停操作超时时间：10分钟（600秒） */
/**
* 暂停操作超时时间：10分钟（600秒）
*/
private static final long STOP_TIMEOUT = 600L;
/** 超时时默认结果标志：3表示超时失败 */
/**
* 超时时默认结果标志：3表示超时失败
*/
private static final int DEFAULT_RESULT_FLAG = 3;
private final PreDetectionParam param;
@@ -117,10 +127,9 @@ public class NettyDevClientHandler extends SimpleChannelInboundHandler<String> {
*
* @param ctx 通道上下文
* @param msg 接收到的消息
* @throws InterruptedException 线程中断异常
*/
@Override
protected void channelRead0(ChannelHandlerContext ctx, String msg) throws InterruptedException {
protected void channelRead0(ChannelHandlerContext ctx, String msg) {
log.info("devhandler接收server端数据: {}", msg);
try {
socketResponseService.deal(param, msg);
@@ -131,7 +140,6 @@ public class NettyDevClientHandler extends SimpleChannelInboundHandler<String> {
}
/**
* 用户事件回调方法，主要用于处理心跳超时
* <p>当触发READER_IDLE事件时，根据当前状态进行超时处理</p>
@@ -208,8 +216,6 @@ public class NettyDevClientHandler extends SimpleChannelInboundHandler<String> {
}
/**
* 处理读取超时事件
* <p>检查源列表，更新超时计数器，判断是否超时并处理</p>
@@ -241,7 +247,7 @@ public class NettyDevClientHandler extends SimpleChannelInboundHandler<String> {
log.warn("当前进入暂停操作超时函数，停止时间: {}", FormalTestManager.stopTime);
if (FormalTestManager.stopTime > STOP_TIMEOUT) {
CnSocketUtil.quitSend(param);
WebServiceManager.sendDetectionErrorMessage(param.getUserPageId(), SourceOperateCodeEnum.STOP_TIMEOUT);
WebServiceManager.sendDetectionErrorMessage(param.getUserPageId(),SourceOperateCodeEnum.FORMAL_REAL.getValue(), SourceOperateCodeEnum.STOP_TIMEOUT);
}
}

22
detection/src/main/java/com/njcn/gather/detection/util/socket/websocket/WebServiceManager.java
View File

@@ -42,12 +42,11 @@ import java.util.concurrent.ConcurrentHashMap;
* </ul>
*
* @author wr
* @date 2024/12/11 13:04
* @version 1.0
* @since 检测系统 v2.3.12
*
* @date 2024/12/11 13:04
* @see com.njcn.gather.detection.util.socket.websocket.WebSocketHandler WebSocket处理器
* @see com.njcn.gather.detection.pojo.vo.WebSocketVO WebSocket消息对象
* @since 检测系统 v2.3.12
*/
@Slf4j
public class WebServiceManager {
@@ -296,5 +295,22 @@ public class WebServiceManager {
webSocketVO.setOperateCode(errorType.getValue());
sendMessage(userId, webSocketVO);
}
/**
* 发送检测错误消息给指定用户
* <p>用于推送特定类型的检测错误信息</p>
*
* @param userId 目标用户ID
* @param requestId 请求ID
* @param errorType 错误类型枚举
* @since v2.3.12 重构版本
*/
public static void sendDetectionErrorMessage(String userId, String requestId, SourceOperateCodeEnum errorType) {
WebSocketVO<Object> webSocketVO = new WebSocketVO<>();
webSocketVO.setRequestId(requestId);
webSocketVO.setData(errorType.getMsg());
webSocketVO.setOperateCode(errorType.getValue());
sendMessage(userId, webSocketVO);
}
}