From ec3fa1a4209062eb95388d19474dd8b5a3ac9c0f Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 16 三月 2026 11:16:18 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/network/real/ZyCrnRealConnect.java |  254 +++++++++++++++++++++++++++++---------------------
 1 files changed, 146 insertions(+), 108 deletions(-)

diff --git a/src/main/java/com/zy/core/network/real/ZyCrnRealConnect.java b/src/main/java/com/zy/core/network/real/ZyCrnRealConnect.java
index 694ef52..9e12fc1 100644
--- a/src/main/java/com/zy/core/network/real/ZyCrnRealConnect.java
+++ b/src/main/java/com/zy/core/network/real/ZyCrnRealConnect.java
@@ -2,16 +2,15 @@
 
 import HslCommunication.Core.Types.OperateResult;
 import HslCommunication.Core.Types.OperateResultExOne;
+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.BasCrnpOpt;
 import com.zy.asrs.entity.DeviceConfig;
-import com.zy.asrs.service.BasCrnpOptService;
-import com.zy.asrs.utils.Utils;
 import com.zy.core.News;
 import com.zy.core.cache.OutputQueue;
+import com.zy.core.enums.CrnTaskModeType;
 import com.zy.core.model.CommandResponse;
 import com.zy.core.model.command.CrnCommand;
 import com.zy.core.network.api.ZyCrnConnectApi;
@@ -25,21 +24,21 @@
     private SiemensS7Net siemensNet;
     private DeviceConfig deviceConfig;
 
-    public ZyCrnRealConnect(SiemensS7Net siemensS7Net, DeviceConfig deviceConfig) {
-        this.siemensNet = siemensS7Net;
+    public ZyCrnRealConnect(DeviceConfig deviceConfig) {
         this.deviceConfig = deviceConfig;
     }
 
     public boolean connect() {
         boolean connected = false;
+        siemensNet = new SiemensS7Net(SiemensPLCS.S1200, deviceConfig.getIp());
         OperateResult connect = siemensNet.ConnectServer();
-        if(connect.IsSuccess){
+        if (connect.IsSuccess) {
             connected = true;
-            OutputQueue.CRN.offer(MessageFormat.format( "銆恵0}銆戝爢鍨涙満plc杩炴帴鎴愬姛 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort()));
-            News.info("SiemensCrn"+" - 1"+" - 鍫嗗灈鏈簆lc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort());
+            OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戝爢鍨涙満plc杩炴帴鎴愬姛 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort()));
+            News.info("鍫嗗灈鏈簆lc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort());
         } else {
             OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戝爢鍨涙満plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort()));
-            News.error("SiemensCrn"+" - 2"+" - 鍫嗗灈鏈簆lc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort());
+            News.error("鍫嗗灈鏈簆lc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort());
         }
 //        siemensNet.ConnectClose();
         return connected;
@@ -54,7 +53,7 @@
     @Override
     public ZyCrnStatusEntity getStatus() {
         try {
-            OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 56);
+            OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 60);
             if (result.IsSuccess) {
                 ZyCrnStatusEntity crnStatus = new ZyCrnStatusEntity();
                 crnStatus.setCrnNo(deviceConfig.getDeviceNo());
@@ -68,27 +67,33 @@
                 crnStatus.setWalkPos((int) siemensNet.getByteTransform().TransInt16(result.Content, 14));
                 crnStatus.setLoaded((int) siemensNet.getByteTransform().TransInt16(result.Content, 16));
                 crnStatus.setAlarm((int) siemensNet.getByteTransform().TransInt16(result.Content, 18));
-                crnStatus.setTemp1((int) siemensNet.getByteTransform().TransInt16(result.Content, 20));
-                crnStatus.setTemp2((int) siemensNet.getByteTransform().TransInt16(result.Content, 22));
-                crnStatus.setTemp3((int) siemensNet.getByteTransform().TransInt16(result.Content, 24));
-                crnStatus.setTemp4((int) siemensNet.getByteTransform().TransInt16(result.Content, 26));
-                crnStatus.setXSpeed((int) siemensNet.getByteTransform().TransInt16(result.Content, 28));
-                crnStatus.setYSpeed((int) siemensNet.getByteTransform().TransInt16(result.Content, 32));
-                crnStatus.setZSpeed((int) siemensNet.getByteTransform().TransInt16(result.Content, 36));
-                crnStatus.setXDistance((int) siemensNet.getByteTransform().TransInt16(result.Content, 40));
-                crnStatus.setYDistance((int) siemensNet.getByteTransform().TransInt16(result.Content, 44));
-                crnStatus.setXDuration((int) siemensNet.getByteTransform().TransInt16(result.Content, 48));
-                crnStatus.setYDuration((int) siemensNet.getByteTransform().TransInt16(result.Content, 52));
+                crnStatus.setTemp1((int) siemensNet.getByteTransform().TransInt16(result.Content, 24));
+                crnStatus.setTemp2((int) siemensNet.getByteTransform().TransInt16(result.Content, 26));
+                crnStatus.setXSpeed((double) siemensNet.getByteTransform().TransSingle(result.Content, 28));
+                crnStatus.setYSpeed((double) siemensNet.getByteTransform().TransSingle(result.Content, 32));
+                crnStatus.setZSpeed((double) siemensNet.getByteTransform().TransSingle(result.Content, 36));
+                crnStatus.setXDistance((double) siemensNet.getByteTransform().TransSingle(result.Content, 40));
+                crnStatus.setYDistance((double) siemensNet.getByteTransform().TransSingle(result.Content, 44));
+                crnStatus.setXDuration((double) siemensNet.getByteTransform().TransSingle(result.Content, 48));
+                crnStatus.setYDuration((double) siemensNet.getByteTransform().TransSingle(result.Content, 52));
+                crnStatus.setWeight((double) siemensNet.getByteTransform().TransSingle(result.Content, 56));
+
+                // 璇诲彇DB110.200 - DB110.398
+                OperateResultExOne<byte[]> resultDb110 = siemensNet.Read("DB110.200", (short) 200);
+                if (resultDb110.IsSuccess) {
+                    short[] db110Data = siemensNet.getByteTransform().TransInt16(resultDb110.Content, 0, 100);
+                    crnStatus.setDb110Data(db110Data);
+                }
 
                 return crnStatus;
             } else {
                 OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戣鍙栧爢鍨涙満plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort()));
-                News.error("SiemensCrn"+" - 4"+" - 璇诲彇鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}]", deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort());
+                News.error("璇诲彇鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}]", deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort());
             }
         } catch (Exception e) {
             e.printStackTrace();
             OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戣鍙栧爢鍨涙満plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort()));
-            News.error("SiemensCrn"+" - 5"+" - 璇诲彇鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}]", deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort());
+            News.error("璇诲彇鍨涙満plc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}]", deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort());
         }
         return null;
     }
@@ -104,46 +109,55 @@
             }
 
             int writeAck = 0;
-            boolean ackResult = false;
+            boolean commandResult = false;
             do {
-                OperateResult resultAck = siemensNet.Write("DB100.0", (short) 0);
-                if (resultAck.IsSuccess) {
-                    Thread.sleep(200);
-                    OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 2);
-                    short ack = siemensNet.getByteTransform().TransInt16(resultRead.Content, 0);
-                    if (ack != 0) {
-                        writeAck++;
-                    } else {
-                        News.info("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", command.getCrnNo(), "ack澶嶄綅瀹屾垚");
-                        ackResult = true;
-                        break;
+                OperateResult result = siemensNet.Write("DB100.0", (short) 0);
+                if (result.IsSuccess) {
+                    OperateResultExOne<byte[]> commandReadResult = siemensNet.Read("DB100.0", (short) 2);
+                    if (commandReadResult.IsSuccess) {
+                        short commandRead = siemensNet.getByteTransform().TransInt16(commandReadResult.Content, 0);
+                        if (commandRead == 1) {
+                            Thread.sleep(500);
+                        }else {
+                            commandResult = true;
+                            break;
+                        }
                     }
                 }
+                writeAck++;
+                Thread.sleep(200);
             } while (writeAck < 5);
 
-            if (!ackResult) {
-                response.setMessage("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}" + command.getCrnNo() + "ack澶嶄綅澶辫触");
+            if (!commandResult) {
+                response.setMessage("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}" + command.getCrnNo() + "浠诲姟鐘舵�佷綅寮傚父");
                 return response;
             }
 
-            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();
+            Integer commandTaskNo = command.getTaskNo();
+            Integer commandTaskMode = command.getTaskMode();
+            if (commandTaskMode.equals(CrnTaskModeType.RESET.id)) {
+                commandTaskNo = 0;
+                commandTaskMode = 0;
+            }
 
-            OperateResult result = null;
+            short[] array = new short[9];
+            array[0] = command.getAckFinish().shortValue();
+            array[1] = commandTaskNo.shortValue();
+            array[2] = commandTaskMode.shortValue();
+            array[3] = command.getSourcePosX().shortValue();
+            array[4] = command.getSourcePosY().shortValue();
+            array[5] = command.getSourcePosZ().shortValue();
+            array[6] = command.getDestinationPosX().shortValue();
+            array[7] = command.getDestinationPosY().shortValue();
+            array[8] = command.getDestinationPosZ().shortValue();
+
             int idx = 0;
+            boolean commandDataResult = false;
             do {
-                OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 20);
-                if (resultRead.IsSuccess) {
-                    if (command.getAckFinish() == 0) {
+                OperateResult result = siemensNet.Write("DB100.0", array);
+                if (result.IsSuccess) {
+                    OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 20);
+                    if (resultRead.IsSuccess) {
                         short taskNo = siemensNet.getByteTransform().TransInt16(resultRead.Content, 2);
                         short taskMode = siemensNet.getByteTransform().TransInt16(resultRead.Content, 4);
                         short sourcePosX = siemensNet.getByteTransform().TransInt16(resultRead.Content, 6);
@@ -155,76 +169,100 @@
                         if (taskNo == 0 || taskMode == 0 || sourcePosX == 0 || sourcePosY == 0 || sourcePosZ == 0 || destinationPosX == 0 || destinationPosY == 0 || destinationPosZ == 0) {
                             result = siemensNet.Write("DB100.0", array);
                         } else {
-                            break;
-                        }
-                    } else {
-                        short ackFinish = siemensNet.getByteTransform().TransInt16(resultRead.Content, 0);
-                        if (ackFinish != command.getAckFinish()) {
-                            result = siemensNet.Write("DB100.0", array);
-                        } else {
+                            commandDataResult = true;
                             break;
                         }
                     }
                 }
                 idx++;
-                Thread.sleep(500);
+                Thread.sleep(200);
             } while (idx < 5);
 
-            if (command.getAckFinish() == 0) {
-                short commandFinish = 1;
-                int i = 0;
-                do {
-                    OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 4);
-                    OperateResultExOne<byte[]> resultReadConfirm = siemensNet.Read("DB100.18", (short) 2);
-                    if (resultRead.IsSuccess && resultReadConfirm.IsSuccess) {
-                        short taskNo = siemensNet.getByteTransform().TransInt16(resultRead.Content, 2);
-                        short confirm = siemensNet.getByteTransform().TransInt16(resultReadConfirm.Content, 0);
-                        if (taskNo != 0 && confirm == 0) {
-                            result = siemensNet.Write("DB100.18", commandFinish);
+            if (!commandDataResult) {
+                response.setMessage("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}" + command.getCrnNo() + "鍫嗗灈鏈哄啓鍏ヤ换鍔℃暟鎹け璐�");
+                return response;
+            }
+
+            int writeConfirmIdx = 0;
+            boolean commandConfirmResult = false;
+            do {
+                OperateResult result = siemensNet.Write("DB100.18", (short) 1);
+                if (result.IsSuccess) {
+                    OperateResultExOne<byte[]> commandReadResult = siemensNet.Read("DB100.18", (short) 2);
+                    if (commandReadResult.IsSuccess) {
+                        short commandRead = siemensNet.getByteTransform().TransInt16(commandReadResult.Content, 0);
+                        if (commandRead == 0) {
+                            Thread.sleep(500);
+                        }else {
+                            commandConfirmResult = true;
+                            break;
                         }
                     }
-                    i++;
-                    Thread.sleep(500);
-                } while (i < 5);
+                }
+                writeConfirmIdx++;
+                Thread.sleep(200);
+            } while (writeConfirmIdx < 5);
+
+            if (!commandConfirmResult) {
+                News.error("鍫嗗灈鏈哄啓鍏ョ‘璁ゆ暟鎹け璐� ===>> [id:{}]", command.getCrnNo());
+                response.setMessage("鍫嗗灈鏈哄啓鍏ョ‘璁ゆ暟鎹け璐�");
+                return response;
             }
 
-            if (result != null && result.IsSuccess) {
-                News.info("SiemensCrn" + " - 7" + " - 鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", command.getCrnNo(), JSON.toJSON(command));
-                OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), command.getCrnNo(), JSON.toJSON(command)));
-                response.setResult(true);
-                response.setMessage("鍛戒护涓嬪彂鎴愬姛");
-            } else {
-                News.error("SiemensCrn" + " - 8" + " - 鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触 ===>> [id:{}]", command.getCrnNo());
-                OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戝啓鍏ュ爢鍨涙満plc鏁版嵁澶辫触 ===>> [id:{1}]", DateUtils.convert(new Date()), command.getCrnNo()));
-                response.setResult(false);
-                response.setMessage("鍛戒护涓嬪彂澶辫触");
-            }
-
+            News.info("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", command.getCrnNo(), JSON.toJSON(command));
+            OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), command.getCrnNo(), JSON.toJSON(command)));
+            response.setResult(true);
+            response.setMessage("鍛戒护涓嬪彂鎴愬姛");
             return response;
         } catch (Exception e) {
             e.printStackTrace();
-        }finally {
-            String sourceLocNo = Utils.getLocNo(command.getSourcePosX(), command.getSourcePosY(), command.getSourcePosZ());
-            String targetLocNo = Utils.getLocNo(command.getDestinationPosX(), command.getDestinationPosY(), command.getDestinationPosZ());
+        }
+        return response;
+    }
 
-            // 鏃ュ織璁板綍
-            BasCrnpOptService bean = SpringUtils.getBean(BasCrnpOptService.class);
-            BasCrnpOpt basCrnpOpt = new BasCrnpOpt(
-                    command.getTaskNo().intValue(),    // 浠诲姟鍙�
-                    command.getCrnNo(),    // 鍫嗗灈鏈篬闈炵┖]
-                    new Date(),    // 涓嬪彂鏃堕棿
-                    String.valueOf(command.getTaskMode()),    // 妯″紡
-                    sourceLocNo, //婧愬簱浣�
-                    targetLocNo, //鐩爣搴撲綅
-                    null,    // 淇敼鏃堕棿
-                    null,    // 淇敼浜哄憳
-                    null,    // 澶囨敞
-                    JSON.toJSONString(command),    // 鎸囦护
-                    JSON.toJSONString(command),    // 绯荤粺鐘舵��
-                    1,    // 涓嬪彂鐘舵�亄0:鏈笅鍙�,1:宸蹭笅鍙憓
-                    JSON.toJSONString(response)    // 鍝嶅簲
-            );
-            bean.insert(basCrnpOpt);
+    @Override
+    public CommandResponse sendCommand2(CrnCommand command) {
+        CommandResponse response = new CommandResponse(false);
+        try {
+            if (null == command) {
+                News.error("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
+                response.setMessage("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
+                return response;
+            }
+
+
+            OperateResult resultAck = siemensNet.Write("DB110." + command.getIndex() * 2, command.getValue());
+            if (resultAck.IsSuccess) {
+                News.info("搴撲綅鐧借壊鐏懡浠や笅鍙慬locNo:{}] >>>>> {}", command.getLocNo(), command.getValue());
+            } else {
+                News.error("搴撲綅鐧借壊鐏懡浠や笅鍙戝け璐locNo:{}] >>>>> {}", command.getLocNo(), command.getValue());
+            }
+            return response;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return response;
+    }
+
+    @Override
+    public CommandResponse sendCommand3(CrnCommand command) {
+        CommandResponse response = new CommandResponse(false);
+        try {
+            if (null == command) {
+                News.error("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
+                response.setMessage("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
+                return response;
+            }
+            Integer index = command.getIndex()*2 + 200;
+            OperateResult resultAck = siemensNet.Write("DB110." + index, command.getValue());
+            if (resultAck.IsSuccess) {
+                News.info("搴撲綅姗欒壊鎸夐挳鍛戒护涓嬪彂[locNo:{}] >>>>> {}", command.getLocNo(), command.getValue());
+            } else {
+                News.error("搴撲綅鐧借壊鐏懡浠や笅鍙戝け璐locNo:{}] >>>>> {}", command.getLocNo(), command.getValue());
+            }
+            return response;
+        } catch (Exception e) {
+            e.printStackTrace();
         }
         return response;
     }

--
Gitblit v1.9.1