From 2443b00048ba01d4889c3b94bf20c44677b674fa Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期日, 11 六月 2023 09:59:39 +0800
Subject: [PATCH] 地图更新1F
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 125 ++++++++++++++++++++++++++++-------------
1 files changed, 84 insertions(+), 41 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index edce7b1..8b093b6 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -8,9 +8,9 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
-import com.sun.org.apache.bcel.internal.generic.IF_ACMPEQ;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.service.BasDevpService;
+import com.zy.common.utils.CommonUtils;
import com.zy.core.DevpThread;
import com.zy.core.News;
import com.zy.core.cache.MessageQueue;
@@ -42,11 +42,11 @@
private SiemensS7Net siemensS7Net;
private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
private short heartBeatVal = 1;
- private int barcodeSize = 2;
+ private int barcodeSize = 1;
public static final ArrayList<Integer> staNos = new ArrayList<Integer>() {{
add(100);add(101);add(102);
- add(200);add(201);add(202);
- add(300);add(301);add(302);
+ add(103);add(104);add(105);
+ add(106);add(107);add(108);
}};
public boolean charge0;
@@ -79,7 +79,7 @@
break;
// 鍑哄叆搴撴ā寮�
case 3:
- write3((int)task.getData());
+ write3((StaProtocol)task.getData());
break;
default:
break;
@@ -132,7 +132,7 @@
}
}
Thread.sleep(200);
- OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB102.100", (short) (staNos.size()));
+ OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB101.0", (short) (staNos.size()));
if (result1.IsSuccess) {
for (int i = 0; i < staNos.size(); i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
@@ -155,10 +155,12 @@
//璇绘潯鐮�
Thread.sleep(100);
- OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.150",(short)24);
+ OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.200",(short)24);
if (result2.IsSuccess) {
for (int i = 0; i <= barcodeSize; i++) {
- String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,8, "UTF-8");
+ byte[] bytes = siemensS7Net.getByteTransform().TransByte(result2.Content, i * 8, 8);
+ String barcode = CommonUtils.bytesToBarcode(bytes);
+// String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,8, "UTF-8");
BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
barcodeThread.setBarcode(barcode);
@@ -181,12 +183,21 @@
charge1 = status[0];
}
-// // 澶栧舰妫�娴� - 102
+ // 澶栧舰妫�娴� - 102
+ Thread.sleep(50);
+ OperateResultExOne<byte[]> result102 = siemensS7Net.Read("DB100.100", (short)2);
+ if (result102.IsSuccess) {
+ //鍑哄叆搴撴ā寮�
+ short outInModel = siemensS7Net.getByteTransform().TransInt16(result102.Content, 0);
+ StaProtocol staProtocol = station.get(102);
+ staProtocol.setOutInModel(outInModel);
+ }
+// // 澶栧舰妫�娴� - 201
// Thread.sleep(50);
-// OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB102.129", (short)1);
-// if (result4.IsSuccess) {
-// boolean[] status = siemensS7Net.getByteTransform().TransBool(result4.Content, 0, 1);
-// StaProtocol staProtocol = station.get(102);
+// OperateResultExOne<byte[]> result201 = siemensS7Net.Read("DB102.112", (short)1);
+// if (result201.IsSuccess) {
+// boolean[] status = siemensS7Net.getByteTransform().TransBool(result201.Content, 0, 1);
+// StaProtocol staProtocol = station.get(201);
// staProtocol.setFrontErr(status[0]);
// staProtocol.setBackErr(status[1]);
// staProtocol.setHighErr(status[2]);
@@ -195,12 +206,12 @@
// staProtocol.setWeightErr(status[5]);
// staProtocol.setBarcodeErr(status[6]);
// }
-// // 澶栧舰妫�娴� - 203
+// // 澶栧舰妫�娴� - 301
// Thread.sleep(50);
-// OperateResultExOne<byte[]> result5 = siemensS7Net.Read("DB102.130", (short)1);
-// if (result5.IsSuccess) {
-// boolean[] status = siemensS7Net.getByteTransform().TransBool(result5.Content, 0, 1);
-// StaProtocol staProtocol = station.get(202);
+// OperateResultExOne<byte[]> result301 = siemensS7Net.Read("DB102.114", (short)1);
+// if (result301.IsSuccess) {
+// boolean[] status = siemensS7Net.getByteTransform().TransBool(result301.Content, 0, 1);
+// StaProtocol staProtocol = station.get(301);
// staProtocol.setFrontErr(status[0]);
// staProtocol.setBackErr(status[1]);
// staProtocol.setHighErr(status[2]);
@@ -209,9 +220,9 @@
// staProtocol.setWeightErr(status[5]);
// staProtocol.setBarcodeErr(status[6]);
// }
+
if (result.IsSuccess && result1.IsSuccess) {
-
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
// 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
@@ -235,34 +246,66 @@
// News.error("璇诲彇杈撻�佺嚎plc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
}
}
+
+ /**
+ * plc涓庢彁鍗囨満浜や簰
+ */
+ private void write4(Integer siteId, Integer direction) throws InterruptedException {
+ if (Cools.isEmpty(siteId, direction)) {
+ return;
+ }
+ switch (siteId) {
+ case 102:
+ siemensS7Net.Write("DB100.300", direction.shortValue());
+ break;
+ case 105:
+ siemensS7Net.Write("DB100.302", direction.shortValue());
+ break;
+ case 106:
+ siemensS7Net.Write("DB100.304", direction.shortValue());
+ break;
+ case 107:
+ siemensS7Net.Write("DB100.306", direction.shortValue());
+ break;
+ case 108:
+ siemensS7Net.Write("DB100.308", direction.shortValue());
+ break;
+ }
+ }
+
/**
* 鍐欏叆 ID+鐩爣绔� =====> 鍗曠珯鐐瑰啓鍏�
*/
- private void write3(int outAndIn) throws InterruptedException{
- if (Cools.isEmpty(outAndIn)) {
+ private void write3(StaProtocol staProtocol) throws InterruptedException {
+ if (Cools.isEmpty(staProtocol)) {
return;
}
- if (outAndIn==666){
- siemensS7Net.Write("DB100.200", (short) 1);
- }else if (outAndIn==999){
- siemensS7Net.Write("DB100.200", (short) 0);
- }else {
- String Db=null;
- if (outAndIn<20){
- Db="DB100.180";
- }else if (outAndIn<30){
- Db="DB100.182";
- }else {
- Db="DB100.184";
- }
- if (outAndIn == 11 || outAndIn == 21 || outAndIn == 31){
- siemensS7Net.Write(Db, (byte) 1); // 鍏ュ簱
- }else if (outAndIn == 12 || outAndIn == 22 || outAndIn == 32){
- siemensS7Net.Write(Db, (byte) 2); // 鍑哄簱
- }else if (outAndIn == 10 || outAndIn == 20 || outAndIn == 30){
- siemensS7Net.Write(Db, (byte) 0); // 鍑哄簱
- }
+ Short outAndIn = staProtocol.getOutInModel();
+ Integer siteId = staProtocol.getSiteId();
+ Short run = 1;//姝ｈ浆
+ if (outAndIn == 1) {//鍏ュ簱
+ run = 1;//姝ｈ浆
+ } else {
+ run = 2;//鍙嶈浆
}
+ switch (siteId) {
+ case 102:
+ siemensS7Net.Write("DB100.300", run);
+ break;
+ case 105:
+ siemensS7Net.Write("DB100.302", run);
+ break;
+ case 106:
+ siemensS7Net.Write("DB100.304", run);
+ break;
+ case 107:
+ siemensS7Net.Write("DB100.306", run);
+ break;
+ case 108:
+ siemensS7Net.Write("DB100.308", run);
+ break;
+ }
+
}
/**
--
Gitblit v1.9.1