V1.16.37

.gitignore

@@ -186,3 +186,5 @@ VRC36LogProcessor/Bin/data/ECVR-FM-25-00-230426042182_log
 VRC36LogProcessor/Bin/data/ECVR-FM-25-00-230426042182_log.xls
 VRC36LogProcessor/VRC36LogProcessor/Debug/VRC36LogProcessor.res
 VRC36LogProcessor/VRC36LogProcessor/Release/VRC36LogProcessor.res
+VaporRecoveryMonitor/油气回收系统安装包/油气回收在线监控系统安装包V1.16.36.zip
+VaporRecoveryMonitor/油气回收系统安装包/油气回收在线监控系统安装包V1.16.37.zip

ChatRoomClient-VR/ChatRoomClient/ChatRoomClientDlg.cpp

@@ -7,6 +7,10 @@
 #include "ChatRoomClientDlg.h"
 #include "afxdialogex.h"
 #include "tools.h"
+#include <chrono>
+#include <thread>
+#include <iomanip>
+#include <ctime>
 
 #include <string>
 
@@ -301,6 +305,22 @@ BOOL CChatRoomClientDlg::OnInitDialog()
 	com.linkRichEdit(&m_richedit);
 
 
+
+
+	/*//测试循环插入交易
+	auto now = std::chrono::system_clock::now();
+	for (int i = 0; i < 2000; i++)
+	{
+		OnBnClickedReflashbegall();
+		time_t now_time_t = std::chrono::system_clock::to_time_t(now);
+		now += std::chrono::seconds(1);
+		((CDateTimeCtrl*)GetDlgItem(IDC_BEGTIME))->SetTime((now_time_t));
+		((CDateTimeCtrl*)GetDlgItem(IDC_ENDTIME))->SetTime((now_time_t));
+		Trade();
+	}
+	*/
+
+
 	return TRUE;  // 除非将焦点设置到控件，否则返回 TRUE
 }
 

ChatRoomClient-VR/ChatRoomClient/Debug/ChatRoomClient.log

@@ -1,75 +1,55 @@
-Build started 2025/9/3 17:14:57.
-     1>Project "C:\bitbucket\apacsys-vaporrecoverymonitor_new\ChatRoomClient-VR\ChatRoomClient\ChatRoomClient.vcxproj" on node 2 (Build target(s)).
-     1>ClCompile:
-         C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\CL.exe /c /ZI /nologo /W3 /WX- /sdl /Od /Oy- /D WIN32 /D _WINDOWS /D _DEBUG /D _USING_V110_SDK71_ /D _MBCS /Gm /EHsc /RTC1 /MTd /GS /fp:precise /Zc:wchar_t /Zc:forScope /Yu"stdafx.h" /Fp"Debug\ChatRoomClient.pch" /Fo"Debug\\" /Fd"Debug\vc120.pdb" /Gd /TP /analyze- /errorReport:prompt ChatRoomClientDlg.cpp
-         ChatRoomClientDlg.cpp
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(717): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(718): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(719): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(720): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(721): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(817): warning C4927: illegal conversion; more than one user-defined conversion has been implicitly applied
-                 while calling the constructor 'std::basic_string<char,std::char_traits<char>,std::allocator<char>>::basic_string(const _Elem *)'
-                 with
-                 [
-                     _Elem=char
-                 ]
-                 c:\program files (x86)\microsoft visual studio 12.0\vc\include\xstring(778) : see declaration of 'std::basic_string<char,std::char_traits<char>,std::allocator<char>>::basic_string'
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(830): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(831): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(832): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(833): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(834): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(916): warning C4244: '=' : conversion from 'long' to 'BYTE', possible loss of data
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(960): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(961): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(962): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(963): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(964): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1289): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1290): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1291): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1292): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1293): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1388): warning C4244: '=' : conversion from 'long' to 'BYTE', possible loss of data
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1430): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1431): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1432): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1433): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1434): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1528): warning C4244: '=' : conversion from 'long' to 'BYTE', possible loss of data
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1570): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1571): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1572): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1573): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1574): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1659): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1660): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1661): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1662): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1663): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1745): warning C4244: '=' : conversion from 'long' to 'BYTE', possible loss of data
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1809): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1810): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1811): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1812): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1813): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1885): warning C4244: '=' : conversion from 'long' to 'BYTE', possible loss of data
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(2020): warning C4244: '=' : conversion from 'long' to 'BYTE', possible loss of data
-       Link:
-         C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\link.exe /ERRORREPORT:PROMPT /OUT:"C:\bitbucket\apacsys-vaporrecoverymonitor_new\ChatRoomClient-VR\Debug\ChatRoomClient.exe" /INCREMENTAL /NOLOGO /MANIFEST /MANIFESTUAC:"level='asInvoker' uiAccess='false'" /manifest:embed /manifestinput:"C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\Include\Manifest\dpiaware.manifest" /DEBUG /PDB:"C:\bitbucket\apacsys-vaporrecoverymonitor_new\ChatRoomClient-VR\Debug\ChatRoomClient.pdb" /SUBSYSTEM:WINDOWS,"5.01" /TLBID:1 /DYNAMICBASE /NXCOMPAT /IMPLIB:"C:\bitbucket\apacsys-vaporrecoverymonitor_new\ChatRoomClient-VR\Debug\ChatRoomClient.lib" /MACHINE:X86 Debug\ChatRoomClient.res
-         Debug\ChatRoomClient.obj
-         Debug\ChatRoomClientDlg.obj
-         Debug\ClientSocket.obj
-         Debug\ComHandle.obj
-         Debug\global.obj
-         Debug\MySeries.obj
-         Debug\stdafx.obj
-         Debug\tools.obj
-         Debug\UdpClientSocket.obj
-         ChatRoomClient.vcxproj -> C:\bitbucket\apacsys-vaporrecoverymonitor_new\ChatRoomClient-VR\Debug\ChatRoomClient.exe
-     1>Done Building Project "C:\bitbucket\apacsys-vaporrecoverymonitor_new\ChatRoomClient-VR\ChatRoomClient\ChatRoomClient.vcxproj" (Build target(s)).
-
-Build succeeded.
-
-Time Elapsed 00:00:02.08
+  ChatRoomClientDlg.cpp
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(737): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(738): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(739): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(740): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(741): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(837): warning C4927: illegal conversion; more than one user-defined conversion has been implicitly applied
+          while calling the constructor 'std::basic_string<char,std::char_traits<char>,std::allocator<char>>::basic_string(const _Elem *)'
+          with
+          [
+              _Elem=char
+          ]
+          c:\program files (x86)\microsoft visual studio 12.0\vc\include\xstring(778) : see declaration of 'std::basic_string<char,std::char_traits<char>,std::allocator<char>>::basic_string'
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(850): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(851): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(852): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(853): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(854): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(936): warning C4244: '=' : conversion from 'long' to 'BYTE', possible loss of data
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(980): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(981): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(982): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(983): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(984): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1309): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1310): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1311): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1312): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1313): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1408): warning C4244: '=' : conversion from 'long' to 'BYTE', possible loss of data
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1450): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1451): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1452): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1453): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1454): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1548): warning C4244: '=' : conversion from 'long' to 'BYTE', possible loss of data
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1590): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1591): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1592): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1593): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1594): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1679): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1680): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1681): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1682): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1683): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1765): warning C4244: '=' : conversion from 'long' to 'BYTE', possible loss of data
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1829): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1830): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1831): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1832): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1833): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(1905): warning C4244: '=' : conversion from 'long' to 'BYTE', possible loss of data
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\chatroomclient-vr\chatroomclient\chatroomclientdlg.cpp(2040): warning C4244: '=' : conversion from 'long' to 'BYTE', possible loss of data
+  ChatRoomClient.vcxproj -> C:\bitbucket\apacsys-vaporrecoverymonitor_new\ChatRoomClient-VR\Debug\ChatRoomClient.exe

ChatRoomClient-VR/ChatRoomClient/Release/ChatRoomClient.log

@@ -3,61 +3,59 @@ C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\atlmfc\include\afx.h(38):
           C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\atlmfc\include\afx.h(33) : see declaration of 'MBCS_Support_Deprecated_In_MFC'
   ChatRoomClient.cpp
   ChatRoomClientDlg.cpp
-c:\bitbucket\apacsys-vaporrecoverymonitor\chatroomclient-vr\chatroomclient\tools.h(20): error C2572: 'numberToBuffer' : redefinition of default parameter : parameter 4
-          c:\bitbucket\apacsys-vaporrecoverymonitor\chatroomclient-vr\chatroomclient\global.h(26) : see declaration of 'numberToBuffer'
-c:\bitbucket\apacsys-vaporrecoverymonitor\chatroomclient-vr\chatroomclient\tools.h(20): error C2995: 'void numberToBuffer(T,int,unsigned char *,bool)' : function template has already been defined
-          c:\bitbucket\apacsys-vaporrecoverymonitor\chatroomclient-vr\chatroomclient\global.h(26) : see declaration of 'numberToBuffer'
-c:\bitbucket\apacsys-vaporrecoverymonitor\chatroomclient-vr\chatroomclient\tools.h(36): error C2572: 'bufferToNumber' : redefinition of default parameter : parameter 4
-          c:\bitbucket\apacsys-vaporrecoverymonitor\chatroomclient-vr\chatroomclient\global.h(41) : see declaration of 'bufferToNumber'
-c:\bitbucket\apacsys-vaporrecoverymonitor\chatroomclient-vr\chatroomclient\tools.h(36): error C2995: 'void bufferToNumber(const unsigned char *,int,T &,bool)' : function template has already been defined
-          c:\bitbucket\apacsys-vaporrecoverymonitor\chatroomclient-vr\chatroomclient\global.h(41) : see declaration of 'bufferToNumber'
-ChatRoomClientDlg.cpp(713): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-ChatRoomClientDlg.cpp(714): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-ChatRoomClientDlg.cpp(715): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-ChatRoomClientDlg.cpp(716): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-ChatRoomClientDlg.cpp(717): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-ChatRoomClientDlg.cpp(808): warning C4927: illegal conversion; more than one user-defined conversion has been implicitly applied
+ChatRoomClientDlg.cpp(737): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+ChatRoomClientDlg.cpp(738): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+ChatRoomClientDlg.cpp(739): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+ChatRoomClientDlg.cpp(740): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+ChatRoomClientDlg.cpp(741): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+ChatRoomClientDlg.cpp(837): warning C4927: illegal conversion; more than one user-defined conversion has been implicitly applied
           while calling the constructor 'std::basic_string<char,std::char_traits<char>,std::allocator<char>>::basic_string(const _Elem *)'
           with
           [
               _Elem=char
           ]
           C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\include\xstring(778) : see declaration of 'std::basic_string<char,std::char_traits<char>,std::allocator<char>>::basic_string'
-ChatRoomClientDlg.cpp(821): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-ChatRoomClientDlg.cpp(822): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-ChatRoomClientDlg.cpp(823): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-ChatRoomClientDlg.cpp(824): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-ChatRoomClientDlg.cpp(825): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-ChatRoomClientDlg.cpp(903): warning C4244: '=' : conversion from 'long' to 'BYTE', possible loss of data
-ChatRoomClientDlg.cpp(947): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-ChatRoomClientDlg.cpp(948): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-ChatRoomClientDlg.cpp(949): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-ChatRoomClientDlg.cpp(950): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-ChatRoomClientDlg.cpp(951): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-ChatRoomClientDlg.cpp(1268): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-ChatRoomClientDlg.cpp(1269): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-ChatRoomClientDlg.cpp(1270): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-ChatRoomClientDlg.cpp(1271): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-ChatRoomClientDlg.cpp(1272): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-ChatRoomClientDlg.cpp(1367): warning C4244: '=' : conversion from 'long' to 'BYTE', possible loss of data
-ChatRoomClientDlg.cpp(1409): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-ChatRoomClientDlg.cpp(1410): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-ChatRoomClientDlg.cpp(1411): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-ChatRoomClientDlg.cpp(1412): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-ChatRoomClientDlg.cpp(1413): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-ChatRoomClientDlg.cpp(1498): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-ChatRoomClientDlg.cpp(1499): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-ChatRoomClientDlg.cpp(1500): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-ChatRoomClientDlg.cpp(1501): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-ChatRoomClientDlg.cpp(1502): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-ChatRoomClientDlg.cpp(1580): warning C4244: '=' : conversion from 'long' to 'BYTE', possible loss of data
-ChatRoomClientDlg.cpp(1644): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-ChatRoomClientDlg.cpp(1645): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-ChatRoomClientDlg.cpp(1646): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-ChatRoomClientDlg.cpp(1647): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-ChatRoomClientDlg.cpp(1648): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-ChatRoomClientDlg.cpp(1720): warning C4244: '=' : conversion from 'long' to 'BYTE', possible loss of data
-ChatRoomClientDlg.cpp(1855): warning C4244: '=' : conversion from 'long' to 'BYTE', possible loss of data
+ChatRoomClientDlg.cpp(850): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+ChatRoomClientDlg.cpp(851): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+ChatRoomClientDlg.cpp(852): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+ChatRoomClientDlg.cpp(853): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+ChatRoomClientDlg.cpp(854): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+ChatRoomClientDlg.cpp(936): warning C4244: '=' : conversion from 'long' to 'BYTE', possible loss of data
+ChatRoomClientDlg.cpp(980): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+ChatRoomClientDlg.cpp(981): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+ChatRoomClientDlg.cpp(982): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+ChatRoomClientDlg.cpp(983): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+ChatRoomClientDlg.cpp(984): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+ChatRoomClientDlg.cpp(1309): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+ChatRoomClientDlg.cpp(1310): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+ChatRoomClientDlg.cpp(1311): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+ChatRoomClientDlg.cpp(1312): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+ChatRoomClientDlg.cpp(1313): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+ChatRoomClientDlg.cpp(1408): warning C4244: '=' : conversion from 'long' to 'BYTE', possible loss of data
+ChatRoomClientDlg.cpp(1450): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+ChatRoomClientDlg.cpp(1451): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+ChatRoomClientDlg.cpp(1452): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+ChatRoomClientDlg.cpp(1453): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+ChatRoomClientDlg.cpp(1454): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+ChatRoomClientDlg.cpp(1548): warning C4244: '=' : conversion from 'long' to 'BYTE', possible loss of data
+ChatRoomClientDlg.cpp(1590): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+ChatRoomClientDlg.cpp(1591): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+ChatRoomClientDlg.cpp(1592): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+ChatRoomClientDlg.cpp(1593): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+ChatRoomClientDlg.cpp(1594): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+ChatRoomClientDlg.cpp(1679): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+ChatRoomClientDlg.cpp(1680): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+ChatRoomClientDlg.cpp(1681): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+ChatRoomClientDlg.cpp(1682): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+ChatRoomClientDlg.cpp(1683): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+ChatRoomClientDlg.cpp(1765): warning C4244: '=' : conversion from 'long' to 'BYTE', possible loss of data
+ChatRoomClientDlg.cpp(1829): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+ChatRoomClientDlg.cpp(1830): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+ChatRoomClientDlg.cpp(1831): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+ChatRoomClientDlg.cpp(1832): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+ChatRoomClientDlg.cpp(1833): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+ChatRoomClientDlg.cpp(1905): warning C4244: '=' : conversion from 'long' to 'BYTE', possible loss of data
+ChatRoomClientDlg.cpp(2040): warning C4244: '=' : conversion from 'long' to 'BYTE', possible loss of data
   ClientSocket.cpp
   ComHandle.cpp
 ComHandle.cpp(96): warning C4018: '<' : signed/unsigned mismatch
@@ -66,3 +64,6 @@ ComHandle.cpp(136): warning C4018: '<' : signed/unsigned mismatch
   MySeries.cpp
   tools.cpp
   UdpClientSocket.cpp
+  Generating code
+  Finished generating code
+  ChatRoomClient.vcxproj -> C:\bitbucket\apacsys-vaporrecoverymonitor_new\ChatRoomClient-VR\Release\ChatRoomClient.exe

ChatRoomClient-VR/ChatRoomClient/Release/ChatRoomClient.tlog/ChatRoomClient.lastbuildstate

@@ -1,2 +1,2 @@
 #TargetFrameworkVersion=v4.0:PlatformToolSet=v120_xp:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native32Bit
-Release|Win32|C:\Bitbucket\apacsys-vaporrecoverymonitor\ChatRoomClient-VR\|
+Release|Win32|C:\bitbucket\apacsys-vaporrecoverymonitor_new\ChatRoomClient-VR\|

ChatRoomClient-VR/ChatRoomClient/conn.ini

@@ -6,7 +6,7 @@ YLS=3.11
 QLS=4.11
 YL=24.11
 QL=25.11
-TTC=1
+TTC=14001
 ERROR=2
 PRESS=11
 PORT=1

ChatRoomClient-VR/Release/conn.ini

@@ -1,12 +1,12 @@
 [Config]
 fip=1
-noz=7
+noz=1
 YLS=10.00
 QLS=10.00
 YL=15.00
 QL=15.00
 VL=1.00
-TTC=7
+TTC=28
 ERROR=0
 PRESS=10
 PWM=10
@@ -15,3 +15,4 @@ noz2=0
 noz3=0
 noz4=0
 PORT=1
+CURRENT=0

VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/FileCache.cpp

@@ -9,6 +9,9 @@
 #include <iomanip>
 #include <sys/stat.h>
 #include <algorithm>
+#include "vr_db.h"
+
+using namespace VR::database;
 
 FileCache::FileCache(const std::string& cacheDir, const std::string& dbConnStr)
 	: cacheDirectory(cacheDir), databaseConnectionString(dbConnStr) {
@@ -48,6 +51,23 @@ bool FileCache::saveFailedRecord(const std::map<std::string, std::string>& recor
 	return true;
 }
 
+bool FileCache::saveFailedRecord(const filling_record& record) {
+	std::string filename = generateFilename();
+	std::ofstream file(filename.c_str());
+	if (!file.is_open()) return false;
+
+
+
+	Json::Value json_record;
+	serialize_filling_record(record, json_record);
+
+	file << json_record.toStyledString();
+
+	file.close();
+	return true;
+}
+
+
 std::vector<std::string> FileCache::listFilesInDirectory() const {
 	std::vector<std::string> files;
 	DIR* dir = opendir(cacheDirectory.c_str());
@@ -63,6 +83,7 @@ std::vector<std::string> FileCache::listFilesInDirectory() const {
 	return files;
 }
 
+/*
 std::map<std::string, std::string> FileCache::parseJsonFile(const std::string& filepath) {
 	std::map<std::string, std::string> record;
 	std::ifstream file(filepath.c_str());
@@ -93,6 +114,60 @@ std::map<std::string, std::string> FileCache::parseJsonFile(const std::string& f
 
 	return record;
 }
+*/
+
+
+filling_record FileCache::parseJsonFile(const std::string& filepath,int& result) {
+	filling_record record = { 0 };
+	std::ifstream file(filepath.c_str());
+	if (!file.is_open())
+	{
+		result = FALSE;
+		return record;
+	}
+
+	//std::string line;
+	//std::getline(file, line);
+	//file.close();
+
+	Json::CharReaderBuilder reader;
+	//std::ifstream i("filling_record.json");
+	std::string errs;
+	Json::Value loaded_json_record;
+	bool parsingSuccessful = Json::parseFromStream(reader, file, &loaded_json_record, &errs);
+	if (!parsingSuccessful) {
+		std::cerr << "Failed to parse JSON: " << errs << std::endl;
+		file.close();
+		result = FALSE;
+		return record;
+	}
+	deserialize_filling_record(loaded_json_record, record);
+	file.close();
+
+	/*
+	// 简单解析JSON格式（假设为简单键值对）
+	size_t pos = 1; // 跳过开头 '{'
+	while ((pos = line.find("\"", pos)) != std::string::npos) {
+		size_t keyStart = pos + 1;
+		size_t keyEnd = line.find("\"", keyStart);
+		if (keyEnd == std::string::npos) break;
+		std::string key = line.substr(keyStart, keyEnd - keyStart);
+
+		pos = line.find(":\"", keyEnd);
+		if (pos == std::string::npos) break;
+		size_t valStart = pos + 2;
+		size_t valEnd = line.find("\"", valStart);
+		if (valEnd == std::string::npos) break;
+		std::string value = line.substr(valStart, valEnd - valStart);
+
+		record[key] = value;
+		pos = valEnd + 1;
+	}*/
+
+	result = TRUE;
+	return record;
+}
+
 
 bool FileCache::insertIntoDatabase(const std::map<std::string, std::string>& record) {
 	// 模拟数据库插入操作
@@ -112,11 +187,33 @@ void FileCache::deleteFile(const std::string& filepath) {
 
 void FileCache::processCacheFiles() {
 	std::vector<std::string> files = listFilesInDirectory();
-	for (std::vector<std::string>::const_iterator it = files.begin(); it != files.end(); ++it) {
-		std::map<std::string, std::string> record = parseJsonFile(*it);
-		if (!record.empty() && insertIntoDatabase(record)) {
+	for (std::vector<std::string>::const_iterator it = files.begin(); it != files.end(); ++it)
+	{
+		int result = FALSE;
+		filling_record record = parseJsonFile(*it, result);
+
+		if (result != FALSE)
+		{
+			t_filling dball;
+			int rtn = dball.insert_filling(&record);
+
+			if (rtn != DB_FAILE)
+			{
+				deleteFile(*it);
+
+				if (rtn == DB_SUCCESS) 
+				{
+					SendWebData_Record_ALL(record);
+				}
+			}
+
+
+		}
+
+
+		/*if (!record.empty() && insertIntoDatabase(record)) {
 			deleteFile(*it);
 			std::cout << "Deleted file: " << *it << std::endl;
-		}
+		}*/
 	}
 }

VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/FileCache.h

@@ -10,6 +10,7 @@ public:
 	~FileCache();
 
 	bool saveFailedRecord(const std::map<std::string, std::string>& record);
+	bool saveFailedRecord(const filling_record& record);
 	void processCacheFiles();
 
 private:
@@ -18,7 +19,8 @@ private:
 
 	std::string generateFilename() const;
 	bool insertIntoDatabase(const std::map<std::string, std::string>& record);
-	std::map<std::string, std::string> parseJsonFile(const std::string& filepath);
+	//std::map<std::string, std::string> parseJsonFile(const std::string& filepath); 
+	filling_record parseJsonFile(const std::string& filepath,int& result);
 	std::vector<std::string> listFilesInDirectory() const;
 	void deleteFile(const std::string& filepath);
 };

VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/conn.ini

@@ -1,9 +1,9 @@
 ;上传平台选择
 [City]
 ;上传平台1；  0-北京；1-；2-；3-浙江杭州环保局；4-；5-山东省环保；6-广州;7-湖南中石化;8-山东烟台;9-重庆;10-;11-浙江金华环保局;12-南京环保局；13-福建厦门环保局；14-东莞市环保局；15-深圳环保局；16-江门环保局；17-沈阳环保局；18-广东惠州环保局;19=汕头环保局；20-云浮环保局；21-揭阳环保局；22-浙江宁波环保局；23-佛山市环保2；24-阳江环保局；25-安徽合肥环保局；26-浙江温州环保局；27-珠海环保局; 28-河北张家口环保局；29-浙江台州环保；30-湛江环保局；31-清远环保局；32-河北唐山环保局；33-内蒙古呼和浩特环保局；34-武汉环保局；35-宁夏环保局；36-成都环保局；37-茂名环保局；38-河源环保局；999-测试1；1000-不设置
-CityNo=0
+CityNo=6
 ;上传平台2；  0-不设置；1-浙江浙石油；2-浙江中石化；3-山东青岛；4-湖南长沙环保局；5-佛山顺德（佛山市）；6-广东中石化；7-重庆环保2；8-山东烟台；9-中化道达尔；999-测试2
-CityNo2=999
+CityNo2=6
 ;上传平台3；0-不设置；1-浙江高速；2-中山智慧平台；3-北京中石化；4-山东烟台(新地址)
 CityNo3=0
 ;主平台设置；1-以平台1规则为主；2-以平台2规则为主
@@ -15,7 +15,7 @@ MainCity=1
 ;是否开启平台1远程传输。0-关闭；1-开启
 Enable=0
 ;是否开启平台2远程传输。0-关闭；1-开启
-Enable2=0
+Enable2=1
 ;是否开启平台3远程传输。0-关闭；1-开启
 Enable3=0
 
@@ -948,7 +948,7 @@ Port=10000
 [DataID]
 Record=67169
 Environment=105878
-Config=3344
+Config=3346
 Warning=14006
 Error=1641
 NozState=1680
@@ -977,14 +977,14 @@ enablefillinglog=1
 nozstr=
 tankstr=
 stationname=珠江二加油站
-Times=1:0;2:0;3:0;5:0;6:0;9:0;13:0;14:0;15:0;16:0;17:0;18:0;19:0;20:0;23:0;24:0;
-Times_alert=1:0;2:0;3:0;5:0;6:0;9:0;13:0;14:0;15:0;16:0;17:0;18:0;19:0;20:0;23:0;24:0;
-configupdatetime=20251107114832
+Times=1:0;2:0;3:0;4:0;5:0;6:0;9:0;13:0;14:0;15:0;16:0;17:0;18:0;19:0;20:0;23:0;24:0;
+Times_alert=1:0;2:0;3:0;4:0;5:0;6:0;9:0;13:0;14:0;15:0;16:0;17:0;18:0;19:0;20:0;23:0;24:0;
+configupdatetime=20260105165403
 
 [RunningState]
 UnLockFlag=000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Date=20251231
-TradeFlag=000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+Date=20260113
+TradeFlag=100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 
 
 

VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/global.cpp

@@ -22,10 +22,9 @@
 
 
 
-
 using namespace VR::notify;
 
-string g_version = "V1.16.35";
+string g_version = "V1.16.37";
 
 
 int g_read_unuploadday = 31;	//程序开启时读未上传交易的天数 非特殊情况皆为31天
@@ -309,6 +308,8 @@ std::map<int, WarningStruct> g_warnset;
 tank_warning_record warning_ = {0};
 
 
+FileCache g_filecache("cache_files", "dummy_db_connection");
+
 //char* string2Duistring(std::string str)
 //{
 //	char ch[100] = { 0 };
@@ -1227,6 +1228,83 @@ int createDir(char* dir,int& err)
 }
 
 
+void serialize_filling_data(const filling_data& data, Json::Value& json_data) {
+	json_data["liquidVL"] = data.liquidVL;
+	json_data["vaporVL"] = data.vaporVL;
+	json_data["liquidFR"] = data.liquidFR;
+	json_data["vaporFR"] = data.vaporFR;
+	json_data["VLR"] = data.VLR;
+	json_data["vaporPA"] = data.vaporPA;
+	json_data["ttc"] = data.ttc;
+	json_data["VLR_BEFORE"] = data.VLR_BEFORE;
+	json_data["VLR_OFFSET"] = data.VLR_OFFSET;
+	json_data["pwm"] = data.pwm;
+	json_data["current"] = data.current;
+}
+
+void deserialize_filling_data(const Json::Value& json_data, filling_data& data) {
+	data.liquidVL = json_data["liquidVL"].asUInt();
+	data.vaporVL = json_data["vaporVL"].asUInt();
+	data.liquidFR = json_data["liquidFR"].asUInt();
+	data.vaporFR = json_data["vaporFR"].asUInt();
+	data.VLR = json_data["VLR"].asUInt();
+	data.vaporPA = json_data["vaporPA"].asUInt();
+	data.ttc = json_data["ttc"].asUInt();
+	data.VLR_BEFORE = json_data["VLR_BEFORE"].asUInt();
+	data.VLR_OFFSET = json_data["VLR_OFFSET"].asInt();
+	data.pwm = json_data["pwm"].asInt();
+	data.current = json_data["current"].asInt();
+}
+
+void serialize_filling_record(const filling_record& record, Json::Value& json_record) {
+	json_record["fip"] = record.fip;
+	json_record["fip_origin"] = record.fip_origin;
+	json_record["nozzle"] = record.nozzle;
+	json_record["tmBegin"] = record.tmBegin;
+	json_record["tmEnd"] = record.tmEnd;
+	Json::Value json_data;
+	serialize_filling_data(record.data, json_data);
+	json_record["data"] = json_data;
+	json_record["overproof"] = record.overproof;
+	json_record["uploadflag"] = record.uploadflag;
+	json_record["uploadflag2"] = record.uploadflag2;
+	json_record["uploadflag3"] = record.uploadflag3;
+	json_record["downloadflag1"] = record.downloadflag1;
+	json_record["yz"] = record.yz;
+	json_record["tankpressure"] = record.tankpressure;
+	json_record["refuelingseconds"] = record.refuelingseconds;
+	json_record["errorcontrolvalue"] = record.errorcontrolvalue;
+	json_record["errornum"] = record.errornum;
+	json_record["callbackflag"] = record.callbackflag;
+	json_record["vccerrorinfo"] = record.vccerrorinfo;
+	json_record["type"] = record.type;
+}
+
+void deserialize_filling_record(const Json::Value& json_record, filling_record& record) {
+	record.fip = json_record["fip"].asUInt();
+	record.fip_origin = json_record["fip_origin"].asUInt();
+	record.nozzle = json_record["nozzle"].asUInt();
+	memset(record.tmBegin, 0, 15);
+	memset(record.tmEnd, 0, 15);
+	strncpy(record.tmBegin, json_record["tmBegin"].asString().c_str(), 14);
+	strncpy(record.tmEnd, json_record["tmEnd"].asString().c_str(), 14);
+	deserialize_filling_data(json_record["data"], record.data);
+	record.overproof = json_record["overproof"].asBool();
+	record.uploadflag = json_record["uploadflag"].asUInt();
+	record.uploadflag2 = json_record["uploadflag2"].asUInt();
+	record.uploadflag3 = json_record["uploadflag3"].asUInt();
+	record.downloadflag1 = json_record["downloadflag1"].asUInt();
+	record.yz = json_record["yz"].asInt();
+	record.tankpressure = json_record["tankpressure"].asInt();
+	record.refuelingseconds = json_record["refuelingseconds"].asInt();
+	record.errorcontrolvalue = json_record["errorcontrolvalue"].asInt();
+	record.errornum = json_record["errornum"].asInt();
+	record.callbackflag = json_record["callbackflag"].asInt();
+	strncpy(record.vccerrorinfo, json_record["vccerrorinfo"].asString().c_str(), 499);
+	memset(record.vccerrorinfo, 0, 500);
+	record.type = json_record["type"].asInt();
+}
+
 
 //static int gzip_uncompress(char *bufin, int lenin, char *bufout, int lenout)
 //{

VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/global.h

@@ -65,6 +65,7 @@
 #include "vr_db.h"
 
 #include "Callback.h"
+#include "FileCache.h"
 //#include "zlib\zlib.h"
 //#include "vld.h"
 
@@ -2486,6 +2487,11 @@ extern NozzleUI_2* g_CurMonitorNozzle;
 
 extern tank_warning_record warning_;
 
+extern FileCache g_filecache;
+
+#define DB_FAILE	0//操作数据库失败
+#define DB_SUCCESS  1//操作数据库成功
+#define DB_EXIST	2//记录已存在
 
 
 
@@ -2583,4 +2589,10 @@ void getDataFiles();
 
 int createDir(char* dir, int& err);
 
+void serialize_filling_data(const filling_data& data, Json::Value& json_data);
+void deserialize_filling_data(const Json::Value& json_data, filling_data& data);
+void serialize_filling_record(const filling_record& record, Json::Value& json_record);
+void deserialize_filling_record(const Json::Value& json_record, filling_record& record);
+
+
 //int httpgzdecompress(Byte *zdata, uLong nzdata, Byte *data, uLong *ndata);

VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/instance.cpp

@@ -51,7 +51,6 @@ CGasManage g_gasmanage;
 
 int g_nServerPort = 10000;
 
-//FileCache cache("cache_files", "dummy_db_connection");
 
 extern int g_UnLockDateFlag[96];
 
@@ -1254,23 +1253,24 @@ void setmap(Sensor_Gas* pgas)
 }
 
 
-//void thread_cacheFile() {
-//	while (!g_ExitFlag)
-//	{
-//		
-//		
-//		cache.processCacheFiles();
-//
-//
-//
-//
-//
-//
-//		Sleep(5000);
-//	}
-//
-//
-//}
+DWORD __stdcall thread_cacheFile(LPVOID lparam)
+{
+	while (!g_ExitFlag)
+	{
+		
+		
+		g_filecache.processCacheFiles();
+
+
+
+
+
+
+		Sleep(5000);
+	}
+
+	return 1;
+}
 
 
 
@@ -2540,6 +2540,7 @@ int APIENTRY WinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance,
 	//HANDLE h = CreateThread(NULL, 0, ThreadHandle_SH, NULL, NULL, &singleton<GData>::GetInstance()->qHandle);
 
 
+	CreateThread(NULL, 0, thread_cacheFile, NULL, NULL, NULL);
 
 
 

VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/vr_db.cpp

@@ -10,7 +10,7 @@ namespace VR
 namespace database
 {
 
-#define MAX_TRY_TIMES 5
+#define MAX_TRY_TIMES 10
 
 t_settings* t_settings::pThis = new  t_settings();
 

VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/vr_ext.cpp

@@ -692,10 +692,10 @@ void SendWebData_NozState_ALL(string strDate)
 
 void SendWebData_Record_ALL(const VR::notify::filling_record& record)
 {
-	if (VR::rules::bUseErrorControl && record.data.VLR <= g_ErrorControlValue*1000)
-	{
-		return;
-	}
+	//if (VR::rules::bUseErrorControl && record.data.VLR <= g_ErrorControlValue*1000)
+	//{
+	//	return;
+	//}
 
 
 	SendWebData_Record_Platform1(record);

VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/vr_object.cpp

@@ -1250,14 +1250,14 @@ void pump_object::translate_message(LPVRMSG src, int packtype,int calltype)
 			dst.record.uploadflag3 = 1;
 
 
-			if (VR::rules::bUseErrorControl && dst.record.data.VLR <= g_ErrorControlValue * 1000)
-			{
-				//插入故障数据表
+			//if (VR::rules::bUseErrorControl && dst.record.data.VLR <= g_ErrorControlValue * 1000)
+			//{
+			//	//插入故障数据表
 
-				dball.insert_errorfilling(&dst.record);
+			//	dball.insert_errorfilling(&dst.record);
 
-			}
-			else
+			//}
+			//else
 			{
 				rtn = dball.insert_filling(&dst.record);
 

VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/vr_ui.cpp

@@ -4,6 +4,7 @@
 #include "vr_app.h"
 #include "tool.h"
 #include "BigScreenMonitor.h"
+#include "global.h"
 
 static time_t g_AutoLockTickCount[96] = { 0 };
 
@@ -374,26 +375,19 @@ int NozzleUI_2::update_record(const filling_record& record, int type,bool is_fue
 
 		int rtn = 0;
 
-		if (VR::rules::bUseErrorControl && m_record.data.VLR <= g_ErrorControlValue * 1000)
-		{
-			//插入故障数据表
-
-			dball.insert_errorfilling(&m_record);
+		//if (VR::rules::bUseErrorControl && m_record.data.VLR <= g_ErrorControlValue * 1000)
+		//{
+		//	//插入故障数据表
+		//	dball.insert_errorfilling(&m_record);
+		//}
+		//else
+		//{
+		//}
 
-		}
-		else
-		{
-			rtn = dball.insert_filling(&m_record);
-		}
+		rtn = dball.insert_filling(&m_record);
 
-		if (rtn == 1)
+		if (rtn != DB_EXIST)
 		{
-			auto noz = get_device_tree()->find_nozzle(m_record.nozzle);
-			if (noz != nullptr)
-			{
-				
-			}
-
 			if (m_record.data.liquidVL >= VR::rules::trx_vol_min)
 			{
 				if (m_record.data.VLR > int(web_gd_zsh.m_warninghigh * 1000) || m_record.data.VLR < int(web_gd_zsh.m_warninglow * 1000))
@@ -458,24 +452,27 @@ int NozzleUI_2::update_record(const filling_record& record, int type,bool is_fue
 					}
 				}
 
+				g_TradeFlag[m_record.nozzle - 1] = 1;
+				setProfile_TradeFlag(g_TradeFlag, 96);
 
 			}
 		}
 
 
-		if (rtn == 1 && bSendToWeb) //rtn为2时是已存在该记录 //& m_record.data.liquidVL >= 1500)// //15L以下属于无效气液比数据，但协议里也没有说不需要上传，所以既然有提到，那就干脆都上传算了 
+		if (rtn == DB_FAILE)
 		{
-			SendWebData_Record_ALL(m_record);
-
-			SendWebData_RecycleData_SH(m_record);
+			g_filecache.saveFailedRecord(m_record);
 		}
 
-		if (m_record.data.liquidVL >= 1500)
+
+		if (rtn == DB_SUCCESS) // & m_record.data.liquidVL >= 1500)// //15L以下属于无效气液比数据，但协议里没有说不需要上传，所以都上传
 		{
-			g_TradeFlag[m_record.nozzle - 1] = 1;
-			setProfile_TradeFlag(g_TradeFlag, 96);
+			SendWebData_Record_ALL(m_record);
+
+			//SendWebData_RecycleData_SH(m_record);
 		}
 
+
 		return rtn;
 	}
 

VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/vr_webservice.cpp

@@ -5529,7 +5529,7 @@ void vr_webservice::CreateRequestThread_2()
 								strj += "&md5=" + UrlEncode(GBKToUTF8(md5str));
 		
 								std::string strk = UTF8_To_GBKA(UrlDecode(strj));
-
+								 
 
 								string sendlog = "ÀàÐÍ£º" + webdata.strtype + "; ID£º" + to_string(webdata.ID) + ";   ·¢ËÍ×¼±¸£º" + strk;
 								log(sendlog.c_str());

VaporRecoveryMonitor/油气回收系统安装包/油气回收在线监控系统安装包/files/VR/conn.ini

@@ -43,6 +43,8 @@ port2=0
 [UserID]
 ;区域代码标识（6位）+ 加油站标识（4位） 环科院给每个油站分配唯一的加油站标识，例如1101080059是北沙滩加油站的标识
 id=
+;用加密工具（位置：C:\VR\加密工具）加密环保局提供的获取token的密码，填入加密后的字段
+pw=
 ;IP地址
 IP=bjzfzd.huazx.cn
 ;端口

VaporRecoveryMonitor/油气回收系统安装包/油气回收在线监控系统安装包/files/bat/updateconn.ini

@@ -22,6 +22,7 @@ port2
 
 [UserID]
 id
+pw
 
 [User]
 companyCode