diff --git a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/common/DeviceCommon.java b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/common/DeviceCommon.java index 098e818..ec45789 100644 --- a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/common/DeviceCommon.java +++ b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/common/DeviceCommon.java @@ -91,5 +91,4 @@ return null; } } - -} +} \ No newline at end of file diff --git a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/common/DeviceCommon.java b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/common/DeviceCommon.java index 098e818..ec45789 100644 --- a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/common/DeviceCommon.java +++ b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/common/DeviceCommon.java @@ -91,5 +91,4 @@ return null; } } - -} +} \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/RobotOptController.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/RobotOptController.java index e2ed939..c4c905d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/RobotOptController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/RobotOptController.java @@ -136,8 +136,6 @@ @ApiOperation(value = "启动或关闭循迹功能", notes = "返回 1成功 0失败 wait 启动时是否等待,0代表循迹启动即运动,不等待;1代表循迹启动原地等待。若无此字段,默认循迹启动不等待直接运动") @PostMapping(value = "/startTrack") public ResponseDataDTO startTrack(@RequestBody StartTrackRequest request) { - - baseRobotService.startTrack(request); return ResponseDataDTO.success(); } diff --git a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/common/DeviceCommon.java b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/common/DeviceCommon.java index 098e818..ec45789 100644 --- a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/common/DeviceCommon.java +++ b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/common/DeviceCommon.java @@ -91,5 +91,4 @@ return null; } } - -} +} \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/RobotOptController.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/RobotOptController.java index e2ed939..c4c905d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/RobotOptController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/RobotOptController.java @@ -136,8 +136,6 @@ @ApiOperation(value = "启动或关闭循迹功能", notes = "返回 1成功 0失败 wait 启动时是否等待,0代表循迹启动即运动,不等待;1代表循迹启动原地等待。若无此字段,默认循迹启动不等待直接运动") @PostMapping(value = "/startTrack") public ResponseDataDTO startTrack(@RequestBody StartTrackRequest request) { - - baseRobotService.startTrack(request); return ResponseDataDTO.success(); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java index 2cc6cdc..f4cbd8b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java @@ -12,12 +12,13 @@ /** * 定位事件监听器 - * @see com.casic.missiles.modular.robot.opt.handler.msg.PoseMessageMsgHandler + * + * @see com.casic.missiles.modular.robot.opt.handler.msg.PoseMessageMsgHandler */ @Slf4j @Component public class PoseMessageListener { - private static ThreadPoolExecutor threadPoolExecutor = ExecutorBuilder.create().setCorePoolSize(5).setMaxPoolSize(10).build(); + private static ThreadPoolExecutor threadPoolExecutor = ExecutorBuilder.create().setCorePoolSize(3).setMaxPoolSize(8).build(); private final IRobotStatusInfoService statusInfoService; private final IRobotTrajectoryInfoService robotTrajectoryInfoService; @@ -28,7 +29,8 @@ @EventListener public void onApplicationEvent(PoseMessageEvent event) { -// threadPoolExecutor.execute(() -> { }); - robotTrajectoryInfoService.savePoseMessage(event.getRobotId(), (MqttMessage) event.getSource()); + threadPoolExecutor.execute(() -> { + robotTrajectoryInfoService.savePoseMessage(event.getRobotId(), (MqttMessage) event.getSource()); + }); } } \ No newline at end of file diff --git a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/common/DeviceCommon.java b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/common/DeviceCommon.java index 098e818..ec45789 100644 --- a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/common/DeviceCommon.java +++ b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/common/DeviceCommon.java @@ -91,5 +91,4 @@ return null; } } - -} +} \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/RobotOptController.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/RobotOptController.java index e2ed939..c4c905d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/RobotOptController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/RobotOptController.java @@ -136,8 +136,6 @@ @ApiOperation(value = "启动或关闭循迹功能", notes = "返回 1成功 0失败 wait 启动时是否等待,0代表循迹启动即运动,不等待;1代表循迹启动原地等待。若无此字段,默认循迹启动不等待直接运动") @PostMapping(value = "/startTrack") public ResponseDataDTO startTrack(@RequestBody StartTrackRequest request) { - - baseRobotService.startTrack(request); return ResponseDataDTO.success(); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java index 2cc6cdc..f4cbd8b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java @@ -12,12 +12,13 @@ /** * 定位事件监听器 - * @see com.casic.missiles.modular.robot.opt.handler.msg.PoseMessageMsgHandler + * + * @see com.casic.missiles.modular.robot.opt.handler.msg.PoseMessageMsgHandler */ @Slf4j @Component public class PoseMessageListener { - private static ThreadPoolExecutor threadPoolExecutor = ExecutorBuilder.create().setCorePoolSize(5).setMaxPoolSize(10).build(); + private static ThreadPoolExecutor threadPoolExecutor = ExecutorBuilder.create().setCorePoolSize(3).setMaxPoolSize(8).build(); private final IRobotStatusInfoService statusInfoService; private final IRobotTrajectoryInfoService robotTrajectoryInfoService; @@ -28,7 +29,8 @@ @EventListener public void onApplicationEvent(PoseMessageEvent event) { -// threadPoolExecutor.execute(() -> { }); - robotTrajectoryInfoService.savePoseMessage(event.getRobotId(), (MqttMessage) event.getSource()); + threadPoolExecutor.execute(() -> { + robotTrajectoryInfoService.savePoseMessage(event.getRobotId(), (MqttMessage) event.getSource()); + }); } } \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/PoseMessageMsgHandler.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/PoseMessageMsgHandler.java index 9c26129..29f8919 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/PoseMessageMsgHandler.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/PoseMessageMsgHandler.java @@ -32,6 +32,6 @@ PoseMessageEvent event = new PoseMessageEvent(LoginEventTypeEnum.RELOAD_SCOPE, message); event.setRobotId(robotId); publisher.publishEvent(event); - log.info("实时定位已发送!!"); +// log.info("实时定位已发送!!"); } } diff --git a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/common/DeviceCommon.java b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/common/DeviceCommon.java index 098e818..ec45789 100644 --- a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/common/DeviceCommon.java +++ b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/common/DeviceCommon.java @@ -91,5 +91,4 @@ return null; } } - -} +} \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/RobotOptController.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/RobotOptController.java index e2ed939..c4c905d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/RobotOptController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/RobotOptController.java @@ -136,8 +136,6 @@ @ApiOperation(value = "启动或关闭循迹功能", notes = "返回 1成功 0失败 wait 启动时是否等待,0代表循迹启动即运动,不等待;1代表循迹启动原地等待。若无此字段,默认循迹启动不等待直接运动") @PostMapping(value = "/startTrack") public ResponseDataDTO startTrack(@RequestBody StartTrackRequest request) { - - baseRobotService.startTrack(request); return ResponseDataDTO.success(); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java index 2cc6cdc..f4cbd8b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java @@ -12,12 +12,13 @@ /** * 定位事件监听器 - * @see com.casic.missiles.modular.robot.opt.handler.msg.PoseMessageMsgHandler + * + * @see com.casic.missiles.modular.robot.opt.handler.msg.PoseMessageMsgHandler */ @Slf4j @Component public class PoseMessageListener { - private static ThreadPoolExecutor threadPoolExecutor = ExecutorBuilder.create().setCorePoolSize(5).setMaxPoolSize(10).build(); + private static ThreadPoolExecutor threadPoolExecutor = ExecutorBuilder.create().setCorePoolSize(3).setMaxPoolSize(8).build(); private final IRobotStatusInfoService statusInfoService; private final IRobotTrajectoryInfoService robotTrajectoryInfoService; @@ -28,7 +29,8 @@ @EventListener public void onApplicationEvent(PoseMessageEvent event) { -// threadPoolExecutor.execute(() -> { }); - robotTrajectoryInfoService.savePoseMessage(event.getRobotId(), (MqttMessage) event.getSource()); + threadPoolExecutor.execute(() -> { + robotTrajectoryInfoService.savePoseMessage(event.getRobotId(), (MqttMessage) event.getSource()); + }); } } \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/PoseMessageMsgHandler.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/PoseMessageMsgHandler.java index 9c26129..29f8919 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/PoseMessageMsgHandler.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/PoseMessageMsgHandler.java @@ -32,6 +32,6 @@ PoseMessageEvent event = new PoseMessageEvent(LoginEventTypeEnum.RELOAD_SCOPE, message); event.setRobotId(robotId); publisher.publishEvent(event); - log.info("实时定位已发送!!"); +// log.info("实时定位已发送!!"); } } diff --git a/casic-web/src/main/build/bin/start.bat b/casic-web/src/main/build/bin/start.bat index 2864d32..3eaea7f 100644 --- a/casic-web/src/main/build/bin/start.bat +++ b/casic-web/src/main/build/bin/start.bat @@ -1,4 +1,4 @@ @echo off title ${project.build.finalName} -java -jar ./lib/casic-web-2.0.0.jar +java -Dfile.encoding=utf-8 -jar ./lib/casic-web-2.0.0.jar @pause diff --git a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/common/DeviceCommon.java b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/common/DeviceCommon.java index 098e818..ec45789 100644 --- a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/common/DeviceCommon.java +++ b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/common/DeviceCommon.java @@ -91,5 +91,4 @@ return null; } } - -} +} \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/RobotOptController.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/RobotOptController.java index e2ed939..c4c905d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/RobotOptController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/RobotOptController.java @@ -136,8 +136,6 @@ @ApiOperation(value = "启动或关闭循迹功能", notes = "返回 1成功 0失败 wait 启动时是否等待,0代表循迹启动即运动,不等待;1代表循迹启动原地等待。若无此字段,默认循迹启动不等待直接运动") @PostMapping(value = "/startTrack") public ResponseDataDTO startTrack(@RequestBody StartTrackRequest request) { - - baseRobotService.startTrack(request); return ResponseDataDTO.success(); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java index 2cc6cdc..f4cbd8b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java @@ -12,12 +12,13 @@ /** * 定位事件监听器 - * @see com.casic.missiles.modular.robot.opt.handler.msg.PoseMessageMsgHandler + * + * @see com.casic.missiles.modular.robot.opt.handler.msg.PoseMessageMsgHandler */ @Slf4j @Component public class PoseMessageListener { - private static ThreadPoolExecutor threadPoolExecutor = ExecutorBuilder.create().setCorePoolSize(5).setMaxPoolSize(10).build(); + private static ThreadPoolExecutor threadPoolExecutor = ExecutorBuilder.create().setCorePoolSize(3).setMaxPoolSize(8).build(); private final IRobotStatusInfoService statusInfoService; private final IRobotTrajectoryInfoService robotTrajectoryInfoService; @@ -28,7 +29,8 @@ @EventListener public void onApplicationEvent(PoseMessageEvent event) { -// threadPoolExecutor.execute(() -> { }); - robotTrajectoryInfoService.savePoseMessage(event.getRobotId(), (MqttMessage) event.getSource()); + threadPoolExecutor.execute(() -> { + robotTrajectoryInfoService.savePoseMessage(event.getRobotId(), (MqttMessage) event.getSource()); + }); } } \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/PoseMessageMsgHandler.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/PoseMessageMsgHandler.java index 9c26129..29f8919 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/PoseMessageMsgHandler.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/PoseMessageMsgHandler.java @@ -32,6 +32,6 @@ PoseMessageEvent event = new PoseMessageEvent(LoginEventTypeEnum.RELOAD_SCOPE, message); event.setRobotId(robotId); publisher.publishEvent(event); - log.info("实时定位已发送!!"); +// log.info("实时定位已发送!!"); } } diff --git a/casic-web/src/main/build/bin/start.bat b/casic-web/src/main/build/bin/start.bat index 2864d32..3eaea7f 100644 --- a/casic-web/src/main/build/bin/start.bat +++ b/casic-web/src/main/build/bin/start.bat @@ -1,4 +1,4 @@ @echo off title ${project.build.finalName} -java -jar ./lib/casic-web-2.0.0.jar +java -Dfile.encoding=utf-8 -jar ./lib/casic-web-2.0.0.jar @pause diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index ff1251c..faaf3ee 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -4,9 +4,12 @@ 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://192.168.1.41:3000/casic_robot_inspection?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true username: root - password: 123456 + password: root + druid: + max-active: 50 + min-idle: 20 jms: pub-sub-domain: true # session: