From fd82105a3dfe347c4c9acb0410c117d8d67c9339 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 18 三月 2026 10:40:16 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/impl/ZySiemensDualCrnThread.java |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/impl/ZySiemensDualCrnThread.java b/src/main/java/com/zy/core/thread/impl/ZySiemensDualCrnThread.java
index ab72c7b..4556561 100644
--- a/src/main/java/com/zy/core/thread/impl/ZySiemensDualCrnThread.java
+++ b/src/main/java/com/zy/core/thread/impl/ZySiemensDualCrnThread.java
@@ -1,9 +1,8 @@
 package com.zy.core.thread.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.core.common.DateUtils;
 import com.core.common.SpringUtils;
 import com.zy.asrs.entity.*;
@@ -11,7 +10,6 @@
 import com.zy.asrs.service.BasDualCrnpService;
 import com.zy.asrs.utils.Utils;
 import com.zy.common.utils.RedisUtil;
-import com.zy.core.News;
 import com.zy.core.cache.MessageQueue;
 import com.zy.core.cache.OutputQueue;
 import com.zy.core.cache.SlaveConnection;
@@ -28,6 +26,7 @@
 import com.zy.core.network.entity.ZyDualCrnStatusEntity;
 import com.zy.core.thread.DualCrnThread;
 import com.zy.core.thread.StationThread;
+import com.zy.core.utils.DeviceLogRedisKeyBuilder;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 
@@ -66,7 +65,7 @@
                 try {
                     deviceLogCollectTime = Utils.getDeviceLogCollectTime();
                     readStatus();
-                    Thread.sleep(50);
+                    Thread.sleep(100);
                 } catch (Exception e) {
                     log.error("DualCrnThread Fail", e);
                 }
@@ -111,16 +110,19 @@
             while (true) {
                 try {
                     if(crnProtocol.getMode() != DualCrnModeType.AUTO.id) {
+                        Thread.sleep(100);
                         continue;
                     }
 
                     if(crnProtocol.getAlarm() != 0) {
+                        Thread.sleep(100);
                         continue;
                     }
 
                     if (!((crnProtocol.getStatusType().equals(DualCrnStatusType.IDLE) || crnProtocol.getStatusType().equals(DualCrnStatusType.FETCH_COMPLETE))
                             && (crnProtocol.getStatusTypeTwo().equals(DualCrnStatusType.IDLE) || crnProtocol.getStatusTypeTwo().equals(DualCrnStatusType.FETCH_COMPLETE)))
                     ) {
+                        Thread.sleep(100);
                         continue;
                     }
 
@@ -282,7 +284,7 @@
 
         }
         if (basDualCrnpService != null) {
-            BasDualCrnp basDualCrnp = basDualCrnpService.selectOne(new EntityWrapper<BasDualCrnp>().eq("crn_no", deviceConfig.getDeviceNo()));
+            BasDualCrnp basDualCrnp = basDualCrnpService.getOne(new QueryWrapper<BasDualCrnp>().eq("crn_no", deviceConfig.getDeviceNo()));
             if(basDualCrnp == null) {
                 basDualCrnp = new BasDualCrnp();
                 basDualCrnp.setCrnNo(deviceConfig.getDeviceNo());
@@ -292,7 +294,7 @@
                 basDualCrnp.setMaxInTask(5);
                 basDualCrnp.setMaxOutTask(5);
                 basDualCrnp.setCreateTime(new Date());
-                basDualCrnpService.insert(basDualCrnp);
+                basDualCrnpService.save(basDualCrnp);
             }
         }
     }
@@ -301,7 +303,7 @@
     public boolean connect() {
         zyDualCrnConnectDriver = new ZyDualCrnConnectDriver(deviceConfig);
         zyDualCrnConnectDriver.start();
-        DeviceConnectPool.put(SlaveType.Crn, deviceConfig.getDeviceNo(), zyDualCrnConnectDriver);
+        DeviceConnectPool.put(SlaveType.DualCrn, deviceConfig.getDeviceNo(), zyDualCrnConnectDriver);
         return true;
     }
 
@@ -370,7 +372,7 @@
             deviceDataLog.setDeviceNo(crnProtocol.getCrnNo());
             deviceDataLog.setCreateTime(new Date());
 
-            redisUtil.set(RedisKeyType.DEVICE_LOG_KEY.key + System.currentTimeMillis(), deviceDataLog, 60 * 60 * 24);
+            redisUtil.set(DeviceLogRedisKeyBuilder.build(deviceDataLog), deviceDataLog, 60 * 60 * 24);
             //鏇存柊閲囬泦鏃堕棿
             crnProtocol.setDeviceDataLog(System.currentTimeMillis());
         }
@@ -392,7 +394,7 @@
                         log.setStatus(1);
                         log.setCreateTime(new Date());
                         log.setSystemStatus(JSON.toJSONString(crnProtocol));
-                        errLogService.insert(log);
+                        errLogService.save(log);
                         if (log.getId() != null) {
                             redisUtil.set(errFlagKey, log.getId(), 60 * 60 * 24);
                         }
@@ -522,7 +524,7 @@
             BasDualCrnpOptService bean = SpringUtils.getBean(BasDualCrnpOptService.class);
             ZyDualCrnStatusEntity statusEntity = zyDualCrnConnectDriver.getStatus();
             BasDualCrnpOpt basDualCrnpOpt = new BasDualCrnpOpt(
-                    command.getTaskNo().intValue(),
+                    command.getTaskNo(),
                     command.getCrnNo(),
                     new Date(),
                     String.valueOf(command.getTaskMode()),
@@ -536,9 +538,7 @@
                     1,
                     JSON.toJSONString(response)
             );
-            if (bean != null) {
-                bean.insert(basDualCrnpOpt);
-            }
+            bean.save(basDualCrnpOpt);
         }
     }
 

--
Gitblit v1.9.1