From 319114168ac26843b06431c3a10e0075526398d4 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 18 三月 2026 08:55:49 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/impl/ZySiemensDualCrnThread.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 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 8d8883c..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,7 +1,6 @@
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.core.conditions.query.QueryWrapper;
import com.core.common.DateUtils;
@@ -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;
}
@@ -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());
}
@@ -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.save(basDualCrnpOpt);
- }
+ bean.save(basDualCrnpOpt);
}
}
--
Gitblit v1.9.1