From 4c7e3f113b80e37c52163c30b80b9256f0bee5e3 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 17 十一月 2025 13:34:39 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/CrnThread.java | 113 +++-----------------------------------------------------
1 files changed, 7 insertions(+), 106 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/CrnThread.java b/src/main/java/com/zy/core/thread/CrnThread.java
index 4b2442a..46cbd00 100644
--- a/src/main/java/com/zy/core/thread/CrnThread.java
+++ b/src/main/java/com/zy/core/thread/CrnThread.java
@@ -1,119 +1,20 @@
package com.zy.core.thread;
-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.CommandResponse;
import com.zy.core.model.command.CrnCommand;
import com.zy.core.model.protocol.CrnProtocol;
-import lombok.Data;
-import lombok.extern.slf4j.Slf4j;
-/**
- * 鍫嗗灈鏈虹嚎绋�
- * Created by vincent on 2020/8/4
- */
-@Data
-@Slf4j
-public class CrnThread implements Runnable, ThreadHandler {
+public interface CrnThread extends ThreadHandler {
- SiemensS7Net siemensNet;
- private Slave slave;
- private CrnProtocol crnProtocol;
+ CrnProtocol getStatus();
- public CrnThread(Slave slave) {
- this.slave = slave;
- }
+ CrnCommand getPickAndPutCommand(String sourceLocNo, String targetLocNo, Integer taskNo, Integer crnNo);//鍙栨斁璐�
- @Override
- @SuppressWarnings("InfiniteLoopStatement")
- public void run() {
- while (true) {
- try {
- int step = 1;
- Task task = MessageQueue.poll(SlaveType.Devp, slave.getId());
- if (task != null) {
- step = task.getStep();
- }
- switch (step) {
- // 璇绘暟鎹�
- case 1:
- readStatus(); // 璇诲彇鐘舵��
- break;
- case 2:
- CrnCommand command = (CrnCommand) task.getData();
- break;
- case 3:
- break;
- // 澶嶄綅
- case 4:
- break;
- default:
- break;
- }
- Thread.sleep(3000);
- } catch (Exception e) {
- e.printStackTrace();
- }
+ CrnCommand getMoveCommand(String targetLocNo, Integer taskNo, Integer crnNo);//绉诲姩
- }
- }
+ CrnCommand getResetCommand(Integer crnNo);//澶嶄綅
- @Override
- 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;
- log.info("鍫嗗灈鏈簆lc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
- } else {
- log.info("鍫嗗灈鏈簆lc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
- }
- siemensNet.ConnectClose();
- return result;
- }
+ CommandResponse sendCommand(CrnCommand command);//涓嬪彂鍛戒护
- /**
- * 璇诲彇鐘舵��
- */
- 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