From 5d4062b4caf6af878db6049f8dbefe8ffe41a57e Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 23 四月 2024 09:48:13 +0800
Subject: [PATCH] 删除多余代码
---
springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java | 92 ++++++++++++++++++++++++++++++----------------
1 files changed, 60 insertions(+), 32 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 4ef8022..df711b9 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
@@ -9,7 +9,9 @@
import org.springframework.stereotype.Service;
import com.example.springboot.common.Result;
+import com.example.springboot.component.Plchome;
import com.example.springboot.component.S7control;
+import com.example.springboot.entity.Queue;
import com.example.springboot.entity.StorageCage;
import com.example.springboot.entity.StorageTask;
import com.example.springboot.mapper.HomeMapper;
@@ -30,19 +32,22 @@
String A01glassid2 = spianService.queGlassid("DB103.142", 14).toString();
String A02glassid1 = spianService.queGlassid("DB103.156", 14).toString();
String B01glassid = spianService.queGlassid("DB103.184", 14).toString();
- String B02glassid = spianService.queGlassid("DB103.198", 14).toString();
+ String B02glassid = spianService.queGlassid("DB103.212", 14).toString();
List<Short> DeviceList = S7control.getinstance().ReadWord("DB103.0", 10);
if (types == 0) {// 缁堟杩涚墖浠诲姟
List<StorageTask> cageList = homeMapper.SelectTaskByState(types);
for (StorageTask storageTask : cageList) {
// 鍒ゆ柇鍑虹墖浠诲姟浣嶇疆骞舵竻闄ゅ搴旂幓鐠僫d
- if ((storageTask.getGlassId() == A01glassid1 || storageTask.getGlassId() == A01glassid2)&&DeviceList.get(4)==0) {
+ if ((storageTask.getGlassId().equals(A01glassid1) || storageTask.getGlassId().equals(A01glassid2))
+ && DeviceList.get(4) == 0) {
outSliceServive.StopTask(storageTask.getGlassId(), types);
ClearGlassId("DB101.10.0");
- } else if (storageTask.getGlassId() == B01glassid&&DeviceList.get(2)==0) {
+ }
+ if (storageTask.getGlassId().equals(B01glassid) && DeviceList.get(2) == 0) {
outSliceServive.StopTask(storageTask.getGlassId(), types);
ClearGlassId("DB101.10.2");
- } else if (storageTask.getGlassId() == B02glassid&&DeviceList.get(3)==0) {
+ }
+ if (storageTask.getGlassId().equals(B02glassid) && DeviceList.get(3) == 0) {
ClearGlassId("DB101.10.3");
outSliceServive.StopTask(storageTask.getGlassId(), types);
}
@@ -51,35 +56,34 @@
} else {// 缁堟鍑虹墖浠诲姟
List<StorageTask> cageLists = homeMapper.SelectTaskByState(types);
List<StorageTask> cageList2 = homeMapper.SelectTaskByState(2);
- if (cageList2.size()>0) {
+ if (cageList2.size() > 0) {
cageLists.add(cageList2.get(0));
}
for (StorageTask cageList : cageLists) {
if (cageList.getTaskType().equals("1")) {
-
System.out.println(DeviceList.get(5));
- if(cageList.getGlassId().equals(A02glassid1)&&DeviceList.get(5)==0){
+ if (cageList.getGlassId().equals(A02glassid1) && DeviceList.get(5) == 0) {
outSliceServive.StopTask(cageList.getGlassId(), types);
ClearGlassId("DB101.10.1");
}
- if(cageList.getGlassId().equals(B01glassid)&&DeviceList.get(2)==0){
+ if (cageList.getGlassId().equals(B01glassid) && DeviceList.get(2) == 0) {
outSliceServive.StopTask(cageList.getGlassId(), types);
ClearGlassId("DB101.10.2");
}
- if(cageList.getGlassId().equals(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().equals(A02glassid1)&&DeviceList.get(5)==0){
+ } else if (cageList.getTaskType().equals("2")) {
+ if (cageList.getGlassId().equals(A02glassid1) && DeviceList.get(5) == 0) {
outSliceServive.StopTask(cageList.getGlassId(), 2);
ClearGlassId("DB101.10.1");
}
- if(cageList.getGlassId().equals(B01glassid)&&DeviceList.get(2)==0){
+ if (cageList.getGlassId().equals(B01glassid) && DeviceList.get(2) == 0) {
outSliceServive.StopTask(cageList.getGlassId(), 2);
ClearGlassId("DB101.10.2");
}
- if(cageList.getGlassId().equals(B02glassid)&&DeviceList.get(3)==0){
+ if (cageList.getGlassId().equals(B02glassid) && DeviceList.get(3) == 0) {
outSliceServive.StopTask(cageList.getGlassId(), 2);
ClearGlassId("DB101.10.3");
}
@@ -88,28 +92,29 @@
// List<StorageCage> storageCages = homeMapper.selectinout(3);
// for (StorageCage storageCage : storageCages) {
- // List<StorageCage> storageCagess = homeMapper.SelectStoragesGlassById(storageCage.getGlassId());
+ // List<StorageCage> storageCagess =
+ // homeMapper.SelectStoragesGlassById(storageCage.getGlassId());
- // for (StorageCage storageCagez : storageCagess) {
+ // for (StorageCage storageCagez : storageCagess) {
- // if (storageCagez.getState().equals("2")) {// 璋冩嫧杩涚墖
- // outSliceServive.StopTask(storageCagez.getGlassId(), 0);
- // } else {// 鍑虹墖
- // outSliceServive.StopTask(storageCagez.getGlassId(), types);
- // }
+ // if (storageCagez.getState().equals("2")) {// 璋冩嫧杩涚墖
+ // outSliceServive.StopTask(storageCagez.getGlassId(), 0);
+ // } else {// 鍑虹墖
+ // outSliceServive.StopTask(storageCagez.getGlassId(), types);
+ // }
- // // 鍒ゆ柇鍑虹墖浠诲姟浣嶇疆骞舵竻闄ゅ搴旂幓鐠僫d
- // if (storageCagez.getGlassId() == A02glassid1&&DeviceList.get(5)==0) {
- // outSliceServive.StopTask(storageCagez.getGlassId(), types);
- // ClearGlassId("DB101.10.1");
- // } else if (storageCagez.getGlassId() == B01glassid&&DeviceList.get(2)==0) {
- // outSliceServive.StopTask(storageCagez.getGlassId(), types);
- // ClearGlassId("DB101.10.2");
- // } else if (storageCagez.getGlassId() == B02glassid&&DeviceList.get(3)==0) {
- // ClearGlassId("DB101.10.3");
- // outSliceServive.StopTask(storageCagez.getGlassId(), types);
- // }
- // }
+ // // 鍒ゆ柇鍑虹墖浠诲姟浣嶇疆骞舵竻闄ゅ搴旂幓鐠僫d
+ // if (storageCagez.getGlassId() == A02glassid1&&DeviceList.get(5)==0) {
+ // outSliceServive.StopTask(storageCagez.getGlassId(), types);
+ // ClearGlassId("DB101.10.1");
+ // } else if (storageCagez.getGlassId() == B01glassid&&DeviceList.get(2)==0) {
+ // outSliceServive.StopTask(storageCagez.getGlassId(), types);
+ // ClearGlassId("DB101.10.2");
+ // } else if (storageCagez.getGlassId() == B02glassid&&DeviceList.get(3)==0) {
+ // ClearGlassId("DB101.10.3");
+ // outSliceServive.StopTask(storageCagez.getGlassId(), types);
+ // }
+ // }
// }
}
}
@@ -174,4 +179,27 @@
return Result.success(map);
}
+ public Result InsertQueueGlassId(Short id, Queue queue) {
+ Map<String, Object> map = new HashMap<>();
+
+ Short zhi = 200;
+ short result = homeMapper.SelectStorageByGlassId(queue.getglassId());
+ if (result > 0) {
+ map.put("message", "300");
+ } else {
+ if (id == 1) {
+ // 璋冪敤浼嶅瓨鍌ㄨ繃绋�
+ zhi = spianService.selectAll(queue.getglassId());
+ if (zhi == 200) {
+ homeMapper.InsertQueueGlassId(queue, id);
+ }
+ }
+ map.put("message", zhi);
+ }
+ if (zhi != 200) {
+ Plchome.FeedState = true;
+ }
+ return Result.success(map);
+ }
+
}
--
Gitblit v1.8.0