From a50ee893d90f98974de664e365f8802198ad2539 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 03 四月 2025 11:33:49 +0800
Subject: [PATCH] 1. 添加生产履历管理器 2. 删除报警管理器的设置数据库的接口，防止野指针
---
SourceCode/Bond/Servo/Servo.cpp | 46 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 46 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/Servo.cpp b/SourceCode/Bond/Servo/Servo.cpp
index 495b5e7..f947821 100644
--- a/SourceCode/Bond/Servo/Servo.cpp
+++ b/SourceCode/Bond/Servo/Servo.cpp
@@ -7,6 +7,13 @@
#include "ServoDlg.h"
#include "ServoGraph.h"
#include "AlarmManager.h"
+#include "SECSRuntimeManager.h"
+#include "ProductionLogManager.h"
+#include "VerticalLine.h"
+#include "EqsGraphWnd.h"
+#include "MapPosWnd.h"
+#include "HmTab.h"
+
// 声明全局变量，用于管理 GDI+ 初始化
ULONG_PTR g_diplusToken;
@@ -91,6 +98,10 @@
// 注册控件
CServoGraph::RegisterWndClass();
+ CVerticalLine::RegisterWndClass();
+ CEqsGraphWnd::RegisterWndClass();
+ CMapPosWnd::RegisterWndClass();
+ CHmTab::RegisterWndClass();
// 初始化Rx库
@@ -112,6 +123,38 @@
catch (const std::exception& ex) {
CString errorMsg;
errorMsg.Format(_T("初始化报警管理器失败：%s"), CString(ex.what()));
+ AfxMessageBox(errorMsg, MB_ICONERROR);
+ return FALSE;
+ }
+ AlarmManager::getInstance().insertMockData();
+
+
+ // 初始化生产履历管理器
+ try {
+ if (!ProductionLogManager::getInstance().initProductionTable()) {
+ AfxMessageBox("初始化生产履历管理器失败！");
+ return FALSE;
+ }
+ }
+ catch (const std::exception& ex) {
+ CString errorMsg;
+ errorMsg.Format(_T("初始化生产履历管理器失败：%s"), CString(ex.what()));
+ AfxMessageBox(errorMsg, MB_ICONERROR);
+ return FALSE;
+ }
+ ProductionLogManager::getInstance().insertMockData();
+
+
+ // 初始化SECS运行设置管理库
+ try {
+ if (!SECSRuntimeManager::getInstance().initRuntimeSetting()) {
+ AfxMessageBox("初始化SECS运行设置失败！");
+ return FALSE;
+ }
+ }
+ catch (const std::exception& ex) {
+ CString errorMsg;
+ errorMsg.Format(_T("初始化SECS运行设置失败：%s"), CString(ex.what()));
AfxMessageBox(errorMsg, MB_ICONERROR);
return FALSE;
}
@@ -159,6 +202,9 @@
// 销毁报警表
AlarmManager::getInstance().termAlarmTable();
+ // 销毁SECS运行设置管理库
+ SECSRuntimeManager::getInstance().termRuntimeSetting();
+
return CWinApp::ExitInstance();
}
--
Gitblit v1.9.3