From 080a3a42da0f4244f4f078b62f10bad11156a5a0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 17 八月 2020 13:45:55 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/CrnThread.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/CrnThread.java b/src/main/java/com/zy/core/thread/CrnThread.java
index fa3e72c..d6b9786 100644
--- a/src/main/java/com/zy/core/thread/CrnThread.java
+++ b/src/main/java/com/zy/core/thread/CrnThread.java
@@ -5,8 +5,10 @@
import HslCommunication.Profinet.Siemens.SiemensPLCS;
import HslCommunication.Profinet.Siemens.SiemensS7Net;
import com.alibaba.fastjson.JSON;
+import com.core.common.DateUtils;
import com.zy.core.ThreadHandler;
import com.zy.core.cache.MessageQueue;
+import com.zy.core.cache.OutputQueue;
import com.zy.core.enums.CrnTaskModeType;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.CrnSlave;
@@ -15,6 +17,9 @@
import com.zy.core.model.protocol.CrnProtocol;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
+
+import java.text.MessageFormat;
+import java.util.Date;
/**
* 鍫嗗灈鏈虹嚎绋�
@@ -27,6 +32,7 @@
private SiemensS7Net siemensNet;
private CrnSlave slave;
private CrnProtocol crnProtocol;
+
public CrnThread(CrnSlave slave) {
this.slave = slave;
@@ -90,8 +96,10 @@
OperateResult connect = siemensNet.ConnectServer();
if(connect.IsSuccess){
result = true;
+ OutputQueue.CRN.offer(MessageFormat.format( "銆恵0}銆戝爢鍨涙満plc杩炴帴鎴愬姛 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
log.info("鍫嗗灈鏈簆lc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
} else {
+ OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戝爢鍨涙満plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
log.error("鍫嗗灈鏈簆lc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
}
siemensNet.ConnectClose();
@@ -104,6 +112,7 @@
private void readStatus(){
OperateResultExOne<byte[]> result = siemensNet.Read("DB8.18", (short) 46);
if (result.IsSuccess) {
+ OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
if (null == crnProtocol) {
crnProtocol = new CrnProtocol();
}
@@ -118,16 +127,19 @@
// crnProtocol.setTaskFinish(siemensNet.getByteTransform().TransInt16(result.Content, 16));
crnProtocol.setLoaded(siemensNet.getByteTransform().TransInt16(result.Content, 18));
crnProtocol.setAlarm1(siemensNet.getByteTransform().TransInt16(result.Content, 20));
- crnProtocol.setError1(siemensNet.getByteTransform().TransInt16(result.Content, 22));
- crnProtocol.setError2(siemensNet.getByteTransform().TransInt16(result.Content, 24));
+ // 寮傚父淇℃伅
+ crnProtocol.setError1(siemensNet.getByteTransform().TransBool(result.Content, 22, 2));
+ crnProtocol.setError2(siemensNet.getByteTransform().TransBool(result.Content, 24, 2));
crnProtocol.setTemp1(siemensNet.getByteTransform().TransInt16(result.Content, 26));
crnProtocol.setXSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 28));
crnProtocol.setYSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 30));
crnProtocol.setZSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 32));
- crnProtocol.setXDistance(siemensNet.getByteTransform().TransInt32(result.Content, 34));
- crnProtocol.setYDistance(siemensNet.getByteTransform().TransInt32(result.Content, 38));
- crnProtocol.setDuration(siemensNet.getByteTransform().TransInt32(result.Content, 42));
+ crnProtocol.setXDistance(siemensNet.getByteTransform().TransSingle(result.Content, 34));
+ crnProtocol.setYDistance(siemensNet.getByteTransform().TransSingle(result.Content, 38));
+ crnProtocol.setXDuration(siemensNet.getByteTransform().TransSingle(result.Content, 42));
+ crnProtocol.setYDuration(siemensNet.getByteTransform().TransSingle(result.Content, 46));
} else {
+ OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戣鍙栧爢鍨涙満plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
log.error("璇诲彇鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
}
}
@@ -153,8 +165,10 @@
array[8] = command.getDestinationPosZ();
OperateResult result = siemensNet.Write("DB8.0", array);
if (result.IsSuccess) {
+ OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
readStatus();
} else {
+ OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戝啓鍏ュ爢鍨涙満plc鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
}
}
--
Gitblit v1.9.1