From 75d0daa4f8dc2010ec92f35cac08a19d240ca45d Mon Sep 17 00:00:00 2001
From: ynhfasrs <ynhfasrs@qq.com>
Date: 星期五, 27 六月 2025 14:23:37 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/SiemensCrnThread.java |  492 ++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 382 insertions(+), 110 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 9bc94c7..962a319 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -5,12 +5,12 @@
 import HslCommunication.Profinet.Siemens.SiemensPLCS;
 import HslCommunication.Profinet.Siemens.SiemensS7Net;
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
 import com.core.common.DateUtils;
 import com.core.common.SpringUtils;
-import com.zy.asrs.entity.BasCrnOpt;
-import com.zy.asrs.entity.BasCrnp;
-import com.zy.asrs.service.BasCrnOptService;
-import com.zy.asrs.service.BasCrnpService;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.service.*;
 import com.zy.core.CrnThread;
 import com.zy.core.cache.MessageQueue;
 import com.zy.core.cache.OutputQueue;
@@ -21,9 +21,8 @@
 import com.zy.core.model.protocol.CrnProtocol;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
-
 import java.text.MessageFormat;
-import java.util.Date;
+import java.util.*;
 
 /**
  * 鍫嗗灈鏈虹嚎绋�
@@ -38,10 +37,8 @@
     private CrnProtocol crnProtocol;
     private boolean resetFlag = false;
 
-    /**
-     * 鍫嗗灈鏈烘槸鍚﹀湪鍥炲師鐐硅繍鍔ㄤ腑鏍囪
-     */
-    private boolean backHpFlag = false;
+    //鍘熷璁惧鏁版嵁
+    private Object originDeviceData;
 
     public SiemensCrnThread(CrnSlave slave) {
         this.slave = slave;
@@ -50,6 +47,7 @@
     @Override
     @SuppressWarnings("InfiniteLoopStatement")
     public void run() {
+        initCrnProtocol();
         this.connect();
         while (true) {
             try {
@@ -65,7 +63,7 @@
                         break;
                     // 鍐欏叆鏁版嵁
                     case 2:
-                        write((CrnCommand) task.getData());
+                        write5((CrnCommand) task.getData());
                         break;
                     // 澶嶄綅
                     case 3:
@@ -85,6 +83,12 @@
                         command.setDestinationPosZ((short)0);     // 鐩爣搴撲綅灞�
                         write(command);
                         break;
+                    case 4:
+                        writeAuto((CrnCommand) task.getData());
+                        break;
+                    case 5:
+                        write((CrnCommand) task.getData());
+                        break;
                     default:
                         break;
                 }
@@ -97,29 +101,19 @@
     }
 
     /**
-     * 鍒濆鍖栧爢鍨涙満鐘舵��
+     * 鍒濆鍖栧爢鍨涙満
      */
-    private void initCrn() {
-        if (null == crnProtocol) {
-            crnProtocol = new CrnProtocol();
-        }
-        crnProtocol.setMode((short) -1);
-//        crnProtocol.setTaskNo((short)0);
-        crnProtocol.setStatus((short)-1);
-        crnProtocol.setBay((short)0);
-        crnProtocol.setLevel((short)0);
-        crnProtocol.setForkPos((short) -1);
-        crnProtocol.setLiftPos((short) -1);
-        crnProtocol.setWalkPos((short)0);
-        crnProtocol.setLoaded((short)0);
-        crnProtocol.setAlarm((short)0);
-        crnProtocol.setxSpeed((short) 0);
-        crnProtocol.setySpeed((short) 0);
-        crnProtocol.setzSpeed((short) 0);
-        crnProtocol.setxDistance((short) 0);
-        crnProtocol.setyDistance((short) 0);
-        crnProtocol.setxDuration((short) 0);
-        crnProtocol.setyDuration((short) 0);
+    private void initCrnProtocol(){
+        crnProtocol = new CrnProtocol();
+        crnProtocol.setMode((short) 0);
+        crnProtocol.setStatus((short) 0);
+        crnProtocol.setTaskNo((short) 0);
+        crnProtocol.setTaskFinish((short) 0);
+        crnProtocol.setValid((short) 0);
+        crnProtocol.setBay((short) 0);
+        crnProtocol.setLevel((short) 0);
+        crnProtocol.setRow((short) 0);
+        crnProtocol.setLane((short) 0);
     }
 
     @Override
@@ -136,7 +130,9 @@
         } else {
             OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戝爢鍨涙満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("鍫嗗灈鏈簆lc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
-            initCrn();
+//            DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+//            deviceErrorService.addDeviceError("crn", slave.getId(), "鍫嗗灈鏈簆lc杩炴帴澶辫触");
+            initCrnProtocol();
         }
 //        siemensNet.ConnectClose();
         return result;
@@ -146,88 +142,165 @@
      * 璇诲彇鐘舵��
      */
     private void readStatus(){
-        try {
-            OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 56);
-            if (result.IsSuccess) {
-                if (null == crnProtocol) {
-                    crnProtocol = new CrnProtocol();
-                    crnProtocol.setCrnNo(slave.getId());
-                }
-                crnProtocol.setMode(siemensNet.getByteTransform().TransInt16(result.Content, 0));
-                crnProtocol.setTaskNo(siemensNet.getByteTransform().TransInt16(result.Content, 2));
-                crnProtocol.setStatus(siemensNet.getByteTransform().TransInt16(result.Content, 4));
-                crnProtocol.setBay(siemensNet.getByteTransform().TransInt16(result.Content, 6));
-                crnProtocol.setLevel(siemensNet.getByteTransform().TransInt16(result.Content, 8));
-                crnProtocol.setForkPos(siemensNet.getByteTransform().TransInt16(result.Content, 10));
-                crnProtocol.setLiftPos(siemensNet.getByteTransform().TransInt16(result.Content, 12));
-                crnProtocol.setWalkPos(siemensNet.getByteTransform().TransInt16(result.Content, 14));
-                crnProtocol.setLoaded(siemensNet.getByteTransform().TransInt16(result.Content, 16));
-                crnProtocol.setAlarm(siemensNet.getByteTransform().TransInt16(result.Content, 18));
-                crnProtocol.setTemp1(siemensNet.getByteTransform().TransInt16(result.Content, 20));
-                crnProtocol.setTemp2(siemensNet.getByteTransform().TransInt16(result.Content, 22));
-                crnProtocol.setTemp3(siemensNet.getByteTransform().TransInt16(result.Content, 24));
-                crnProtocol.setTemp4(siemensNet.getByteTransform().TransInt16(result.Content, 26));
-                crnProtocol.setxSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 28));
-                crnProtocol.setySpeed(siemensNet.getByteTransform().TransInt16(result.Content, 32));
-                crnProtocol.setzSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 36));
-                crnProtocol.setxDistance(siemensNet.getByteTransform().TransInt16(result.Content, 40));
-                crnProtocol.setyDistance(siemensNet.getByteTransform().TransInt16(result.Content, 44));
-                crnProtocol.setxDuration(siemensNet.getByteTransform().TransInt16(result.Content, 48));
-                crnProtocol.setyDuration(siemensNet.getByteTransform().TransInt16(result.Content, 52));
 
-                OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
-
-                // 澶嶄綅淇″彿
-                if (crnProtocol.getStatusType().equals(CrnStatusType.WAITING)) {
-                    if (resetFlag) {
-                        if(crnProtocol.getTaskNo()==9999){
-                            backHpFlag = false;
-                        }
-                        CrnCommand crnCommand = new CrnCommand();
-                        crnCommand.setAckFinish((short)1);
-                        if (write(crnCommand)) {
-                            resetFlag = false;
-                        }
-                    }
-                }
-
-                try {
-                    // 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
-                    BasCrnpService basCrnpService = SpringUtils.getBean(BasCrnpService.class);
-                    BasCrnp basCrnp = new BasCrnp();
-                    basCrnp.setCrnNo(slave.getId());
-                    basCrnp.setCrnSts((int)crnProtocol.getMode());
-                    if (!basCrnpService.updateById(crnProtocol.toSqlModel(basCrnp))){
-                        log.error("鍫嗗灈鏈簆lc鏁版嵁搴撴洿鏂板け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
-                    }
-                } catch (Exception ignore){}
-
-            } else {
-                initCrn();
-                OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戣鍙栧爢鍨涙満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("璇诲彇鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
+        OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 56);
+        OperateResultExOne<byte[]> result2 = siemensNet.Read("DB25.0", (short) 20);
+        if (result.IsSuccess) {
+            this.originDeviceData = result.Content;
+            if (null == crnProtocol) {
+                crnProtocol = new CrnProtocol();
             }
-        } catch (Exception e) {
-            e.printStackTrace();
-            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());
-            initCrn();
-        }
-    }
+            crnProtocol.setMode(siemensNet.getByteTransform().TransInt16(result.Content, 0));
+            crnProtocol.setTaskNo(siemensNet.getByteTransform().TransInt16(result.Content, 2));
+            crnProtocol.setStatus(siemensNet.getByteTransform().TransInt16(result.Content, 4));
+            crnProtocol.setBay(siemensNet.getByteTransform().TransInt16(result.Content, 6));
+            crnProtocol.setLevel(siemensNet.getByteTransform().TransInt16(result.Content, 8));
+            crnProtocol.setForkPos(siemensNet.getByteTransform().TransInt16(result.Content, 10));
+            crnProtocol.setLiftPos(siemensNet.getByteTransform().TransInt16(result.Content, 12));
+            crnProtocol.setWalkPos(siemensNet.getByteTransform().TransInt16(result.Content, 14));
+            crnProtocol.setLoaded(siemensNet.getByteTransform().TransInt16(result.Content, 16));
+            crnProtocol.setAlarm(siemensNet.getByteTransform().TransInt16(result.Content, 18));
+//            crnProtocol.setTemp1(siemensNet.getByteTransform().TransInt16(result.Content, 20));
+//            crnProtocol.setTemp2(siemensNet.getByteTransform().TransInt16(result.Content, 22));
+//            crnProtocol.setTemp3(siemensNet.getByteTransform().TransInt16(result.Content, 24));
+//            crnProtocol.setTemp4(siemensNet.getByteTransform().TransInt16(result.Content, 26));
+            crnProtocol.setXSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 28));
+            crnProtocol.setYSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 32));
+            crnProtocol.setZSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 36));
+            crnProtocol.setXDistance(siemensNet.getByteTransform().TransSingle(result.Content, 40));
+            crnProtocol.setYDistance(siemensNet.getByteTransform().TransSingle(result.Content, 44));
+            crnProtocol.setXDuration(siemensNet.getByteTransform().TransSingle(result.Content, 48));
+            crnProtocol.setYDuration(siemensNet.getByteTransform().TransSingle(result.Content, 52));
 
-    private void convertRow(CrnCommand crnCommand) {
-        if (crnCommand.getSourcePosX() != null && crnCommand.getSourcePosX() != 0) {
-            crnCommand.setSourcePosX((short) (crnCommand.getSourcePosX() - ((slave.getId() - 1) * 4)));
-        }
-        if (crnCommand.getDestinationPosX() != null && crnCommand.getDestinationPosX() != 0) {
-            crnCommand.setDestinationPosX((short) (crnCommand.getDestinationPosX() - ((slave.getId() - 1) * 4)));
+            OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
+
+            // 澶嶄綅淇″彿
+            if (crnProtocol.getTaskFinish() == 0) {
+                if (resetFlag) {
+                    CrnCommand crnCommand = new CrnCommand();
+                    crnCommand.setAckFinish((short)1);
+                    if (write(crnCommand)) {
+                        resetFlag = false;
+                    }
+                }
+            }
+
+            List<boolean[]> errorPointList = new ArrayList<>();
+            if (result2.IsSuccess) {
+                for (int i = 0; i < result2.Content.length; i++) {
+                    boolean[] valList = siemensNet.getByteTransform().TransBool(result2.Content, i, 1);
+                    errorPointList.add(valList);
+                }
+            }
+
+            if (System.currentTimeMillis() - crnProtocol.getDeviceDataLog() > 1000 * 5) {
+                if (this.originDeviceData != null) {
+                    //閲囬泦鏃堕棿瓒呰繃5s锛屼繚瀛樹竴娆℃暟鎹褰�
+                    //淇濆瓨鏁版嵁璁板綍
+                    DeviceDataLogService deviceDataLogService = SpringUtils.getBean(DeviceDataLogService.class);
+                    if (deviceDataLogService == null) {
+                        return;
+                    }
+
+                    HashMap<String, Object> originData = new HashMap<>();
+                    originData.put("readStatus", this.originDeviceData);
+                    originData.put("errorPoints", errorPointList);
+
+                    DeviceDataLog deviceDataLog = new DeviceDataLog();
+                    deviceDataLog.setOriginData(JSON.toJSONString(originData));
+                    deviceDataLog.setWcsData(JSON.toJSONString(crnProtocol));
+                    deviceDataLog.setType(String.valueOf(SlaveType.Crn));
+                    deviceDataLog.setDeviceNo(slave.getId());
+                    deviceDataLog.setCreateTime(new Date());
+                    deviceDataLogService.insert(deviceDataLog);
+
+                    //鏇存柊閲囬泦鏃堕棿
+                    crnProtocol.setDeviceDataLog(System.currentTimeMillis());
+                }
+            }
+
+            try {
+                // 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
+                BasCrnpService basCrnpService = SpringUtils.getBean(BasCrnpService.class);
+                BasCrnp basCrnp = new BasCrnp();
+                basCrnp.setCrnNo(slave.getId());
+                basCrnp.setCrnSts((int)crnProtocol.getMode());
+                if (!basCrnpService.updateById(crnProtocol.toSqlModel(basCrnp))){
+                    log.error("鍫嗗灈鏈簆lc鏁版嵁搴撴洿鏂板け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
+                }
+            } catch (Exception ignore){}
+
+            DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+            deviceErrorService.deleteDeviceError("crn", slave.getId());
+        } else {
+            OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戣鍙栧爢鍨涙満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("璇诲彇鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
+            DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+            deviceErrorService.addDeviceError("crn", slave.getId(), "璇诲彇鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐�");
         }
     }
 
     /**
      * 鍐欏叆鏁版嵁
      */
-    private boolean write(CrnCommand command) throws InterruptedException {
+    private boolean write(CrnCommand command){
+        if (null == command) {
+            log.error("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
+            return false;
+        }
+        //杞崲鍓嶅厠闅嗕竴浠�
+        CrnCommand crnCommand = new CrnCommand();
+        crnCommand.setCrnNo(command.getCrnNo());
+        crnCommand.setAckFinish(command.getAckFinish());
+        crnCommand.setTaskNo(command.getTaskNo());
+        crnCommand.setTaskMode(command.getTaskMode());
+        crnCommand.setSourcePosX(command.getSourcePosX());
+        crnCommand.setSourcePosY(command.getSourcePosY());
+        crnCommand.setSourcePosZ(command.getSourcePosZ());
+        crnCommand.setDestinationPosX(command.getDestinationPosX());
+        crnCommand.setDestinationPosY(command.getDestinationPosY());
+        crnCommand.setDestinationPosZ(command.getDestinationPosZ());
+//        crnCommand.setSourceStaNo(command.getSourceStaNo());
+//        crnCommand.setDestinationStaNo(command.getDestinationStaNo());
+        crnCommand.setCommand(command.getCommand());
+        if (command.getTaskNo() == 0 && command.getAckFinish() == 0 && command.getAuto() != 1) {
+            command.setTaskNo((short) 999);
+        }
+
+        command.setCrnNo(slave.getId());
+        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();
+
+        // 浣滀笟淇℃伅
+        OperateResult result = siemensNet.Write("DB100.0", array);
+
+
+        if (result.IsSuccess) {
+            log.warn("鍫嗗灈鏈哄懡浠や笅鍙慬id:{},鏃堕棿锛歿}] >>>>> {}", slave.getId(), DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmsssss_F), 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}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
+            log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
+            return false;
+        }
+    }
+
+    /**
+     * 鍐欏叆鏁版嵁
+     */
+    private synchronized boolean write5(CrnCommand command) throws InterruptedException {
+        String methodName = Thread.currentThread().getStackTrace()[1].getMethodName();
+
         if (null == command) {
             log.error("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
             return false;
@@ -247,12 +320,58 @@
 //        array[9] = command.getSourceStaNo();
 //        array[10] = command.getDestinationStaNo();
         array[9] = command.getCommand();
+        OperateResult result18 = siemensNet.Write("DB100.18", (short)0);
+        Thread.sleep(100L);
         OperateResult result = siemensNet.Write("DB100.0", array);
+
+        int i=0;
+        do{
+            //鍫嗗灈鏈轰换鍔″啓鍏ュ悗锛屽洖璇讳竴娆★紝鐪嬫槸鍚︽垚鍔�
+            Thread.sleep(100);
+            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));
+                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())
+                ){
+                    i++;
+                    log.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲け璐id:{}]>>>>閲嶅啓[{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), i,JSON.toJSON(command),JSON.toJSON(one));
+                    result = siemensNet.Write("DB100.0", array);
+                }else{
+                    break;
+                }
+            }
+        }while(i<5);
 
         if (command.getAckFinish() == 0) {
             short commandFinish = 1;
             Thread.sleep(100L);
             result = siemensNet.Write("DB100.18", commandFinish);
+            int signFinish = 1;
+            while (signFinish<5){
+                OperateResultExOne<byte[]> result10018 = siemensNet.Read("DB100.18", (short) 2);
+                short transInt16 = siemensNet.getByteTransform().TransInt16(result10018.Content, 0);
+                if (transInt16 != commandFinish){
+                    log.info("涓嬪彂DB100.18  鍥炶澶辫触" + "commandFinish:"+commandFinish);
+                    log.info("涓嬪彂DB100.18  鍥炶澶辫触" + "array:"+ JSON.toJSONString(array));
+                    result = siemensNet.Write("DB100.18", commandFinish);
+                    signFinish++;
+                }else {
+                    log.info("涓嬪彂DB100.18" + "commandFinish:"+commandFinish);
+                    log.info("涓嬪彂DB100.18" + "array:"+ JSON.toJSONString(array));
+                    break;
+                }
+            }
         }
 
         try {
@@ -279,18 +398,171 @@
         } catch (Exception ignore) {}
 
         if (result != null && result.IsSuccess) {
-            Thread.sleep(200);
+            Thread.sleep(300);
             this.readStatus();
-            log.info("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), JSON.toJSON(command));
+            log.info(methodName + ":鍫嗗灈鏈哄懡浠や笅鍙慬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());
+            log.error(methodName + ":鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
             return false;
         }
     }
 
+    /**
+     * 鍐欏叆鏁版嵁
+     */
+    private boolean write2(CrnCommand command){
+        if (null == command) {
+            log.error("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
+            return false;
+        }
+        //杞崲鍓嶅厠闅嗕竴浠�
+        CrnCommand crnCommand = new CrnCommand();
+        crnCommand.setCrnNo(command.getCrnNo());
+        crnCommand.setAckFinish(command.getAckFinish());
+        crnCommand.setTaskNo(command.getTaskNo());
+        crnCommand.setTaskMode(command.getTaskMode());
+        crnCommand.setSourcePosX(command.getSourcePosX());
+        crnCommand.setSourcePosY(command.getSourcePosY());
+        crnCommand.setSourcePosZ(command.getSourcePosZ());
+        crnCommand.setDestinationPosX(command.getDestinationPosX());
+        crnCommand.setDestinationPosY(command.getDestinationPosY());
+        crnCommand.setDestinationPosZ(command.getDestinationPosZ());
+//        crnCommand.setSourceStaNo(command.getSourceStaNo());
+//        crnCommand.setDestinationStaNo(command.getDestinationStaNo());
+        crnCommand.setCommand(command.getCommand());
+        if (command.getTaskNo() == 0 && command.getAckFinish() == 0 && command.getAuto() != 1) {
+            command.setTaskNo((short) 999);
+        }
+
+        command.setCrnNo(slave.getId());
+        short[] array = new short[10];
+        if (Cools.isEmpty(command.getAckFinish())) {
+            array[0] = 5;
+        } else {
+            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();
+        // 浣滀笟淇℃伅
+        OperateResult result = siemensNet.Write("DB100.0", array);
+        // 鏃ュ織璁板綍
+            if (command.getAckFinish() != 1) {
+                BasCrnOptService bean = SpringUtils.getBean(BasCrnOptService.class);
+                BasCrnOpt basCrnOpt = new BasCrnOpt(
+                        command.getTaskNo().intValue(),    // 浠诲姟鍙�
+                        command.getCrnNo(),    // 鍫嗗灈鏈篬闈炵┖]
+                        new Date(),    // 涓嬪彂鏃堕棿
+                        command.getTaskModeType() == null ? null : 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) {}
+
+        //鏇存柊鍛戒护鏃ュ織
+        CommandInfoLogService commandInfoLogService = SpringUtils.getBean(CommandInfoLogService.class);
+        CommandInfoService commandInfoService = SpringUtils.getBean(CommandInfoService.class);
+        CommandInfo commandInfo = commandInfoService.selectById(command.getCommandId());
+        if (Cools.isEmpty(commandInfo)){
+            commandInfo = commandInfoService.selectOne(new EntityWrapper<CommandInfo>()
+                    .eq("wrk_no",crnProtocol.getTaskNo())
+                    .eq("device","Crn"));
+        }
+        CommandInfoLog commandInfoLog = JSON.parseObject(JSON.toJSONString(commandInfo), CommandInfoLog.class);
+        commandInfoLog.setId(null);
+        if (result.IsSuccess) {
+            Date now = new Date();
+            //鏇存柊鎸囦护鏃ュ織
+            commandInfoLog.setDeviceLog("鎸囦护涓嬪彂鎴愬姛");
+            commandInfoLogService.insert(commandInfoLog);
+
+            //绾跨▼鏆傚瓨鎸囦护ID
+            crnProtocol.setCommandId(command.getCommandId());
+
+            //鏇存柊鎸囦护鐘舵��
+            commandInfo.setCommandStatus(CommandStatusType.EXECUTE.id);//鎵ц涓�
+            commandInfo.setExecuteTime(now);
+            commandInfoService.updateById(commandInfo);
+
+            //鏇存柊浠诲姟姝ュ簭
+            TaskWrkService taskWrkService = SpringUtils.getBean(TaskWrkService.class);
+            TaskWrk taskWrk = taskWrkService.selectByWrkNo(command.getTaskNo().intValue());
+            if (taskWrk != null) {
+                taskWrk.setCommandStep(taskWrk.getCommandStep() + 1);//鏇存柊鎸囦护姝ュ簭
+                taskWrkService.updateById(taskWrk);
+            }
+
+
+        } else {
+            OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戝啓鍏ュ爢鍨涙満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("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
+        }
+        return true;
+    }
+
+    private boolean writeAuto(CrnCommand command){
+        if (null == command) {
+            log.error("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
+            return false;
+        }
+        OperateResult result = new OperateResult();
+        short[] array = new short[1];
+        array[0] = command.getAuto();
+        if(command.getAuto() !=0){
+            array[0] = command.getAuto();
+            result = siemensNet.Write("DB103.0", array);
+        }else if (command.getOnlineWrk1() != 0){
+            array[0] = command.getOnlineWrk1();
+            result = siemensNet.Write("DB103.2", array);
+        }else if (command.getOnlineWrk2() !=0){
+            array[0] = command.getOnlineWrk2();
+            result = siemensNet.Write("DB103.4", array);
+        }else if (command.getOnlineWrk3() != 0){
+            array[0] = command.getOnlineWrk3();
+            result = siemensNet.Write("DB103.6", array);
+        }else if (command.getOnlineWrk4() != 0){
+            array[0] = command.getOnlineWrk4();
+            result = siemensNet.Write("DB103.8", array);
+        } else if (command.getReset() != 0) {
+            array[0] = command.getReset();
+            result = siemensNet.Write("DB103.10", array);
+        }
+
+
+        if (result.IsSuccess) {
+            log.warn("鍫嗗灈鏈哄懡浠や笅鍙慬id:{},鏃堕棿锛歿}] >>>>> {}", slave.getId(), DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmsssss_F), 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}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
+            log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
+
+            return false;
+        }
+    }
 
     @Override
     public void close() {

--
Gitblit v1.9.1