修改三维课程对象转换赋值bug
This commit is contained in:
parent
48a3b8c6cf
commit
cfe232769d
@ -87,6 +87,10 @@ public class SimulationRealDeviceThread {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取真实设备数据
|
||||||
|
* @param simulation
|
||||||
|
*/
|
||||||
public void queryDeviceStatus(Simulation simulation) {
|
public void queryDeviceStatus(Simulation simulation) {
|
||||||
PlcGateway plcGateway = simulation.queryPlcGatewayDevice();
|
PlcGateway plcGateway = simulation.queryPlcGatewayDevice();
|
||||||
if (Objects.isNull(plcGateway)) {
|
if (Objects.isNull(plcGateway)) {
|
||||||
@ -104,6 +108,10 @@ public class SimulationRealDeviceThread {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 根据获取到的真实设备状态更新仿真设备状态
|
||||||
|
* @param simulation
|
||||||
|
*/
|
||||||
public void UpdateDeviceStatusByCollection(Simulation simulation) {
|
public void UpdateDeviceStatusByCollection(Simulation simulation) {
|
||||||
Queue<DeviceQueryFuture> futureQueue = simulation.getDeviceQueryFutureQueue();
|
Queue<DeviceQueryFuture> futureQueue = simulation.getDeviceQueryFutureQueue();
|
||||||
DeviceQueryFuture deviceQueryFuture = futureQueue.peek();
|
DeviceQueryFuture deviceQueryFuture = futureQueue.peek();
|
||||||
|
@ -35,6 +35,10 @@ public class TCPServer2 implements ApplicationRunner {
|
|||||||
this.start();
|
this.start();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 真实设备(屏蔽门、道岔、信号机等)连接服务启动
|
||||||
|
* @throws InterruptedException
|
||||||
|
*/
|
||||||
public void start() throws InterruptedException {
|
public void start() throws InterruptedException {
|
||||||
EventLoopGroup bossGroup = new NioEventLoopGroup();
|
EventLoopGroup bossGroup = new NioEventLoopGroup();
|
||||||
EventLoopGroup workerGroup = new NioEventLoopGroup();
|
EventLoopGroup workerGroup = new NioEventLoopGroup();
|
||||||
|
@ -68,6 +68,7 @@ public class Lesson3DVO {
|
|||||||
this.id = lesson.getId();
|
this.id = lesson.getId();
|
||||||
this.name = lesson.getName();
|
this.name = lesson.getName();
|
||||||
this.type = lesson.getType();
|
this.type = lesson.getType();
|
||||||
|
this.data = lesson.getData();
|
||||||
this.state = lesson.getState();
|
this.state = lesson.getState();
|
||||||
this.userId = lesson.getUserId();
|
this.userId = lesson.getUserId();
|
||||||
this.createTime = lesson.getCreateTime();
|
this.createTime = lesson.getCreateTime();
|
||||||
|
Loading…
Reference in New Issue
Block a user