Browse Source

耗材加载

master
sige 2 years ago
parent
commit
2d56684820
  1. 20
      src/main/java/com/dreamworks/boditech/driver/task/TaskLoad.java
  2. 4
      src/main/java/com/dreamworks/boditech/service/DeviceService.java
  3. 8
      src/main/java/com/dreamworks/boditech/service/ProjectService.java
  4. 2
      src/main/resources/application-dev.yml

20
src/main/java/com/dreamworks/boditech/driver/task/TaskLoad.java

@ -69,11 +69,11 @@ public class TaskLoad extends TaskBase {
Device device = executor.getDevice();
if ( !device.enable ) { // @TODO : 移除测试数据
device.bufferTubes.appendByCode(0, "01CAGGB66U");
device.bufferTubes.appendByCode(1, "02CAGGB66U");
device.bufferTubes.appendByCode(2, "03CAGGB66U");
device.bufferTubes.appendByCode(3, "04CAGGB66U");
device.bufferTubes.appendByCode(4, "05CAGGB66U");
device.bufferTubes.appendByCode(5, "06CAGGB66U");
device.bufferTubes.appendByCode(1, "02DEMOLOT1");
device.bufferTubes.appendByCode(2, "03DEMOLOT2");
device.bufferTubes.appendByCode(3, "04DEMOLOT3");
device.bufferTubes.appendByCode(4, "05DEMOLOT4");
device.bufferTubes.appendByCode(5, "06DEMOLOT5");
return ;
}
@ -118,11 +118,11 @@ public class TaskLoad extends TaskBase {
Device device = executor.getDevice();
if ( !device.enable ) { // @TODO : 移除测试数据
device.largeBufferTubes.appendByCode(0, "01CAGGB66U");
device.largeBufferTubes.appendByCode(1, "02CAGGB66U");
device.largeBufferTubes.appendByCode(2, "03CAGGB66U");
device.largeBufferTubes.appendByCode(3, "04CAGGB66U");
device.largeBufferTubes.appendByCode(4, "05CAGGB66U");
device.largeBufferTubes.appendByCode(5, "06CAGGB66U");
device.largeBufferTubes.appendByCode(1, "02DEMOLOT1");
device.largeBufferTubes.appendByCode(2, "03DEMOLOT2");
device.largeBufferTubes.appendByCode(3, "04DEMOLOT3");
device.largeBufferTubes.appendByCode(4, "05DEMOLOT4");
device.largeBufferTubes.appendByCode(5, "06DEMOLOT5");
return ;
}

4
src/main/java/com/dreamworks/boditech/service/DeviceService.java

@ -5,6 +5,7 @@ import com.dreamworks.boditech.driver.entity.*;
import com.dreamworks.boditech.driver.task.*;
import com.dreamworks.boditech.driver.task.TaskStopReset;
import com.dreamworks.boditech.entity.ParamTestEmergencyAppend;
import com.dreamworks.boditech.entity.Project;
import com.dreamworks.boditech.entity.parameter.ParamTestTubeRackTaskSave;
import com.dreamworks.boditech.entity.parameter.ParamTestTubeRackTaskSaveTube;
import jakarta.annotation.Resource;
@ -22,6 +23,8 @@ public class DeviceService {
private ActionLogService actionLog;
@Resource
private TestService testService;
@Resource
private ProjectService projectService;
// tasks
private final List<Task> tasks = new ArrayList<>();
@ -74,6 +77,7 @@ public class DeviceService {
this.device.testCards.clear();
this.device.bufferTubes.clear();
this.device.largeBufferTubes.clear();
this.projectService.unload();
}
/**

8
src/main/java/com/dreamworks/boditech/service/ProjectService.java

@ -28,6 +28,14 @@ public class ProjectService {
}
}
// load all projects
public void unload() {
this.projects.clear();
for ( int i=0; i<6; i++ ) {
this.projects.add(null);
}
}
// get active project by given id
public Project activeProjectGetById( Integer id ) {
for ( Project project : this.projects ) {

2
src/main/resources/application-dev.yml

@ -7,7 +7,7 @@ spring:
app:
device:
enable : true
enable : false
debug : true
connectionType : SerialPort # SerialPort, WebSocket
path : COM3

Loading…
Cancel
Save