From ccd6309576bfa66ddf40b8a48202ced37c05333a Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 23 四月 2025 14:32:39 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/core/thread/RgvThread.java |  685 ++++++++++++++++++++++++++++++++------------------------
 1 files changed, 390 insertions(+), 295 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/RgvThread.java b/src/main/java/com/zy/core/thread/RgvThread.java
index b3d3f21..15214fe 100644
--- a/src/main/java/com/zy/core/thread/RgvThread.java
+++ b/src/main/java/com/zy/core/thread/RgvThread.java
@@ -5,6 +5,7 @@
 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.zy.asrs.entity.BasRgv;
@@ -13,8 +14,8 @@
 import com.zy.asrs.service.BasRgvService;
 import com.zy.asrs.utils.RouteUtils;
 import com.zy.core.ThreadHandler;
-import com.zy.core.cache.MessageQueue;
-import com.zy.core.cache.OutputQueue;
+import com.zy.core.cache.*;
+import com.zy.core.enums.RgvModeType;
 import com.zy.core.enums.RgvStatusType;
 import com.zy.core.enums.RgvTaskModeType;
 import com.zy.core.enums.SlaveType;
@@ -22,11 +23,16 @@
 import com.zy.core.model.Task;
 import com.zy.core.model.command.RgvCommand;
 import com.zy.core.model.protocol.RgvProtocol;
+import com.zy.core.model.protocol.RgvTaskProtocol;
+import com.zy.core.model.protocol.TaskProtocol;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 
 import java.text.MessageFormat;
 import java.util.Date;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * RGV绾跨▼
@@ -38,7 +44,15 @@
 
     private SiemensS7Net siemensNet;
     private RgvSlave slave;
-    private RgvProtocol rgvProtocol;
+//    private RgvProtocol rgvProtocol;
+    private TaskProtocolCache taskProtocolCache = new TaskProtocolCache();
+    // # 杞ㄩ亾鎬婚暱
+    private Long trackEntireLength = 100L;
+    //# 杞ㄩ亾鍩哄噯鐐�
+    private Long trackBenchmark = 100L;
+    //  # 閬胯璺濈
+    private Long avoidDistance = 100L;
+
     /**
      * 宸ヤ綅1澶嶄綅淇″彿
      */
@@ -55,103 +69,339 @@
     @Override
     @SuppressWarnings("InfiniteLoopStatement")
     public void run() {
-        this.connect();
+        boolean connect = this.connect();
+        if (connect){
+
+            // 鍚姩璇绘暟鎹嚎绋�
+            new Thread(this::readStatusRgv).start();
+
+            // 鍚姩浠诲姟涓嬪彂绾跨▼
+            new Thread(this::taskIssued).start();
+
+            // 鍚姩婕父绾跨▼
+            new Thread(this::taskWalkIssued).start();
+        }
+    }
+
+    private void readStatusRgv(){
         while (true) {
             try {
-                int step = 1;
-                Task task = MessageQueue.poll(SlaveType.Rgv, slave.getId());
-                if (task != null) {
-                    step = task.getStep();
-                }
-                switch (step) {
-                    // 璇绘暟鎹�
-                    case 1:
-                        readStatus();
-                        break;
-                    // 宸ヤ綅1銆�2鍐欏叆鏁版嵁
-                    case 2:
-                        write((RgvCommand) task.getData());
-                        break;
-                    //宸ヤ綅1鍐欏叆鏁版嵁
-                    case 4:
-                        write1((RgvCommand) task.getData());
-                        break;
-                    //宸ヤ綅2鍐欏叆鏁版嵁
-                    case 5:
-                        write2((RgvCommand) task.getData());
-                        break;
-                    // 澶嶄綅
-                    case 3:
-                        RgvCommand command = (RgvCommand) task.getData();
-                        if (null == command) {
-                            command = new RgvCommand();
-                        }
-                        command.setRgvNo(slave.getId()); // RGV缂栧彿
-                        command.setTaskNo1((short) 0); // 宸ヤ綔鍙�
-                        command.setAckFinish1((short) 1);  // 浠诲姟瀹屾垚纭浣�
-                        command.setTaskMode1(RgvTaskModeType.NONE); // 浠诲姟妯″紡
-                        command.setSourceStaNo1((short)0);     // 婧愮珯
-                        command.setDestinationStaNo1((short)0);     // 鐩爣绔�
-                        command.setTaskNo2((short) 0); // 宸ヤ綔鍙�
-                        command.setAckFinish2((short) 1);  // 浠诲姟瀹屾垚纭浣�
-                        command.setTaskMode2(RgvTaskModeType.NONE); // 浠诲姟妯″紡
-                        command.setSourceStaNo2((short)0);     // 婧愮珯
-                        command.setDestinationStaNo2((short)0);     // 鐩爣绔�
-                        command.setCommand((short)0);
-                        write(command);
-                        break;
-                    // 鍥炲師鐐�  閬胯
-                    case 9:
-                        RgvCommand commandAvoidanceXY = (RgvCommand) task.getData();
-                        if (null == commandAvoidanceXY) {
-                            commandAvoidanceXY = new RgvCommand();
-                        }
-                        commandAvoidanceXY.setRgvNo(slave.getId()); // RGV缂栧彿
-                        commandAvoidanceXY.setTaskNo1((short) 32222); // 宸ヤ綔鍙�
-                        commandAvoidanceXY.setAckFinish1((short) 1);  // 浠诲姟瀹屾垚纭浣�
-                        commandAvoidanceXY.setTaskMode1(RgvTaskModeType.X_MOVE); // 浠诲姟妯″紡
-                        commandAvoidanceXY.setSourceStaNo1((short)0);     // 婧愮珯
-                        commandAvoidanceXY.setDestinationStaNo1(slave.getId()==1? (short) 101:(short)116);     // 鐩爣绔�
-                        commandAvoidanceXY.setTaskNo2((short) 0); // 宸ヤ綔鍙�
-                        commandAvoidanceXY.setAckFinish2((short) 1);  // 浠诲姟瀹屾垚纭浣�
-                        commandAvoidanceXY.setTaskMode2(RgvTaskModeType.X_MOVE); // 浠诲姟妯″紡
-                        commandAvoidanceXY.setSourceStaNo2((short)0);     // 婧愮珯
-                        commandAvoidanceXY.setDestinationStaNo2(slave.getId()==1? (short) 101:(short)117);     // 鐩爣绔�
-                        commandAvoidanceXY.setCommand((short)0);
-                        write(commandAvoidanceXY);
-                        break;
-                    default:
-                        break;
-                }
-                Thread.sleep(500);
+                Thread.sleep(100);
+
+                readStatus();
+
             } catch (Exception e) {
+                log.error("RGV鏁版嵁璇诲彇绾跨▼寮傚父锛侊紒锛�"+e.getMessage());
+                initRgv();
 //                e.printStackTrace();
             }
 
         }
+
+    }
+
+    /**
+     * 婕父
+     */
+    private void taskWalkIssued() {
+        while (true) {
+            try {
+                // 浼戠湢 1 绉�
+                Thread.sleep(100);
+
+                if (!deviceDetection()){
+                    continue;
+                }
+                RgvTaskProtocol rgvTaskProtocol = RgvTaskCache.getRgvStatus(slave.getId());
+                if (rgvTaskProtocol == null) {
+                    initRgv();
+                    rgvTaskProtocol = RgvTaskCache.getRgvStatus(slave.getId());
+                }
+                if (rgvTaskProtocol.getAvoid() != 1) {
+                    continue;
+                }
+                TaskProtocol issued = new TaskProtocol();
+                issued.setTaskNo(32222L);
+                issued.setTargetPosition(rgvTaskProtocol.getAvoidingTheDestination());
+                write(issued);
+                rgvTaskProtocol.setAvoid(0);
+
+                Thread.sleep(200);
+                RgvTaskCache.updateRgvStatus(rgvTaskProtocol);
+
+            } catch (Exception e) {
+                log.error("RGV琛岃蛋浠诲姟涓嬪彂绾跨▼寮傚父锛侊紒锛�"+e.getMessage());
+//                e.printStackTrace();
+            }
+        }
+    }
+
+    /**
+     * 浠诲姟涓嬪彂
+     */
+    private void taskIssued() {
+        while (true) {
+            try {
+                // 浼戠湢 1 绉�
+                Thread.sleep(100);
+                if (!deviceDetection()){
+                    continue;
+                }
+                RgvProtocol rgvProtocol = RgvStatusCache.getRgvStatus(slave.getId());
+                RgvTaskProtocol rgvTaskProtocol = RgvTaskCache.getRgvStatus(slave.getId());
+                if (rgvProtocol == null || rgvTaskProtocol == null) {
+                    initRgv();
+                    rgvProtocol = RgvStatusCache.getRgvStatus(slave.getId());
+                    rgvTaskProtocol = RgvTaskCache.getRgvStatus(slave.getId());
+                }
+                if (rgvTaskProtocol.getAvoid() != 0) {
+                    continue;
+                }
+
+                List<TaskProtocol> allTakeTaskProtocol = taskProtocolCache.getTakeOrPutTaskProtocol(rgvProtocol.getLoaded());
+                for(TaskProtocol taskProtocol: allTakeTaskProtocol){
+                    if (taskProtocol.getIsRunning() == 1){//鍑嗗涓嬪彂
+                        RgvProtocol rgvProtocolOther = RgvStatusCache.getRgvStatus(slave.getOtherId());
+                        //鍙岃溅
+                        if (rgvOtherStatusEnable()){
+                            //鍙︿竴鍙拌溅鏄惁鍏佽姝ゅ彴杞︽墽琛�
+                            if (!otherRgvAvoid(taskProtocol.getTargetPosition())){
+                                continue;
+                            }
+                        }
+                        Thread.sleep(200);
+                        TaskProtocol issued = new TaskProtocol(taskProtocol);
+                        write(issued);
+                        taskProtocol.setIsRunning(taskProtocol.getIsRunning() +1);
+                        taskProtocolCache.updateTaskProtocol(taskProtocol);
+                        break;
+                    }
+                }
+            } catch (Exception e) {
+                log.error("RGV鍙栬揣浠诲姟涓嬪彂绾跨▼寮傚父锛侊紒锛�"+e.getMessage());
+//                e.printStackTrace();
+            }
+        }
+    }
+
+    public boolean deviceDetection(){
+        RgvProtocol rgvProtocol = RgvStatusCache.getRgvStatus(slave.getId());
+        RgvTaskProtocol rgvTaskProtocol = RgvTaskCache.getRgvStatus(slave.getId());
+
+        if (rgvProtocol == null || rgvTaskProtocol ==null) {
+            return false;
+        }
+        if (!rgvProtocol.getModeType().equals(RgvModeType.AUTO) || rgvProtocol.getRgvPos().equals(0L) || rgvTaskProtocol.getAvoid() == -1 || rgvProtocol.getRgvPosDestination() == 0L
+                || (!rgvProtocol.getStatusType().equals(RgvStatusType.IDLE) && !rgvProtocol.getStatusType().equals(RgvStatusType.ROAM))) {
+            return false;
+        }
+        RgvProtocol rgvProtocolOther = RgvStatusCache.getRgvStatus(slave.getOtherId());
+        RgvTaskProtocol rgvTaskProtocolOther = RgvTaskCache.getRgvStatus(slave.getOtherId());
+
+        if (rgvProtocolOther == null) {
+            return false;
+        }
+        if (rgvProtocolOther.statusEnable){
+            if (!rgvProtocolOther.getModeType().equals(RgvModeType.AUTO) || rgvProtocolOther.getRgvPos().equals(0L) || rgvTaskProtocolOther.getAvoid() == -1  || rgvProtocolOther.getRgvPosDestination() == 0L) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean rgvOtherStatusEnable(){
+        RgvProtocol rgvProtocolOther = RgvStatusCache.getRgvStatus(slave.getOtherId());
+        if (rgvProtocolOther == null) {
+            return true;
+        }
+        if (rgvProtocolOther.statusEnable){
+//            if (!rgvProtocolOther.getModeType().equals(RgvModeType.AUTO) || rgvProtocolOther.getRgvPos().equals(0L)) {
+            return true;
+//            }
+        }
+        return false;
+    }
+
+    public boolean otherRgvAvoid(Long targetPosition){
+        RgvProtocol rgvProtocol = RgvStatusCache.getRgvStatus(slave.getId());
+        RgvTaskProtocol rgvTaskProtocol = RgvTaskCache.getRgvStatus(slave.getId());
+
+        RgvProtocol rgvProtocolOther = RgvStatusCache.getRgvStatus(slave.getOtherId());
+
+        if (rgvProtocol.getRgvPos()<rgvProtocolOther.getRgvPos()){
+            if (rgvProtocolOther.getStatusType().equals(RgvStatusType.IDLE)){
+                if ((rgvProtocolOther.getRgvPos()-rgvProtocolOther.getCarBodyJiaoMing())
+                        - (targetPosition+rgvProtocol.getCarBodyKunPeng())
+                        > avoidDistance){//鏃犻渶閬胯
+                    return true;
+                } else {
+                    long avoid = targetPosition + rgvProtocol.getCarBodyKunPeng() + avoidDistance + rgvProtocolOther.getCarBodyJiaoMing();
+                    if (avoid > trackEntireLength-rgvProtocolOther.getCarBodyKunPeng()){
+                        log.error("閬胯瓒呭嚭鑼冨洿锛侊紒锛佷换鍔″紓甯�  鑱旂郴绠$悊鍛橈紒锛侊紒");
+                        return false;
+                    }
+                    rgvTaskProtocol.setAvoid(1);
+                    rgvTaskProtocol.setAvoidingTheDestination(avoid);
+                    RgvTaskCache.updateRgvStatus(rgvTaskProtocol);
+                    return true;
+                }
+            } else if (rgvProtocolOther.getStatusType().equals(RgvStatusType.ROAM)){
+                if ((rgvProtocolOther.getRgvPosDestination()-rgvProtocolOther.getCarBodyJiaoMing())
+                        - (targetPosition+rgvProtocol.getCarBodyKunPeng())
+                        > avoidDistance){//鏃犻渶閬胯
+                    return true;
+                } else {
+                    long avoid = targetPosition + rgvProtocol.getCarBodyKunPeng() + avoidDistance + rgvProtocolOther.getCarBodyJiaoMing();
+                    if (avoid > trackEntireLength-rgvProtocolOther.getCarBodyKunPeng()){
+                        log.error("閬胯瓒呭嚭鑼冨洿锛侊紒锛佷换鍔″紓甯�  鑱旂郴绠$悊鍛橈紒锛侊紒");
+                        return false;
+                    }
+                    rgvTaskProtocol.setAvoid(1);
+                    rgvTaskProtocol.setAvoidingTheDestination(avoid);
+                    RgvTaskCache.updateRgvStatus(rgvTaskProtocol);
+                    return true;
+                }
+            } else if (rgvProtocolOther.getStatusType().equals(RgvStatusType.WORKING)){
+                if ((rgvProtocolOther.getRgvPosDestination()-rgvProtocolOther.getCarBodyJiaoMing())
+                        - (targetPosition+rgvProtocol.getCarBodyKunPeng())
+                        > avoidDistance){//鏃犻渶閬胯
+                    return true;
+                } else {
+                    RgvThread rgvThreadOther = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgvProtocolOther.getRgvNo());
+                    TaskProtocolCache taskProtocolCacheOther = rgvThreadOther.getTaskProtocolCache();
+                    List<TaskProtocol> allPutTaskProtocol = taskProtocolCacheOther.getAllPutTaskProtocol();
+                    if (allPutTaskProtocol.size() > 1){
+                        return false;
+                    }
+                    for (TaskProtocol taskProtocol : allPutTaskProtocol){
+                        if (taskProtocol.getTargetPosition()>=rgvProtocolOther.getRgvPos()){
+                            long avoid = rgvProtocolOther.getRgvPos()-rgvProtocolOther.getCarBodyJiaoMing()-avoidDistance-rgvProtocol.getCarBodyKunPeng();
+                            if (avoid > trackEntireLength-rgvProtocolOther.getCarBodyKunPeng()){
+                                log.error("琛岃蛋瓒呭嚭鑼冨洿锛侊紒锛佷换鍔″紓甯�  鑱旂郴绠$悊鍛橈紒锛侊紒");
+                                return false;
+                            }
+                            rgvTaskProtocol.setAvoid(1);
+                            rgvTaskProtocol.setAvoidingTheDestination(avoid);
+                            RgvTaskCache.updateRgvStatus(rgvTaskProtocol);
+                            return false;
+                        } else {
+                            return false;
+                        }
+                    }
+                    return false;
+                }
+            }
+        } else {
+            if (rgvProtocolOther.getStatusType().equals(RgvStatusType.IDLE)){
+                if ((targetPosition-rgvProtocol.getCarBodyJiaoMing())
+                        - (rgvProtocolOther.getRgvPos()+rgvProtocolOther.getCarBodyKunPeng())
+                        > avoidDistance){//鏃犻渶閬胯
+                    return true;
+                } else {
+                    long avoid = targetPosition -rgvProtocol.getCarBodyJiaoMing() - avoidDistance - rgvProtocolOther.getCarBodyKunPeng();
+                    if (avoid < trackBenchmark + rgvProtocolOther.getCarBodyJiaoMing()){
+                        log.error("閬胯瓒呭嚭鑼冨洿锛侊紒锛佷换鍔″紓甯�  鑱旂郴绠$悊鍛橈紒锛侊紒");
+                        return false;
+                    }
+                    rgvTaskProtocol.setAvoid(1);
+                    rgvTaskProtocol.setAvoidingTheDestination(avoid);
+                    RgvTaskCache.updateRgvStatus(rgvTaskProtocol);
+                    return true;
+                }
+            } else if (rgvProtocolOther.getStatusType().equals(RgvStatusType.ROAM)){
+                if ((targetPosition-rgvProtocol.getCarBodyJiaoMing())
+                        - (rgvProtocolOther.getRgvPosDestination()+rgvProtocolOther.getCarBodyKunPeng())
+                        > avoidDistance){//鏃犻渶閬胯
+                    return true;
+                } else {
+                    long avoid = targetPosition -rgvProtocol.getCarBodyJiaoMing() - avoidDistance - rgvProtocolOther.getCarBodyKunPeng();
+                    if (avoid < trackBenchmark + rgvProtocolOther.getCarBodyJiaoMing()){
+                        log.error("閬胯瓒呭嚭鑼冨洿锛侊紒锛佷换鍔″紓甯�  鑱旂郴绠$悊鍛橈紒锛侊紒");
+                        return false;
+                    }
+                    rgvTaskProtocol.setAvoid(1);
+                    rgvTaskProtocol.setAvoidingTheDestination(avoid);
+                    RgvTaskCache.updateRgvStatus(rgvTaskProtocol);
+                    return true;
+                }
+            } else if (rgvProtocolOther.getStatusType().equals(RgvStatusType.WORKING)){
+                if ((targetPosition-rgvProtocol.getCarBodyJiaoMing())
+                        - (rgvProtocolOther.getRgvPosDestination()+rgvProtocolOther.getCarBodyKunPeng())
+                        > avoidDistance){//鏃犻渶閬胯
+                    return true;
+                } else {
+                    RgvThread rgvThreadOther = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgvProtocolOther.getRgvNo());
+                    TaskProtocolCache taskProtocolCacheOther = rgvThreadOther.getTaskProtocolCache();
+                    List<TaskProtocol> allPutTaskProtocol = taskProtocolCacheOther.getAllPutTaskProtocol();
+                    if (allPutTaskProtocol.size() > 1){
+                        return false;
+                    }
+                    for (TaskProtocol taskProtocol : allPutTaskProtocol){
+                        if (taskProtocol.getTargetPosition()<=rgvProtocolOther.getRgvPos()){
+                            long avoid = rgvProtocolOther.getRgvPos()+rgvProtocolOther.getCarBodyKunPeng()+avoidDistance+rgvProtocol.getCarBodyJiaoMing();
+                            if (avoid < trackBenchmark + rgvProtocolOther.getCarBodyJiaoMing()){
+                                log.error("琛岃蛋瓒呭嚭鑼冨洿锛侊紒锛佷换鍔″紓甯�  鑱旂郴绠$悊鍛橈紒锛侊紒");
+                                return false;
+                            }
+                            rgvTaskProtocol.setAvoid(1);
+                            rgvTaskProtocol.setAvoidingTheDestination(avoid);
+                            RgvTaskCache.updateRgvStatus(rgvTaskProtocol);
+                            return false;
+                        } else {
+                            return false;
+                        }
+                    }
+                    return false;
+                }
+            }
+        }
+        return false;
     }
 
     /**
      * 鍒濆鍖朢GV鐘舵��
      */
     private void initRgv() {
-        if (null == rgvProtocol) {
+        RgvProtocol rgvProtocol = RgvStatusCache.getRgvStatus(slave.getId());
+        if (rgvProtocol == null) {
             rgvProtocol = new RgvProtocol();
+            rgvProtocol.setRgvNo(slave.getId());
         }
         rgvProtocol.setMode((short) -1);
         rgvProtocol.setStatus((short)-1);
-        rgvProtocol.setTaskNo1((short)0);
-        rgvProtocol.setStatus1((short)-1);
-        rgvProtocol.setLoaded1((short)0);
         rgvProtocol.setWalkPos((short)0);
-        rgvProtocol.setRgvPos((short)0);
-        rgvProtocol.setTaskNo2((short)0);
-        rgvProtocol.setStatus2((short)-1);
-        rgvProtocol.setLoaded2((short)0);
+        rgvProtocol.setRgvPos(0L);
         rgvProtocol.setAlarm((short)0);
         rgvProtocol.setxSpeed((short) 0);
         rgvProtocol.setxDistance((short) 0);
         rgvProtocol.setxDuration((short) 0);
+        rgvProtocol.setCarBodyJiaoMing(0L);
+        rgvProtocol.setCarBodyKunPeng(0L);
+        try{
+            BasRgvService basRgvService = SpringUtils.getBean(BasRgvService.class);
+            BasRgv rgv = basRgvService.selectById(slave.getId());
+            if (!Cools.isEmpty(rgv)){
+                rgvProtocol.setStatusEnable(rgv.getStatus() == 1);
+            } else {
+                rgvProtocol.setStatusEnable(false);
+            }
+        } catch (Exception e){
+            log.error("RGV寮傚父锛侊紒锛�"+e.getMessage());
+            rgvProtocol.setStatusEnable(true);
+        }
+
+        RgvTaskProtocol rgvTaskProtocol = RgvTaskCache.getRgvStatus(slave.getId());
+        if (rgvTaskProtocol == null) {
+            rgvTaskProtocol = new RgvTaskProtocol();
+            rgvTaskProtocol.setRgvNo(slave.getId());
+        }
+        rgvTaskProtocol.setAvoid(-1);
+        rgvTaskProtocol.setAvoidingTheDestination(0L);
+
+        RgvStatusCache.updateRgvStatus(rgvProtocol);
+
+        RgvTaskCache.updateRgvStatus(rgvTaskProtocol);
+
     }
 
     @Override
@@ -163,13 +413,14 @@
         OperateResult connect = siemensNet.ConnectServer();
         if(connect.IsSuccess){
             result = true;
-            OutputQueue.RGV.offer(MessageFormat.format( "銆恵0}銆慠GV plc杩炴帴鎴愬姛 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
+//            OutputQueue.RGV.offer(MessageFormat.format( "銆恵0}銆慠GV plc杩炴帴鎴愬姛 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
             log.info("RGV plc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
         } else {
-            OutputQueue.RGV.offer(MessageFormat.format("銆恵0}銆慠GV plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
+//            OutputQueue.RGV.offer(MessageFormat.format("銆恵0}銆慠GV plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
             log.error("RGV plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
-            initRgv();
+
         }
+        initRgv();
 //        siemensNet.ConnectClose();
         return result;
     }
@@ -181,125 +432,106 @@
         try {
             OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 34);
             if (result.IsSuccess) {
-                if (null == rgvProtocol) {
+                // 鏋勫缓璁惧鐘舵�佸璞�
+                RgvProtocol rgvProtocol = RgvStatusCache.getRgvStatus(slave.getId());
+                if (rgvProtocol == null) {
                     rgvProtocol = new RgvProtocol();
                     rgvProtocol.setRgvNo(slave.getId());
                 }
                 rgvProtocol.setMode(siemensNet.getByteTransform().TransInt16(result.Content, 0));
                 rgvProtocol.setStatus(siemensNet.getByteTransform().TransInt16(result.Content, 2));
-                rgvProtocol.setTaskNo1(siemensNet.getByteTransform().TransInt16(result.Content, 4));
-                rgvProtocol.setStatus1(siemensNet.getByteTransform().TransInt16(result.Content, 6));
-                rgvProtocol.setLoaded1(siemensNet.getByteTransform().TransInt16(result.Content, 8));
-                rgvProtocol.setRgvPos(RouteUtils.RgvPosSta(slave.getId(),siemensNet.getByteTransform().TransInt16(result.Content, 10)));
-                rgvProtocol.setWalkPos(siemensNet.getByteTransform().TransInt16(result.Content, 12));
-                rgvProtocol.setTaskNo2(siemensNet.getByteTransform().TransInt16(result.Content, 14));
-                rgvProtocol.setStatus2(siemensNet.getByteTransform().TransInt16(result.Content, 16));
-                rgvProtocol.setLoaded2(siemensNet.getByteTransform().TransInt16(result.Content, 18));
+                rgvProtocol.setRgvPos(siemensNet.getByteTransform().TransUInt32(result.Content, 10));
                 rgvProtocol.setAlarm(siemensNet.getByteTransform().TransInt16(result.Content, 20));
-                rgvProtocol.setHeart(siemensNet.getByteTransform().TransInt16(result.Content, 22));
-                rgvProtocol.setTemp1(siemensNet.getByteTransform().TransInt16(result.Content, 24));
-                rgvProtocol.setTemp2(siemensNet.getByteTransform().TransInt16(result.Content, 26));
-                rgvProtocol.setTemp3(siemensNet.getByteTransform().TransInt16(result.Content, 28));
-                rgvProtocol.setTemp4(siemensNet.getByteTransform().TransInt16(result.Content, 30));
-                rgvProtocol.setTemp5(siemensNet.getByteTransform().TransInt16(result.Content, 32));
 //                rgvProtocol.setxSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 28));
 //                rgvProtocol.setxDistance(siemensNet.getByteTransform().TransInt16(result.Content, 40));
 //                rgvProtocol.setxDuration(siemensNet.getByteTransform().TransInt16(result.Content, 48));
 
                 OutputQueue.RGV.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
-
-                // 宸ヤ綅1澶嶄綅淇″彿
-                if (rgvProtocol.getStatusType1().equals(RgvStatusType.WAITING)
-                        || rgvProtocol.getStatusType1().equals(RgvStatusType.FETCHWAITING)) {
-                    if (resetFlag1) {
-                        RgvCommand rgvCommand = new RgvCommand();
-                        rgvCommand.setAckFinish1((short)1);
-                        if (write(rgvCommand)) {
-                            resetFlag1 = false;
-                        }
-                    }
-                }
-
-                // 宸ヤ綅2澶嶄綅淇″彿
-                if (rgvProtocol.getStatusType2().equals(RgvStatusType.WAITING)
-                        || rgvProtocol.getStatusType2().equals(RgvStatusType.FETCHWAITING)) {
-                    if (resetFlag2) {
-                        RgvCommand rgvCommand = new RgvCommand();
-                        rgvCommand.setAckFinish2((short)1);
-                        if (write(rgvCommand)) {
-                            resetFlag2 = false;
-                        }
-                    }
-                }
+//                // 宸ヤ綅1澶嶄綅淇″彿
+//                if (rgvProtocol.getStatusType().equals(RgvStatusType.WAITING)
+//                        || rgvProtocol.getStatusType().equals(RgvStatusType.FETCHWAITING)) {
+//                    if (resetFlag1) {
+//                        RgvCommand rgvCommand = new RgvCommand();
+//                        rgvCommand.setAckFinish1((short)1);
+//                        if (write(rgvCommand)) {
+//                            resetFlag1 = false;
+//                        }
+//                    }
+//                }
 
                 try {
                     // 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
                     BasRgvService basRgvService = SpringUtils.getBean(BasRgvService.class);
-                    BasRgv basRgv = new BasRgv();
+                    BasRgv basRgv = basRgvService.selectById(slave.getId());
+                    if (!Cools.isEmpty(basRgv)){
+                        rgvProtocol.setStatusEnable(basRgv.getStatus() == 1);
+                    } else {
+                        rgvProtocol.setStatusEnable(false);
+                    }
+//                    BasRgv basRgv = new BasRgv();
                     basRgv.setRgvNo(slave.getId());
                     basRgv.setRgvSts((int)rgvProtocol.getMode());
-                    basRgv.setLoaded2(rgvProtocol.getLoaded2().intValue());
                     if (!basRgvService.updateById(rgvProtocol.toSqlModel(basRgv))){
                         log.error("RGV plc鏁版嵁搴撴洿鏂板け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
                     }
-                } catch (Exception ignore){}
+                } catch (Exception ignore){
+
+                }
+
+
+                // 鏇存柊缂撳瓨
+                RgvStatusCache.updateRgvStatus(rgvProtocol);
 
             } else {
                 initRgv();
-                OutputQueue.RGV.offer(MessageFormat.format("銆恵0}銆戣鍙朢GV plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
+//                OutputQueue.RGV.offer(MessageFormat.format("銆恵0}銆戣鍙朢GV plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
                 log.error("璇诲彇RGV plc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
             }
         } catch (Exception e) {
-            e.printStackTrace();
-            OutputQueue.RGV.offer(MessageFormat.format("銆恵0}銆戣鍙朢GV plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
+//            e.printStackTrace();
+//            OutputQueue.RGV.offer(MessageFormat.format("銆恵0}銆戣鍙朢GV plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
             log.error("璇诲彇RGV plc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
             initRgv();
         }
     }
 
     /**
-     * 宸ヤ綅1銆�2鍚屾椂鍐欏叆鏁版嵁
+     * 鍐欏叆鏁版嵁
      */
-    private boolean write(RgvCommand command) throws InterruptedException {
-        if (null == command) {
+    private boolean write(TaskProtocol taskProtocol) throws InterruptedException {
+        if (null == taskProtocol) {
             log.error("RGV鍐欏叆鍛戒护涓虹┖");
             return false;
         }
 //        convertRow(command);
-        command.setRgvNo(slave.getId());
-        short[] array = new short[11];
-        array[0] = command.getAckFinish1();
-        array[1] = command.getTaskNo1();
-        array[2] = command.getTaskMode1();
-        array[3] = command.getSourceStaNo1();
-        array[4] = command.getDestinationStaNo1();
-        array[5] = command.getAckFinish2();
-        array[6] = command.getTaskNo2();
-        array[7] = command.getTaskMode2();
-        array[8] = command.getSourceStaNo2();
-        array[9] = command.getDestinationStaNo2();
-        array[10] = command.getCommand();
-        OperateResult result = siemensNet.Write("DB100.0", array);
+//        taskProtocol.setRgvNo(slave.getId());
+        Long[] array = new Long[11];
+//        array[0] = taskProtocol.getAckFinish1();
+        array[1] = taskProtocol.getTaskNo();
+//        array[2] = taskProtocol.getTaskMode();
+//        array[4] = command.getDestinationStaNo();
+//        array[10] = taskProtocol.getCommand();
+        OperateResult result = siemensNet.Write("DB100.0", taskProtocol.getTaskNo());
 
-        if (command.getAckFinish1() == 0 && command.getAckFinish2() == 0) {
-            short commandFinish = 3;  //宸ヤ綅1銆�2浠诲姟鍚屾椂鍐欏叆
-            Thread.sleep(100L);
-            result = siemensNet.Write("DB100.20", commandFinish);
-        }
+//        if (taskProtocol.getAckFinish1() == 0) {
+//            short commandFinish = 3;  //宸ヤ綅1銆�2浠诲姟鍚屾椂鍐欏叆
+//            Thread.sleep(100L);
+//            result = siemensNet.Write("DB100.20", commandFinish);
+//        }
 
         try {
             // 鏃ュ織璁板綍
             BasRgvOptService bean = SpringUtils.getBean(BasRgvOptService.class);
             BasRgvOpt basRgvOpt = new BasRgvOpt(
-                    command.getTaskNo1().intValue(),
-                    command.getTaskNo2().intValue(),
-                    command.getRgvNo(),
+                    taskProtocol.getTaskNo().intValue(),
+                    taskProtocol.getTaskNo().intValue(),
+                    slave.getId(),
                     new Date(),
-                    command.getTaskModeType1().toString(),
-                    command.getSourceStaNo1().intValue(),
-                    command.getDestinationStaNo1().intValue(),
-                    command.getSourceStaNo2().intValue(),
-                    command.getDestinationStaNo2().intValue(),
+                    String.valueOf(taskProtocol.getTaskStatus()),
+                    null,
+                    null,
+                    null,
+                    result.IsSuccess? 1 : 0,
                     null,
                     new Date(),
                     null
@@ -310,8 +542,8 @@
         if (result != null && result.IsSuccess) {
             Thread.sleep(200);
             this.readStatus();
-            log.info("RGV 鍛戒护涓嬪彂[id:{}] >>>>> {}", slave.getId(), JSON.toJSON(command));
-            OutputQueue.RGV.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
+            log.info("RGV 鍛戒护涓嬪彂[id:{}] >>>>> {}", slave.getId(), JSON.toJSON(taskProtocol));
+            OutputQueue.RGV.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(taskProtocol)));
             return true;
         } else {
             OutputQueue.RGV.offer(MessageFormat.format("銆恵0}銆戝啓鍏GV plc鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
@@ -320,146 +552,9 @@
         }
     }
 
-    /**
-     * 宸ヤ綅1鍐欏叆鏁版嵁
-     */
-    private boolean write1(RgvCommand command) throws InterruptedException {
-        if (null == command) {
-            log.error("RGV鍐欏叆鍛戒护涓虹┖");
-            return false;
-        }
-
-//        siemensNet.Write("DB100.20", command.getCommand());
-
-        command.setRgvNo(slave.getId());
-        short[] array = new short[5];
-        array[0] = command.getAckFinish1();
-        array[1] = command.getTaskNo1();
-        array[2] = command.getTaskMode1();//浠诲姟妯″紡
-        array[3] = command.getSourceStaNo1();
-        array[4] = command.getDestinationStaNo1();
-//        siemensNet.Write("DB100.20", 0);
-
-        OperateResult result = siemensNet.Write("DB100.0", array);
-
-        if (command.getAckFinish1() == 0) {
-            short commandFinish = 1;  //宸ヤ綅1浠诲姟鍐欏叆
-            Thread.sleep(100L);
-            result = siemensNet.Write("DB100.20", commandFinish);
-        }
-
-        try {
-            // 鏃ュ織璁板綍
-            BasRgvOptService bean = SpringUtils.getBean(BasRgvOptService.class);
-            BasRgvOpt basRgvOpt = new BasRgvOpt(
-                    command.getTaskNo1().intValue(),
-                    command.getTaskNo2().intValue(),
-                    command.getRgvNo(),
-                    new Date(),
-                    command.getTaskModeType1().toString(),
-                    command.getSourceStaNo1().intValue(),
-                    command.getDestinationStaNo1().intValue(),
-                    command.getSourceStaNo2().intValue(),
-                    command.getDestinationStaNo2().intValue(),
-                    null,
-                    new Date(),
-                    null
-            );
-            bean.insert(basRgvOpt);
-        } catch (Exception ignore) {}
-
-        if (result != null && result.IsSuccess) {
-            Thread.sleep(200);
-            this.readStatus();
-            log.info("RGV 宸ヤ綅1鍛戒护涓嬪彂[id:{}] >>>>> {}", slave.getId(), JSON.toJSON(command));
-            OutputQueue.RGV.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 宸ヤ綅1鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
-            return true;
-        } else {
-            OutputQueue.RGV.offer(MessageFormat.format("銆恵0}銆戝啓鍏GV plc宸ヤ綅1鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
-            log.error("鍐欏叆RGV plc宸ヤ綅1鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
-            return false;
-        }
-    }
-
-    /**
-     * 宸ヤ綅2鍐欏叆鏁版嵁
-     */
-    private boolean write2(RgvCommand command) throws InterruptedException {
-        if (null == command) {
-            log.error("RGV鍐欏叆鍛戒护涓虹┖");
-            return false;
-        }
-
-        command.setRgvNo(slave.getId());
-        short[] array = new short[6];
-        array[0] = command.getAckFinish2();//浠诲姟瀹屾垚纭浣�
-        array[1] = command.getTaskNo2();//浠诲姟鍙�
-        array[2] = command.getTaskMode2();//浠诲姟妯″紡
-        array[3] = command.getSourceStaNo2();//婧愮珯
-        array[4] = command.getDestinationStaNo2();//鐩爣绔�
-        array[5] = command.getCommand();//浠诲姟涓嬪彂纭
-
-        OperateResult result = siemensNet.Write("DB100.10", array);
-
-        if (command.getAckFinish2() == 0) {
-            short commandFinish = 2;  //宸ヤ綅2浠诲姟鍐欏叆
-            Thread.sleep(100L);
-            result = siemensNet.Write("DB100.20", commandFinish);
-        }
-
-        try {
-            // 鏃ュ織璁板綍
-            BasRgvOptService bean = SpringUtils.getBean(BasRgvOptService.class);
-            BasRgvOpt basRgvOpt = new BasRgvOpt(
-                    command.getTaskNo1().intValue(),
-                    command.getTaskNo2().intValue(),
-                    command.getRgvNo(),
-                    new Date(),
-                    command.getTaskModeType1().toString(),
-                    command.getSourceStaNo1().intValue(),
-                    command.getDestinationStaNo1().intValue(),
-                    command.getSourceStaNo2().intValue(),
-                    command.getDestinationStaNo2().intValue(),
-                    null,
-                    new Date(),
-                    null
-            );
-            bean.insert(basRgvOpt);
-        } catch (Exception ignore) {}
-
-        if (result != null && result.IsSuccess) {
-            Thread.sleep(200);
-            this.readStatus();
-            log.info("RGV 宸ヤ綅2鍛戒护涓嬪彂[id:{}] >>>>> {}", slave.getId(), JSON.toJSON(command));
-            OutputQueue.RGV.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 宸ヤ綅2鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
-            return true;
-        } else {
-            OutputQueue.RGV.offer(MessageFormat.format("銆恵0}銆戝啓鍏GV plc宸ヤ綅2鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
-            log.error("鍐欏叆RGV plc宸ヤ綅2鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
-            return false;
-        }
-    }
-
     @Override
     public void close() {
         siemensNet.ConnectClose();
-    }
-
-    /******************************************************************************************/
-    /**************************************** 娴嬭瘯涓撶敤 *****************************************/
-    /*****************************************************************************************/
-    public static void main(String[] args) throws InterruptedException {
-        RgvSlave slave = new RgvSlave();
-        slave.setId(1);
-        slave.setIp("192.168.6.9");
-        slave.setRack(0);
-        slave.setSlot(0);
-        RgvThread rgvThread = new RgvThread(slave);
-        rgvThread.connect();
-        rgvThread.readStatus();
-        System.out.println(JSON.toJSONString(rgvThread.rgvProtocol));
-        Thread.sleep(3000L);
-
     }
 
 }

--
Gitblit v1.9.1