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 e8c59b8..ae41ed4 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 @@ -17,7 +17,9 @@ import javax.annotation.Resource; import java.nio.charset.StandardCharsets; import java.util.List; +import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.ForkJoinPool; +import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; @Slf4j @@ -50,7 +52,7 @@ public void initChannel(SocketChannel ch) throws Exception { ChannelPipeline p = ch.pipeline(); p.addLast(new HjtDecoder()); - p.addLast(new NettyClientHandler(userId,channelCache,neutronOptService,NettyClient.this)); + p.addLast(new NettyClientHandler(userId, channelCache, neutronOptService, NettyClient.this)); } }); @@ -117,8 +119,10 @@ System.out.println("中子源探测器开始连接了------>"); List detectorInfoList = iDetectorInfoService.list(); if (null != detectorInfoList && detectorInfoList.size() > 0) { + ThreadPoolExecutor executor = new ThreadPoolExecutor(detectorInfoList.size(), detectorInfoList.size(), 10, TimeUnit.SECONDS, + new ArrayBlockingQueue<>(10), new ThreadPoolExecutor.CallerRunsPolicy()); detectorInfoList.forEach(detectorInfo -> { - ForkJoinPool.commonPool().submit(() -> startClient(detectorInfo.getDetectorIp(), + executor.execute(() -> startClient(detectorInfo.getDetectorIp(), detectorInfo.getDetectorPort(), detectorInfo.getRobotId())); }); } 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 e8c59b8..ae41ed4 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 @@ -17,7 +17,9 @@ import javax.annotation.Resource; import java.nio.charset.StandardCharsets; import java.util.List; +import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.ForkJoinPool; +import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; @Slf4j @@ -50,7 +52,7 @@ public void initChannel(SocketChannel ch) throws Exception { ChannelPipeline p = ch.pipeline(); p.addLast(new HjtDecoder()); - p.addLast(new NettyClientHandler(userId,channelCache,neutronOptService,NettyClient.this)); + p.addLast(new NettyClientHandler(userId, channelCache, neutronOptService, NettyClient.this)); } }); @@ -117,8 +119,10 @@ System.out.println("中子源探测器开始连接了------>"); List detectorInfoList = iDetectorInfoService.list(); if (null != detectorInfoList && detectorInfoList.size() > 0) { + ThreadPoolExecutor executor = new ThreadPoolExecutor(detectorInfoList.size(), detectorInfoList.size(), 10, TimeUnit.SECONDS, + new ArrayBlockingQueue<>(10), new ThreadPoolExecutor.CallerRunsPolicy()); detectorInfoList.forEach(detectorInfo -> { - ForkJoinPool.commonPool().submit(() -> startClient(detectorInfo.getDetectorIp(), + executor.execute(() -> startClient(detectorInfo.getDetectorIp(), detectorInfo.getDetectorPort(), detectorInfo.getRobotId())); }); } diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index d1675b6..3d8ae29 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -4,7 +4,7 @@ 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: root jms: 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 e8c59b8..ae41ed4 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 @@ -17,7 +17,9 @@ import javax.annotation.Resource; import java.nio.charset.StandardCharsets; import java.util.List; +import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.ForkJoinPool; +import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; @Slf4j @@ -50,7 +52,7 @@ public void initChannel(SocketChannel ch) throws Exception { ChannelPipeline p = ch.pipeline(); p.addLast(new HjtDecoder()); - p.addLast(new NettyClientHandler(userId,channelCache,neutronOptService,NettyClient.this)); + p.addLast(new NettyClientHandler(userId, channelCache, neutronOptService, NettyClient.this)); } }); @@ -117,8 +119,10 @@ System.out.println("中子源探测器开始连接了------>"); List detectorInfoList = iDetectorInfoService.list(); if (null != detectorInfoList && detectorInfoList.size() > 0) { + ThreadPoolExecutor executor = new ThreadPoolExecutor(detectorInfoList.size(), detectorInfoList.size(), 10, TimeUnit.SECONDS, + new ArrayBlockingQueue<>(10), new ThreadPoolExecutor.CallerRunsPolicy()); detectorInfoList.forEach(detectorInfo -> { - ForkJoinPool.commonPool().submit(() -> startClient(detectorInfo.getDetectorIp(), + executor.execute(() -> startClient(detectorInfo.getDetectorIp(), detectorInfo.getDetectorPort(), detectorInfo.getRobotId())); }); } diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index d1675b6..3d8ae29 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -4,7 +4,7 @@ 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: root jms: diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml index 029c779..b8e78ef 100644 --- a/casic-web/src/main/resources/config/application.yml +++ b/casic-web/src/main/resources/config/application.yml @@ -40,8 +40,8 @@ session-invalidate-time: 86400 #session失效时间(只在单机环境下生效,,多机环境在SpringSessionConfig类中配置) 单位:秒 session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位:秒 no-login-urls: /user/login,/kaptcha,/config/baseConfig - hikSdk: D:\workspace\server\keti\casic-robot-inspection\casic-web\src\main\resources\config\hiklib\HCNetSDK.dll - hikPlay: D:\workspace\server\keti\casic-robot-inspection\casic-web\src\main\resources\config\hiklib\PlayCtrl.dll + hikSdk: D:\code\robot\casic-robot-inspection\casic-web\src\main\resources\config\hiklib\HCNetSDK.dll + hikPlay: D:\code\robot\casic-robot-inspection\casic-web\src\main\resources\config\hiklib\PlayCtrl.dll algorithm: initPath: D:\workspace\server\keti\casic-robot-inspection\casic-web\src\main\resources\config\path\PathPlanning_init.exe planPath: D:\workspace\server\keti\casic-robot-inspection\casic-web\src\main\resources\config\path\PathPlanning.exe