diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/listener/MqttMsgReceiver.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/listener/MqttMsgReceiver.java index e40e1f6..93f84ed 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/listener/MqttMsgReceiver.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/listener/MqttMsgReceiver.java @@ -16,7 +16,7 @@ /** * 系统的mqtt客户端id */ - private static String mqttClientId; + private String mqttClientId; private IRobotStatusInfoService statusInfoService; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/listener/MqttMsgReceiver.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/listener/MqttMsgReceiver.java index e40e1f6..93f84ed 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/listener/MqttMsgReceiver.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/listener/MqttMsgReceiver.java @@ -16,7 +16,7 @@ /** * 系统的mqtt客户端id */ - private static String mqttClientId; + private String mqttClientId; private IRobotStatusInfoService statusInfoService; 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 98e3930..e9ffad6 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 @@ -48,16 +48,14 @@ QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.isNotNull("robot_url"); List robotInfos = robotService.list(queryWrapper); - List errors = new ArrayList<>(); - robotInfos.forEach(robotInfo -> { - if (!createMqtt(robotInfo)) { - errors.add(robotInfo); - } - ; - }); - //持续重连 - if (CollectionUtil.isNotEmpty(errors)) { - new Thread(() -> { + + robotInfos.stream().forEach(robotInfo -> { + new Thread(()->{ + List errors = new ArrayList<>(); + if (!createMqtt(robotInfo)) { + errors.add(robotInfo); + }; + //持续重连 while (CollectionUtil.isNotEmpty(errors)) { try { Thread.sleep(5000); @@ -73,9 +71,13 @@ } errors.removeAll(rms); } + }).start(); - }).run(); - } + }); + //持续重连 +// if (CollectionUtil.isNotEmpty(errors)) { +// +// } } @@ -83,14 +85,17 @@ MqttClientConnection mqttClientConnect = new MqttClientConnection(); mqttClientConnect.setMqttClientId(robotInfo.getId() + ""); try { + MqttMsgReceiver msgReceiver = new MqttMsgReceiver(robotInfo.getId() + "", statusInfoService); statusInfoService.updateConnStatus(robotInfo.getId() + "", 0); - mqttClientConnect.setMqttClient(robotInfo.getRobotUrl(), robotInfo.getId() + "", robotInfo.getRobotAdmin(), robotInfo.getRobotPassword(), false, new MqttMsgReceiver(robotInfo.getId() + "", statusInfoService)); + log.info("{}--开始连接", robotInfo.getRobotUrl()); + mqttClientConnect.setMqttClient(robotInfo.getRobotUrl(), robotInfo.getId() + "", robotInfo.getRobotAdmin(), robotInfo.getRobotPassword(), false,msgReceiver); + //添加至 MqttClientConnection.mqttClients.put(robotInfo.getId() + "", mqttClientConnect); log.info("{}--连接成功！！", robotInfo.getRobotUrl()); //加载路线信息 baseRobotService.initMonitor(robotInfo); statusInfoService.updateConnStatus(robotInfo.getId() + "", 1); - + //中子源连接 nettyClient.init(); return true; } catch (Exception e) { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/listener/MqttMsgReceiver.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/listener/MqttMsgReceiver.java index e40e1f6..93f84ed 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/listener/MqttMsgReceiver.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/listener/MqttMsgReceiver.java @@ -16,7 +16,7 @@ /** * 系统的mqtt客户端id */ - private static String mqttClientId; + private String mqttClientId; private IRobotStatusInfoService statusInfoService; 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 98e3930..e9ffad6 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 @@ -48,16 +48,14 @@ QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.isNotNull("robot_url"); List robotInfos = robotService.list(queryWrapper); - List errors = new ArrayList<>(); - robotInfos.forEach(robotInfo -> { - if (!createMqtt(robotInfo)) { - errors.add(robotInfo); - } - ; - }); - //持续重连 - if (CollectionUtil.isNotEmpty(errors)) { - new Thread(() -> { + + robotInfos.stream().forEach(robotInfo -> { + new Thread(()->{ + List errors = new ArrayList<>(); + if (!createMqtt(robotInfo)) { + errors.add(robotInfo); + }; + //持续重连 while (CollectionUtil.isNotEmpty(errors)) { try { Thread.sleep(5000); @@ -73,9 +71,13 @@ } errors.removeAll(rms); } + }).start(); - }).run(); - } + }); + //持续重连 +// if (CollectionUtil.isNotEmpty(errors)) { +// +// } } @@ -83,14 +85,17 @@ MqttClientConnection mqttClientConnect = new MqttClientConnection(); mqttClientConnect.setMqttClientId(robotInfo.getId() + ""); try { + MqttMsgReceiver msgReceiver = new MqttMsgReceiver(robotInfo.getId() + "", statusInfoService); statusInfoService.updateConnStatus(robotInfo.getId() + "", 0); - mqttClientConnect.setMqttClient(robotInfo.getRobotUrl(), robotInfo.getId() + "", robotInfo.getRobotAdmin(), robotInfo.getRobotPassword(), false, new MqttMsgReceiver(robotInfo.getId() + "", statusInfoService)); + log.info("{}--开始连接", robotInfo.getRobotUrl()); + mqttClientConnect.setMqttClient(robotInfo.getRobotUrl(), robotInfo.getId() + "", robotInfo.getRobotAdmin(), robotInfo.getRobotPassword(), false,msgReceiver); + //添加至 MqttClientConnection.mqttClients.put(robotInfo.getId() + "", mqttClientConnect); log.info("{}--连接成功！！", robotInfo.getRobotUrl()); //加载路线信息 baseRobotService.initMonitor(robotInfo); statusInfoService.updateConnStatus(robotInfo.getId() + "", 1); - + //中子源连接 nettyClient.init(); return true; } catch (Exception e) { diff --git a/casic-server/src/main/java/com/casic/missiles/mqtt/config/MqttClientConnection.java b/casic-server/src/main/java/com/casic/missiles/mqtt/config/MqttClientConnection.java index 27f9d82..e22a328 100644 --- a/casic-server/src/main/java/com/casic/missiles/mqtt/config/MqttClientConnection.java +++ b/casic-server/src/main/java/com/casic/missiles/mqtt/config/MqttClientConnection.java @@ -61,7 +61,7 @@ if (StrUtil.isNotEmpty(passWord)) { options.setPassword(passWord.toCharArray()); } - options.setConnectionTimeout(60);///默认：30 + options.setConnectionTimeout(15);///默认：30 options.setCleanSession(cleanSession);//默认：true options.setKeepAliveInterval(60); options.setAutomaticReconnect(true);//默认：false diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/listener/MqttMsgReceiver.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/listener/MqttMsgReceiver.java index e40e1f6..93f84ed 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/listener/MqttMsgReceiver.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/listener/MqttMsgReceiver.java @@ -16,7 +16,7 @@ /** * 系统的mqtt客户端id */ - private static String mqttClientId; + private String mqttClientId; private IRobotStatusInfoService statusInfoService; 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 98e3930..e9ffad6 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 @@ -48,16 +48,14 @@ QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.isNotNull("robot_url"); List robotInfos = robotService.list(queryWrapper); - List errors = new ArrayList<>(); - robotInfos.forEach(robotInfo -> { - if (!createMqtt(robotInfo)) { - errors.add(robotInfo); - } - ; - }); - //持续重连 - if (CollectionUtil.isNotEmpty(errors)) { - new Thread(() -> { + + robotInfos.stream().forEach(robotInfo -> { + new Thread(()->{ + List errors = new ArrayList<>(); + if (!createMqtt(robotInfo)) { + errors.add(robotInfo); + }; + //持续重连 while (CollectionUtil.isNotEmpty(errors)) { try { Thread.sleep(5000); @@ -73,9 +71,13 @@ } errors.removeAll(rms); } + }).start(); - }).run(); - } + }); + //持续重连 +// if (CollectionUtil.isNotEmpty(errors)) { +// +// } } @@ -83,14 +85,17 @@ MqttClientConnection mqttClientConnect = new MqttClientConnection(); mqttClientConnect.setMqttClientId(robotInfo.getId() + ""); try { + MqttMsgReceiver msgReceiver = new MqttMsgReceiver(robotInfo.getId() + "", statusInfoService); statusInfoService.updateConnStatus(robotInfo.getId() + "", 0); - mqttClientConnect.setMqttClient(robotInfo.getRobotUrl(), robotInfo.getId() + "", robotInfo.getRobotAdmin(), robotInfo.getRobotPassword(), false, new MqttMsgReceiver(robotInfo.getId() + "", statusInfoService)); + log.info("{}--开始连接", robotInfo.getRobotUrl()); + mqttClientConnect.setMqttClient(robotInfo.getRobotUrl(), robotInfo.getId() + "", robotInfo.getRobotAdmin(), robotInfo.getRobotPassword(), false,msgReceiver); + //添加至 MqttClientConnection.mqttClients.put(robotInfo.getId() + "", mqttClientConnect); log.info("{}--连接成功！！", robotInfo.getRobotUrl()); //加载路线信息 baseRobotService.initMonitor(robotInfo); statusInfoService.updateConnStatus(robotInfo.getId() + "", 1); - + //中子源连接 nettyClient.init(); return true; } catch (Exception e) { diff --git a/casic-server/src/main/java/com/casic/missiles/mqtt/config/MqttClientConnection.java b/casic-server/src/main/java/com/casic/missiles/mqtt/config/MqttClientConnection.java index 27f9d82..e22a328 100644 --- a/casic-server/src/main/java/com/casic/missiles/mqtt/config/MqttClientConnection.java +++ b/casic-server/src/main/java/com/casic/missiles/mqtt/config/MqttClientConnection.java @@ -61,7 +61,7 @@ if (StrUtil.isNotEmpty(passWord)) { options.setPassword(passWord.toCharArray()); } - options.setConnectionTimeout(60);///默认：30 + options.setConnectionTimeout(15);///默认：30 options.setCleanSession(cleanSession);//默认：true options.setKeepAliveInterval(60); options.setAutomaticReconnect(true);//默认：false diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 7b5edb4..eb3f092 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -4,10 +4,10 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver -# url: jdbc:mysql://localhost:3306/casic_robot_inspection?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true - url: jdbc:mysql://111.198.10.15:11336/casic_robot_inspection?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true + url: jdbc:mysql://localhost:3306/casic_robot_inspection?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true +# url: jdbc:mysql://111.198.10.15:11336/casic_robot_inspection?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true username: root - password: Casic203 + password: 123456 druid: max-active: 50 min-idle: 20