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

测试提交

Browse Source
This commit is contained in:
chendaofei
2024-12-18 10:32:10 +08:00
parent 4c439e299c
commit 0232eee131
7 changed files with 60 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,34 +37,20 @@ public class SocketDevResponseService {
public void deal(String userId,String msg){
SocketDataMsg socketDataMsg = MsgUtil.socketDataMsg(msg);
if(SourceOperateCodeEnum.YJC_YTXJY.getValue().equals(socketDataMsg.getRequestId())){
SourceResponseCodeEnum dictDataEnumByCode = SourceResponseCodeEnum.getDictDataEnumByCode(socketDataMsg.getCode());
if(ObjectUtil.isNotNull(dictDataEnumByCode)){
SocketMsg socketMsg=new SocketMsg();
SourceOperateCodeEnum sourceOperateCodeEnum = SourceOperateCodeEnum.getDictDataEnumByCode(socketDataMsg.getRequestId());
switch (sourceOperateCodeEnum) {
case YJC_SBTXJY:
switch (dictDataEnumByCode){
case SUCCESS:
break;
case UNPROCESSED_BUSINESS:
break;
case RE_OPERATE:
socketMsg.setRequestId(socketDataMsg.getRequestId());
socketMsg.setOperateCode("QUIT_FUNEND$01");
SocketManager.sendMsg(userId,JSON.toJSONString(socketMsg));
break;
default:
socketMsg.setRequestId(socketDataMsg.getRequestId());
socketMsg.setOperateCode(socketDataMsg.getOperateCode());
socketMsg.setData(dictDataEnumByCode.getMessage());
webSocketHandler.sendMsgToUser(userId, JSON.toJSONString(socketMsg));
break;
}
}
break;
case YJC_XYJY:
break;
case YJC_XUJY:
break;
}
}

5
detection/src/main/java/com/njcn/gather/detection/handler/SocketSourceResponseService.java
View File

@@ -15,6 +15,7 @@ import com.njcn.gather.detection.util.socket.cilent.NettyDevClientHandler;
import com.njcn.gather.detection.util.socket.web.WebSocketHandler;
import com.njcn.gather.device.device.pojo.vo.PreDetection;
import com.njcn.gather.device.device.service.IPqDevService;
import io.netty.channel.Channel;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -78,9 +79,9 @@ public class SocketSourceResponseService {
switch (dictDataEnumByCode){
case SUCCESS:
webSocketHandler.sendMsgToUser(param.getUserPageId(), msg);
String s = param.getUserPageId() + "_Dev";
String s = param.getUserPageId() + "_dev";
//开始设备通讯检测
NettyClient.socketClient(ip, port,param.getPlanId(), new NettyDevClientHandler(param.getPlanId(), socketDevResponseService));
NettyClient.socketClient(ip, port, param.getUserPageId(), new NettyDevClientHandler(s, socketDevResponseService));
List<PreDetection> devList = iPqDevService.getDevInfo(param.getDevIds());
Map<String, List<PreDetection>> map = new HashMap(1);
map.put("deviceList", devList);

17
detection/src/main/java/com/njcn/gather/detection/pojo/vo/WebSocketVO.java
View File

@@ -1,5 +1,6 @@
package com.njcn.gather.detection.pojo.vo;
import com.njcn.gather.detection.pojo.enums.SourceResponseCodeEnum;
import lombok.Data;
import org.apache.poi.ss.formula.functions.T;
@@ -11,4 +12,20 @@ public class WebSocketVO {
private String message;
private T data;
public WebSocketVO(SourceResponseCodeEnum sourceResponseCodeEnum){
this.code = sourceResponseCodeEnum.getCode();
this.message= sourceResponseCodeEnum.getMessage();
}
public WebSocketVO(Integer code, String message, T data) {
this.code = code;
this.message = message;
this.data = data;
}
public WebSocketVO() {
}
}

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

@@ -25,6 +25,7 @@ import com.njcn.gather.plan.service.IAdPlanService;
import com.njcn.gather.plan.service.IAdPlanSourceService;
import com.njcn.gather.system.dictionary.pojo.enums.DictDataEnum;
import com.njcn.gather.system.dictionary.service.IDictDataService;
import io.netty.channel.Channel;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -123,18 +124,18 @@ public class PreDetectionServiceImpl implements PreDetectionService {
@Override
public boolean startTest(PreDetectionParam param) {
// Runnable runnable = new Runnable() {
// @Override
// public void run() {
// String ddId = param.getUserPageId();
// Channel channel = SocketManager.getChannelByUserId(ddId);
// if( channel== null || !channel.isActive()){
// NettyClient.socketClient(ip, port,param.getUserPageId(),new NettySourceClientHandler(ddId, sourceResponseService));
// }
// SocketManager.sendMsg(ddId,"start\n");
// }
// };
// runnable.run();
Runnable runnable = new Runnable() {
@Override
public void run() {
String ddId = param.getUserPageId()+"_Source";
Channel channel = SocketManager.getChannelByUserId(ddId);
if( channel== null || !channel.isActive()){
NettyClient.socketClient(ip, port,param.getUserPageId(),new NettySourceClientHandler(param, sourceResponseService));
}
SocketManager.sendMsg(ddId,"start\n");
}
};
runnable.run();
return true;
}
}

1
detection/src/main/java/com/njcn/gather/detection/util/socket/SocketManager.java
View File

@@ -30,6 +30,7 @@ public class SocketManager {
public static void sendMsg(String userId,String msg) {
Channel channel = userSessions.get(userId);
channel.writeAndFlush(msg);
System.out.println(userId+"__"+channel.id()+"往"+channel.remoteAddress()+"发送数据："+msg);
}
}

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

@@ -1,5 +1,7 @@
package com.njcn.gather.detection.util.socket;
import com.alibaba.fastjson.JSON;
import com.njcn.gather.detection.pojo.vo.WebSocketVO;
import io.netty.channel.Channel;
import io.netty.handler.codec.http.websocketx.TextWebSocketFrame;
import lombok.extern.slf4j.Slf4j;
@@ -57,5 +59,16 @@ public class WebServiceManager {
}
}
public static void sendMessage(String userId, WebSocketVO webSocketVO) {
Channel channel = userSessions.get(userId);
if(Objects.nonNull(channel) && channel.isActive()){
TextWebSocketFrame wd = new TextWebSocketFrame(JSON.toJSONString(webSocketVO));
channel.writeAndFlush(wd);
}else {
log.error("{}-websocket推送消息失败;当前用户-{}-客户端已经断开连接", LocalDateTime.now(),userId);
}
}
}

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

@@ -62,8 +62,8 @@ public class NettyDevClientHandler extends SimpleChannelInboundHandler<String> {
*/
@Override
public void channelInactive(ChannelHandlerContext ctx) {
System.out.println("客户端连接成功");
SocketManager.addUser(webUser,ctx.channel());
System.out.println("客户端重新连接成功");
//SocketManager.addUser(webUser,ctx.channel());
}
/**
@@ -97,7 +97,7 @@ public class NettyDevClientHandler extends SimpleChannelInboundHandler<String> {
@Override
public void handlerAdded(ChannelHandlerContext ctx) {
SocketManager.addUser(webUser,ctx.channel());
SocketManager.addUser(webUser+"_dev",ctx.channel());
System.out.println("有通道接入" + ctx.channel());
}