From 155cb7fe0dcb564729c6aecdb65815f3f0ed24e2 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期二, 13 一月 2026 11:28:26 +0800
Subject: [PATCH] 1.ECID, DVID的查询和实现；
---
SourceCode/Bond/Servo/CPageGlassList.cpp | 201 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 163 insertions(+), 38 deletions(-)
diff --git a/SourceCode/Bond/Servo/CPageGlassList.cpp b/SourceCode/Bond/Servo/CPageGlassList.cpp
index e9f0892..801a337 100644
--- a/SourceCode/Bond/Servo/CPageGlassList.cpp
+++ b/SourceCode/Bond/Servo/CPageGlassList.cpp
@@ -13,6 +13,7 @@
#include <unordered_map>
#include <vector>
#include <string>
+#include <algorithm>
#include "CProcessDataListDlg.h"
#define PAGE_SIZE 50
@@ -99,6 +100,9 @@
// ====== 寮�鍏筹細1=鍚敤鍋囨暟鎹紙鍙浛鎹� DB 鏌ヨ锛夛紱0=鐢ㄧ湡瀹� DB ======
#define USE_FAKE_DB_DEMO 0
+
+// ====== 寮�鍏筹細1=鍚敤妯℃嫙浼犳劅鍣ㄦ暟鎹敓鎴愶紱0=浣跨敤鐪熷疄鏁版嵁 ======
+#define USE_MOCK_SENSOR_DATA 0
#if USE_FAKE_DB_DEMO
#include <ctime>
@@ -1360,7 +1364,7 @@
if (!row.pretty.empty()) {
CFile file;
if (file.Open(filePath, CFile::modeCreate | CFile::modeWrite)) {
- file.Write(row.pretty.c_str(), row.pretty.length());
+ file.Write(row.pretty.c_str(), (UINT)row.pretty.length());
file.Close();
CString strSuccess;
@@ -1471,72 +1475,66 @@
if (!row.pretty.empty()) {
SERVO::CGlass tempGlass;
if (GlassJson::FromString(row.pretty, tempGlass)) {
+#if USE_MOCK_SENSOR_DATA
+ // 鐢熸垚妯℃嫙鐨凷VData鐢ㄤ簬娴嬭瘯
+ GenerateMockSVData(tempGlass);
+#endif
// 瀵规瘡涓満鍣ㄧ敓鎴愯〃鏍�
for (const auto& machinePair : tempGlass.getAllSVData()) {
int machineId = machinePair.first;
+ const auto& dataByType = machinePair.second;
CString machineName = CString(SERVO::CServoUtilsTool::getEqName(machineId).c_str());
csvContent += _T("\n[") + machineName + _T("]\n");
- // 鑾峰彇璇ユ満鍣ㄧ殑棰勫畾涔夊垪椤哄簭
- auto columnOrder = getMachineColumnOrder(machineId);
-
- if (columnOrder.empty()) {
- csvContent += _T("鏃犻瀹氫箟鍒楅厤缃甛n");
+ if (dataByType.empty()) {
+ csvContent += _T("No sensor data\n");
continue;
}
- // 鏋勫缓琛ㄥご - 鐩存帴浣跨敤涓枃鍒楀悕
- CString header = _T("鏃堕棿鎴�(ms),鏈湴鏃堕棿");
+ auto columnOrder = getMachineColumnOrder(machineId, &dataByType);
+ if (columnOrder.empty()) {
+ csvContent += _T("No exportable columns\n");
+ continue;
+ }
+
+ CString header = _T("Timestamp(ms),LocalTime");
for (const auto& dataType : columnOrder) {
header += _T(",");
- header += CString(dataType.c_str()); // 鐩存帴浣跨敤涓枃鍒楀悕
+ header += CString(dataType.c_str());
}
header += _T("\n");
csvContent += header;
- // 妫�鏌ユ槸鍚︽湁鏁版嵁
- if (machinePair.second.empty()) {
- csvContent += _T("鏃犱紶鎰熷櫒鏁版嵁\n");
+ auto baselineIt = std::find_if(columnOrder.begin(), columnOrder.end(),
+ [&](const std::string& type) {
+ auto dataIt = dataByType.find(type);
+ return dataIt != dataByType.end() && !dataIt->second.empty();
+ });
+ if (baselineIt == columnOrder.end()) {
+ csvContent += _T("No usable time series\n");
continue;
}
- // 浣跨敤绗竴涓暟鎹被鍨嬬殑鏃堕棿搴忓垪浣滀负鍩哄噯
- const std::string& firstDataType = columnOrder[0];
- auto firstDataTypeIt = machinePair.second.find(firstDataType);
- if (firstDataTypeIt == machinePair.second.end() || firstDataTypeIt->second.empty()) {
- csvContent += _T("鏃犲熀鍑嗘暟鎹被鍨嬫暟鎹甛n");
- continue;
- }
-
- const auto& timeSeries = firstDataTypeIt->second;
-
- // 瀵逛簬姣忎釜鏃堕棿鐐癸紝杈撳嚭涓�琛屾暟鎹�
- for (size_t i = 0; i < timeSeries.size(); i++) {
+ const auto& timeSeries = dataByType.at(*baselineIt);
+ for (size_t i = 0; i < timeSeries.size(); ++i) {
auto timestamp = timeSeries[i].timestamp;
-
- // 鏃堕棿鎴筹紙姣锛�
auto ms = timePointToMs(timestamp);
CString row;
row.Format(_T("%lld,"), ms);
- // 鏈湴鏃堕棿瀛楃涓�
CString localTime = CString(timePointToString(timestamp).c_str());
row += localTime;
- // 鎸夌収棰勫畾涔夌殑鍒楅『搴忚緭鍑烘暟鎹�
for (const auto& dataType : columnOrder) {
row += _T(",");
-
- auto dataTypeIt = machinePair.second.find(dataType);
- if (dataTypeIt != machinePair.second.end() && i < dataTypeIt->second.size()) {
- // 鐩存帴鎸夌储寮曡幏鍙栨暟鎹�
+ auto dataTypeIt = dataByType.find(dataType);
+ if (dataTypeIt != dataByType.end() && i < dataTypeIt->second.size()) {
CString valueStr;
valueStr.Format(_T("%.3f"), dataTypeIt->second[i].value);
row += valueStr;
}
else {
- // 鐞嗚涓婁笉搴旇鍙戠敓锛屽洜涓烘偍璇存病鏈夌┖鍊�
row += _T("N/A");
}
}
@@ -1575,9 +1573,14 @@
auto* p = reinterpret_cast<NMC_ELC_SHOWFULLTEXT*>(pNMHDR);
// 瀵硅瘽妗嗘樉绀哄伐鑹哄弬鏁�
- CProcessDataListDlg dlg;
- dlg.setRawText(p->text);
- dlg.DoModal();
+ if (p->iSubItem == 12) {
+ CProcessDataListDlg dlg;
+ dlg.setRawText(p->text);
+ dlg.DoModal();
+ }
+ else {
+ AfxMessageBox(p->text);
+ }
*pResult = 0;
}
@@ -1912,11 +1915,33 @@
}
// 鑾峰彇鏈哄櫒棰勫畾涔夌殑鍒楅『搴�
-std::vector<std::string> CPageGlassList::getMachineColumnOrder(int machineId)
+std::vector<std::string> CPageGlassList::getMachineColumnOrder(int machineId,
+ const std::unordered_map<std::string, std::vector<SERVO::SVDataItem>>* actualData)
{
+ std::vector<std::string> columnOrder;
auto dataTypes = SERVO::CServoUtilsTool::getEqDataTypes();
auto it = dataTypes.find(machineId);
- return it != dataTypes.end() ? it->second : std::vector<std::string>();
+
+ if (actualData != nullptr) {
+ if (it != dataTypes.end()) {
+ for (const auto& name : it->second) {
+ if (actualData->find(name) != actualData->end()) {
+ columnOrder.push_back(name);
+ }
+ }
+ }
+ for (const auto& kv : *actualData) {
+ if (std::find(columnOrder.begin(), columnOrder.end(), kv.first) == columnOrder.end()) {
+ columnOrder.push_back(kv.first);
+ }
+ }
+ return columnOrder;
+ }
+
+ if (it != dataTypes.end()) {
+ columnOrder = it->second;
+ }
+ return columnOrder;
}
// 鏃堕棿鎴宠浆鎹负瀛楃涓�
@@ -1934,4 +1959,104 @@
int64_t CPageGlassList::timePointToMs(const std::chrono::system_clock::time_point& tp)
{
return std::chrono::duration_cast<std::chrono::milliseconds>(tp.time_since_epoch()).count();
+}
+
+// 鐢熸垚妯℃嫙鐨凷VData鐢ㄤ簬娴嬭瘯
+void CPageGlassList::GenerateMockSVData(SERVO::CGlass& glass)
+{
+ // 鑾峰彇璁惧鏁版嵁绫诲瀷閰嶇疆
+ auto& dataTypes = SERVO::CServoUtilsTool::getEqDataTypes();
+
+ // 涓烘瘡涓澶囩敓鎴愭ā鎷熸暟鎹�
+ for (const auto& machinePair : dataTypes) {
+ int machineId = machinePair.first;
+ const auto& dataTypeList = machinePair.second;
+ std::vector<std::string> filteredTypes;
+
+ if (machineId == EQ_ID_VACUUMBAKE || machineId == EQ_ID_BAKE_COOLING) {
+ const char activePrefix = 'A';
+ for (const auto& dataType : dataTypeList) {
+ if (!dataType.empty() && dataType[0] == activePrefix) {
+ filteredTypes.push_back(dataType);
+ }
+ }
+ }
+
+ const auto& typeList = filteredTypes.empty() ? dataTypeList : filteredTypes;
+
+ // 鐢熸垚鏃堕棿搴忓垪锛氫粠褰撳墠鏃堕棿寰�鍓嶆帹10鍒嗛挓锛屾瘡1绉掍竴涓暟鎹偣
+ auto now = std::chrono::system_clock::now();
+ auto startTime = now - std::chrono::minutes(10);
+
+ // 涓烘瘡涓暟鎹被鍨嬬敓鎴愭ā鎷熸暟鎹�
+ for (const auto& dataType : typeList) {
+ std::vector<SERVO::SVDataItem> mockData;
+
+ // 鐢熸垚600涓暟鎹偣锛�10鍒嗛挓 * 60涓偣/鍒嗛挓锛�
+ for (int i = 0; i < 600; ++i) {
+ auto timestamp = startTime + std::chrono::seconds(i * 1);
+
+ // 鏍规嵁璁惧绫诲瀷鍜屾暟鎹被鍨嬬敓鎴愪笉鍚岀殑妯℃嫙鍊�
+ double value = GenerateMockValue(machineId, dataType, i);
+
+ mockData.emplace_back(timestamp, value);
+ }
+
+ // 灏嗘ā鎷熸暟鎹坊鍔犲埌glass瀵硅薄涓�
+ glass.addSVData(machineId, dataType, mockData);
+ }
+ }
+}
+
+// 鏍规嵁璁惧绫诲瀷鍜屾暟鎹被鍨嬬敓鎴愭ā鎷熸暟鍊�
+double CPageGlassList::GenerateMockValue(int machineId, const std::string& dataType, int index)
+{
+ // 鍩虹鍊艰寖鍥�
+ double baseValue = 0.0;
+ double variation = 0.0;
+
+ // 鏍规嵁璁惧绫诲瀷璁剧疆鍩虹鍊�
+ switch (machineId) {
+ case EQ_ID_Bonder1:
+ case EQ_ID_Bonder2:
+ if (dataType.find("鍘嬪姏") != std::string::npos) {
+ baseValue = 50.0; // 鍘嬪姏鍩虹鍊�
+ variation = 10.0; // 鍘嬪姏鍙樺寲鑼冨洿
+ } else if (dataType.find("娓╁害") != std::string::npos) {
+ baseValue = 180.0; // 娓╁害鍩虹鍊�
+ variation = 5.0; // 娓╁害鍙樺寲鑼冨洿
+ } else if (dataType.find("鎵╁睍鍊�") != std::string::npos) {
+ baseValue = 100.0; // 鎵╁睍鍊煎熀纭�鍊�
+ variation = 15.0; // 鎵╁睍鍊煎彉鍖栬寖鍥�
+ }
+ break;
+
+ case EQ_ID_VACUUMBAKE:
+ if (dataType.find("鎵╁睍鍊�") != std::string::npos) {
+ baseValue = 80.0;
+ variation = 12.0;
+ } else if (dataType.find("娓╁害") != std::string::npos) {
+ baseValue = 200.0;
+ variation = 8.0;
+ }
+ break;
+
+ case EQ_ID_BAKE_COOLING:
+ if (dataType.find("娓╁害") != std::string::npos) {
+ baseValue = 25.0; // 鍐峰嵈娓╁害
+ variation = 3.0;
+ }
+ break;
+
+ default:
+ baseValue = 50.0;
+ variation = 5.0;
+ break;
+ }
+
+ // 娣诲姞鏃堕棿鐩稿叧鐨勮秼鍔垮拰闅忔満鍙樺寲
+ double timeTrend = sin(index * 0.1) * 2.0; // 姝ｅ鸡娉㈣秼鍔�
+ double randomNoise = (rand() % 100 - 50) / 100.0 * variation * 0.3; // 闅忔満鍣０
+
+ return baseValue + timeTrend + randomNoise;
}
\ No newline at end of file
--
Gitblit v1.9.3