From 5a3218fc35dd3e949bb017c77839aedda8c528c8 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 25 四月 2024 18:10:22 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/ZyRgvThread.java |  351 ++++++++++++++++++++++------------------------------------
 1 files changed, 135 insertions(+), 216 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/ZyRgvThread.java b/src/main/java/com/zy/core/thread/ZyRgvThread.java
index e10e17f..184847d 100644
--- a/src/main/java/com/zy/core/thread/ZyRgvThread.java
+++ b/src/main/java/com/zy/core/thread/ZyRgvThread.java
@@ -7,10 +7,10 @@
 import com.alibaba.fastjson.JSON;
 import com.core.common.DateUtils;
 import com.core.common.SpringUtils;
-import com.zy.asrs.entity.BasRgv;
-import com.zy.asrs.entity.BasRgvOpt;
-import com.zy.asrs.service.BasRgvOptService;
-import com.zy.asrs.service.BasRgvService;
+//import com.zy.asrs.entity.BasRgv;
+//import com.zy.asrs.entity.BasRgvOpt;
+//import com.zy.asrs.service.BasRgvOptService;
+//import com.zy.asrs.service.BasRgvService;
 import com.zy.core.RgvThread;
 import com.zy.core.cache.MessageQueue;
 import com.zy.core.cache.OutputQueue;
@@ -71,7 +71,7 @@
                             command = new RgvCommand();
                         }
                         command.setRgvNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
-                        command.setTaskNo1((short) 0); // 宸ヤ綔鍙�
+                        command.setTaskNo1(0); // 宸ヤ綔鍙�
                         command.setTaskMode1(RgvTaskModeType.NONE); // 浠诲姟妯″紡
                         command.setSourceStaNo1((short) 0);//婧愮珯
                         command.setDestinationStaNo1((short) 0);//鐩爣绔�
@@ -79,13 +79,10 @@
                         command.setTaskMode2(RgvTaskModeType.NONE); // 浠诲姟妯″紡
                         command.setSourceStaNo2((short) 0);//婧愮珯
                         command.setDestinationStaNo2((short) 0);//鐩爣绔�
-                        command.setAckFinish((short) 1);  // 浠诲姟瀹屾垚纭浣�
+                        command.setAckFinish(true);  // 浠诲姟瀹屾垚纭浣�
                         write(command);
                         break;
-                    //鍐欏叆鏁版嵁纭鍛戒护
-                    case 4:
-                        writeCommand((RgvCommand) task.getData());
-                        break;
+
                     default:
                         break;
                 }
@@ -121,86 +118,56 @@
      */
     private void readStatus(){
         try {
-            OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 34);
+            OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 30);
             if (result.IsSuccess) {
                 if (null == rgvProtocol) {
                     rgvProtocol = new RgvProtocol();
                     rgvProtocol.setRgvNo(slave.getId());
                 }
                 rgvProtocol.setMode(siemensNet.getByteTransform().TransInt16(result.Content, 0));//妯″紡
-                rgvProtocol.setStatus(siemensNet.getByteTransform().TransInt16(result.Content, 2));//RGV鐘舵��
-                rgvProtocol.setTaskNo1(siemensNet.getByteTransform().TransInt16(result.Content, 4));//宸ヤ綅1宸ヤ綔鍙�
-                rgvProtocol.setLoaded1(siemensNet.getByteTransform().TransInt16(result.Content, 6));//宸ヤ綅1鏈夌墿
+                rgvProtocol.setTaskNo1(siemensNet.getByteTransform().TransInt32(result.Content, 2));//宸ヤ綅1宸ヤ綔鍙�
+                rgvProtocol.setStatus(siemensNet.getByteTransform().TransInt16(result.Content, 6));//RGV鐘舵��
                 rgvProtocol.setRgvPos(siemensNet.getByteTransform().TransInt16(result.Content, 8));//RGV褰撳墠浣嶇疆
                 rgvProtocol.setWalkPos(siemensNet.getByteTransform().TransInt16(result.Content, 10));//璧拌鍦ㄥ畾浣�
-                rgvProtocol.setTaskNo2(siemensNet.getByteTransform().TransInt16(result.Content, 12));//宸ヤ綅2宸ヤ綔鍙�
-                rgvProtocol.setLoaded2(siemensNet.getByteTransform().TransInt16(result.Content, 14));//宸ヤ綅2鏈夌墿
-                rgvProtocol.setTaskFinish1(siemensNet.getByteTransform().TransInt16(result.Content, 16));//宸ヤ綅1浠诲姟瀹屾垚
-                rgvProtocol.setTaskFinish2(siemensNet.getByteTransform().TransInt16(result.Content, 18));//宸ヤ綅2浠诲姟瀹屾垚
-                rgvProtocol.setAlarm(siemensNet.getByteTransform().TransInt16(result.Content, 20));//寮傚父鐮�
-                rgvProtocol.setHeart(siemensNet.getByteTransform().TransInt16(result.Content, 22));//RGV蹇冭烦淇″彿
-                rgvProtocol.setTemp1(siemensNet.getByteTransform().TransInt16(result.Content, 24));//澶囩敤1
-                rgvProtocol.setTemp2(siemensNet.getByteTransform().TransInt16(result.Content, 26));//澶囩敤2
-                rgvProtocol.setTemp3(siemensNet.getByteTransform().TransInt16(result.Content, 28));//澶囩敤3
-                rgvProtocol.setTemp4(siemensNet.getByteTransform().TransInt16(result.Content, 30));//澶囩敤4
-                rgvProtocol.setTemp5(siemensNet.getByteTransform().TransInt16(result.Content, 32));//澶囩敤5
-
-                OperateResultExOne<byte[]> result2 = siemensNet.Read("DB100.0", (short) 22);
-                if (result2.IsSuccess) {
-                    rgvProtocol.setTaskMode1(siemensNet.getByteTransform().TransInt16(result.Content, 4));//宸ヤ綅1浠诲姟妯″紡
-                    rgvProtocol.setSourceStn1(siemensNet.getByteTransform().TransInt16(result.Content, 6));//宸ヤ綅1婧愮珯
-                    rgvProtocol.setDestinationPos1(siemensNet.getByteTransform().TransInt16(result.Content, 8));//宸ヤ綅1鐩爣绔�
-                    rgvProtocol.setTaskMode2(siemensNet.getByteTransform().TransInt16(result.Content, 14));//宸ヤ綅2浠诲姟妯″紡
-                    rgvProtocol.setSourceStn2(siemensNet.getByteTransform().TransInt16(result.Content, 16));//宸ヤ綅2婧愮珯
-                    rgvProtocol.setDestinationPos2(siemensNet.getByteTransform().TransInt16(result.Content, 18));//宸ヤ綅2鐩爣绔�
-                }
+                rgvProtocol.setTemp1(siemensNet.getByteTransform().TransInt32(result.Content, 12));//澶囩敤1
+                rgvProtocol.setLoaded1(siemensNet.getByteTransform().TransInt16(result.Content, 16));//宸ヤ綅1鏈夌墿
+                rgvProtocol.setAlarm(siemensNet.getByteTransform().TransInt16(result.Content, 18));//寮傚父鐮�
+                rgvProtocol.setTemp2(siemensNet.getByteTransform().TransInt16(result.Content, 20));//澶囩敤2
+                rgvProtocol.setTemp3(siemensNet.getByteTransform().TransInt16(result.Content, 24));//澶囩敤3
+                rgvProtocol.setTemp4(siemensNet.getByteTransform().TransInt16(result.Content, 28));//澶囩敤4
 
                 OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
 
                 // 澶嶄綅淇″彿
                 if (rgvProtocol.getStatusType().equals(RgvStatusType.WAITING)) {
-                    if (resetFlag1) {
-                        RgvCommand rgvCommand = new RgvCommand();
-                        rgvCommand.setAckFinish((short) 2);//宸ヤ綅1浠诲姟缁撴潫宸叉帴鏀�
-                        if (write(rgvCommand)) {
-                            resetFlag1 = false;
-                        }
-                    }
 
-                    if (resetFlag2) {
-                        RgvCommand rgvCommand = new RgvCommand();
-                        rgvCommand.setAckFinish((short) 3);//宸ヤ綅2浠诲姟缁撴潫宸叉帴鏀�
-                        if (write(rgvCommand)) {
-                            resetFlag2 = false;
-                        }
-                    }
                 }
 
                 try {
                     // 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
-                    BasRgvService basRgvService = SpringUtils.getBean(BasRgvService.class);
-                    BasRgv basRgv = new BasRgv();
-                    basRgv.setRgvNo(slave.getId());
-                    basRgv.setMode(rgvProtocol.getMode().intValue());
-                    basRgv.setStatus(rgvProtocol.getStatus().intValue());
-                    basRgv.setTaskNo1(rgvProtocol.getTaskNo1().intValue());
-                    basRgv.setLoaded1(rgvProtocol.getLoaded1().intValue());
-                    basRgv.setRgvPos(rgvProtocol.getRgvPos().intValue());
-                    basRgv.setWalkPos(rgvProtocol.getWalkPos().intValue());
-                    basRgv.setTaskNo2(rgvProtocol.getTaskNo2().intValue());
-                    basRgv.setLoaded2(rgvProtocol.getLoaded2().intValue());
-                    basRgv.setTaskFinish1(rgvProtocol.getTaskFinish1().intValue());
-                    basRgv.setTaskFinish2(rgvProtocol.getTaskFinish2().intValue());
-                    basRgv.setAlarm(rgvProtocol.getAlarm().intValue());
-                    basRgv.setHeart(rgvProtocol.getHeart().intValue());
-                    basRgv.setTemp1(rgvProtocol.getTemp1().intValue());
-                    basRgv.setTemp2(rgvProtocol.getTemp2().intValue());
-                    basRgv.setTemp3(rgvProtocol.getTemp3().intValue());
-                    basRgv.setTemp4(rgvProtocol.getTemp4().intValue());
-                    basRgv.setTemp5(rgvProtocol.getTemp5().intValue());
-                    if (!basRgvService.updateById(basRgv)){
-                        log.error("RGV plc鏁版嵁搴撴洿鏂板け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
-                    }
+//                    BasRgvService basRgvService = SpringUtils.getBean(BasRgvService.class);
+//                    BasRgv basRgv = new BasRgv();
+//                    basRgv.setRgvNo(slave.getId());
+//                    basRgv.setMode(rgvProtocol.getMode().intValue());
+//                    basRgv.setStatus(rgvProtocol.getStatus().intValue());
+//                    basRgv.setTaskNo1(rgvProtocol.getTaskNo1());
+//                    basRgv.setLoaded1(rgvProtocol.getLoaded1().intValue());
+//                    basRgv.setRgvPos(rgvProtocol.getRgvPos().intValue());
+//                    basRgv.setWalkPos(rgvProtocol.getWalkPos().intValue());
+////                    basRgv.setTaskNo2(rgvProtocol.getTaskNo2().intValue());
+////                    basRgv.setLoaded2(rgvProtocol.getLoaded2().intValue());
+////                    basRgv.setTaskFinish1(rgvProtocol.getTaskFinish1().intValue());
+////                    basRgv.setTaskFinish2(rgvProtocol.getTaskFinish2().intValue());
+//                    basRgv.setAlarm(rgvProtocol.getAlarm().intValue());
+////                    basRgv.setHeart(rgvProtocol.getHeart().intValue());
+//                    basRgv.setTemp1(rgvProtocol.getTemp1());
+//                    basRgv.setTemp2(rgvProtocol.getTemp2().intValue());
+//                    basRgv.setTemp3(rgvProtocol.getTemp3().intValue());
+////                    basRgv.setTemp4(rgvProtocol.getTemp4().intValue());
+////                    basRgv.setTemp5(rgvProtocol.getTemp5().intValue());
+//                    if (!basRgvService.updateById(basRgv)){
+//                        log.error("RGV plc鏁版嵁搴撴洿鏂板け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
+//                    }
                 } catch (Exception ignore){}
 
             } else {
@@ -224,164 +191,116 @@
             log.error("RGV鍐欏叆鍛戒护涓虹┖");
             return false;
         }
+
         command.setRgvNo(slave.getId());
-        OperateResult result = null;
-        if (command.getTaskNo1() > 0 && command.getTaskNo2() == 0) {
-            //鍙湁宸ヤ綅1瀛樺湪浠诲姟涓斾换鍔℃病鏈夎纭锛屽伐浣�1寮�濮嬭鏃�
-            if (command.getCommand() == 0) {
-                rgvProtocol.setTask1SendTime(System.currentTimeMillis());
+        short[] array = new short[5];
+        array[0] = command.getSourceStaNo1();
+        array[1] = command.getSourceStaNo2();
+        array[2] = command.getDestinationStaNo1();
+        array[3] = command.getDestinationStaNo2();
+        array[4] = command.getTaskMode1();
+
+        OperateResult result1 = siemensNet.Write("DB100.0",array);
+        OperateResult result2 = siemensNet.Write("DB100.10",command.getTaskNo1());
+        OperateResult result3 = siemensNet.Write("DB100.18.1",command.isAckFinish());
+
+        if (!result1.IsSuccess && !result2.IsSuccess && !result3.IsSuccess){
+            log.error("鍐欏叆RGVplc鏁版嵁澶辫触锛岄噸鏂版坊鍔犱换鍔″埌闃熷垪 ===> [id:{}],{}",slave.getId(),JSON.toJSON(command));
+            MessageQueue.offer(SlaveType.Rgv,slave.getId(),new Task(2,command));
+            Thread.sleep(100);
+            readStatus();
+            return false;
+        }
+
+        //RGV浠诲姟鍐欏叆鍚庯紝鍥炶涓�娆★紝鐪嬫槸鍚︽垚鍔�
+        Thread.sleep(400);
+        try {
+            OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 20);
+            OperateResultExOne<byte[]> resultReadAck = siemensNet.Read("DB100.18.1", (short) 1);
+            if (resultRead.IsSuccess){
+                RgvCommand one = new RgvCommand();
+                one.setAckFinish(siemensNet.getByteTransform().TransBool(resultReadAck.Content, 0));
+                one.setSourceStaNo1(siemensNet.getByteTransform().TransInt16(resultRead.Content, 0));
+                one.setSourceStaNo2(siemensNet.getByteTransform().TransInt16(resultRead.Content, 2));
+                one.setDestinationStaNo1(siemensNet.getByteTransform().TransInt16(resultRead.Content, 4));
+                one.setDestinationStaNo2(siemensNet.getByteTransform().TransInt16(resultRead.Content, 6));
+                one.setTaskMode1(siemensNet.getByteTransform().TransInt16(resultRead.Content, 8));
+                one.setTaskNo1(siemensNet.getByteTransform().TransInt32(resultRead.Content, 10));
+//                one.setDestinationStaNo1(siemensNet.getByteTransform().TransInt16(resultRead.Content, 8));
+                if (    !command.isAckFinish() == one.isAckFinish() ||
+                        !command.getTaskNo1().equals(one.getTaskNo1()) ||
+                        !command.getTaskMode1().equals(one.getTaskMode1()) ||
+                        !command.getSourceStaNo1().equals(one.getSourceStaNo1()) ||
+                        !command.getDestinationStaNo1().equals(one.getDestinationStaNo1())
+                ){
+                    try{
+                        log.error("RGV鍛戒护鍦板潃鍐欏叆鍚庡洖璇诲け璐id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
+                    }catch (Exception e){
+                        try{
+                            log.error("鏃ュ織鎵撳嵃澶辫触锛�===>>鍙傛暟one鎶ラ敊 [id:{}],{}", slave.getId(), JSON.toJSON(command),JSON.toJSON(resultRead));
+                        }catch (Exception e1){
+                            log.error("鏃ュ織鎵撳嵃澶辫触锛�===>> [id:{}],{}", slave.getId(), JSON.toJSON(command));
+                        }
+                    }
+                    log.error("Rgv鍛戒护鍥炶澶辫触鍚庯紝閲嶆柊娣诲姞浠诲姟鍒伴槦鍒� ===>> [id:{}],{}", slave.getId(), JSON.toJSON(command));
+                    MessageQueue.offer(SlaveType.Rgv, slave.getId(), new Task(2, command));
+                    Thread.sleep(100);
+                    readStatus();
+                    return false;
+                }else {
+                    log.info("RGV鍛戒护鍦板潃鍐欏叆鍚庡洖璇绘垚鍔焄id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
+                }
             }
-            short[] array = new short[10];
-            array[0] = command.getAckFinish(); // 浠诲姟瀹屾垚纭浣�
-            array[1] = command.getTaskNo1();  // 宸ヤ綅1浠诲姟鍙�
-            array[2] = command.getTaskMode1();  // 宸ヤ綅1妯″紡
-            array[3] = command.getSourceStaNo1(); // 宸ヤ綅1婧愮珯
-            array[4] = command.getDestinationStaNo1(); // 宸ヤ綅1鐩爣绔�
-            array[5] = 0; // 宸ヤ綅2浠诲姟鍙�
-            array[6] = 0;  // 宸ヤ綅2妯″紡
-            array[7] = 0; // 宸ヤ綅2婧愮珯
-            array[8] = 0; // 宸ヤ綅2鐩爣绔�
-            array[9] = command.getCommand();// 浠诲姟纭浣�
-            result = siemensNet.Write("DB100.0", array);
-            log.info("RGV鍛戒护涓嬪彂[id:{}] >>>>> {}", slave.getId(), array);
-        } else if (command.getTaskNo2() > 0 && command.getTaskNo1() == 0) {
-            //鍙湁宸ヤ綅2瀛樺湪浠诲姟
-            short[] array = new short[5];
-            array[0] = command.getTaskNo2(); // 宸ヤ綅2浠诲姟鍙�
-            array[1] = command.getTaskMode2();  // 宸ヤ綅2妯″紡
-            array[2] = command.getSourceStaNo2(); // 宸ヤ綅2婧愮珯
-            array[3] = command.getDestinationStaNo2(); // 宸ヤ綅2鐩爣绔�
-            array[4] = command.getCommand();// 浠诲姟纭浣�
-            result = siemensNet.Write("DB100.12", array);
-            log.info("RGV鍛戒护涓嬪彂[id:{}] >>>>> {}", slave.getId(), array);
-        }else {
-            //宸ヤ綅1鍜屽伐浣�2浠诲姟
-            short[] array = new short[10];
-            array[0] = command.getAckFinish(); // 浠诲姟瀹屾垚纭浣�
-            array[1] = command.getTaskNo1();  // 宸ヤ綅1浠诲姟鍙�
-            array[2] = command.getTaskMode1();  // 宸ヤ綅1妯″紡
-            array[3] = command.getSourceStaNo1(); // 宸ヤ綅1婧愮珯
-            array[4] = command.getDestinationStaNo1(); // 宸ヤ綅1鐩爣绔�
-            array[5] = command.getTaskNo2(); // 宸ヤ綅2浠诲姟鍙�
-            array[6] = command.getTaskMode2();  // 宸ヤ綅2妯″紡
-            array[7] = command.getSourceStaNo2(); // 宸ヤ綅2婧愮珯
-            array[8] = command.getDestinationStaNo2(); // 宸ヤ綅2鐩爣绔�
-            array[9] = command.getCommand();// 浠诲姟纭浣�
-            result = siemensNet.Write("DB100.0", array);
-            log.info("RGV鍛戒护涓嬪彂[id:{}] >>>>> {}", slave.getId(), array);
+        }catch (Exception e){
+            log.error("RGV鍛戒护鍦板潃鍐欏叆鍚庡洖璇诲嚭閿�");
         }
 
-        if (command.getCommand() == 1) {
-            //浠诲姟琚‘璁�
-            rgvProtocol.setTask1SendTime(0L);//閲嶇疆宸ヤ綅1涓嬪彂鏃堕棿
+        if (!command.isAckFinish()) {
+            if (result1.IsSuccess) {
+                Thread.sleep(300);
+                //浠诲姟涓嬪彂娆℃暟
+                int writeCount2 = 0;
+
+                do {
+                    writeCount2++;
+                    result1 = siemensNet.Write("DB100.18", true);
+                    if(result1.IsSuccess){
+                        //RGV浠诲姟鍐欏叆鍚庯紝鍥炶涓�娆★紝鐪嬫槸鍚︽垚鍔�
+                        Thread.sleep(200);
+                        OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.18", (short) 2);
+                        if (resultRead.IsSuccess) {
+                            boolean commandFinish=siemensNet.getByteTransform().TransBool(resultRead.Content, 0);
+                            if (!commandFinish){
+                                log.error("RGV浠诲姟纭浣�"+commandFinish+"鍐欏叆鏁版嵁涓庡洖璇绘暟鎹笉涓�鑷达紒"+"寰幆鎵ц娆℃暟:"+writeCount2+"娆�");
+                            }else{
+                                //浠诲姟鍛戒护鍐欏叆鎴愬姛
+                                log.info("RGV浠诲姟纭浣�"+commandFinish+"鍥炶鎴愬姛锛�"+"寰幆鎵ц娆℃暟:"+writeCount2+"娆�");
+                                break;
+                            }
+                        }else {
+                            log.error("RGV浠诲姟纭浣嶅洖璇诲け璐ワ紒"+"寰幆鎵ц娆℃暟:"+writeCount2+"娆�");
+                        }
+                    } else {
+                        log.error("RGV浠诲姟纭浣嶅啓鍏ュけ璐ワ紒"+"寰幆鎵ц娆℃暟:"+writeCount2+"娆�");
+                    }
+                }while (writeCount2<5);
+            }
         }
 
-        if(!result.IsSuccess){
-            log.error("鍐欏叆RGV plc鏁版嵁澶辫触锛岄噸鏂版坊鍔犱换鍔″埌闃熷垪 ===>> [id:{}],{}", slave.getId(), JSON.toJSON(command));
-            MessageQueue.offer(SlaveType.Rgv, slave.getId(), new Task(2, command));
-            Thread.sleep(100);
-            readStatus();
-            return false;
-        }
-
-        try {
-            // 鏃ュ織璁板綍
-            BasRgvOptService bean = SpringUtils.getBean(BasRgvOptService.class);
-            Date now = new Date();
-            BasRgvOpt basRgvOpt = new BasRgvOpt(
-                    command.getRgvNo(),    // RGV[闈炵┖]
-                    command.getAckFinish().intValue(),    // 浠诲姟瀹屾垚纭浣�
-                    command.getTaskNo1().intValue(),    // 浠诲姟鍙�
-                    command.getTaskMode1().intValue(),    // 妯″紡
-                    command.getSourceStaNo1().intValue(),    // 婧愮珯
-                    command.getDestinationStaNo1().intValue(),    // 鐩爣绔�
-                    command.getTaskNo2().intValue(),    // 浠诲姟鍙�
-                    command.getTaskMode2().intValue(),    // 妯″紡
-                    command.getSourceStaNo2().intValue(),    // 婧愮珯
-                    command.getDestinationStaNo2().intValue(),    // 鐩爣绔�
-                    command.getCommand().intValue(),
-                    now,    // 涓嬪彂鏃堕棿
-                    null, // 涓嬪彂浜哄憳
-                    now,    // 淇敼鏃堕棿
-                    null,    // 淇敼浜哄憳
-                    null //鍝嶅簲
-            );
-            bean.insert(basRgvOpt);
-        } catch (Exception ignore) {}
-
-        if (result != null && result.IsSuccess) {
+        if (result1 != null && result1.IsSuccess) {
             Thread.sleep(200);
             this.readStatus();
-            log.info("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), JSON.toJSON(command));
-            OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
+            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.CRN.offer(MessageFormat.format("銆恵0}銆戝啓鍏ュ爢鍨涙満plc鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
-            log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+            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;
         }
+
     }
 
-    /**
-     * 鍐欏叆鏁版嵁纭鍛戒护
-     */
-    private boolean writeCommand(RgvCommand command) throws InterruptedException {
-        if (null == command) {
-            log.error("RGV鍐欏叆鍛戒护涓虹┖");
-            return false;
-        }
-
-        command.setRgvNo(slave.getId());
-        short[] array = new short[1];
-        array[0] = command.getCommand();// 浠诲姟纭浣�
-        OperateResult result = siemensNet.Write("DB100.20", array);
-        log.info("RGV鍛戒护涓嬪彂[id:{}] >>>>> {}", slave.getId(), array);
-
-        if(!result.IsSuccess){
-            log.error("鍐欏叆RGV plc鏁版嵁澶辫触锛岄噸鏂版坊鍔犱换鍔″埌闃熷垪 ===>> [id:{}],{}", slave.getId(), JSON.toJSON(command));
-            MessageQueue.offer(SlaveType.Rgv, slave.getId(), new Task(2, command));
-            Thread.sleep(100);
-            readStatus();
-            return false;
-        }
-
-        try {
-            // 鏃ュ織璁板綍
-            BasRgvOptService bean = SpringUtils.getBean(BasRgvOptService.class);
-            Date now = new Date();
-            BasRgvOpt basRgvOpt = new BasRgvOpt(
-                    command.getRgvNo(),    // RGV[闈炵┖]
-                    command.getAckFinish().intValue(),    // 浠诲姟瀹屾垚纭浣�
-                    command.getTaskNo1().intValue(),    // 浠诲姟鍙�
-                    command.getTaskMode1().intValue(),    // 妯″紡
-                    command.getSourceStaNo1().intValue(),    // 婧愮珯
-                    command.getDestinationStaNo1().intValue(),    // 鐩爣绔�
-                    command.getTaskNo2().intValue(),    // 浠诲姟鍙�
-                    command.getTaskMode2().intValue(),    // 妯″紡
-                    command.getSourceStaNo2().intValue(),    // 婧愮珯
-                    command.getDestinationStaNo2().intValue(),    // 鐩爣绔�
-                    command.getCommand().intValue(),
-                    now,    // 涓嬪彂鏃堕棿
-                    null, // 涓嬪彂浜哄憳
-                    now,    // 淇敼鏃堕棿
-                    null,    // 淇敼浜哄憳
-                    null //鍝嶅簲
-            );
-            bean.insert(basRgvOpt);
-        } catch (Exception ignore) {}
-
-        if (result != null && result.IsSuccess) {
-            Thread.sleep(200);
-            this.readStatus();
-            log.info("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), JSON.toJSON(command));
-            OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
-            return true;
-        } else {
-            OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戝啓鍏ュ爢鍨涙満plc鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
-            log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
-            return false;
-        }
-    }
 
     /**
      * 鍒濆鍖栧爢鍨涙満鐘舵��

--
Gitblit v1.9.1