diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java index e47e343..c916d99 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java @@ -53,7 +53,7 @@ webSocket.sendOneMessage(robotId, msg); } } catch (Exception e) { - log.error(e.getMessage()); + log.error("websocket error!"); } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java index e47e343..c916d99 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java @@ -53,7 +53,7 @@ webSocket.sendOneMessage(robotId, msg); } } catch (Exception e) { - log.error(e.getMessage()); + log.error("websocket error!"); } } diff --git a/casic-server/src/main/java/com/casic/missiles/mqtt/config/MqttClientConfigListener.java b/casic-server/src/main/java/com/casic/missiles/mqtt/config/MqttClientConfigListener.java index 85d7f20..98e3930 100644 --- a/casic-server/src/main/java/com/casic/missiles/mqtt/config/MqttClientConfigListener.java +++ b/casic-server/src/main/java/com/casic/missiles/mqtt/config/MqttClientConfigListener.java @@ -7,6 +7,7 @@ import com.casic.missiles.modular.robot.opt.listener.MqttMsgReceiver; import com.casic.missiles.modular.robot.service.IRobotInfoService; import com.casic.missiles.modular.robot.service.IRobotStatusInfoService; +import com.casic.missiles.netty.NettyClient; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.eclipse.paho.client.mqttv3.MqttException; @@ -31,7 +32,8 @@ @Autowired private IRobotStatusInfoService statusInfoService; private volatile AtomicBoolean isInit = new AtomicBoolean(false); - + @Autowired + private NettyClient nettyClient; @Autowired @Lazy private IBaseRobotService baseRobotService; @@ -88,6 +90,8 @@ //加载路线信息 baseRobotService.initMonitor(robotInfo); statusInfoService.updateConnStatus(robotInfo.getId() + "", 1); + + nettyClient.init(); return true; } catch (Exception e) { log.error("机器人:{}--连接失败!!", robotInfo.getRobotUrl()); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java index e47e343..c916d99 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java @@ -53,7 +53,7 @@ webSocket.sendOneMessage(robotId, msg); } } catch (Exception e) { - log.error(e.getMessage()); + log.error("websocket error!"); } } diff --git a/casic-server/src/main/java/com/casic/missiles/mqtt/config/MqttClientConfigListener.java b/casic-server/src/main/java/com/casic/missiles/mqtt/config/MqttClientConfigListener.java index 85d7f20..98e3930 100644 --- a/casic-server/src/main/java/com/casic/missiles/mqtt/config/MqttClientConfigListener.java +++ b/casic-server/src/main/java/com/casic/missiles/mqtt/config/MqttClientConfigListener.java @@ -7,6 +7,7 @@ import com.casic.missiles.modular.robot.opt.listener.MqttMsgReceiver; import com.casic.missiles.modular.robot.service.IRobotInfoService; import com.casic.missiles.modular.robot.service.IRobotStatusInfoService; +import com.casic.missiles.netty.NettyClient; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.eclipse.paho.client.mqttv3.MqttException; @@ -31,7 +32,8 @@ @Autowired private IRobotStatusInfoService statusInfoService; private volatile AtomicBoolean isInit = new AtomicBoolean(false); - + @Autowired + private NettyClient nettyClient; @Autowired @Lazy private IBaseRobotService baseRobotService; @@ -88,6 +90,8 @@ //加载路线信息 baseRobotService.initMonitor(robotInfo); statusInfoService.updateConnStatus(robotInfo.getId() + "", 1); + + nettyClient.init(); return true; } catch (Exception e) { log.error("机器人:{}--连接失败!!", robotInfo.getRobotUrl()); diff --git a/casic-server/src/main/java/com/casic/missiles/netty/NettyClient.java b/casic-server/src/main/java/com/casic/missiles/netty/NettyClient.java index 34bcce6..8a6b31d 100644 --- a/casic-server/src/main/java/com/casic/missiles/netty/NettyClient.java +++ b/casic-server/src/main/java/com/casic/missiles/netty/NettyClient.java @@ -113,12 +113,13 @@ } // 客户端启动,并连上服务器端 - @PostConstruct +// @PostConstruct public void init() { List detectorInfoList = new ArrayList<>(); //10秒轮询机器人是否上线 while (true) { try { + System.out.println("中子等待连接------>"); detectorInfoList = iDetectorInfoService.getOnlineList(); if (null != detectorInfoList && detectorInfoList.size() > 0) { break;