From 437d3d047183eed3bbd8eb79e4b40c4a1e0427c9 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期四, 15 一月 2026 10:39:31 +0800
Subject: [PATCH] 1.修复: CEID 校验恒通过:ceidDefined 返回 true,PauseEvent ID 不做有效性检查。Host 若下发无效 CEID,将被接受但运行时无法触发暂停,风险难以察觉。 指定事件发生时暂停;
---
SourceCode/Bond/Servo/ToolUnits.h | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/SourceCode/Bond/Servo/ToolUnits.h b/SourceCode/Bond/Servo/ToolUnits.h
index d369213..7314ea8 100644
--- a/SourceCode/Bond/Servo/ToolUnits.h
+++ b/SourceCode/Bond/Servo/ToolUnits.h
@@ -5,7 +5,7 @@
#include <utility>
enum class QuickRange { Today, Last7Days, ThisMonth, ThisYear };
-
+using TP = std::chrono::system_clock::time_point;
class CToolUnits
{
public:
@@ -49,10 +49,18 @@
static bool IsLeap(int y);
static int DaysInMonth(int y, int m);
static void GetTodayYMD_Local(int& y, int& m, int& d);
- static void CToolUnits::LocalCalendarMinusDays(int& y, int& m, int& d, int nDays);
+ 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>
- CToolUnits::CalcQuickRangeUtc(QuickRange r);
-
+ 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