From 97c788f31a57b4e8c3fc8091dc29aab598adeebb Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期日, 04 一月 2026 08:07:00 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 86 ++++++++++++++++++++++++++++++++++++------
1 files changed, 73 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 5baf7d8..64d0eee 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -53,7 +53,7 @@
add(100);add(101);add(102);add(103);add(104);
add(105);add(106);add(107);add(108);add(109);
add(110);add(111);add(112);add(113);add(114);
- add(115);add(116);add(117);add(118);add(119);add(120);
+ add(115);add(116);add(117);add(118);add(119);add(120);add(122);
}};
public static final ArrayList<Integer> barcode1 = new ArrayList<Integer>() {{
@@ -130,6 +130,10 @@
case 2:
write((LiftCommand) task.getData());
break;
+ case 3:
+ writeIoMode((Integer) task.getData());
+ case 4:
+ writeBack((Integer) task.getData());
default:
break;
}
@@ -193,7 +197,7 @@
private void read() throws InterruptedException {
ArrayList<Integer> staNos = getStaNo();
int staNoSize = staNos.size();
- OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (staNoSize * 13));
+ OperateResultExOne<byte[]> result = siemensS7Net.Read("DB301.0", (short) (staNoSize * 14));
if (result.IsSuccess) {
for (int i = 0; i < staNoSize; i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
@@ -204,18 +208,31 @@
station.put(siteId, staProtocol);
}
staProtocol.setSiteId(siteId);
- staProtocol.setWorkNo((short) siemensS7Net.getByteTransform().TransInt32(result.Content, (i * 13))); // 宸ヤ綔鍙�
- staProtocol.setStaNo((short) siemensS7Net.getByteTransform().TransInt32(result.Content, (i * 13) + 4)); // 鐩爣绔�
- staProtocol.setLocHeight(siemensS7Net.getByteTransform().TransInt16(result.Content, (i * 13) + 8));//搴撲綅楂樺害
- staProtocol.setError(siemensS7Net.getByteTransform().TransInt16(result.Content, (i * 13) + 10)); // 鎶ヨ
+ staProtocol.setWorkNo((short) siemensS7Net.getByteTransform().TransInt32(result.Content, (i * 14))); // 宸ヤ綔鍙�
+ staProtocol.setStaNo((short) siemensS7Net.getByteTransform().TransInt32(result.Content, (i * 14) + 4)); // 鐩爣绔�
+ staProtocol.setLocHeight(siemensS7Net.getByteTransform().TransInt16(result.Content, (i * 14) + 8));//搴撲綅楂樺害
+ staProtocol.setError(siemensS7Net.getByteTransform().TransInt16(result.Content, (i * 14) + 10)); // 鎶ヨ
- boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, (i * 13) + 12, 1);
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, (i * 14) + 12, 1);
staProtocol.setAutoing(status[0]); // 鑷姩
staProtocol.setLoading(status[1]); // 鏈夌墿
staProtocol.setInEnable(status[2]); // 鍙叆
staProtocol.setOutEnable(status[3]);// 鍙嚭
staProtocol.setEmptyMk(status[4]); // 绌烘澘淇″彿
staProtocol.setFullPlt(status[5]); // 婊℃墭鐩�
+
+
+
+ //122 鎻愬崌鏈哄崟鐙鍙�
+ if (siteId == 122){
+ staProtocol.setSiteId(siteId);
+ OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB301.308", (short) 10);
+ OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB301.306", (short) 1);
+ staProtocol.setWorkNo((short) siemensS7Net.getByteTransform().TransInt32(result3.Content, 6)); //宸ヤ綔鍙�
+ staProtocol.setAutoing(siemensS7Net.getByteTransform().TransInt16(result3.Content, 0) == 1); //鑷姩
+ boolean[] booleans = siemensS7Net.getByteTransform().TransBool(result4.Content, 0, 1);
+ staProtocol.setLoading(booleans[1]); //1 鏈夌墿 0 鏃犵墿
+ }
if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
staProtocol.setPakMk(true);
@@ -225,18 +242,19 @@
//浠诲姟淇℃伅鍙嶉
Thread.sleep(200);
- OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB101.400", (short) 10);
+ OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB301.308", (short) 10);
if (result3.IsSuccess) {
liftProtocol.setMode(siemensS7Net.getByteTransform().TransInt16(result3.Content, 0)); // 妯″紡
liftProtocol.setDeviceStatus(siemensS7Net.getByteTransform().TransInt16(result3.Content, 2)); // 璁惧鐘舵��
liftProtocol.setTaskStatus(siemensS7Net.getByteTransform().TransInt16(result3.Content, 4)); // 瀹屾垚淇″彿
liftProtocol.setWorkNo((short) siemensS7Net.getByteTransform().TransInt32(result3.Content, 6)); // 宸ヤ綔鍙�
+ liftProtocol.setIoMode(siemensS7Net.getByteTransform().TransInt16(result3.Content, 8)); // 鍑哄叆搴撴ā寮�
}
//娓╂箍搴︿俊鎭弽棣�
Thread.sleep(200);
ArrayList<Integer> temperatureList = getTemperature();
- OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB101.300", (short) (temperatureList.size() * 4));
+ OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB301.300", (short) (temperatureList.size() * 4));
if (result4.IsSuccess) {
for (int i = 0; i < temperatureList.size(); i++) {
Integer deviceId = temperatureList.get(i); // 缂栧彿
@@ -255,7 +273,7 @@
Thread.sleep(200);
ArrayList<Integer> barcodeList = getBarcode();
int barcodeSize = barcodeList.size();
- OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB103.0", (short) (barcodeSize * 8));
+ OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB4.0", (short) (barcodeSize * 8));
if (result2.IsSuccess) {
for (int i = 0; i < barcodeSize; i++) {
String barcode = siemensS7Net.getByteTransform().TransString(result2.Content, i * 8, 8, "UTF-8");
@@ -283,7 +301,7 @@
deviceDataLogTime = System.currentTimeMillis();
}
- if (result.IsSuccess && result2.IsSuccess) {
+ if (result.IsSuccess && result2.IsSuccess && result3.IsSuccess && result4.IsSuccess) {
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
} else {
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戣鍙栬緭閫佺嚎plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
@@ -293,7 +311,7 @@
/**
* 鍐欏叆鍛戒护
*/
- private void write(LiftCommand liftCommand) throws InterruptedException {
+ private void write(LiftCommand liftCommand) {
if (null == liftCommand) {
return;
}
@@ -302,7 +320,7 @@
array[1] = liftCommand.getSourceStaNo();
array[2] = liftCommand.getTargetStaNo();
- OperateResult write = siemensS7Net.Write("DB100.0", array);
+ OperateResult write = siemensS7Net.Write("DB300.0", array);
if (!write.IsSuccess) {
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(liftCommand)));
@@ -314,6 +332,48 @@
}
/**
+ * 鍐欏叆鍛戒护
+ */
+ private void writeIoMode(Integer ioMode) {
+ if (null == ioMode) {
+ return;
+ }
+ short[] array = new short[1];
+ array[0] = ioMode.shortValue();
+
+ OperateResult write = siemensS7Net.Write("DB300.12", array);
+
+ if (!write.IsSuccess) {
+ OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ュ嚭鍏ュ簱妯″紡鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", DateUtils.convert(new Date()), slave.getId(), ioMode));
+ News.error("SiemensDevp"+" - 4"+" - 鍐欏叆鍑哄叆搴撴ā寮忔暟鎹け璐ャ�傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), ioMode);
+ } else {
+ OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆� 鍑哄叆搴撴ā寮忓懡浠や笅鍙� [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), ioMode));
+ News.info("SiemensDevp"+" - 5"+" - 鍑哄叆搴撴ā寮忓懡浠や笅鍙� [id:{}] >>>>> 鍛戒护涓嬪彂锛� {}", slave.getId(), ioMode);
+ }
+ }
+
+ /**
+ * 鍐欏叆鍛戒护
+ */
+ private void writeBack(Integer back) {
+ if (null == back) {
+ return;
+ }
+ short[] array = new short[1];
+ array[0] = back.shortValue();
+
+ OperateResult write = siemensS7Net.Write("DB300.14", array);
+
+ if (!write.IsSuccess) {
+ OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ユ墭鐩橀��鍥炴暟鎹け璐ャ�傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", DateUtils.convert(new Date()), slave.getId(), back));
+ News.error("SiemensDevp"+" - 4"+" - 鍐欏叆鎵樼洏閫�鍥炴暟鎹け璐ャ�傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), back);
+ } else {
+ OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆� 鎵樼洏閫�鍥炲懡浠や笅鍙� [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), back));
+ News.info("SiemensDevp"+" - 5"+" - 鎵樼洏閫�鍥炲懡浠や笅鍙� [id:{}] >>>>> 鍛戒护涓嬪彂锛� {}", slave.getId(), back);
+ }
+ }
+
+ /**
* 璁剧疆鍏ュ簱鏍囪
*/
@Override
--
Gitblit v1.9.1