From 1632ba92d37e43baf671f7d465b67d644d545cf5 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 03 一月 2024 08:06:57 +0800
Subject: [PATCH] 测试更新，添加出片队列排序
---
springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java
index 1598c96..e48d3c0 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java
@@ -21,7 +21,7 @@
public class PlcParameter2 extends Thread {
@Autowired
- StorageCageService StorageCageService ;
+ StorageCageService storageCageService;
// 鐢ㄤ簬瀛樺偍搴旂敤绋嬪簭鐨勯厤缃俊鎭�
@@ -44,12 +44,12 @@
} catch (InterruptedException e) {
e.printStackTrace();
}
- StorageCageService = WebSocketServer.applicationContext.getBean(StorageCageService .class);
+ storageCageService = WebSocketServer.applicationContext.getBean(StorageCageService .class);
// id
List<String> addressList1 = Arrays.asList(config.getProperty("Parameter2.id").split(","));
List<String> paramlist = S7control.getinstance().readStrings(addressList1);
-
+ // System.out.println("addressList锛�" + paramlist);
//鎵嬪姩鐘舵��
List<String> addresses = Arrays.asList(config.getProperty("Parameter2.state").split(","));
@@ -201,13 +201,13 @@
System.out.println(id);
switch (i) {
case 1:
- StorageCageService.UpdateTask(2, 0, paramlist.get(i));
+ storageCageService.UpdateTask(2, 0, paramlist.get(i));
break;
case 2:
case 3:
case 4:
case 5:
- StorageCageService.UpdateTask(3, 0, paramlist.get(i));
+ storageCageService.UpdateTask(3, 0, paramlist.get(i));
break;
default:
// 澶勭悊绱㈠紩鍊间笉鍦ㄨ寖鍥村唴鐨勬儏鍐�
@@ -215,7 +215,7 @@
}
}
}
- }
+
}
// 妫�鏌ュ竷灏斿�煎垪琛ㄦ槸鍚︿负绌�
if (!sValue.isEmpty()) {
@@ -223,6 +223,7 @@
// 璋冪敤 S7control.getinstance().WriteBit 鏂规硶灏嗗竷灏斿�煎垪琛ㄥ啓鍏ュ湴鍧�鍒楄〃
S7control.getinstance().WriteBit(addressList0, sValue);
System.out.println("Values " + sValue + " written to PLC at address " + addressList0);
+ }
}
}
} catch (Exception e) {
@@ -270,19 +271,19 @@
boolean Value2 = sValue.get(1);
if (Value1) {
- StorageCageService.EndTask(0);
+ storageCageService.EndTask(0);
}
if (Value2) {
- StorageCageService.EndTask(1);
+ storageCageService.EndTask(1);
}
// 妫�鏌ュ竷灏斿�煎垪琛ㄦ槸鍚︿负绌�
if (!sValue.isEmpty()) {
// 璋冪敤 S7control.getinstance().WriteBit 鏂规硶灏嗗竷灏斿�煎垪琛ㄥ啓鍏ュ湴鍧�鍒楄〃
- S7control.getinstance().WriteBit(addressList0, sValue);
- System.out.println("Values " + sValue + " written to PLC at address " + addressList0);
+ S7control.getinstance().WriteBit(niuanaddressList3, sValue);
+ System.out.println("Values " + sValue + " written to PLC at address " + niuanaddressList3);
}
}
} catch (Exception e) {
--
Gitblit v1.8.0