From 45943c779909587c4457226df41015412ef7abbd Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期五, 22 十一月 2024 09:09:02 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/LedThread.java |   85 ++++++++++++++++++++++++++++++++++++++----
 1 files changed, 76 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/LedThread.java b/src/main/java/com/zy/core/thread/LedThread.java
index fecbd49..40a3dea 100644
--- a/src/main/java/com/zy/core/thread/LedThread.java
+++ b/src/main/java/com/zy/core/thread/LedThread.java
@@ -1,13 +1,11 @@
 package com.zy.core.thread;
 
-import com.alibaba.fastjson.JSON;
-import com.core.common.Cools;
-import com.zy.common.entity.Parameter;
 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.ErrMsg;
 import com.zy.core.model.Task;
 import com.zy.core.model.command.LedCommand;
 import lombok.Data;
@@ -23,9 +21,8 @@
 import onbon.bx05.utils.DisplayStyleFactory;
 
 import java.awt.*;
-import java.util.HashSet;
+import java.util.*;
 import java.util.List;
-import java.util.Set;
 
 /**
  * Created by vincent on 2020/9/1
@@ -43,11 +40,18 @@
     private boolean ledMk = false;
     private boolean resetStatus = false;    // 澶嶄綅鐘舵��
 
+    // 鏄剧ず鍣�
+    private StringBuffer stringBuffer = new StringBuffer();
+    private List<LedCommand> commandList;
+
+//    private StringBuffer errorMsg = new StringBuffer();
+    private List<ErrMsg> errorMsg = new ArrayList<>();
+
     public LedThread(Slave slave) {
         this.slave = slave;
         try {
-            Bx5GEnv.initial(3000);
-            screen = new Bx5GScreenClient("my");
+//            Bx5GEnv.initial(3000);
+//            screen = new Bx5GScreenClient("my");
         } catch (Exception e) {
             e.printStackTrace();
             log.info("led杩炴帴鏋勯�犲櫒閿欒 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
@@ -57,7 +61,7 @@
     @Override
     @SuppressWarnings({"InfiniteLoopStatement", "unchecked"})
     public void run() {
-        connect();
+//        connect();
         close();
         while (true) {
             try {
@@ -71,6 +75,20 @@
                         // 澶嶄綅
                         case 2:
                             reset();
+                            break;
+                        // 鍐欐暟鎹� 娑叉櫠
+                        case 3:
+                            write7((List<LedCommand>)task.getData());
+                            break;
+                        // 澶嶄綅 娑叉櫠
+                        case 4:
+                            reset7();
+                            break;
+                        case 5:
+                            error((ErrMsg)task.getData());
+                            break;
+                        case 6:
+                            errorReset();
                             break;
                         default:
                             break;
@@ -181,6 +199,55 @@
         }
         close();
     }
+    private void write7(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("鐗╂枡缂栫爜锛�").append(matDto.getMatNo()).append("\n");
+                    sb.append("鏁伴噺锛�").append(matDto.getCount()).append("\n");
+                }
+            }
+            sb.append("\n");
+        }
+        stringBuffer.delete(0, stringBuffer.length());
+        stringBuffer.append(sb.toString());
+
+        errorReset();
+    }
+
+
+    private void reset7() {
+        commandList = null;
+
+        stringBuffer.delete(0, stringBuffer.length());
+    }
+
+
+    private void error(ErrMsg errMsg) {
+//        errorMsg.clear();
+        ErrMsg errMsOld = null;
+        for (ErrMsg errMsg1 : errorMsg){
+            if (errMsg1.getId()==1){
+                errMsOld = errMsg1;
+            }
+            errMsg1.setId(errMsg1.getId()-1);
+        }
+        if (errMsOld != null){
+            errorMsg.remove(errMsOld);
+        }
+        errMsg.setId(errMsg.getIdCode());
+        errorMsg.add(errMsg);
+    }
+
+    public void errorReset() {
+        this.errorMsg.clear();
+    }
 
     @Override
     public boolean connect() {
@@ -200,7 +267,7 @@
 
     @Override
     public void close() {
-        screen.disconnect();
+//        screen.disconnect();
     }
 
 

--
Gitblit v1.9.1