From ea46f28356e2acb3bc7cc69b9af3c52fab38c0b0 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 18 一月 2024 16:56:47 +0800
Subject: [PATCH] 终止任务功能测试
---
springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java b/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java
index dc630bf..4ef8022 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java
@@ -45,39 +45,41 @@
} else if (storageTask.getGlassId() == B02glassid&&DeviceList.get(3)==0) {
ClearGlassId("DB101.10.3");
outSliceServive.StopTask(storageTask.getGlassId(), types);
- }\
+ }
}
// 鍙戦�佺粓姝㈣繘鐗囦换鍔′俊鍙�
} else {// 缁堟鍑虹墖浠诲姟
List<StorageTask> cageLists = homeMapper.SelectTaskByState(types);
List<StorageTask> cageList2 = homeMapper.SelectTaskByState(2);
- if (cageList2!=null) {
+ if (cageList2.size()>0) {
cageLists.add(cageList2.get(0));
}
for (StorageTask cageList : cageLists) {
if (cageList.getTaskType().equals("1")) {
- if(cageList.getGlassId() ==A02glassid1&&DeviceList.get(5)==0){
+
+ System.out.println(DeviceList.get(5));
+ if(cageList.getGlassId().equals(A02glassid1)&&DeviceList.get(5)==0){
outSliceServive.StopTask(cageList.getGlassId(), types);
ClearGlassId("DB101.10.1");
}
- else if(cageList.getGlassId() ==B01glassid&&DeviceList.get(2)==0){
+ if(cageList.getGlassId().equals(B01glassid)&&DeviceList.get(2)==0){
outSliceServive.StopTask(cageList.getGlassId(), types);
ClearGlassId("DB101.10.2");
}
- else if(cageList.getGlassId() ==B02glassid&&DeviceList.get(3)==0){
+ if(cageList.getGlassId().equals(B02glassid)&&DeviceList.get(3)==0){
outSliceServive.StopTask(cageList.getGlassId(), types);
ClearGlassId("DB101.10.3");
}
}else if (cageList.getTaskType().equals("2")) {
- if(cageList.getGlassId() ==A02glassid1&&DeviceList.get(5)==0){
+ if(cageList.getGlassId().equals(A02glassid1)&&DeviceList.get(5)==0){
outSliceServive.StopTask(cageList.getGlassId(), 2);
ClearGlassId("DB101.10.1");
}
- else if(cageList.getGlassId() ==B01glassid&&DeviceList.get(2)==0){
+ if(cageList.getGlassId().equals(B01glassid)&&DeviceList.get(2)==0){
outSliceServive.StopTask(cageList.getGlassId(), 2);
ClearGlassId("DB101.10.2");
}
- else if(cageList.getGlassId() ==B02glassid&&DeviceList.get(3)==0){
+ if(cageList.getGlassId().equals(B02glassid)&&DeviceList.get(3)==0){
outSliceServive.StopTask(cageList.getGlassId(), 2);
ClearGlassId("DB101.10.3");
}
--
Gitblit v1.8.0