From 0fb528df2c1f05ef7d52827432bd934ce6f9d8cd Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期五, 12 九月 2025 09:46:59 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/ToolUnits.h | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/SourceCode/Bond/Servo/ToolUnits.h b/SourceCode/Bond/Servo/ToolUnits.h
index d369213..b5f8430 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,15 @@
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);
};
--
Gitblit v1.9.3