From 63b01db83d9aad8a15276b4236a9a22e4aeef065 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 05 五月 2026 12:30:59 +0800
Subject: [PATCH] # Agent数据分析V3.0.1.7

---
 src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java |   34 ++++++++++++++++++++++++++++++----
 1 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java b/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java
index 2c0013f..3475ddf 100644
--- a/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java
@@ -26,6 +26,7 @@
 import com.zy.core.network.entity.ZyCrnStatusEntity;
 import com.zy.core.service.WrkCommandRollbackService;
 import com.zy.core.thread.CrnThread;
+import com.zy.core.task.DeviceAsyncLogPublisher;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 
@@ -46,10 +47,12 @@
     private ZyCrnConnectDriver zyCrnConnectDriver;
     private CrnProtocol crnProtocol;
     private int deviceLogCollectTime = 200;
+    private final DeviceAsyncLogPublisher deviceAsyncLogPublisher;
 
     public ZySiemensCrnThread(DeviceConfig deviceConfig, RedisUtil redisUtil) {
         this.deviceConfig = deviceConfig;
         this.redisUtil = redisUtil;
+        this.deviceAsyncLogPublisher = SpringUtils.getBean(DeviceAsyncLogPublisher.class);
     }
 
     @Override
@@ -168,6 +171,7 @@
         crnProtocol.setWalkPos(crnStatus.getWalkPos());
         crnProtocol.setLoaded(crnStatus.getLoaded());
         crnProtocol.setAlarm(crnStatus.getAlarm());
+        crnProtocol.setLaserValue(crnStatus.getLaserValue());
         crnProtocol.setTemp1(crnStatus.getTemp1());
         crnProtocol.setTemp2(crnStatus.getTemp2());
         crnProtocol.setTemp3(crnStatus.getTemp3());
@@ -199,7 +203,7 @@
             deviceDataLog.setDeviceNo(crnProtocol.getCrnNo());
             deviceDataLog.setCreateTime(new Date());
 
-            redisUtil.set(RedisKeyType.DEVICE_LOG_KEY.key + System.currentTimeMillis(), deviceDataLog, 60 * 60 * 24);
+            deviceAsyncLogPublisher.publishLatest(deviceDataLog);
             //鏇存柊閲囬泦鏃堕棿
             crnProtocol.setDeviceDataLog(System.currentTimeMillis());
         }
@@ -255,14 +259,15 @@
 
     @Override
     public CrnCommand getPickAndPutCommand(String sourceLocNo, String targetLocNo, Integer taskNo, Integer crnNo) {
+        BasCrnp basCrnp = getBasCrnp(crnNo);
         CrnCommand crnCommand = new CrnCommand();
         crnCommand.setCrnNo(crnNo); // 鍫嗗灈鏈虹紪鍙�
         crnCommand.setTaskNo(taskNo); // 宸ヤ綔鍙�
         crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE.id); // 浠诲姟妯″紡:  搴撲綅绉昏浆
-        crnCommand.setSourcePosX(Utils.getRow(sourceLocNo));     // 婧愬簱浣嶆帓
+        crnCommand.setSourcePosX(resolveCommandRow(sourceLocNo, basCrnp));     // 婧愬簱浣嶆帓
         crnCommand.setSourcePosY(Utils.getBay(sourceLocNo));     // 婧愬簱浣嶅垪
         crnCommand.setSourcePosZ(Utils.getLev(sourceLocNo));     // 婧愬簱浣嶅眰
-        crnCommand.setDestinationPosX(Utils.getRow(targetLocNo));     // 鐩爣搴撲綅鎺�
+        crnCommand.setDestinationPosX(resolveCommandRow(targetLocNo, basCrnp));     // 鐩爣搴撲綅鎺�
         crnCommand.setDestinationPosY(Utils.getBay(targetLocNo));     // 鐩爣搴撲綅鍒�
         crnCommand.setDestinationPosZ(Utils.getLev(targetLocNo));     // 鐩爣搴撲綅灞�
         crnCommand.setCommand(1);     // 浠诲姟纭
@@ -271,18 +276,39 @@
 
     @Override
     public CrnCommand getMoveCommand(String targetLocNo, Integer taskNo, Integer crnNo) {
+        Integer targetRow = resolveCommandRow(targetLocNo, crnNo);
         CrnCommand crnCommand = new CrnCommand();
         crnCommand.setCrnNo(crnNo); // 鍫嗗灈鏈虹紪鍙�
         crnCommand.setTaskNo(taskNo); // 宸ヤ綔鍙�
         crnCommand.setAckFinish(0);  // 浠诲姟瀹屾垚纭浣�
         crnCommand.setTaskMode(CrnTaskModeType.CRN_MOVE.id); // 浠诲姟妯″紡:  鍫嗗灈鏈虹Щ鍔�
-        crnCommand.setDestinationPosX(Utils.getRow(targetLocNo));     // 鐩爣搴撲綅鎺�
+        crnCommand.setSourcePosX(targetRow);     // 鐩爣搴撲綅鎺�
+        crnCommand.setSourcePosY(Utils.getBay(targetLocNo));     // 鐩爣搴撲綅鍒�
+        crnCommand.setSourcePosZ(Utils.getLev(targetLocNo));     // 鐩爣搴撲綅灞�
+        crnCommand.setDestinationPosX(targetRow);     // 鐩爣搴撲綅鎺�
         crnCommand.setDestinationPosY(Utils.getBay(targetLocNo));     // 鐩爣搴撲綅鍒�
         crnCommand.setDestinationPosZ(Utils.getLev(targetLocNo));     // 鐩爣搴撲綅灞�
         crnCommand.setCommand(1);     // 浠诲姟纭
         return crnCommand;
     }
 
+    private Integer resolveCommandRow(String locNo, Integer crnNo) {
+        return resolveCommandRow(locNo, getBasCrnp(crnNo));
+    }
+
+    private Integer resolveCommandRow(String locNo, BasCrnp basCrnp) {
+        Integer locationRow = Utils.getRow(locNo);
+        if (basCrnp == null) {
+            return locationRow;
+        }
+        return basCrnp.getCommandRow(locationRow);
+    }
+
+    private BasCrnp getBasCrnp(Integer crnNo) {
+        BasCrnpService basCrnpService = SpringUtils.getBean(BasCrnpService.class);
+        return basCrnpService.getById(crnNo);
+    }
+
     @Override
     public CrnCommand getResetCommand(Integer taskNo, Integer crnNo) {
         CrnCommand crnCommand = new CrnCommand();

--
Gitblit v1.9.1