From 955033fd4b1f9a7e972909eae71927654a54f7ac Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 07 六月 2024 10:11:08 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 192e9dc..70deceb 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -135,6 +135,7 @@
crnProtocol.setMode((short) -1);
// crnProtocol.setTaskNo((short)0);
crnProtocol.setStatus((short)-1);
+ crnProtocol.setStatusTwo((short)-1);
crnProtocol.setBay((short)0);
crnProtocol.setLevel((short)0);
crnProtocol.setForkPos((short) -1);
@@ -149,6 +150,16 @@
crnProtocol.setyDistance((short) 0);
crnProtocol.setxDuration((short) 0);
crnProtocol.setyDuration((short) 0);
+
+ // 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
+ BasCrnpService basCrnpService = SpringUtils.getBean(BasCrnpService.class);
+ BasCrnp basCrnp = basCrnpService.selectById(slave.getId());
+ basCrnp.setCrnSts((int)crnProtocol.getMode());
+ basCrnp.setCrnStatusOne(-1);
+ basCrnp.setCrnStatusTwo(-1);
+ if (!basCrnpService.updateById(basCrnp)){
+ log.error("鍫嗗灈鏈簆lc鏁版嵁搴撴洿鏂板け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
+ }
}
@Override
@@ -178,9 +189,9 @@
try {
OperateResultExOne<byte[]> result = new OperateResultExOne<byte[]>();
if (slave.getId()>2 && slave.getId()<6){
- result = siemensNet.Read("DB101.0", (short) 62);
+ result = siemensNet.Read("DB101.0", (short) 66);
} else {
- result = siemensNet.Read("DB101.0", (short) 52);
+ result = siemensNet.Read("DB101.0", (short) 56);
}
if (result.IsSuccess) {
if (null == crnProtocol) {
@@ -194,7 +205,7 @@
crnProtocol.setLevel(siemensNet.getByteTransform().TransInt16(result.Content, 8));
crnProtocol.setForkPos(siemensNet.getByteTransform().TransInt16(result.Content, 10));
- if (slave.getId()>2 && slave.getId()<6){
+ if (slave.getId()<3 || slave.getId()>5){
crnProtocol.setLiftPos(siemensNet.getByteTransform().TransInt16(result.Content, 12));
crnProtocol.setWalkPos(siemensNet.getByteTransform().TransInt16(result.Content, 14));
crnProtocol.setLoaded(siemensNet.getByteTransform().TransInt16(result.Content, 16));
@@ -220,6 +231,9 @@
crnProtocol.setForkPosTwo(siemensNet.getByteTransform().TransInt16(result.Content, 22));
crnProtocol.setLoadedTwo(siemensNet.getByteTransform().TransInt16(result.Content, 24));
+ crnProtocol.setLiftPos(siemensNet.getByteTransform().TransInt16(result.Content, 30));
+ crnProtocol.setAlarm(siemensNet.getByteTransform().TransInt16(result.Content, 32));
+
crnProtocol.setxSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 34));
crnProtocol.setySpeed(siemensNet.getByteTransform().TransInt16(result.Content, 38));
crnProtocol.setzSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 42));
@@ -229,12 +243,6 @@
crnProtocol.setyDistance(siemensNet.getByteTransform().TransInt16(result.Content, 54));
crnProtocol.setxDuration(siemensNet.getByteTransform().TransInt16(result.Content, 58));
crnProtocol.setyDuration(siemensNet.getByteTransform().TransInt16(result.Content, 62));
- }
- //宸ヤ綅2鏁版嵁 鏃犲垯鏃犻渶鐞嗕細
- try{
-
- }catch (Exception e){
-
}
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
--
Gitblit v1.9.1