From bdcc326cf75564f324c164d8ad64e90bda4a95eb Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 08 八月 2020 17:16:33 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/CrnThread.java |   39 ++++++++++++++++++++++++++++++++++++---
 1 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/CrnThread.java b/src/main/java/com/zy/core/thread/CrnThread.java
index 9e281ad..ad1b865 100644
--- a/src/main/java/com/zy/core/thread/CrnThread.java
+++ b/src/main/java/com/zy/core/thread/CrnThread.java
@@ -1,13 +1,14 @@
 package com.zy.core.thread;
 
-import com.zy.common.HslCommunication.Core.Types.OperateResult;
-import com.zy.common.HslCommunication.Profinet.Siemens.SiemensPLCS;
-import com.zy.common.HslCommunication.Profinet.Siemens.SiemensS7Net;
+import HslCommunication.Core.Types.OperateResult;
+import HslCommunication.Profinet.Siemens.SiemensPLCS;
+import HslCommunication.Profinet.Siemens.SiemensS7Net;
 import com.zy.core.Slave;
 import com.zy.core.ThreadHandler;
 import com.zy.core.cache.MessageQueue;
 import com.zy.core.enums.SlaveType;
 import com.zy.core.model.Task;
+import com.zy.core.model.protocol.CrnProtocol;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 
@@ -21,6 +22,7 @@
 
     SiemensS7Net siemensNet;
     private Slave slave;
+    private CrnProtocol crnProtocol;
 
     public CrnThread(Slave slave) {
         this.slave = slave;
@@ -62,6 +64,8 @@
     public boolean connect() {
         boolean result = false;
         siemensNet = new SiemensS7Net(SiemensPLCS.S1200,slave.getIp());
+        siemensNet.setRack((byte) 0);
+        siemensNet.setSlot((byte) 1);
         OperateResult connect = siemensNet.ConnectServer();
         if(connect.IsSuccess){
             result = true;
@@ -73,11 +77,40 @@
         return result;
     }
 
+    /**
+     * 璇诲彇鐘舵��
+     */
     private void readStatus(){
+        CrnProtocol protocol = new CrnProtocol();
+        protocol.setMode(siemensNet.ReadInt16("D2231").Content);
+        protocol.setEStop(siemensNet.ReadInt16("D2232").Content);
+        protocol.setTaskNo(siemensNet.ReadInt16("D2233").Content);
+        protocol.setStatus(siemensNet.ReadInt16("D2234").Content);
+        protocol.setBay(siemensNet.ReadInt16("D2235").Content);
+        protocol.setLevel(siemensNet.ReadInt16("D2236").Content);
+        protocol.setForkPos(siemensNet.ReadInt16("D2237").Content);
+        protocol.setLiftPos(siemensNet.ReadInt16("D2238").Content);
+        protocol.setWalkPos(siemensNet.ReadInt16("D2239").Content);
+        protocol.setTaskFinish(siemensNet.ReadInt16("D2240").Content);
+        protocol.setLoaded(siemensNet.ReadInt16("D2241").Content);
+        protocol.setAlarm(siemensNet.ReadInt16("D2242").Content);
+        protocol.setXDistance(siemensNet.ReadInt32("D2251").Content);
+        protocol.setYDistance(siemensNet.ReadInt32("D2253").Content);
+        protocol.setDuration(siemensNet.ReadInt32("D2255").Content);
+        this.crnProtocol = protocol;
+    }
+
+    /**
+     * 鍐欏叆鏁版嵁
+     */
+    private void write(){
 
     }
 
     @Override
     public void close() {
+
+
+
     }
 }

--
Gitblit v1.9.1