From e83761d390b593cff8b7c17144529e92eb482bd6 Mon Sep 17 00:00:00 2001 From: zhangc <zc@123> Date: 星期三, 16 四月 2025 16:38:04 +0800 Subject: [PATCH] 1 --- src/main/java/com/zy/core/thread/LedThread.java | 111 ++++--------------------------------------------------- 1 files changed, 8 insertions(+), 103 deletions(-) diff --git a/src/main/java/com/zy/core/thread/LedThread.java b/src/main/java/com/zy/core/thread/LedThread.java index e37e85a..ffb06ab 100644 --- a/src/main/java/com/zy/core/thread/LedThread.java +++ b/src/main/java/com/zy/core/thread/LedThread.java @@ -1,118 +1,23 @@ package com.zy.core.thread; -import com.zy.common.model.MatDto; -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.command.LedCommand; -import lombok.Data; -import lombok.extern.slf4j.Slf4j; -import java.util.HashSet; import java.util.List; -import java.util.Set; -/** - * Created by vincent on 2020/9/1 - */ -@Data -@Slf4j -public class LedThread implements Runnable, ThreadHandler { +public interface LedThread extends ThreadHandler { - private Slave slave; - private Set<Integer> workNos = new HashSet<>(); + void write(List<LedCommand> commands); - // 鏄剧ず鍣� - private StringBuffer stringBuffer = new StringBuffer(); - private List<LedCommand> commandList; + void reset(); - private StringBuffer errorMsg = new StringBuffer(); + void error(String error); - public LedThread(Slave slave) { - this.slave = slave; - } + void errorReset(); - @Override - @SuppressWarnings({"InfiniteLoopStatement", "unchecked"}) - public void run() { -// connect(); - while (true) { - try { - Task task = MessageQueue.poll(SlaveType.Led, slave.getId()); - if (task != null) { - switch (task.getStep()) { - // 鍐欐暟鎹� - case 1: - write((List<LedCommand>)task.getData()); - break; - // 澶嶄綅 - case 2: - reset(); - break; - case 3: - error((String) task.getData()); - break; - case 4: - errorReset(); - break; - default: - break; - } - } - Thread.sleep(1000); - } catch (Exception e) { - e.printStackTrace(); - } - } - } + void setLedMk(boolean mk); - private void write(List<LedCommand> list) { - commandList = list; - - StringBuilder sb = new StringBuilder(); - for (LedCommand command : list) { - sb.append(command.getTitle()).append("锛�").append(command.getWorkNo()).append(")").append("\n"); - sb.append("婧愬簱浣嶏細").append(command.getSourceLocNo()).append("\n"); - sb.append("鐩爣绔欙細").append(command.getStaNo()).append("\n"); - if (!command.isEmptyMk()) { - for (MatDto matDto : command.getMatDtos()) { - sb.append(matDto.getMatnr()).append("-").append(matDto.getBatch()).append("\n"); - } - } - sb.append("\n"); - } - stringBuffer.delete(0, stringBuffer.length()); - stringBuffer.append(sb.toString()); - - errorReset(); - } - - - private void reset() { - commandList = null; - - stringBuffer.delete(0, stringBuffer.length()); - } - - - private void error(String msg) { - errorMsg.delete(0, errorMsg.length()); - errorMsg.append(msg); - } - - public void errorReset() { - this.errorMsg.delete(0, errorMsg.length()); - } - - @Override - public boolean connect() { - return true; - } - - @Override - public void close() { - } + boolean isLedMk(); } -- Gitblit v1.9.1