From 5cf81e2b0e9c3490f83a06811ea6939c5b5ae7c7 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 23 五月 2024 16:45:21 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensRgvThread.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensRgvThread.java b/src/main/java/com/zy/core/thread/SiemensRgvThread.java
index a3eda80..cfc074b 100644
--- a/src/main/java/com/zy/core/thread/SiemensRgvThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensRgvThread.java
@@ -9,8 +9,10 @@
import com.core.common.SpringUtils;
import com.zy.asrs.entity.BasRgv;
+import com.zy.asrs.service.BasRgvErrService;
import com.zy.asrs.service.BasRgvService;
+import com.zy.common.utils.News;
import com.zy.core.RgvThread;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
@@ -136,7 +138,7 @@
rgvProtocol.setStatus((short)-1);
rgvProtocol.setTaskNo1((short)0);
rgvProtocol.setStatus1((short)-1);
- rgvProtocol.setLoaded1((short)0);
+ rgvProtocol.setLoaded1(false);
rgvProtocol.setWalkPos((short)0);
rgvProtocol.setRgvPos(0);
// rgvProtocol.setTaskNo2((short)0);
@@ -146,6 +148,8 @@
rgvProtocol.setxSpeed((short) 0);
rgvProtocol.setxDistance((short) 0);
rgvProtocol.setxDuration((short) 0);
+ rgvProtocol.setSouSta((short)0);
+ rgvProtocol.setEndSta((short)0);
}
@Override
@@ -186,10 +190,17 @@
rgvProtocol.setAlarm(siemensNet.getByteTransform().TransInt16(result.Content, 8));
rgvProtocol.setStatus(siemensNet.getByteTransform().TransInt16(result.Content, 10));
rgvProtocol.setSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 12));
- rgvProtocol.setRgvPos((int) siemensNet.getByteTransform().TransInt16(result.Content, 14));
+ rgvProtocol.setRgvPos(siemensNet.getByteTransform().TransInt32(result.Content, 14));
+// rgvProtocol.setLoaded1(siemensNet.getByteTransform().TransBool(result.Content,18));
OutputQueue.RGV.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛", DateUtils.convert(new Date()), slave.getId()));
+ if (rgvProtocol.getAlarm() > 0 ){
+ BasRgvErrService basRgvErrService = SpringUtils.getBean(BasRgvErrService.class);
+ News.error("RGV 寮傚父 ===>> [id:{}] [ip:{}],鎶ヨ浠ｇ爜:{},鎶ヨ鏂囨湰:{}",slave.getId(), slave.getIp(),rgvProtocol.getAlarm(),basRgvErrService.selectById(rgvProtocol.getAlarm()).getErrName());
+ }else {
+ News.info("RGV鐘舵�佹甯�==>[id:{}]",slave.getId());
+ }
// 宸ヤ綅1澶嶄綅淇″彿
// if (rgvProtocol.getStatusType1().equals(RgvStatusType.WAITING)
--
Gitblit v1.9.1