From c239509e6dabc82639aaab9e48cc4faf8b41fe80 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 06 六月 2025 16:31:16 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/core/thread/RgvThread.java | 50 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 44 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/RgvThread.java b/src/main/java/com/zy/core/thread/RgvThread.java
index 8a420d6..4ebfcfd 100644
--- a/src/main/java/com/zy/core/thread/RgvThread.java
+++ b/src/main/java/com/zy/core/thread/RgvThread.java
@@ -27,7 +27,9 @@
import lombok.extern.slf4j.Slf4j;
import java.text.MessageFormat;
+import java.util.ArrayList;
import java.util.Date;
+import java.util.List;
/**
* RGV绾跨▼
@@ -98,9 +100,10 @@
step = task.getStep();
}
switch (step) {
- // 璇绘暟鎹�
+ //婕父浠诲姟瀹屾垚淇″彿
case 1:
// readStatus();
+ taskComplete();
break;
//宸ヤ綅1鍐欏叆鏁版嵁
case 2:
@@ -136,12 +139,12 @@
break;
// 婕父
case 5:
- write5();
+ write5((Long) task.getData());
break;
default:
break;
}
- Thread.sleep(100);
+ Thread.sleep(50);
} catch (Exception e) {
log.error("RGV鍐欑嚎绋嬪紓甯�"+e.getMessage());
// e.printStackTrace();
@@ -250,6 +253,7 @@
OperateResultExOne<byte[]> result = siemensNet.Read("DB100.0", (short) 20);
OperateResultExOne<byte[]> resultV = siemensNet.Read("DB20.16", (short) 2);
OperateResultExOne<byte[]> resultE = siemensNet.Read("DB20.26", (short) 2);
+ OperateResultExOne<byte[]> resultError = siemensNet.Read("DB13.0", (short) 13);
if (result.IsSuccess && resultV.IsSuccess && resultE.IsSuccess) {
if (null == rgvProtocol) {
rgvProtocol = new RgvProtocol();
@@ -266,8 +270,20 @@
rgvProtocol.setRgvPos(siemensNet.getByteTransform().TransUInt32(result.Content, 16));
rgvProtocol.setInstantaneousSpeed(Double.valueOf(siemensNet.getByteTransform().TransInt16(resultV.Content, 0)));
rgvProtocol.setEndStaM(siemensNet.getByteTransform().TransInt16(resultE.Content, 0));
+ boolean[] statusAlarmList = siemensNet.getByteTransform().TransBool(resultError.Content, 0, 13);
+ int alarmCount = 0;
+ List<Integer> alarmList = new ArrayList<>();
+ for (boolean alarmSign : statusAlarmList){
+ alarmCount++;
+ if (alarmSign){
+ alarmList.add(alarmCount);
+ }
+ }
+ rgvProtocol.setAlarmList(alarmList);
+
// rgvProtocol.setRgvPos((long)NumUtils.GetRandomIntInRange(1737000));
OutputQueue.RGV.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
+
try {
// 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
@@ -361,11 +377,33 @@
return false;
}
}
- private void write5(){
+
+ /**
+ * 瀹屾垚
+ */
+ private void taskComplete() {
try {
- siemensNet.Write("DB24.10.0", false);
- } catch (Exception ignore) {}
+ OperateResultExOne<byte[]> result = siemensNet.Read("DB24.11", (short) 1);
+ boolean[] status = siemensNet.getByteTransform().TransBool(result.Content, 0, 1);
+ if (status[0]){
+ OperateResult result4 = siemensNet.Write("DB24.11.0", false);
+ }
+ } catch (Exception e) {
+ log.error("RGV鏁版嵁浠诲姟涓嬪彂澶嶄綅绾跨▼寮傚父锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ }
}
+
+ private void write5(Long devperimeter){
+ try {
+ siemensNet.Write("DB24.12", devperimeter.intValue());
+ Thread.sleep(10L);
+ siemensNet.Write("DB24.11.0", true);
+
+ } catch (Exception ignore) {
+ log.error("鍐欏叆RGV plc宸ヤ綅1婕父鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ }
+ }
+
private boolean write3(RgvCommand command) throws InterruptedException {
if (null == command) {
log.error("RGV鍐欏叆鍛戒护涓虹┖");
--
Gitblit v1.9.1