From 2f2181f889354ca405ce9f6d4847a231ab26bbf0 Mon Sep 17 00:00:00 2001
From: markYao <yaozhiyuan@huawei.com>
Date: Fri, 15 Nov 2024 10:14:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=87=8D=E6=97=B6=E9=97=B4=E9=97=B4?=
 =?UTF-8?q?=E9=9A=94=E8=AE=A1=E7=AE=97=E6=94=B9=E4=B8=BAsystem=5Fclock?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: markYao <yaozhiyuan@huawei.com>
---
 services/ans/include/advanced_notification_service.h        | 2 +-
 services/ans/src/advanced_notification_publish_service.cpp  | 6 +++---
 .../unittest/advanced_notification_publish_service_test.cpp | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/services/ans/include/advanced_notification_service.h b/services/ans/include/advanced_notification_service.h
index 7ed7f0e99..1873e8f3c 100644
--- a/services/ans/include/advanced_notification_service.h
+++ b/services/ans/include/advanced_notification_service.h
@@ -1447,7 +1447,7 @@ private:
     std::shared_ptr<PermissionFilter> permissonFilter_ = nullptr;
     std::shared_ptr<NotificationSlotFilter> notificationSlotFilter_ = nullptr;
     std::shared_ptr<NotificationDialogManager> dialogManager_ = nullptr;
-    std::list<std::pair<std::chrono::steady_clock::time_point, std::string>> uniqueKeyList_;
+    std::list<std::pair<std::chrono::system_clock::time_point, std::string>> uniqueKeyList_;
     std::list<std::pair<std::shared_ptr<NotificationRecord>, uint64_t>> delayNotificationList_;
     std::mutex delayNotificationMutext_;
     static std::mutex doNotDisturbMutex_;
diff --git a/services/ans/src/advanced_notification_publish_service.cpp b/services/ans/src/advanced_notification_publish_service.cpp
index 957671bad..fdebca3f9 100644
--- a/services/ans/src/advanced_notification_publish_service.cpp
+++ b/services/ans/src/advanced_notification_publish_service.cpp
@@ -2529,7 +2529,7 @@ ErrCode AdvancedNotificationService::DuplicateMsgControl(const sptr<Notification
         return ERR_ANS_DUPLICATE_MSG;
     }
 
-    uniqueKeyList_.emplace_back(std::make_pair(std::chrono::steady_clock::now(), uniqueKey));
+    uniqueKeyList_.emplace_back(std::make_pair(std::chrono::system_clock::now(), uniqueKey));
     return ERR_OK;
 }
 
@@ -2555,10 +2555,10 @@ void AdvancedNotificationService::DeleteDuplicateMsgs(const sptr<NotificationBun
 
 void AdvancedNotificationService::RemoveExpiredUniqueKey()
 {
-    std::chrono::steady_clock::time_point now = std::chrono::steady_clock::now();
+    std::chrono::system_clock::time_point now = std::chrono::system_clock::now();
     auto iter = uniqueKeyList_.begin();
     while (iter != uniqueKeyList_.end()) {
-        if (std::chrono::duration_cast<std::chrono::seconds>(now - (*iter).first).count() > SECONDS_IN_ONE_DAY) {
+        if (std::chrono::duration_cast<std::chrono::seconds>(abs(now - (*iter).first)).count() > SECONDS_IN_ONE_DAY) {
             iter = uniqueKeyList_.erase(iter);
         } else {
             break;
diff --git a/services/ans/test/unittest/advanced_notification_publish_service_test.cpp b/services/ans/test/unittest/advanced_notification_publish_service_test.cpp
index 6512c10ee..6d8b0aac1 100644
--- a/services/ans/test/unittest/advanced_notification_publish_service_test.cpp
+++ b/services/ans/test/unittest/advanced_notification_publish_service_test.cpp
@@ -862,7 +862,7 @@ HWTEST_F(AnsPublishServiceTest, DuplicateMsgControl_00002, Function | SmallTest
     request->SetAppMessageId("test1");
     auto uniqueKey = request->GenerateUniqueKey();
     advancedNotificationService_->uniqueKeyList_.emplace_back(
-        std::make_pair(std::chrono::steady_clock::now(), uniqueKey));
+        std::make_pair(std::chrono::system_clock::now(), uniqueKey));
 
     auto ret = advancedNotificationService_->DuplicateMsgControl(request);
     ASSERT_EQ(ret, (int)ERR_ANS_DUPLICATE_MSG);
@@ -915,7 +915,7 @@ HWTEST_F(AnsPublishServiceTest, IsDuplicateMsg_00002, Function | SmallTest | Lev
     request->SetAppMessageId("test2");
     auto uniqueKey = request->GenerateUniqueKey();
     advancedNotificationService_->uniqueKeyList_.emplace_back(
-        std::make_pair(std::chrono::steady_clock::now(), uniqueKey));
+        std::make_pair(std::chrono::system_clock::now(), uniqueKey));
 
     auto ret = advancedNotificationService_->IsDuplicateMsg(uniqueKey);
     ASSERT_EQ(ret, true);
@@ -934,7 +934,7 @@ HWTEST_F(AnsPublishServiceTest, RemoveExpiredUniqueKey_00001, Function | SmallTe
     request->SetAppMessageId("test2");
     auto uniqueKey = request->GenerateUniqueKey();
     advancedNotificationService_->uniqueKeyList_.emplace_back(
-        std::make_pair(std::chrono::steady_clock::now() - std::chrono::hours(24), uniqueKey));
+        std::make_pair(std::chrono::system_clock::now() - std::chrono::hours(24), uniqueKey));
 
     sleep(1);
     ASSERT_EQ(advancedNotificationService_->uniqueKeyList_.size(), 1);
-- 
Gitee