From d64036c0510cf06009a7252e318d828fbc2658f0 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 11 九月 2025 09:22:02 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/ToolUnits.h | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/ToolUnits.h b/SourceCode/Bond/Servo/ToolUnits.h
index b91ca36..b5f8430 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:
@@ -32,5 +37,27 @@
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);
};
--
Gitblit v1.9.3