From 3b08b4868e19a653aa5d61e22868a1c81f23d217 Mon Sep 17 00:00:00 2001
From: zjj <zjj123456>
Date: 星期四, 01 八月 2024 16:39:27 +0800
Subject: [PATCH] #1

---
 src/main/java/com/zy/core/thread/SiemensCrnThread.java |  316 +++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 259 insertions(+), 57 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 45edc73..e08db4f 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -185,14 +185,19 @@
 
                 // 澶嶄綅淇″彿
                 if (!Cools.isEmpty(crnProtocol.getStatusType()) && crnProtocol.getStatusType().equals(CrnStatusType.WAITING)) {
+                    News.error("---绗竴姝ャ�乕鍫嗗灈鏈哄彿锛歿}, 宸ヤ綔鍙凤細{}, 杞借揣鍙颁俊鍙�:{}]==>> 鐘舵�佷负10锛岀瓑寰呯‘璁わ紒锛�",
+                            slave.getId(),crnProtocol.getTaskNo(), crnProtocol.getLoaded()==1 ? "鏈夌墿" : "鏃犵墿");
                     if (resetFlag) {
                         if(crnProtocol.getTaskNo()==9999){
                             backHpFlag = false;
                         }
+                        Short wrkNo = crnProtocol.getTaskNo();
                         CrnCommand crnCommand = new CrnCommand();
                         crnCommand.setAckFinish((short)1);
                         if (write(crnCommand)) {
                             resetFlag = false;
+                            News.error("---绗簩姝ャ�乕鍫嗗灈鏈哄彿锛歿}, 宸ヤ綔鍙凤細{}]==>> 澶嶄綅resetFlag鏍囪鎴愬姛{}锛侊紒",
+                                    slave.getId(), wrkNo, resetFlag);
                         }
                     }
                 }
@@ -256,9 +261,9 @@
                         || !command.getSourcePosZ().equals(one.getSourcePosZ()) || !command.getDestinationPosX().equals(one.getDestinationPosX())
                         || !command.getDestinationPosY().equals(one.getDestinationPosY()) || !command.getDestinationPosZ().equals(one.getDestinationPosZ())
                 ){
-                    News.error("涓嬪彂鍓嶏細[id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
+//                    News.error("涓嬪彂鍓嶏細[id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
                 } else {
-                    News.info("涓嬪彂鍓嶏細[id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
+//                    News.info("涓嬪彂鍓嶏細[id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
                 }
             }
         }catch (Exception e){
@@ -283,59 +288,76 @@
         boolean[] array2 = new boolean[1];
         array2[0] = command.isTraySize();
         OperateResult result = siemensNet.Write("DB100.0", array);
-        OperateResult result2 = siemensNet.Write("DB100.20", array2);
+        OperateResult result2 = siemensNet.Write("DB100.22", array2);
         News.info("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), array);
-
-        if(!result.IsSuccess || !result2.IsSuccess){
-            News.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触锛岄噸鏂版坊鍔犱换鍔″埌闃熷垪 ===>> [id:{}],{}", slave.getId(), JSON.toJSON(command));
-            MessageQueue.offer(SlaveType.Crn, slave.getId(), new Task(2, command));
-            Thread.sleep(100);
-            readStatus();
-            return false;
-        }
 
         //鍫嗗灈鏈轰换鍔″啓鍏ュ悗锛屽洖璇讳竴娆★紝鐪嬫槸鍚︽垚鍔�
         Thread.sleep(200);
-        try{
-            OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 20);
-            if (resultRead.IsSuccess) {
-                CrnCommand one = new CrnCommand();
-                one.setTaskNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 2));
-                one.setTaskMode(siemensNet.getByteTransform().TransInt16(resultRead.Content, 4));
-                one.setSourcePosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 6));
-                one.setSourcePosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 8));
-                one.setSourcePosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 10));
-                one.setDestinationPosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 12));
-                one.setDestinationPosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 14));
-                one.setDestinationPosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 16));
-                one.setTraySize(siemensNet.getByteTransform().TransBool(resultRead.Content, 20));
-                if (!command.getTaskNo().equals(one.getTaskNo()) || !command.getTaskMode().equals(one.getTaskMode())
-                        || !command.getSourcePosX().equals(one.getSourcePosX()) || !command.getSourcePosY().equals(one.getSourcePosY())
-                        || !command.getSourcePosZ().equals(one.getSourcePosZ()) || !command.getDestinationPosX().equals(one.getDestinationPosX())
-                        || !command.getDestinationPosY().equals(one.getDestinationPosY()) || !command.getDestinationPosZ().equals(one.getDestinationPosZ())
-                        || !command.isTraySize() == one.isTraySize()
-                ){
-                    try{
-                        News.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲け璐id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
-                    }catch (Exception e){
-                        try{
-                            News.error("鏃ュ織鎵撳嵃澶辫触锛�===>>鍙傛暟one鎶ラ敊 [id:{}],{}", slave.getId(), JSON.toJSON(command),JSON.toJSON(resultRead));
-                        }catch (Exception e1){
-                            News.error("鏃ュ織鎵撳嵃澶辫触锛�===>> [id:{}],{}", slave.getId(), JSON.toJSON(command));
-                        }
-                    }
-                    News.error("鍫嗗灈鏈哄懡浠ゅ洖璇诲け璐ュ悗锛岄噸鏂版坊鍔犱换鍔″埌闃熷垪 ===>> [id:{}],{}", slave.getId(), JSON.toJSON(command));
-                    MessageQueue.offer(SlaveType.Crn, slave.getId(), new Task(2, command));
+        int writeCount1 = 1;
+
+        do {
+            try{
+                if(!result.IsSuccess || !result2.IsSuccess){
+                    News.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�  鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(command),writeCount1);
+//                    MessageQueue.offer(SlaveType.Crn, slave.getId(), new Task(2, command));
+                    result = siemensNet.Write("DB100.0", array);
+                    result2 = siemensNet.Write("DB100.22", array2);
                     Thread.sleep(100);
-                    readStatus();
-                    return false;
-                } else {
-                    News.info("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇绘垚鍔焄id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
+                    writeCount1++;
+                    continue;
                 }
+                OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 24);
+                if (resultRead.IsSuccess) {
+                    CrnCommand one = new CrnCommand();
+                    one.setTaskNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 2));
+                    one.setTaskMode(siemensNet.getByteTransform().TransInt16(resultRead.Content, 4));
+                    one.setSourcePosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 6));
+                    one.setSourcePosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 8));
+                    one.setSourcePosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 10));
+                    one.setDestinationPosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 12));
+                    one.setDestinationPosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 14));
+                    one.setDestinationPosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 16));
+                    one.setTraySize(siemensNet.getByteTransform().TransBool(resultRead.Content, 22));
+                    if (!command.getTaskNo().equals(one.getTaskNo()) || !command.getTaskMode().equals(one.getTaskMode())
+                            || !command.getSourcePosX().equals(one.getSourcePosX()) || !command.getSourcePosY().equals(one.getSourcePosY())
+                            || !command.getSourcePosZ().equals(one.getSourcePosZ()) || !command.getDestinationPosX().equals(one.getDestinationPosX())
+                            || !command.getDestinationPosY().equals(one.getDestinationPosY()) || !command.getDestinationPosZ().equals(one.getDestinationPosZ())
+                            || !command.isTraySize() == one.isTraySize()
+                    ){
+                        try{
+                            News.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲け璐�==>涓嶄竴鑷碵id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
+                        }catch (Exception e){
+                            try{
+                                News.error("鏃ュ織鎵撳嵃澶辫触锛�===>>鍙傛暟one鎶ラ敊 [id:{}],{}", slave.getId(), JSON.toJSON(command),JSON.toJSON(resultRead));
+                            }catch (Exception e1){
+                                News.error("鏃ュ織鎵撳嵃澶辫触锛�===>> [id:{}],{}", slave.getId(), JSON.toJSON(command));
+                            }
+                        }
+
+                        try{
+                            Thread.sleep(100);
+                        }catch (Exception e){
+
+                        }
+
+//                        News.error("鍫嗗灈鏈哄懡浠ゅ洖璇诲け璐ュ悗锛岄噸鏂版坊鍔犱换鍔″埌闃熷垪 ===>> [id:{}],{},resetFlag={}", slave.getId(), JSON.toJSON(command),resetFlag);
+//                            MessageQueue.offer(SlaveType.Crn, slave.getId(), new Task(2, command));
+                        News.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�  鍥炶涓嶄竴鑷� ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(command),writeCount1);
+                        result = siemensNet.Write("DB100.0", array);
+                        result2 = siemensNet.Write("DB100.22", array2);
+                        writeCount1++;
+                        continue;
+
+                    } else {
+                        News.info("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇绘垚鍔焄id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
+                        break;
+                    }
+                }
+            }catch (Exception e){
+                News.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲嚭閿�,寮傚父锛�"+e);
             }
-        }catch (Exception e){
-            News.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲嚭閿�");
-        }
+            writeCount1++;
+        } while (writeCount1<6);
 
 
         if (command.getAckFinish() == 0) {
@@ -358,7 +380,7 @@
                                 News.error("鍫嗗灈鏈轰换鍔$‘璁や綅"+commandFinish+"鍐欏叆鏁版嵁涓庡洖璇绘暟鎹笉涓�鑷达紒"+"寰幆鎵ц娆℃暟:"+writeCount2+"娆�");
                             }else{
                                 //浠诲姟鍛戒护鍐欏叆鎴愬姛
-                                News.info("鍫嗗灈鏈轰换鍔$‘璁や綅"+commandFinish+"鍥炶鎴愬姛锛�"+"寰幆鎵ц娆℃暟:"+writeCount2+"娆�");
+//                                News.info("鍫嗗灈鏈轰换鍔$‘璁や綅"+commandFinish+"鍥炶鎴愬姛锛�"+"寰幆鎵ц娆℃暟:"+writeCount2+"娆�");
                                 break;
                             }
                         }else {
@@ -371,13 +393,6 @@
             }
         }
 
-//        if (command.getAckFinish() == 0) {
-//            short commandFinish = 1;
-//            Thread.sleep(200L);
-//            result = siemensNet.Write("DB100.18", commandFinish);
-//            log.info("鍫嗗灈鏈篶ommandFinish涓嬪彂[id:{}] >>>>> {}", slave.getId(), commandFinish);
-////            result = siemensNet.Write("DB100.22", commandFinish);
-//        }
 
         try {
             // 鏃ュ織璁板綍
@@ -405,7 +420,7 @@
         if (result != null && result.IsSuccess) {
             Thread.sleep(200);
             this.readStatus();
-            News.info("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), JSON.toJSON(command));
+//            News.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 {
@@ -415,6 +430,193 @@
         }
     }
 
+    /**
+     * 鍐欏叆鏁版嵁
+     */
+//    private boolean write(CrnCommand command) throws InterruptedException {
+//        if (null == command) {
+//            News.error("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
+//            return false;
+//        }
+//        // 鍚戝爢鍨涙満鍙戜换鍔″墠鐨勫爢鍨涙満鐘舵��
+//        try{
+//            OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 24);
+//            if (resultRead.IsSuccess) {
+//                CrnCommand one = new CrnCommand();
+//                one.setTaskNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 2));
+//                one.setTaskMode(siemensNet.getByteTransform().TransInt16(resultRead.Content, 4));
+//                one.setSourcePosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 6));
+//                one.setSourcePosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 8));
+//                one.setSourcePosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 10));
+//                one.setDestinationPosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 12));
+//                one.setDestinationPosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 14));
+//                one.setDestinationPosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 16));
+//                if (!command.getTaskNo().equals(one.getTaskNo()) || !command.getTaskMode().equals(one.getTaskMode())
+//                        || !command.getSourcePosX().equals(one.getSourcePosX()) || !command.getSourcePosY().equals(one.getSourcePosY())
+//                        || !command.getSourcePosZ().equals(one.getSourcePosZ()) || !command.getDestinationPosX().equals(one.getDestinationPosX())
+//                        || !command.getDestinationPosY().equals(one.getDestinationPosY()) || !command.getDestinationPosZ().equals(one.getDestinationPosZ())
+//                ){
+////                    News.error("涓嬪彂鍓嶏細[id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
+//                } else {
+////                    News.info("涓嬪彂鍓嶏細[id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
+//                }
+//            }
+//        }catch (Exception e){
+//            News.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲嚭閿�");
+//        }
+////        convertRow(command);
+//        command.setCrnNo(slave.getId());
+////        short[] array = new short[10];
+//        short[] array = new short[10];
+//        array[0] = command.getAckFinish(); // 浠诲姟瀹屾垚纭浣�
+//        array[1] = command.getTaskNo();  // 浠诲姟鍙�
+//        array[2] = command.getTaskMode();  // 妯″紡
+//        array[3] = command.getSourcePosX(); // 婧愪綅缃帓鍙�
+//        array[4] = command.getSourcePosY(); // 婧愪綅缃垪鍙�
+//        array[5] = command.getSourcePosZ(); // 婧愪綅缃眰鍙�
+//        array[6] = command.getDestinationPosX();  // 鐩爣浣嶇疆鎺掑彿
+//        array[7] = command.getDestinationPosY(); // 鐩爣浣嶇疆鍒楀彿
+//        array[8] = command.getDestinationPosZ(); // 鐩爣浣嶇疆灞傚彿
+//        array[9] = command.getCommand();
+////        array[10] = 0;   //澶囩敤1
+//
+//        boolean[] array2 = new boolean[1];
+//        array2[0] = command.isTraySize();
+//        OperateResult result = siemensNet.Write("DB100.0", array);
+//        OperateResult result2 = siemensNet.Write("DB100.22", array2);
+//        News.info("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), array);
+//
+//        if(!result.IsSuccess || !result2.IsSuccess){
+//            News.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触锛岄噸鏂版坊鍔犱换鍔″埌闃熷垪 ===>> [id:{}],{}", slave.getId(), JSON.toJSON(command));
+//            MessageQueue.offer(SlaveType.Crn, slave.getId(), new Task(2, command));
+
+//                    if(!resetFlag) {
+//                        News.error("鍫嗗灈鏈哄懡浠ゅ洖璇诲け璐ュ悗锛岄噸鏂版坊鍔犱换鍔″埌闃熷垪 ===>> [id:{}],{},resetFlag={}", slave.getId(), JSON.toJSON(command),resetFlag);
+//                        MessageQueue.offer(SlaveType.Crn, slave.getId(), new Task(2, command));
+//                    }
+//            Thread.sleep(100);
+//            readStatus();
+//            return false;
+//        }
+//
+//        //鍫嗗灈鏈轰换鍔″啓鍏ュ悗锛屽洖璇讳竴娆★紝鐪嬫槸鍚︽垚鍔�
+//        Thread.sleep(200);
+//        try{
+//            OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 24);
+//            if (resultRead.IsSuccess) {
+//                CrnCommand one = new CrnCommand();
+//                one.setTaskNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 2));
+//                one.setTaskMode(siemensNet.getByteTransform().TransInt16(resultRead.Content, 4));
+//                one.setSourcePosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 6));
+//                one.setSourcePosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 8));
+//                one.setSourcePosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 10));
+//                one.setDestinationPosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 12));
+//                one.setDestinationPosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 14));
+//                one.setDestinationPosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 16));
+//                one.setTraySize(siemensNet.getByteTransform().TransBool(resultRead.Content, 22));
+//                if (!command.getTaskNo().equals(one.getTaskNo()) || !command.getTaskMode().equals(one.getTaskMode())
+//                        || !command.getSourcePosX().equals(one.getSourcePosX()) || !command.getSourcePosY().equals(one.getSourcePosY())
+//                        || !command.getSourcePosZ().equals(one.getSourcePosZ()) || !command.getDestinationPosX().equals(one.getDestinationPosX())
+//                        || !command.getDestinationPosY().equals(one.getDestinationPosY()) || !command.getDestinationPosZ().equals(one.getDestinationPosZ())
+//                        || !command.isTraySize() == one.isTraySize()
+//                ){
+//                    try{
+////                        News.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲け璐id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
+//                    }catch (Exception e){
+//                        try{
+//                            News.error("鏃ュ織鎵撳嵃澶辫触锛�===>>鍙傛暟one鎶ラ敊 [id:{}],{}", slave.getId(), JSON.toJSON(command),JSON.toJSON(resultRead));
+//                        }catch (Exception e1){
+//                            News.error("鏃ュ織鎵撳嵃澶辫触锛�===>> [id:{}],{}", slave.getId(), JSON.toJSON(command));
+//                        }
+//                    }
+//
+//                    if(!resetFlag) {
+//                        News.error("鍫嗗灈鏈哄懡浠ゅ洖璇诲け璐ュ悗锛岄噸鏂版坊鍔犱换鍔″埌闃熷垪 ===>> [id:{}],{},resetFlag={}", slave.getId(), JSON.toJSON(command),resetFlag);
+//                        MessageQueue.offer(SlaveType.Crn, slave.getId(), new Task(2, command));
+//                    }
+//
+//                    Thread.sleep(100);
+//                    readStatus();
+//                    return false;
+//                } else {
+//                    News.info("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇绘垚鍔焄id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
+//                }
+//            }
+//        }catch (Exception e){
+//            News.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲嚭閿�");
+//        }
+//
+//
+//        if (command.getAckFinish() == 0) {
+//            if (result.IsSuccess) {
+//                Thread.sleep(300);
+//                //浠诲姟涓嬪彂娆℃暟
+//                int writeCount2 = 0;
+//
+//                do {
+//                    writeCount2++;
+//                    short commandFinish = (short) 1;
+//                    result = siemensNet.Write("DB100.18", commandFinish);
+//                    if(result.IsSuccess){
+//                        //鍫嗗灈鏈轰换鍔″啓鍏ュ悗锛屽洖璇讳竴娆★紝鐪嬫槸鍚︽垚鍔�
+//                        Thread.sleep(200);
+//                        OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.18", (short) 2);
+//                        if (resultRead.IsSuccess) {
+//                            commandFinish=siemensNet.getByteTransform().TransInt16(resultRead.Content, 0);
+//                            if (commandFinish != 1){
+//                                News.error("鍫嗗灈鏈轰换鍔$‘璁や綅"+commandFinish+"鍐欏叆鏁版嵁涓庡洖璇绘暟鎹笉涓�鑷达紒"+"寰幆鎵ц娆℃暟:"+writeCount2+"娆�");
+//                            }else{
+//                                //浠诲姟鍛戒护鍐欏叆鎴愬姛
+////                                News.info("鍫嗗灈鏈轰换鍔$‘璁や綅"+commandFinish+"鍥炶鎴愬姛锛�"+"寰幆鎵ц娆℃暟:"+writeCount2+"娆�");
+//                                break;
+//                            }
+//                        }else {
+//                            News.error("鍫嗗灈鏈轰换鍔$‘璁や綅"+commandFinish+"鍥炶澶辫触锛�"+"寰幆鎵ц娆℃暟:"+writeCount2+"娆�");
+//                        }
+//                    } else {
+//                        News.error("鍫嗗灈鏈轰换鍔$‘璁や綅"+commandFinish+"鍐欏叆澶辫触锛�"+"寰幆鎵ц娆℃暟:"+writeCount2+"娆�");
+//                    }
+//                }while (writeCount2<5);
+//            }
+//        }
+//
+//
+//        try {
+//            // 鏃ュ織璁板綍
+//            BasCrnOptService bean = SpringUtils.getBean(BasCrnOptService.class);
+//            BasCrnOpt basCrnOpt = new BasCrnOpt(
+//                    command.getTaskNo().intValue(),    // 浠诲姟鍙�
+//                    command.getCrnNo(),    // 鍫嗗灈鏈篬闈炵┖]
+//                    new Date(),    // 涓嬪彂鏃堕棿
+//                    command.getTaskModeType().toString(),    // 妯″紡
+//                    command.getSourcePosX().intValue(),    // 婧愭帓
+//                    command.getSourcePosY().intValue(),    // 婧愬垪
+//                    command.getSourcePosZ().intValue(),    // 婧愬眰
+//                    null,    // 婧愮珯
+//                    command.getDestinationPosX().intValue(),    // 鐩爣鎺�
+//                    command.getDestinationPosY().intValue(),    // 鐩爣鍒�
+//                    command.getDestinationPosZ().intValue(),    // 鐩爣灞�
+//                    null,    // 鐩爣绔�
+//                    null,    // 鍝嶅簲缁撴灉
+//                    null,    // 淇敼鏃堕棿
+//                    null    // 淇敼浜哄憳
+//            );
+//            bean.insert(basCrnOpt);
+//        } catch (Exception ignore) {}
+//
+//        if (result != null && result.IsSuccess) {
+//            Thread.sleep(200);
+//            this.readStatus();
+////            News.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()));
+//            News.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+//            return false;
+//        }
+//    }
+
     public void requestStop() {
         isRunning = false;
     }

--
Gitblit v1.9.1