From 0f0df7dbac349bacfaf501cfe97bcba1733fb18d Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期二, 28 二月 2023 19:15:57 +0800
Subject: [PATCH] phpswcs创建
---
src/main/webapp/static/images/zy-logo.png | 0
src/main/webapp/views/index.html | 2
src/main/webapp/views/control.html | 2
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 50 +++++++++++++++++--------
src/main/resources/application.yml | 10 ++--
5 files changed, 41 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 44066ed..17a5521 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -8,6 +8,7 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
+import com.core.exception.CoolException;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.service.BasDevpService;
import com.zy.common.utils.News;
@@ -42,7 +43,7 @@
private SiemensS7Net siemensS7Net;
private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
private short heartBeatVal = 1;
- public static final ArrayList<Integer> staNos = new ArrayList<Integer>() {{
+ public static final ArrayList<Integer> staNos1 = new ArrayList<Integer>() {{
add(100);add(101);add(102);add(103);
add(104);add(105);add(106);add(107);
add(108);add(109);add(110);add(111);
@@ -62,11 +63,23 @@
add(308);add(309);add(310);add(311);
add(312);
}};
+ private ArrayList<Integer> getStaNo() {
+ switch (slave.getId()) {
+ case 1:
+ return staNos1;
+ case 2:
+ return staNos2;
+ case 3:
+ return staNos3;
+ default:
+ throw new CoolException("鑾峰彇绔欑偣澶辫触锛�");
+ }
+ }
/**
* 鏉＄爜鏁伴噺
*/
- private int barcodeSize = 1;
+ private int barcodeSize = 9;
/**
* 鍏ュ嚭搴撴ā寮�
@@ -76,9 +89,9 @@
* 3.鍑哄簱鍚姩涓� 锛堜笉鑳界敓鎴愬叆搴撳伐浣滄。锛�
* 4.鍑哄簱妯″紡
*/
- public IoModeType ioModeOf2F = IoModeType.NONE;
+// public IoModeType ioModeOf2F = IoModeType.NONE;
// public IoModeType ioMode = IoModeType.NONE;
- public IoModeType ioModeOf4F = IoModeType.NONE;
+// public IoModeType ioModeOf4F = IoModeType.NONE;
// public IoModeType ioMode = IoModeType.NONE;
public SiemensDevpThread(DevpSlave slave) {
@@ -145,10 +158,13 @@
* 璇诲彇鐘舵�� ====> 鏁村潡plc
*/
private void read() throws InterruptedException {
+
+
String methodName = Thread.currentThread().getStackTrace()[1].getMethodName();
// // 鏇存柊鍏ュ嚭搴撴ā寮�
// updateIoMode();
+ ArrayList<Integer> staNos = getStaNo();
int staNoSize = staNos.size();
OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) (staNoSize*4));
if (result.IsSuccess) {
@@ -279,6 +295,7 @@
*/
private void write(StaProtocol staProtocol) throws InterruptedException {
String methodName = Thread.currentThread().getStackTrace()[1].getMethodName();
+ ArrayList<Integer> staNos = getStaNo();
if (null == staProtocol) {
return;
@@ -307,14 +324,14 @@
}
// 鏇存柊鍏ュ嚭搴撴ā寮�
- private void updateIoMode() throws InterruptedException {
- if (this.ioModeOf2F != IoModeType.NONE) {
- if (!siemensS7Net.Write("DB100.180", this.ioModeOf2F.id).IsSuccess) {
- OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎2F鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId()));
- News.error("鍐欏叆杈撻�佺嚎2F鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
- }
- }
- }
+// private void updateIoMode() throws InterruptedException {
+// if (this.ioModeOf2F != IoModeType.NONE) {
+// if (!siemensS7Net.Write("DB100.180", this.ioModeOf2F.id).IsSuccess) {
+// OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎2F鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId()));
+// News.error("鍐欏叆杈撻�佺嚎2F鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
+// }
+// }
+// }
/**
* 蹇冭烦
@@ -348,14 +365,15 @@
}
public static void main(String[] args) {
- System.out.println(staNos.indexOf(129));
- System.out.println(staNos.size());
- for (int i = 0; i<staNos.size(); i++) {
+
+ System.out.println(staNos1.indexOf(129));
+ System.out.println(staNos1.size());
+ for (int i = 0; i<staNos1.size(); i++) {
// System.out.println(i*2);
// System.out.println(i*2 + 200);
// System.out.println(i);
}
- int index = staNos.indexOf(128);
+ int index = staNos1.indexOf(128);
System.out.println(index*2);
System.out.println(index*2 + 200);
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 578fd64..e6e5ae1 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -9,7 +9,7 @@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
# url: jdbc:sqlserver://10.10.10.100:1433;databasename=stasrs
- url: jdbc:sqlserver://192.168.4.15:1433;databasename=phpsasrs
+ url: jdbc:sqlserver://localhost:1433;databasename=phpsasrs
username: sa
password: sa@123
mvc:
@@ -299,11 +299,11 @@
barcode: ${wcs-slave.barcode[3].id}
# 鎷ｆ枡鍏ュ簱鍙�2
pickSta[1]:
- staNo: 201
+ staNo: 203
barcode: ${wcs-slave.barcode[4].id}
# 鎷ｆ枡鍏ュ簱鍙�3
pickSta[2]:
- staNo: 201
+ staNo: 205
barcode: ${wcs-slave.barcode[5].id}
# 杈撻�佺嚎3妤�
devp[2]:
@@ -351,11 +351,11 @@
barcode: ${wcs-slave.barcode[6].id}
# 鎷ｆ枡鍏ュ簱鍙�2
pickSta[1]:
- staNo: 301
+ staNo: 303
barcode: ${wcs-slave.barcode[7].id}
# 鎷ｆ枡鍏ュ簱鍙�3
pickSta[2]:
- staNo: 301
+ staNo: 305
barcode: ${wcs-slave.barcode[8].id}
# 鏉＄爜鎵弿浠�1
barcode[0]:
diff --git a/src/main/webapp/static/images/zy-logo.png b/src/main/webapp/static/images/zy-logo.png
index 3726d78..e2fc662 100644
--- a/src/main/webapp/static/images/zy-logo.png
+++ b/src/main/webapp/static/images/zy-logo.png
Binary files differ
diff --git a/src/main/webapp/views/control.html b/src/main/webapp/views/control.html
index 721a504..f09fc1d 100644
--- a/src/main/webapp/views/control.html
+++ b/src/main/webapp/views/control.html
@@ -84,7 +84,7 @@
</main>
<footer class="footer">
- Copyright 漏 2015 All Rights Reserved. <a href="http://www.zoneyung.com" target="_blank">閫熻吘鐢靛瓙鏈夐檺鍏徃</a> 淇濈暀鎵�鏈夋潈鍒�
+ Copyright 漏 2015 All Rights Reserved. <a href="http://www.zoneyung.com" target="_blank">娴欐睙涓壃鎶�鏈湁闄愬叕鍙�</a> 淇濈暀鎵�鏈夋潈鍒�
</footer>
</body>
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index 1df63d5..5c0be59 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -28,7 +28,7 @@
<!-- 涓讳綋鍐呭 -->
<iframe id="content" src="console.html"></iframe>
<footer class="footer">
- Copyright 漏 2015 All Rights Reserved. <a href="https://www.superton.cn/" target="_blank">娴欐睙閫熻吘鐢靛瓙鎶�鏈湁闄愬叕鍙�</a> 淇濈暀鎵�鏈夋潈鍒�
+ Copyright 漏 2015 All Rights Reserved. <a href="https://www.superton.cn/" target="_blank">娴欐睙涓壃绔嬪簱鎶�鏈湁闄愬叕鍙�</a> 淇濈暀鎵�鏈夋潈鍒�
</footer>
</body>
<script>
--
Gitblit v1.9.1