From 3b7aeee4db56af4f5bfb8f2dfa93ada0143d3d4f Mon Sep 17 00:00:00 2001
From: bgy <bgy@topsail.com>
Date: Wed, 20 May 2026 10:04:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=97=A5=E5=BF=97=E6=8A=A5?=
 =?UTF-8?q?=E5=AD=98=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                      |  8 ++++----
 .../com/topsail/scheduletask/pojo/TopsailTransmitLog.java    | 12 ++++++++++++
 .../topsail/scheduletask/mapper/TopsailTransmitLogMapper.xml | 12 +++++++++---
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index f7cb5b3..a520a36 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,10 +31,10 @@
             <artifactId>spring-boot-starter</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-starter-web</artifactId>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/src/main/java/com/topsail/scheduletask/pojo/TopsailTransmitLog.java b/src/main/java/com/topsail/scheduletask/pojo/TopsailTransmitLog.java
index 5bc5da8..ef8b556 100644
--- a/src/main/java/com/topsail/scheduletask/pojo/TopsailTransmitLog.java
+++ b/src/main/java/com/topsail/scheduletask/pojo/TopsailTransmitLog.java
@@ -66,10 +66,22 @@ public class TopsailTransmitLog {
      * 转发协议类型
      */
     private String forwardProtocol;
+    /**
+     * 传输协议
+     */
+    private String protocol;
+    /**
+     * 转发描述
+     */
+    private String forwardDesc;
     /**
      * 转发结果
      */
     private String forwardResult;
+    /**
+     * 转发结果状态
+     */
+    private Integer forwardResultStatus;
     /**
      * 转发时间
      */
diff --git a/src/main/resources/com/topsail/scheduletask/mapper/TopsailTransmitLogMapper.xml b/src/main/resources/com/topsail/scheduletask/mapper/TopsailTransmitLogMapper.xml
index 89f3cd2..4018ca2 100644
--- a/src/main/resources/com/topsail/scheduletask/mapper/TopsailTransmitLogMapper.xml
+++ b/src/main/resources/com/topsail/scheduletask/mapper/TopsailTransmitLogMapper.xml
@@ -16,7 +16,10 @@
         <result column="forward_url" property="forwardUrl"/>
         <result column="forward_port" property="forwardPort"/>
         <result column="forward_protocol" property="forwardProtocol"/>
+        <result column="protocol" property="protocol"/>
+        <result column="forward_desc" property="forwardDesc"/>
         <result column="forward_result" property="forwardResult"/>
+        <result column="forward_result_status" property="forwardResultStatus"/>
         <result column="forward_time" property="forwardTime"/>
         <result column="last_forward_time" property="lastForwardTime"/>
     </resultMap>
@@ -25,7 +28,7 @@
     <select id="getTopsailTransmitLogByImei" resultMap="BaseResultMap">
         SELECT platform, device_id, imei, device_type, device_type_name, imsi, source_data, 
                forward_content, forward_user_id, forward_user_name, forward_url, forward_port, 
-               forward_protocol, forward_result, forward_time, last_forward_time
+               forward_protocol, forward_result,forward_result_status, protocol, forward_desc, forward_time, last_forward_time
         FROM topsail_transmit_log
         WHERE imei = #{imei}
         LIMIT 1
@@ -36,12 +39,12 @@
         INSERT INTO topsail_transmit_log (
             platform, device_id, imei, device_type, device_type_name, imsi,
             source_data, forward_content, forward_user_id, forward_user_name,
-            forward_url, forward_port, forward_protocol, forward_result,
+            forward_url, forward_port, forward_protocol, forward_result,forward_result_status,protocol, forward_desc,
             forward_time, last_forward_time
         ) VALUES (
             #{platform}, #{deviceId}, #{imei}, #{deviceType}, #{deviceTypeName}, #{imsi},
             #{sourceData}, #{forwardContent}, #{forwardUserId}, #{forwardUserName},
-            #{forwardUrl}, #{forwardPort}, #{forwardProtocol}, #{forwardResult},
+            #{forwardUrl}, #{forwardPort}, #{forwardProtocol}, #{forwardResult},#{forwardResultStatus},#{protocol}, #{forwardDesc},
             #{forwardTime}, #{lastForwardTime}
         )
     </insert>
@@ -62,6 +65,9 @@
             forward_port = #{forwardPort},
             forward_protocol = #{forwardProtocol},
             forward_result = #{forwardResult},
+            forward_result_status = #{forwardResultStatus},
+            protocol = #{protocol},
+            forward_desc = #{forwardDesc},
             forward_time = #{forwardTime},
             last_forward_time = #{lastForwardTime}
         WHERE imei = #{imei}