From c147a3dc2a56ab23b1cfeafef3de2867593f4206 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 21 六月 2024 18:24:05 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/JarThread.java | 41 +++++++++++++++++------------------------
1 files changed, 17 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/JarThread.java b/src/main/java/com/zy/core/thread/JarThread.java
index 836bb08..7a2f354 100644
--- a/src/main/java/com/zy/core/thread/JarThread.java
+++ b/src/main/java/com/zy/core/thread/JarThread.java
@@ -5,7 +5,6 @@
import HslCommunication.Profinet.Siemens.SiemensPLCS;
import HslCommunication.Profinet.Siemens.SiemensS7Net;
import com.alibaba.fastjson.JSON;
-import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
import com.core.exception.CoolException;
@@ -21,9 +20,8 @@
import com.zy.core.enums.SlaveType;
import com.zy.core.model.JarSlave;
import com.zy.core.model.Task;
-import com.zy.core.model.command.SteCommand;
+import com.zy.core.model.command.JarCommand;
import com.zy.core.model.protocol.JarProtocol;
-import com.zy.core.model.protocol.StaProtocol;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
@@ -32,8 +30,7 @@
/**
* shuttle 纭寲缃愮嚎绋�
- * Created by vincent on 2020/8/4
- * 涓嶈兘鏈� 妲藉彿 鍜� 鏈烘灦鍙�
+ * Created by vincent on 2024/3/01
*/
@Data
@Slf4j
@@ -139,6 +136,14 @@
jarProtocol.setStatus(siemensS7Net.getByteTransform().TransInt16(result.Content, 16));//鐘舵��
+ jarProtocol.setLeftDoorOpen((int)siemensS7Net.getByteTransform().TransInt16(result.Content, 18));//open the left door
+
+ jarProtocol.setLeftDoorClose((int)siemensS7Net.getByteTransform().TransInt16(result.Content, 20));//close the left door
+
+ jarProtocol.setRightDoorOpen((int)siemensS7Net.getByteTransform().TransInt16(result.Content, 22));//open the right door
+
+ jarProtocol.setRightDoorClose((int)siemensS7Net.getByteTransform().TransInt16(result.Content, 24));//close the right door
+
jarProtocol.setAutoing(siemensS7Net.getByteTransform().TransInt16(result.Content, 12) != 2);//鑷姩
// 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
@@ -168,12 +173,12 @@
/**
* 鍐欏叆鏁版嵁
*/
- private synchronized boolean write(SteCommand command){
+ private synchronized boolean write(JarCommand command){
if (null == command) {
News.error("绌挎杞﹀啓鍏ュ懡浠や负绌�");
return false;
}
- command.setSteNo(slave.getId());
+ command.setJarNo(slave.getId());
OperateResult result = null;
// 寮�濮嬩换鍔�
if (!command.getComplete()) {
@@ -212,7 +217,7 @@
if (null != bean) {
BasSteOpt basSteOpt = new BasSteOpt(
command.getTaskNo(), // 浠诲姟鍙�
- command.getSteNo(), // 绌挎杞�
+ command.getJarNo(), // 纭寲缃�
new Date(), // 涓嬪彂鏃堕棿
command.getTaskModeType().desc, // 浣滀笟
null, // 婧愭帓
@@ -236,30 +241,18 @@
if (result != null && result.IsSuccess) {
-
- News.info("绌挎杞﹀懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), JSON.toJSON(command));
- OutputQueue.STE.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
+ News.info("纭寲缃愬懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), JSON.toJSONString(command));
+ OutputQueue.STE.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 纭寲缃愬懡浠や笅鍙戯細 {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSONString(command)));
try {
Thread.sleep(500);
} catch (Exception e){
}
- OperateResultExOne<byte[]> result1 = siemensS7Net.Read("V998", (short) 4);
- if (result1.IsSuccess) {
- short taskNo = siemensS7Net.getByteTransform().TransInt16(result1.Content, 0);
- short taskType = siemensS7Net.getByteTransform().TransInt16(result1.Content, 2);
-// readStatus();
- }
return true;
} else {
- OutputQueue.STE.offer(MessageFormat.format("銆恵0}銆戝啓鍏ョ┛姊溅plc鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
- News.error("鍐欏叆绌挎杞lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
-
- //鍐欏叆澶辫触鍚庯紝閲嶆柊娣诲姞commanddao 浠诲姟闃熷垪涓�,骞剁珛鍗冲洖璇讳竴娆¤澶囩姸鎬�
-// MessageQueue.offer(SlaveType.Ste, slave.getId(), new Task(2, command));
-// readStatus();
-
+ OutputQueue.STE.offer(MessageFormat.format("銆恵0}銆戝啓鍏ョ～鍖栫綈plc鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
+ News.error("鍐欏叆纭寲缃恜lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
initSte();
return false;
}
--
Gitblit v1.9.1