From 7fcee9618bec2384cfc3322b22d7adef3f111ac2 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期二, 06 一月 2026 14:20:01 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java | 70 ++++++++++++++---------------------
1 files changed, 28 insertions(+), 42 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 72610b6..74b1bc1 100644
--- a/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java
@@ -107,13 +107,34 @@
crnProtocol.setWalkPos(0);
crnProtocol.setLoaded(0);
crnProtocol.setAlarm(0);
- crnProtocol.setXSpeed(0);
- crnProtocol.setYSpeed(0);
- crnProtocol.setZSpeed(0);
- crnProtocol.setXDistance(0);
- crnProtocol.setYDistance(0);
- crnProtocol.setXDuration(0);
- crnProtocol.setYDuration(0);
+ crnProtocol.setXSpeed(0D);
+ crnProtocol.setYSpeed(0D);
+ crnProtocol.setZSpeed(0D);
+ crnProtocol.setXDistance(0D);
+ crnProtocol.setYDistance(0D);
+ crnProtocol.setXDuration(0D);
+ crnProtocol.setYDuration(0D);
+
+ BasCrnpService basCrnpService = null;
+ try {
+ basCrnpService = SpringUtils.getBean(BasCrnpService.class);
+ }catch (Exception e){
+
+ }
+ if (basCrnpService != null) {
+ BasCrnp basCrnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no", deviceConfig.getDeviceNo()));
+ if(basCrnp == null) {
+ basCrnp = new BasCrnp();
+ basCrnp.setCrnNo(deviceConfig.getDeviceNo());
+ basCrnp.setStatus(1);
+ basCrnp.setInEnable("N");
+ basCrnp.setOutEnable("N");
+ basCrnp.setMaxInTask(5);
+ basCrnp.setMaxOutTask(5);
+ basCrnp.setCreateTime(new Date());
+ basCrnpService.insert(basCrnp);
+ }
+ }
}
@Override
@@ -158,20 +179,6 @@
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), deviceConfig.getDeviceNo()));
-// // 澶嶄綅淇″彿
-// if (!Cools.isEmpty(crnProtocol.getStatusType()) && crnProtocol.getStatusType().equals(CrnStatusType.WAITING)) {
-// if (resetFlag) {
-// if(crnProtocol.getTaskNo()==9999){
-// backHpFlag = false;
-// }
-// CrnCommand crnCommand = new CrnCommand();
-// crnCommand.setAckFinish((short)1);
-// if (write(crnCommand)) {
-// resetFlag = false;
-// }
-// }
-// }
-
if (crnProtocol.getAlarm() > 0) {
crnProtocol.setLastCommandTime(-1L);
}
@@ -192,27 +199,6 @@
redisUtil.set(RedisKeyType.DEVICE_LOG_KEY.key + System.currentTimeMillis(), deviceDataLog, 60 * 60 * 24);
//鏇存柊閲囬泦鏃堕棿
crnProtocol.setDeviceDataLog(System.currentTimeMillis());
- }
-
- BasCrnpService basCrnpService = null;
- try {
- basCrnpService = SpringUtils.getBean(BasCrnpService.class);
- }catch (Exception e){
-
- }
- if (basCrnpService != null) {
- BasCrnp basCrnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no", deviceConfig.getDeviceNo()));
- if(basCrnp == null) {
- basCrnp = new BasCrnp();
- basCrnp.setCrnNo(deviceConfig.getDeviceNo());
- basCrnp.setStatus(1);
- basCrnp.setInEnable("N");
- basCrnp.setOutEnable("N");
- basCrnp.setMaxInTask(5);
- basCrnp.setMaxOutTask(5);
- basCrnp.setCreateTime(new Date());
- basCrnpService.insert(basCrnp);
- }
}
}
--
Gitblit v1.9.1