From 7c35ff8d9a626f69a8a8b7de3d73dc9d73de9dd7 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期六, 13 九月 2025 10:51:32 +0800
Subject: [PATCH] 1. 解决读取报警文件错误的问题，提高兼容性（可能文件是在MacOS编辑的，导致换行符不一样）

---
 SourceCode/Bond/EAPSimulator/EAPSimulatorDlg.cpp |  105 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 104 insertions(+), 1 deletions(-)

diff --git a/SourceCode/Bond/EAPSimulator/EAPSimulatorDlg.cpp b/SourceCode/Bond/EAPSimulator/EAPSimulatorDlg.cpp
index bb79178..e15ff68 100644
--- a/SourceCode/Bond/EAPSimulator/EAPSimulatorDlg.cpp
+++ b/SourceCode/Bond/EAPSimulator/EAPSimulatorDlg.cpp
@@ -12,6 +12,8 @@
 #include "CTerminalDisplayDlg.h"
 #include "CEDEventReportDlg.h"
 #include "CDefineReportsDlg.h"
+#include "CLinkReportDlg.h"
+#include "CPJsDlg.h"
 
 
 #ifdef _DEBUG
@@ -82,6 +84,17 @@
 	ON_BN_CLICKED(IDC_BUTTON_ED_EVENT_REPORT, &CEAPSimulatorDlg::OnBnClickedButtonEdEventReport)
 	ON_BN_CLICKED(IDC_BUTTON_ED_ALARM_REPORT, &CEAPSimulatorDlg::OnBnClickedButtonEdAlarmReport)
 	ON_BN_CLICKED(IDC_BUTTON_DEFINE_REPORT, &CEAPSimulatorDlg::OnBnClickedButtonDefineReport)
+	ON_BN_CLICKED(IDC_BUTTON_LINE_REPORT, &CEAPSimulatorDlg::OnBnClickedButtonLineReport)
+	ON_BN_CLICKED(IDC_BUTTON_CONFIGURE_SPOOLING, &CEAPSimulatorDlg::OnBnClickedButtonConfigureSpooling)
+	ON_BN_CLICKED(IDC_BUTTON_TRANSMIT_SPOOLED_DATA, &CEAPSimulatorDlg::OnBnClickedButtonTransmitSpooledData)
+	ON_BN_CLICKED(IDC_BUTTON_PURGE_SPOOLED_DATA, &CEAPSimulatorDlg::OnBnClickedButtonPurgeSpooledData)
+	ON_BN_CLICKED(IDC_BUTTON_QUERY_PPID_LIST, &CEAPSimulatorDlg::OnBnClickedButtonQueryPpidList)
+	ON_BN_CLICKED(IDC_BUTTON_PROCEED_WITH_CARRIER, &CEAPSimulatorDlg::OnBnClickedButtonProceedWithCarrier)
+	ON_BN_CLICKED(IDC_BUTTON_CARRIER_RELEASE, &CEAPSimulatorDlg::OnBnClickedButtonCarrierRelease)
+	ON_BN_CLICKED(IDC_BUTTON_QUERY_CJ_SPACE, &CEAPSimulatorDlg::OnBnClickedButtonQueryCjSpace)
+	ON_BN_CLICKED(IDC_BUTTON_QUERY_PJ_SPACE, &CEAPSimulatorDlg::OnBnClickedButtonQueryPjSpace)
+	ON_BN_CLICKED(IDC_BUTTON_CREATE_PJ, &CEAPSimulatorDlg::OnBnClickedButtonCreatePj)
+	ON_BN_CLICKED(IDC_BUTTON_CREATE_CJ, &CEAPSimulatorDlg::OnBnClickedButtonCreateCj)
 END_MESSAGE_MAP()
 
 
@@ -263,7 +276,18 @@
 	GetDlgItem(IDC_BUTTON_TERMINAL_DISPLAY)->EnableWindow(enabled);	
 	GetDlgItem(IDC_BUTTON_ED_EVENT_REPORT)->EnableWindow(enabled);
 	GetDlgItem(IDC_BUTTON_ED_ALARM_REPORT)->EnableWindow(enabled);	
-	GetDlgItem(IDC_BUTTON_DEFINE_REPORT)->EnableWindow(enabled);	
+	GetDlgItem(IDC_BUTTON_DEFINE_REPORT)->EnableWindow(enabled);
+	GetDlgItem(IDC_BUTTON_LINE_REPORT)->EnableWindow(enabled);	
+	GetDlgItem(IDC_BUTTON_CONFIGURE_SPOOLING)->EnableWindow(enabled);	
+	GetDlgItem(IDC_BUTTON_TRANSMIT_SPOOLED_DATA)->EnableWindow(enabled);
+	GetDlgItem(IDC_BUTTON_PURGE_SPOOLED_DATA)->EnableWindow(enabled);
+	GetDlgItem(IDC_BUTTON_QUERY_PPID_LIST)->EnableWindow(enabled);	
+	GetDlgItem(IDC_BUTTON_PROCEED_WITH_CARRIER)->EnableWindow(enabled);	
+	GetDlgItem(IDC_BUTTON_CARRIER_RELEASE)->EnableWindow(enabled);
+	GetDlgItem(IDC_BUTTON_QUERY_CJ_SPACE)->EnableWindow(enabled);
+	GetDlgItem(IDC_BUTTON_QUERY_PJ_SPACE)->EnableWindow(enabled);
+	GetDlgItem(IDC_BUTTON_CREATE_PJ)->EnableWindow(enabled);	
+	GetDlgItem(IDC_BUTTON_CREATE_CJ)->EnableWindow(enabled);	
 }
 
 void CEAPSimulatorDlg::OnBnClickedButtonConnect()
@@ -319,3 +343,82 @@
 	CDefineReportsDlg dlg;
 	dlg.DoModal();
 }
+
+void CEAPSimulatorDlg::OnBnClickedButtonLineReport()
+{
+	CLinkReportDlg dlg;
+	dlg.DoModal();
+}
+
+void CEAPSimulatorDlg::OnBnClickedButtonConfigureSpooling()
+{
+	std::map<unsigned int, std::set<unsigned int>> spoolingConfig;
+
+	// test clear all
+	// theApp.m_model.m_pHsmsActive->hsmsConfigureSpooling(spoolingConfig);
+
+
+	// test add s2[1,3,5];
+	// spoolingConfig[2].insert(1);
+	// spoolingConfig[2].insert(3);
+	// spoolingConfig[2].insert(5);
+	// spoolingConfig[3].insert(2);
+	// spoolingConfig[3].insert(4);
+	// spoolingConfig[3].insert(6);
+	// theApp.m_model.m_pHsmsActive->hsmsConfigureSpooling(spoolingConfig);
+
+	// test clear S2
+	// spoolingConfig[2].clear();
+	// theApp.m_model.m_pHsmsActive->hsmsConfigureSpooling(spoolingConfig);
+
+	spoolingConfig[5].insert(66);
+	theApp.m_model.m_pHsmsActive->hsmsConfigureSpooling(spoolingConfig);
+}
+
+void CEAPSimulatorDlg::OnBnClickedButtonTransmitSpooledData()
+{
+	theApp.m_model.m_pHsmsActive->hsmsTransmitSpooledData();
+}
+
+void CEAPSimulatorDlg::OnBnClickedButtonPurgeSpooledData()
+{
+	theApp.m_model.m_pHsmsActive->hsmsPurgeSpooledData();
+}
+
+void CEAPSimulatorDlg::OnBnClickedButtonQueryCjSpace()
+{
+	theApp.m_model.m_pHsmsActive->hsmsSelectedEquipmentStatusRequest(SVID_CJobSpace);
+}
+
+void CEAPSimulatorDlg::OnBnClickedButtonQueryPjSpace()
+{
+	theApp.m_model.m_pHsmsActive->hsmsSelectedEquipmentStatusRequest(SVID_PJobQueued);
+}
+
+void CEAPSimulatorDlg::OnBnClickedButtonQueryPpidList()
+{
+	theApp.m_model.m_pHsmsActive->hsmsQueryPPIDList();
+}
+
+static int DATAID = 1;
+void CEAPSimulatorDlg::OnBnClickedButtonProceedWithCarrier()
+{
+	theApp.m_model.m_pHsmsActive->hsmsProceedWithCarrier(DATAID++, "CSX 52078", 1);
+}
+
+void CEAPSimulatorDlg::OnBnClickedButtonCarrierRelease()
+{
+	theApp.m_model.m_pHsmsActive->hsmsCarrierRelease(DATAID++, "CSX 52078", 2);
+}
+
+void CEAPSimulatorDlg::OnBnClickedButtonCreatePj()
+{
+	CPJsDlg dlg;
+	dlg.DoModal();
+}
+
+void CEAPSimulatorDlg::OnBnClickedButtonCreateCj()
+{
+	std::vector<std::string> processJobIds = {"PJ0001", "PJ0003"};
+	theApp.m_model.m_pHsmsActive->hsmsCreateControlJob("CJ5007", processJobIds);
+}

--
Gitblit v1.9.3