From f4a16b5b09c53c644df1096e4a723bd5053cb5c6 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Sat, 27 Sep 2025 23:09:44 +0800
Subject: [PATCH] =?UTF-8?q?feat(dto):=20=E6=B7=BB=E5=8A=A0=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=E4=BF=A1=E6=81=AF=E5=AD=97=E6=AE=B5=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=20-=20=E5=9C=A8=20ZTSourceMessage=20DTO=20=E4=B8=AD=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=20posJson=20=E5=AD=97=E6=AE=B5=20-=20=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E6=95=B0=E6=8D=AE=E5=BA=93=E6=8F=92=E5=85=A5=E8=AF=AD?=
 =?UTF-8?q?=E5=8F=A5=E4=BB=A5=E6=94=AF=E6=8C=81=20posJson=20=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=AD=98=E5=82=A8=20-=20=E8=B0=83=E6=95=B4=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E8=BE=93=E5=87=BA=E5=86=85=E5=AE=B9=EF=BC=8C=E7=AA=81?=
 =?UTF-8?q?=E5=87=BA=E5=85=B3=E9=94=AE=E4=B8=9A=E5=8A=A1=E6=A0=87=E8=AF=86?=
 =?UTF-8?q?=20-=20=E5=9C=A8=E6=95=B0=E6=8D=AE=E6=9C=8D=E5=8A=A1=E5=B1=82?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=B9=20posJson=20=E7=9A=84=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/ycwl/basic/dto/ZTSourceMessage.java        | 3 +++
 .../java/com/ycwl/basic/service/ZTSourceConsumerService.java | 5 ++---
 .../java/com/ycwl/basic/service/ZTSourceDataService.java     | 3 +++
 src/main/resources/mapper/SourceMapper.xml                   | 4 ++--
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/ycwl/basic/dto/ZTSourceMessage.java b/src/main/java/com/ycwl/basic/dto/ZTSourceMessage.java
index 92a63950..4cac5f0c 100644
--- a/src/main/java/com/ycwl/basic/dto/ZTSourceMessage.java
+++ b/src/main/java/com/ycwl/basic/dto/ZTSourceMessage.java
@@ -45,6 +45,9 @@ public class ZTSourceMessage {
     @JsonProperty("faceSampleId")
     private Long faceSampleId;
 
+    @JsonProperty("posJson")
+    private String posJson;
+
     /**
      * 判断是否为视频片段
      */
diff --git a/src/main/java/com/ycwl/basic/service/ZTSourceConsumerService.java b/src/main/java/com/ycwl/basic/service/ZTSourceConsumerService.java
index afdf3880..2e39ca51 100644
--- a/src/main/java/com/ycwl/basic/service/ZTSourceConsumerService.java
+++ b/src/main/java/com/ycwl/basic/service/ZTSourceConsumerService.java
@@ -42,9 +42,8 @@ public class ZTSourceConsumerService {
             sourceMessage = JacksonUtil.parseObject(message, ZTSourceMessage.class);
 
             // 输出业务相关的日志信息
-            log.info("接收到ZT-Source消息, sourceId: {}, sourceType: {}, scenicId: {}, deviceId: {}, sourceUrl: {}",
-                    sourceMessage.getSourceId(), sourceMessage.getSourceType(),
-                    sourceMessage.getScenicId(), sourceMessage.getDeviceId(), sourceMessage.getSourceUrl());
+            log.info("接收到ZT-Source消息, sourceId: {}, deviceId: {}, faceSampleId: {}",
+                    sourceMessage.getSourceId(), sourceMessage.getDeviceId(), sourceMessage.getFaceSampleId());
 
             // 处理消息
             boolean processed = ztSourceDataService.processZTSourceMessage(sourceMessage);
diff --git a/src/main/java/com/ycwl/basic/service/ZTSourceDataService.java b/src/main/java/com/ycwl/basic/service/ZTSourceDataService.java
index 3c0a6f1d..f99c2e76 100644
--- a/src/main/java/com/ycwl/basic/service/ZTSourceDataService.java
+++ b/src/main/java/com/ycwl/basic/service/ZTSourceDataService.java
@@ -109,6 +109,9 @@ public class ZTSourceDataService {
         // 人脸样本ID处理
         entity.setFaceSampleId(message.getFaceSampleId());
 
+        // 位置信息JSON处理
+        entity.setPosJson(message.getPosJson());
+
         // 时间处理
         Date shootTime = message.getShootTime();
         if (shootTime != null) {
diff --git a/src/main/resources/mapper/SourceMapper.xml b/src/main/resources/mapper/SourceMapper.xml
index ab3ae6a4..e61f9b57 100644
--- a/src/main/resources/mapper/SourceMapper.xml
+++ b/src/main/resources/mapper/SourceMapper.xml
@@ -6,8 +6,8 @@
         values (#{id}, #{scenicId}, #{deviceId}, #{url}, #{videoUrl}, #{type}, #{faceSampleId}, #{posJson}, #{createTime})
     </insert>
     <insert id="addFromZTSource">
-        insert into source(id, scenic_id, device_id, url, `type`, face_sample_id, create_time)
-        values (#{id}, #{scenicId}, #{deviceId}, #{url}, #{type}, #{faceSampleId}, #{createTime})
+        insert into source(id, scenic_id, device_id, url, `type`, face_sample_id, pos_json, create_time)
+        values (#{id}, #{scenicId}, #{deviceId}, #{url}, #{type}, #{faceSampleId}, #{posJson}, #{createTime})
     </insert>
     <insert id="addRelation">
         replace member_source(scenic_id, face_id, member_id, source_id, is_buy, type, order_id<if test="isFree">, is_free</if>)