From 77c5de231f003ce1e86caa4bd825de4a554e4a0b Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期六, 21 六月 2025 09:18:23 +0800
Subject: [PATCH] 1. 添加搬运记录的时间戳为0插入空字符串
---
SourceCode/Bond/Servo/Model.cpp | 92 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 91 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/Model.cpp b/SourceCode/Bond/Servo/Model.cpp
index 8e32798..064a164 100644
--- a/SourceCode/Bond/Servo/Model.cpp
+++ b/SourceCode/Bond/Servo/Model.cpp
@@ -6,6 +6,7 @@
#include "CEqAlarmStep.h"
#include "AlarmManager.h"
#include "CGlassPool.h"
+#include "TransferManager.h"
CModel::CModel()
@@ -37,6 +38,18 @@
void CModel::setWorkDir(const char* pszWorkDir)
{
m_strWorkDir = pszWorkDir;
+}
+
+void CModel::loadPortParams()
+{
+ BOOL portEnable, autoChangeEnable;
+ int portType, portMode, cassetteType, transferMode;
+ for (int i = 0; i < 4; i++) {
+ m_configuration.getPortParms(i, portEnable, portType, portMode,
+ cassetteType, transferMode, autoChangeEnable);
+ m_master.setPortType(i, portEnable, portType, portMode, cassetteType,
+ transferMode, autoChangeEnable);
+ }
}
int CModel::init()
@@ -171,7 +184,84 @@
notifyPtr(RX_CODE_EQ_DATA_CHANGED, pEquipment);
};
masterListener.onRobotTaskEvent = [&](void* pMaster, SERVO::CRobotTask* pTask, int code) {
- notifyPtr(RX_CODE_EQ_ROBOT_TASK, pTask);
+ if (pTask == nullptr) {
+ LOGE("<CModel>onRobotTaskEvent: 空任务指针，忽略事件 code=%d", code);
+ return;
+ }
+
+ // 任务描述与 ID 用于日志
+ const std::string& strDesc = pTask->getDescription();
+ const std::string& strClassID = pTask->getId();
+
+ // 日志输出与状态处理
+ switch (code) {
+ case ROBOT_EVENT_CREATE:
+ LOGI("<CModel>onRobotTaskEvent: 新任务创建(%s, ClassID=%s).", strDesc.c_str(), strClassID.c_str());
+ break;
+ case ROBOT_EVENT_FINISH:
+ LOGI("<CModel>onRobotTaskEvent: 任务完成(%s, ClassID=%s).", strDesc.c_str(), strClassID.c_str());
+ break;
+ case ROBOT_EVENT_ERROR:
+ LOGE("<CModel>onRobotTaskEvent: 任务错误(%s, ClassID=%s).", strDesc.c_str(), strClassID.c_str());
+ break;
+ case ROBOT_EVENT_ABORT:
+ LOGE("<CModel>onRobotTaskEvent: 任务停止(%s, ClassID=%s).", strDesc.c_str(), strClassID.c_str());
+ break;
+ case ROBOT_EVENT_RESTORE:
+ LOGE("<CModel>onRobotTaskEvent: 任务回撤(%s, ClassID=%s).", strDesc.c_str(), strClassID.c_str());
+ break;
+ default:
+ LOGE("<CModel>onRobotTaskEvent: 未知事件 code=%d, 任务=%s", code, strDesc.c_str());
+ break;
+ }
+
+ // 安全格式化时间
+ auto format_time = [](time_t t) -> std::string {
+ if (t <= 0 || t == _I64_MIN || t == _I64_MAX) {
+ return "";
+ }
+
+ // 使用 localtime_s 确保线程安全
+ tm tmBuf{};
+ errno_t err = localtime_s(&tmBuf, &t);
+ if (err != 0 || tmBuf.tm_mon < 0 || tmBuf.tm_mon > 11) {
+ return "";
+ }
+
+ // 格式化时间字符串
+ char buf[64] = {};
+ strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", &tmBuf);
+ return std::string(buf);
+ };
+
+ // 构造 TransferData 数据结构
+ TransferData data;
+ data.strClassID = strClassID;
+ data.strCreateTime = format_time(pTask->getCreateTime());
+ data.strPickTime = format_time(pTask->getFetchoutTime());
+ data.strPlaceTime = format_time(pTask->getStoredTime());
+ data.strEndTime = format_time(pTask->getFinishTime());
+ data.strDescription = pTask->getSimpleDescription();
+
+ // 状态映射
+ static const char* STATUS_STR[] = {
+ "Unknown", "Ready", "Running", "Picking", "Placing", "Restoring", "Error", "Abort", "Completed"
+ };
+ auto state = pTask->getState();
+ int index = static_cast<int>(state);
+ if (index > 0 && index < static_cast<int>(std::size(STATUS_STR))) {
+ data.strStatus = STATUS_STR[index];
+ }
+ else {
+ data.strStatus = STATUS_STR[0];
+ }
+
+ // 写入数据库
+ int nRecordId = 0;
+ TransferManager::getInstance().addTransferRecord(data, nRecordId);
+
+ notifyPtrAndInt(RX_CODE_EQ_ROBOT_TASK, pTask, nullptr, code);
+ LOGI("<CModel>onRobotTaskEvent: 任务记录已保存，RecordID=%d", nRecordId);
};
m_master.setListener(masterListener);
--
Gitblit v1.9.3