From e11589c8e386f49070be8f25671c9530ae8a016c Mon Sep 17 00:00:00 2001
From: fanyinbo <1553199396@qq.com>
Date: Tue, 28 Nov 2023 15:41:30 +0800
Subject: [PATCH] Fix query lock record error

Signed-off-by: fanyinbo <1553199396@qq.com>
---
 .../java/ai/basic/x1/adapter/dto/DataAnnotationRecordDTO.java | 2 +-
 .../adapter/port/dao/mybatis/model/DataAnnotationRecord.java  | 2 +-
 .../main/java/ai/basic/x1/entity/DataAnnotationRecordBO.java  | 2 +-
 .../resources/mybatis/mapper/DataAnnotationRecordMapper.xml   | 4 ++--
 deploy/mysql/migration/V1__Create_tables.sql                  | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/backend/src/main/java/ai/basic/x1/adapter/dto/DataAnnotationRecordDTO.java b/backend/src/main/java/ai/basic/x1/adapter/dto/DataAnnotationRecordDTO.java
index 123a8c7e..d625485c 100644
--- a/backend/src/main/java/ai/basic/x1/adapter/dto/DataAnnotationRecordDTO.java
+++ b/backend/src/main/java/ai/basic/x1/adapter/dto/DataAnnotationRecordDTO.java
@@ -24,7 +24,7 @@ public class DataAnnotationRecordDTO {
      */
     private Long datasetId;
 
-    private ItemTypeEnum type;
+    private ItemTypeEnum itemType;
 
     /**
      * Serial number
diff --git a/backend/src/main/java/ai/basic/x1/adapter/port/dao/mybatis/model/DataAnnotationRecord.java b/backend/src/main/java/ai/basic/x1/adapter/port/dao/mybatis/model/DataAnnotationRecord.java
index 919133e0..290d56f4 100644
--- a/backend/src/main/java/ai/basic/x1/adapter/port/dao/mybatis/model/DataAnnotationRecord.java
+++ b/backend/src/main/java/ai/basic/x1/adapter/port/dao/mybatis/model/DataAnnotationRecord.java
@@ -28,7 +28,7 @@ public class DataAnnotationRecord {
      */
     private Long datasetId;
 
-    private ItemTypeEnum type;
+    private ItemTypeEnum itemType;
 
     /**
      * Serial number
diff --git a/backend/src/main/java/ai/basic/x1/entity/DataAnnotationRecordBO.java b/backend/src/main/java/ai/basic/x1/entity/DataAnnotationRecordBO.java
index 9ef8f388..71e80dcb 100644
--- a/backend/src/main/java/ai/basic/x1/entity/DataAnnotationRecordBO.java
+++ b/backend/src/main/java/ai/basic/x1/entity/DataAnnotationRecordBO.java
@@ -25,7 +25,7 @@ public class DataAnnotationRecordBO {
     */
    private Long datasetId;
 
-   private ItemTypeEnum type;
+   private ItemTypeEnum itemType;
 
    /**
     * Serial number
diff --git a/backend/src/main/resources/mybatis/mapper/DataAnnotationRecordMapper.xml b/backend/src/main/resources/mybatis/mapper/DataAnnotationRecordMapper.xml
index 277e7b3e..71bc71c7 100644
--- a/backend/src/main/resources/mybatis/mapper/DataAnnotationRecordMapper.xml
+++ b/backend/src/main/resources/mybatis/mapper/DataAnnotationRecordMapper.xml
@@ -6,7 +6,7 @@
     <resultMap id="BaseResultMap" type="ai.basic.x1.adapter.port.dao.mybatis.model.DataAnnotationRecord">
         <id column="id" property="id" />
         <result column="dataset_id" property="datasetId" />
-        <result column="type" property="type" />
+        <result column="item_type" property="itemType" />
         <result column="serial_no" property="serialNo" />
         <result column="created_by" property="createdBy" />
         <result column="created_at" property="createdAt" />
@@ -14,7 +14,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,dataset_id,type,serial_no,created_by, created_at
+        id,dataset_id,item_type,serial_no,created_by, created_at
     </sql>
 
 
diff --git a/deploy/mysql/migration/V1__Create_tables.sql b/deploy/mysql/migration/V1__Create_tables.sql
index dea81b59..9ac5ac98 100644
--- a/deploy/mysql/migration/V1__Create_tables.sql
+++ b/deploy/mysql/migration/V1__Create_tables.sql
@@ -125,7 +125,7 @@ CREATE TABLE `data_annotation_record`
 (
     `id`         bigint(20)                   NOT NULL AUTO_INCREMENT COMMENT 'Primary key',
     `dataset_id` bigint(20)                   NOT NULL COMMENT 'Dataset id',
-    `data_type`  enum ('SINGLE_DATA','SCENE') NOT NULL DEFAULT 'SINGLE_DATA' COMMENT 'Type (indicates continuous frames, non-consecutive frames)',
+    `item_type`  enum ('SINGLE_DATA','SCENE') NOT NULL DEFAULT 'SINGLE_DATA' COMMENT 'Type (indicates continuous frames, non-consecutive frames)',
     `serial_no`  bigint(20)                            DEFAULT NULL COMMENT 'Serial number',
     `created_by` bigint(20)                            DEFAULT NULL COMMENT 'Creator id',
     `created_at` datetime                              DEFAULT CURRENT_TIMESTAMP COMMENT 'Create time',