From a4f07b2a0ddb6c210e05afbbb491feeb466203e7 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 09 三月 2026 19:15:50 +0800
Subject: [PATCH] #V3重大更新，升级JDK17，升级SpirngBoot3.5.1
---
src/main/java/com/zy/core/thread/impl/ZySiemensCrnV2Thread.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/impl/ZySiemensCrnV2Thread.java b/src/main/java/com/zy/core/thread/impl/ZySiemensCrnV2Thread.java
index ac6d3b4..2541dd5 100644
--- a/src/main/java/com/zy/core/thread/impl/ZySiemensCrnV2Thread.java
+++ b/src/main/java/com/zy/core/thread/impl/ZySiemensCrnV2Thread.java
@@ -1,7 +1,7 @@
package com.zy.core.thread.impl;
import com.alibaba.fastjson.JSON;
-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.*;
@@ -58,7 +58,7 @@
try {
deviceLogCollectTime = Utils.getDeviceLogCollectTime();
readStatus();
- Thread.sleep(100);
+ Thread.sleep(50);
} catch (Exception e) {
log.error("CrnThread Fail", e);
}
@@ -120,7 +120,7 @@
}
if (basCrnpService != null) {
- BasCrnp basCrnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no", deviceConfig.getDeviceNo()));
+ BasCrnp basCrnp = basCrnpService.getOne(new QueryWrapper<BasCrnp>().eq("crn_no", deviceConfig.getDeviceNo()));
if(basCrnp == null) {
basCrnp = new BasCrnp();
basCrnp.setCrnNo(deviceConfig.getDeviceNo());
@@ -130,7 +130,7 @@
basCrnp.setMaxInTask(5);
basCrnp.setMaxOutTask(5);
basCrnp.setCreateTime(new Date());
- basCrnpService.insert(basCrnp);
+ basCrnpService.save(basCrnp);
}
}
}
@@ -174,6 +174,7 @@
crnProtocol.setYDistance(crnStatus.getYDistance());
crnProtocol.setXDuration(crnStatus.getXDuration());
crnProtocol.setYDuration(crnStatus.getYDuration());
+ crnProtocol.setTaskReceive(crnStatus.getTaskReceive());
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), deviceConfig.getDeviceNo()));
@@ -215,7 +216,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);
}
@@ -282,12 +283,12 @@
}
@Override
- public CrnCommand getResetCommand(Integer crnNo) {
+ public CrnCommand getResetCommand(Integer taskNo, Integer crnNo) {
CrnCommand crnCommand = new CrnCommand();
crnCommand.setCrnNo(crnNo); // 鍫嗗灈鏈虹紪鍙�
- crnCommand.setTaskNo(0); // 宸ヤ綔鍙�
+ crnCommand.setTaskNo(taskNo); // 宸ヤ綔鍙�
crnCommand.setAckFinish(1); // 浠诲姟瀹屾垚纭浣�
- crnCommand.setTaskMode(CrnTaskModeType.NONE.id); // 浠诲姟妯″紡
+ crnCommand.setTaskMode(CrnTaskModeType.RESET.id); // 浠诲姟妯″紡
crnCommand.setSourcePosX(0); // 婧愬簱浣嶆帓
crnCommand.setSourcePosY(0); // 婧愬簱浣嶅垪
crnCommand.setSourcePosZ(0); // 婧愬簱浣嶅眰
@@ -326,7 +327,7 @@
JSON.toJSONString(response)
);
if (bean != null) {
- bean.insert(basCrnpOpt);
+ bean.save(basCrnpOpt);
}
}
}
--
Gitblit v1.9.1