From c0df58a6fb50ee32e7336b5901000549700ebc82 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 16 三月 2026 15:02:59 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/impl/ZySiemensDualCrnThread.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 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..ebbe876 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;
@@ -66,7 +64,7 @@
try {
deviceLogCollectTime = Utils.getDeviceLogCollectTime();
readStatus();
- Thread.sleep(50);
+ Thread.sleep(100);
} catch (Exception e) {
log.error("DualCrnThread Fail", e);
}
@@ -111,16 +109,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 +283,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 +293,7 @@
basDualCrnp.setMaxInTask(5);
basDualCrnp.setMaxOutTask(5);
basDualCrnp.setCreateTime(new Date());
- basDualCrnpService.insert(basDualCrnp);
+ basDualCrnpService.save(basDualCrnp);
}
}
}
@@ -392,7 +393,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 +523,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 +537,7 @@
1,
JSON.toJSONString(response)
);
- if (bean != null) {
- bean.insert(basDualCrnpOpt);
- }
+ bean.save(basDualCrnpOpt);
}
}
--
Gitblit v1.9.1