From 11260184c3c930d0d9ccd6b65e905c7828efd3cf Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期五, 12 九月 2025 09:44:02 +0800
Subject: [PATCH] 1. 优化报警的查询功能 2. 插入设备表数据和单元表数据 3. 修复报警查询失败的问题
---
SourceCode/Bond/Servo/CRecipesManager.cpp | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/CRecipesManager.cpp b/SourceCode/Bond/Servo/CRecipesManager.cpp
index 48ba9d1..98a17a2 100644
--- a/SourceCode/Bond/Servo/CRecipesManager.cpp
+++ b/SourceCode/Bond/Servo/CRecipesManager.cpp
@@ -232,7 +232,7 @@
// 找到对应CRecipeList, 找不到则返回NG
lock();
- CRecipeList* pRecipeList = getRecipeListFromTemp(unitNo);
+ CRecipeList* pRecipeList = getRecipeList(unitNo);
if (pRecipeList == nullptr) {
unlock();
return MRLRC_NG;
@@ -262,6 +262,11 @@
lock();
m_nSyncStatus = SS_PARAMS_COMPLETE;
unlock();
+
+ if (m_onSyncingStateChanged != nullptr) {
+ m_onSyncingStateChanged(m_nSyncStatus);
+ }
+
return MRLRC_OK;
}
@@ -286,6 +291,23 @@
return iter->second;
}
+ bool CRecipesManager::saveRecipeList(int unitNo, std::string& strFilepath)
+ {
+ CRecipeList* pRecipeList = getRecipeList(unitNo);
+ if (pRecipeList == nullptr) return false;
+ return pRecipeList->serialize(strFilepath);
+ }
+
+ bool CRecipesManager::readRecipeList(int unitNo, std::string& strFilepath)
+ {
+ CRecipeList* pRecipeList = getRecipeList(unitNo);
+ if (pRecipeList == nullptr) {
+ pRecipeList = new CRecipeList();
+ m_mapRecipes[unitNo] = pRecipeList;
+ }
+ return pRecipeList->deserialize(strFilepath);
+ }
+
void CRecipesManager::setOnSyncingStateChanged(ONSYNCINGSTATECHANGED block)
{
m_onSyncingStateChanged = block;
--
Gitblit v1.9.3