From 0c55dbe10fc19bf52b55815d8b2c628f044ef9f1 Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Tue, 10 Sep 2024 18:55:35 +0800
Subject: [PATCH] VERSION 1.1.6

---
 README.md                                            | 3 +++
 appsrc/appsetting/project_port/basic/zappversion.hpp | 2 +-
 appsrc/service/disinfection_logs_service.cpp         | 7 +++++++
 appsrc/service/disinfection_logs_service.hpp         | 1 +
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2db4a27..096efee 100644
--- a/README.md
+++ b/README.md
@@ -63,6 +63,9 @@ VERSION 1.1.3
 VERSION 1.1.5
     1. 修复用户行为时间戳错误的BUG
     2. 修复usrMgr接口BUG
+VERSION 1.1.6
+    1. 添加批量日志接口
+    2. 修复测试模式下出现重复消毒日志的BUG
 
 TODO:
     添加用户增加用户查重检查
diff --git a/appsrc/appsetting/project_port/basic/zappversion.hpp b/appsrc/appsetting/project_port/basic/zappversion.hpp
index 915b4ba..6f57d2f 100644
--- a/appsrc/appsetting/project_port/basic/zappversion.hpp
+++ b/appsrc/appsetting/project_port/basic/zappversion.hpp
@@ -1,3 +1,3 @@
 #pragma once
-#define VERSION      "1.1.5"
+#define VERSION      "1.1.6"
 #define PROJECT_NAME "TRANSMIT_DM"
\ No newline at end of file
diff --git a/appsrc/service/disinfection_logs_service.cpp b/appsrc/service/disinfection_logs_service.cpp
index ce2c68d..562ab8e 100644
--- a/appsrc/service/disinfection_logs_service.cpp
+++ b/appsrc/service/disinfection_logs_service.cpp
@@ -255,6 +255,8 @@ void DisinfectionLogsService::onAppDisinfectionFinishedEvent(shared_ptr<Disinfec
   m_statistics = statistics;
   dumpDisinfectionRecord(m_sessionId, m_snapshots);
   dumpDisinfectionToPrinterLog(m_sessionId, m_snapshots);
+
+  m_recordFiles.remove_if([m_sessionId](const string& s) { return s == m_sessionId; });  // 删除已经存在的记录
   m_recordFiles.push_back(m_sessionId);
   /**
    * @brief
@@ -605,6 +607,11 @@ void DisinfectionLogsService::getRecord(shared_ptr<MsgProcessContext> cxt, strin
 }
 
 void DisinfectionLogsService::deleteReport(shared_ptr<MsgProcessContext> cxt, string logName) { deleteRecordFile(logName); }
+void DisinfectionLogsService::deleteReports(shared_ptr<MsgProcessContext> cxt, vector<string> logNames) {
+  for (auto& key : logNames) {
+    deleteRecordFile(key);
+  }
+}
 
 void DisinfectionLogsService::exportRecord(shared_ptr<MsgProcessContext> cxt, vector<string> logNames) {
   vector<string> files;
diff --git a/appsrc/service/disinfection_logs_service.hpp b/appsrc/service/disinfection_logs_service.hpp
index ebc1447..056ced3 100644
--- a/appsrc/service/disinfection_logs_service.hpp
+++ b/appsrc/service/disinfection_logs_service.hpp
@@ -56,6 +56,7 @@ class DisinfectionLogsService : public enable_shared_from_this<DisinfectionLogsS
   void getRecordList(shared_ptr<MsgProcessContext> cxt);
   void getRecord(shared_ptr<MsgProcessContext> cxt, string logName);
   void deleteReport(shared_ptr<MsgProcessContext> cxt, string logName);
+  void deleteReports(shared_ptr<MsgProcessContext> cxt, string logNames);
   void exportRecord(shared_ptr<MsgProcessContext> cxt, vector<string> logNames);
   void printRecord(shared_ptr<MsgProcessContext> cxt, string logName);