From bdf0dc4cb183d3fec40e1d51b3bb94b7e53d0a55 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期日, 04 一月 2026 10:45:07 +0800
Subject: [PATCH] 1.修复报文字段差异风险： S1F3：项目用 getSubItemU4(0) 取 SVID；日志里有 U2 的情况，可能导致解析失败后回退成 SV=0。 S6F11：项目发送 DATAID(U4) + CEID(U4)；日志样例里第一个字段是 U2，可能存在类型/字段定义不一致。
---
SourceCode/Bond/Servo/ToolUnits.h | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/ToolUnits.h b/SourceCode/Bond/Servo/ToolUnits.h
index d010744..7314ea8 100644
--- a/SourceCode/Bond/Servo/ToolUnits.h
+++ b/SourceCode/Bond/Servo/ToolUnits.h
@@ -1,6 +1,11 @@
#pragma once
#include <string>
+#include <chrono>
+#include <optional>
+#include <utility>
+enum class QuickRange { Today, Last7Days, ThisMonth, ThisYear };
+using TP = std::chrono::system_clock::time_point;
class CToolUnits
{
public:
@@ -15,6 +20,7 @@
static CString& floatToString1(float value, CString& strOut);
static CString& floatToString3(float value, CString& strOut);
static ULONGLONG getTimestamp();
+ static time_t getUnixTimestamp();
static void createDir(const char* pszDir);
static BOOL copyTextToClipboard(CWnd* pWnd, const CString& strText);
static std::string getCurrentExePath();
@@ -29,5 +35,32 @@
static std::string getRecipePath();
static std::string getCurrentTimeString();
static bool startsWith(const std::string& str, const std::string& prefix);
+ static std::string& toHexString(int value, std::string& strOut);
+ static void convertString(const char* pszBuffer, int size, std::string& strOut);
+ static inline std::chrono::system_clock::time_point FileTimeToTimePointUTC(const FILETIME& ftUtc);
+ static bool GetCtrlTimeUtc(const CDateTimeCtrl& ctrl,
+ std::chrono::system_clock::time_point& outUtc);
+ static bool GetCtrlDateRangeUtc_StartOfDay(const CDateTimeCtrl& ctrl,
+ std::chrono::system_clock::time_point& outUtc);
+ static bool GetCtrlDateRangeUtc_EndOfDay(const CDateTimeCtrl& ctrl,
+ std::chrono::system_clock::time_point& outUtc);
+ static std::chrono::system_clock::time_point CToolUnits::LocalSTtoUtcTP(const SYSTEMTIME& stLocal);
+ static SYSTEMTIME CToolUnits::MakeLocalST(int y, int m, int d, int hh, int mi, int ss, int ms);
+ static bool IsLeap(int y);
+ static int DaysInMonth(int y, int m);
+ static void GetTodayYMD_Local(int& y, int& m, int& d);
+ static void LocalCalendarMinusDays(int& y, int& m, int& d, int nDays);
+ static std::pair<std::chrono::system_clock::time_point,
+ std::chrono::system_clock::time_point>
+ CalcQuickRangeUtc(QuickRange r);
+ static bool containsCI(const std::string& hay, const std::string& needle);
+ static std::string TimePointToLocalString(const std::optional<TP>& tp,
+ const char* fmt = "%Y-%m-%d %H:%M:%S");
+ static std::string TimePointToUtcString(const std::optional<TP>& tp,
+ const char* fmt = "%Y-%m-%d %H:%M:%S");
+ static std::string TimePointToLocalStringMs(const std::optional<TP>& tp);
+ static std::string NowStrSec();
+ static std::wstring AnsiToWString(const std::string& str);
+ static std::string WStringToAnsi(const std::wstring& wstr);
};
--
Gitblit v1.9.3