From 635c92468df74c81b066d98f812af1f03166aa90 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期一, 17 十一月 2025 09:04:53 +0800
Subject: [PATCH] 堆垛机移库任务等待确认调整
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 19 +++++++++++++++++++
src/main/java/com/zy/core/model/protocol/CrnProtocol.java | 5 +++++
src/main/java/com/zy/common/CodeBuilder.java | 11 +++++++++--
3 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java
index d2c576a..42e0f2d 100644
--- a/src/main/java/com/zy/common/CodeBuilder.java
+++ b/src/main/java/com/zy/common/CodeBuilder.java
@@ -1,6 +1,7 @@
package com.zy.common;
import com.core.generators.CoolGenerator;
+import com.core.generators.constant.SqlOsType;
/**
* Created by vincent on 2019-06-04
@@ -15,11 +16,17 @@
// generator.password="xltys1995";
// generator.table="sys_host";
// sqlserver
- generator.url="192.168.3.208:1433;databasename=cool";
+ generator.sqlOsType = SqlOsType.SQL_SERVER;
+ generator.url="127.0.0.1:1433;databasename=rqdzasrs";
generator.username="sa";
generator.password="sa@123";
- generator.table="asr_wrk_detl";
+ generator.table="wcs_device_data_log";
generator.packagePath="com.zy.asrs";
+
+ generator.js = false;
+ generator.html = false;
+ generator.htmlDetail = false;
+ generator.controller = false;
generator.build();
}
diff --git a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
index 70a9b8a..a5110cd 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -195,6 +195,11 @@
public Float yDuration;
/**
+ * 鏃ュ織閲囬泦鏃堕棿
+ */
+ private Long deviceDataLog = System.currentTimeMillis();
+
+ /**
* 涓婁竴娆℃寚浠や笅鍙戞椂闂�
*/
private Long lastCommandTime = System.currentTimeMillis();
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index babbb57..cc12a8f 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -10,8 +10,10 @@
import com.core.common.SpringUtils;
import com.zy.asrs.entity.BasCrnOpt;
import com.zy.asrs.entity.BasCrnp;
+import com.zy.asrs.entity.DeviceDataLog;
import com.zy.asrs.service.BasCrnOptService;
import com.zy.asrs.service.BasCrnpService;
+import com.zy.asrs.service.DeviceDataLogService;
import com.zy.common.utils.News;
import com.zy.core.CrnThread;
import com.zy.core.cache.MessageQueue;
@@ -27,6 +29,7 @@
import lombok.extern.slf4j.Slf4j;
import java.text.MessageFormat;
+import java.util.Base64;
import java.util.Date;
/**
@@ -271,6 +274,22 @@
}
}
+ if (System.currentTimeMillis() - crnProtocol.getDeviceDataLog() > 200) {
+ //閲囬泦鏃堕棿瓒呰繃5s锛屼繚瀛樹竴娆℃暟鎹褰�
+ //淇濆瓨鏁版嵁璁板綍
+ DeviceDataLogService deviceDataLogService = SpringUtils.getBean(DeviceDataLogService.class);
+ DeviceDataLog deviceDataLog = new DeviceDataLog();
+ deviceDataLog.setOriginData(Base64.getEncoder().encodeToString(result.Content));
+ deviceDataLog.setWcsData(JSON.toJSONString(crnProtocol));
+ deviceDataLog.setType("crn");
+ deviceDataLog.setDeviceNo(crnProtocol.getCrnNo());
+ deviceDataLog.setCreateTime(new Date());
+ deviceDataLogService.insert(deviceDataLog);
+
+ //鏇存柊閲囬泦鏃堕棿
+ crnProtocol.setDeviceDataLog(System.currentTimeMillis());
+ }
+
try {
// 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
BasCrnpService basCrnpService = SpringUtils.getBean(BasCrnpService.class);
--
Gitblit v1.9.1