Compare commits

...

2 Commits

Author SHA1 Message Date
修宁 9a3ef4fdfa 线程终端问题 5 months ago
修宁 d97b98f795 线程终端问题 5 months ago
  1. 2
      servo/src/main/java/com/galaxis/rcs/amr/AmrAgvItem.java
  2. 5
      servo/src/main/java/com/galaxis/rcs/amr/AmrConnectorThread.java
  3. 8
      servo/src/main/java/com/yvan/workbench/controller/ApiController.java

2
servo/src/main/java/com/galaxis/rcs/amr/AmrAgvItem.java

@ -461,7 +461,7 @@ public abstract class AmrAgvItem extends ExecutorItem {
* 停止连接器线程
*/
public void stopConnector() {
connectorThread.stop();
connectorThread.interrupt();
}
private static final int speed = 1000;

5
servo/src/main/java/com/galaxis/rcs/amr/AmrConnectorThread.java

@ -47,6 +47,7 @@ public class AmrConnectorThread extends Thread {
// 计算中的任务
List<AmrDeviceTask> computingTaskList = new ArrayList<>();
while (running.get()) {
Thread.sleep(1);
if (paused.get()) {
synchronized (pauseLock) {
while (paused.get()) {
@ -124,9 +125,9 @@ public class AmrConnectorThread extends Thread {
}
} catch (InterruptedException e) {
System.out.println("Connector thread interrupted for executor: " + this.ptrAgvItem.getId());
log.error("Connector thread interrupted for executor: " + this.ptrAgvItem.getId(), e);
} finally {
System.out.println("Connector thread stopped for executor: " + this.ptrAgvItem.getId());
log.info("Connector thread stopped for executor: " + this.ptrAgvItem.getId());
}
}

8
servo/src/main/java/com/yvan/workbench/controller/ApiController.java

@ -52,14 +52,14 @@ public class ApiController {
private final static String gifPos = "82_0_0_0";
private final static String cl2_gstore = "146_0_0_0";
private final static String cl2_agvId = "200";
private final static String cl2_agvLocCode = "AGV_200";
private final static String cl2_agvId = "2";
private final static String cl2_agvLocCode = "AGV_2";
private final static Set<String> cl2_demoLocSet = Sets.newHashSet(
"155_0_1_0", "157_0_1_0", "159_0_1_0");
private final static String clx_gstore = "84_0_0_0";
private final static String clx_agvId = "300";
private final static String clx_agvLocCode = "AGV_300";
private final static String clx_agvId = "3";
private final static String clx_agvLocCode = "AGV_3";
private final static Set<String> clx_demoLocSet = Sets.newHashSet(
"89_0_2_0", "162_0_2_0", "91_0_2_0", "93_0_2_0");

Loading…
Cancel
Save