Fix query lock record error

Signed-off-by: fanyinbo <[email protected]>
xtreme1-io · Nov 28, 2023 · e11589c · e11589c
1 parent 1f7001b
commit e11589c
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 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
@@ -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
@@ -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
@@ -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
@@ -6,15 +6,15 @@
     <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" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <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
@@ -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',