From fcb71b8fc63f74cd00d3faa76c73f4c5566ee352 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期三, 07 五月 2025 23:23:09 +0800
Subject: [PATCH] 解决提升机在本层，而没有锁提升机的问题
---
src/main/java/com/zy/core/thread/DevpThread.java | 106 +---------------------------------------------------
1 files changed, 3 insertions(+), 103 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/DevpThread.java b/src/main/java/com/zy/core/thread/DevpThread.java
index b8cfd82..46122e9 100644
--- a/src/main/java/com/zy/core/thread/DevpThread.java
+++ b/src/main/java/com/zy/core/thread/DevpThread.java
@@ -1,114 +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 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.StaProtocol;
-import lombok.Data;
-import lombok.extern.slf4j.Slf4j;
import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-/**
- * 杈撻�佺嚎绾跨▼
- * Created by vincent on 2020/8/4
- */
-@Data
-@Slf4j
-public class DevpThread implements Runnable, ThreadHandler {
+public interface DevpThread extends ThreadHandler {
- private Slave slave;
- private SiemensS7Net siemensS7Net;
- private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
+ Map<Integer, StaProtocol> getStation();
- public DevpThread(Slave slave) {
- this.slave = slave;
- connect();
- }
+ void setPakMk(Integer siteId, boolean pakMk);
- @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:
- readWorkNo(); // 璇诲彇宸ヤ綔鍙�
- readStaDest(); // 璇诲彇鐩爣绔�
- readStatus(); // 璇诲彇鐘舵��
- readError(); // 璇诲彇寮傚父淇℃伅
- break;
- case 2:
- break;
- default:
- break;
- }
- Thread.sleep(3000);
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- }
- }
-
- @Override
- public boolean connect() {
- boolean result = false;
- siemensS7Net = new SiemensS7Net(SiemensPLCS.S1200, slave.getIp());
- OperateResult connect = siemensS7Net.ConnectServer();
- if(connect.IsSuccess){
- result = true;
- log.info("杈撻�佺嚎plc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
- } else {
- log.info("杈撻�佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
- }
- siemensS7Net.ConnectClose();
- return result;
- }
-
- /**
- * 璇诲彇宸ヤ綔鍙�
- */
- private void readWorkNo(){
-
- }
-
- /**
- * 璇诲彇鐩爣绔�
- */
- private void readStaDest(){
-
- }
-
- /**
- * 璇诲彇鐘舵��
- */
- private void readStatus(){
-
- }
-
- /**
- * 璇诲彇寮傚父淇℃伅
- */
- private void readError(){
-
- }
-
-
- @Override
- public void close() {
-
- }
}
--
Gitblit v1.9.1