From fb956794ce68616b418372a7c780e6e068b5d038 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 30 七月 2024 18:40:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/RgvThread.java | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/RgvThread.java b/src/main/java/com/zy/core/thread/RgvThread.java
index 3d626eb..3b2d4cc 100644
--- a/src/main/java/com/zy/core/thread/RgvThread.java
+++ b/src/main/java/com/zy/core/thread/RgvThread.java
@@ -7,12 +7,12 @@
import com.alibaba.fastjson.JSON;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
-import com.zy.asrs.entity.BasRgv;
-import com.zy.asrs.entity.BasRgvOpt;
-import com.zy.asrs.service.BasRgvOptService;
-import com.zy.asrs.service.BasRgvService;
-import com.zy.common.utils.News;
-import com.zy.core.ThreadHandler;
+import com.zy.entity.BasRgv;
+import com.zy.entity.BasRgvOpt;
+import com.zy.service.BasRgvOptService;
+import com.zy.service.BasRgvService;
+import com.zy.utils.News;
+import com.zy.core.RgvThread2;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.enums.RgvStatusType;
@@ -20,7 +20,6 @@
import com.zy.core.enums.SlaveType;
import com.zy.core.model.RgvSlave;
import com.zy.core.model.Task;
-import com.zy.core.model.command.CrnCommand;
import com.zy.core.model.command.RgvCommand;
import com.zy.core.model.protocol.RgvProtocol;
import lombok.Data;
@@ -35,7 +34,7 @@
*/
@Data
@Slf4j
-public class RgvThread implements Runnable, ThreadHandler {
+public class RgvThread implements Runnable, RgvThread2 {
private SiemensS7Net siemensNet;
private RgvSlave slave;
@@ -48,6 +47,9 @@
* 宸ヤ綅2澶嶄綅淇″彿
*/
private boolean resetFlag2 = false;
+
+ //閿佸畾鏍囪
+ private boolean PakMk = true;
public RgvThread(RgvSlave slave) {
this.slave = slave;
@@ -331,6 +333,26 @@
return false;
}
+ OperateResultExOne<byte[]> result3 = siemensNet.Read("DB100.0", (short) 12);
+ OperateResultExOne<byte[]> result4 = siemensNet.Read("DB100.10", (short) 2);
+ if (result3.IsSuccess){
+ RgvCommand one = new RgvCommand();
+// one.setAckFinish1(siemensNet.getByteTransform().TransInt16(resultRead.Content, 0));
+ one.setTaskNo1(siemensNet.getByteTransform().TransInt16(result3.Content, 2));
+ one.setTaskMode1(siemensNet.getByteTransform().TransInt16(result3.Content, 4));
+ one.setSourceStaNo1(siemensNet.getByteTransform().TransInt16(result3.Content, 6));
+ one.setDestinationStaNo1(siemensNet.getByteTransform().TransInt16(result3.Content, 8));
+ one.setCommand(siemensNet.getByteTransform().TransInt16(result4.Content, 0));
+
+ News.error("RGV鍛戒护涓嬪彂鍓嶈鍙栫姸鎬乕id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
+ }
+
+
+ OperateResult result8 = siemensNet.Write("DB100.10", (short) 0);
+ if (result8.IsSuccess){
+ News.error("涓嬪彂鍓嶆妸杞﹀瓙纭浣嶇疆涓�0");
+ }
+
// siemensNet.Write("DB100.20", command.getCommand());
command.setRgvNo(slave.getId());
--
Gitblit v1.9.1