From a71c4376d98d368fe27c3a3de62ad094d6199e27 Mon Sep 17 00:00:00 2001
From: PushM <584406942@qq.com>
Date: Wed, 26 Jun 2024 02:16:11 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=8C=87=E4=BB=A4=E6=96=B0=E5=BB=BA?=
 =?UTF-8?q?=E6=97=B6=E6=8F=92=E5=85=A5=E6=97=A5=E5=BF=97=E8=A1=A8=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0uuid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../protection/server/command/CommandMapper.java |  2 +-
 .../server/command/CommandService.java           | 16 ++++++++++++----
 src/main/resources/mappers/CommandMapper.xml     | 12 ++++++++----
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/realtime/protection/server/command/CommandMapper.java b/src/main/java/com/realtime/protection/server/command/CommandMapper.java
index 1215b00..0473cdf 100644
--- a/src/main/java/com/realtime/protection/server/command/CommandMapper.java
+++ b/src/main/java/com/realtime/protection/server/command/CommandMapper.java
@@ -53,7 +53,7 @@ public interface CommandMapper {
 
     void updateCommandHistoryExpireTime(@Param("command_id") String commandUUID);
 
-    void insertCommandHistory(@Param("command_id") String commandUUID);
+    void insertCommandHistory(@Param("command_id") String commandUUID, @Param("log_id") String logUUID);
 
     void updateCommandHistoryExpireTimeBatch(@Param("commandIds")List<String> commandIds);
 
diff --git a/src/main/java/com/realtime/protection/server/command/CommandService.java b/src/main/java/com/realtime/protection/server/command/CommandService.java
index de3d56a..25b400c 100644
--- a/src/main/java/com/realtime/protection/server/command/CommandService.java
+++ b/src/main/java/com/realtime/protection/server/command/CommandService.java
@@ -238,15 +238,23 @@ public class CommandService {
     }
 
     public void insertCommandHistory(String commandUUID) {
-        commandMapper.updateCommandHistoryExpireTime(commandUUID);
-        commandMapper.insertCommandHistory(commandUUID);
+        //todo: 不update， insert加入uuid
+//        commandMapper.updateCommandHistoryExpireTime(commandUUID);
+        String logId = UUID.randomUUID().toString();
+        commandMapper.insertCommandHistory(commandUUID, logId);
     }
 
     public void insertCommandHistoryBatch(List<TaskCommandInfo> commandIdList) {
         List<String> commandIds = ListUtils.newArrayListWithExpectedSize(commandIdList.size());
         commandIdList.forEach(item -> commandIds.add(item.getUUID()));
-
-        commandMapper.updateCommandHistoryExpireTimeBatch(commandIds);
+        //todo: 不update， insert加入uuid
+//        commandMapper.updateCommandHistoryExpireTimeBatch(commandIds);
+//        List<String> logIds;
+//        logIds = ListUtils.newArrayListWithExpectedSize(commandIds.size());
+//        for (int i = 0; i < commandIds.size(); i++) {
+//            logIds.add(UUID.randomUUID().toString());
+//        }
+        //新建的loguuid拿commannd_id来定顶一会吧
         commandMapper.insertCommandHistoryBatch(commandIds);
     }
 }
diff --git a/src/main/resources/mappers/CommandMapper.xml b/src/main/resources/mappers/CommandMapper.xml
index ca64565..0cedcb2 100644
--- a/src/main/resources/mappers/CommandMapper.xml
+++ b/src/main/resources/mappers/CommandMapper.xml
@@ -165,7 +165,8 @@
                                 session_num,
                                 first_effect_time,
                                 last_rcp_query_time,
-                                last_traffic_query_time
+                                last_traffic_query_time,
+                                log_uuid
                     )
         select
             NOW(),
@@ -218,7 +219,8 @@
             session_num,
             first_effect_time,
             last_rcp_query_time,
-            last_traffic_query_time
+            last_traffic_query_time,
+            #{log_id}
         from t_command
         where COMMAND_ID = #{command_id}
     </insert>
@@ -274,7 +276,8 @@
             session_num,
             first_effect_time,
             last_rcp_query_time,
-            last_traffic_query_time
+            last_traffic_query_time,
+            log_uuid
         )
         select
             NOW(),
@@ -327,7 +330,8 @@
             session_num,
             first_effect_time,
             last_rcp_query_time,
-            last_traffic_query_time
+            last_traffic_query_time,
+            COMMAND_ID
         from t_command
         where COMMAND_ID IN
         <foreach collection="commandIds" item="command_id" separator="," open="(" close=")">