bigint -> varchar

backend/src/main/java/io/metersphere/base/domain/LoadTestReportLog.java

@@ -6,7 +6,7 @@ import java.io.Serializable;
 
 @Data
 public class LoadTestReportLog implements Serializable {
-    private Long id;
+    private String id;
 
     private String reportId;
 

backend/src/main/java/io/metersphere/base/domain/LoadTestReportLogExample.java

@@ -114,52 +114,62 @@ public class LoadTestReportLogExample {
             return (Criteria) this;
         }
 
-        public Criteria andIdEqualTo(Long value) {
+        public Criteria andIdEqualTo(String value) {
             addCriterion("id =", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdNotEqualTo(Long value) {
+        public Criteria andIdNotEqualTo(String value) {
             addCriterion("id <>", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdGreaterThan(Long value) {
+        public Criteria andIdGreaterThan(String value) {
             addCriterion("id >", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdGreaterThanOrEqualTo(Long value) {
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
             addCriterion("id >=", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdLessThan(Long value) {
+        public Criteria andIdLessThan(String value) {
             addCriterion("id <", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdLessThanOrEqualTo(Long value) {
+        public Criteria andIdLessThanOrEqualTo(String value) {
             addCriterion("id <=", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdIn(List<Long> values) {
+        public Criteria andIdLike(String value) {
+            addCriterion("id like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotLike(String value) {
+            addCriterion("id not like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<String> values) {
             addCriterion("id in", values, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdNotIn(List<Long> values) {
+        public Criteria andIdNotIn(List<String> values) {
             addCriterion("id not in", values, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdBetween(Long value1, Long value2) {
+        public Criteria andIdBetween(String value1, String value2) {
             addCriterion("id between", value1, value2, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdNotBetween(Long value1, Long value2) {
+        public Criteria andIdNotBetween(String value1, String value2) {
             addCriterion("id not between", value1, value2, "id");
             return (Criteria) this;
         }

backend/src/main/java/io/metersphere/base/domain/LoadTestReportResult.java

@@ -6,7 +6,7 @@ import java.io.Serializable;
 
 @Data
 public class LoadTestReportResult implements Serializable {
-    private Long id;
+    private String id;
 
     private String reportId;
 

backend/src/main/java/io/metersphere/base/domain/LoadTestReportResultExample.java

@@ -114,52 +114,62 @@ public class LoadTestReportResultExample {
             return (Criteria) this;
         }
 
-        public Criteria andIdEqualTo(Long value) {
+        public Criteria andIdEqualTo(String value) {
             addCriterion("id =", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdNotEqualTo(Long value) {
+        public Criteria andIdNotEqualTo(String value) {
             addCriterion("id <>", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdGreaterThan(Long value) {
+        public Criteria andIdGreaterThan(String value) {
             addCriterion("id >", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdGreaterThanOrEqualTo(Long value) {
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
             addCriterion("id >=", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdLessThan(Long value) {
+        public Criteria andIdLessThan(String value) {
             addCriterion("id <", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdLessThanOrEqualTo(Long value) {
+        public Criteria andIdLessThanOrEqualTo(String value) {
             addCriterion("id <=", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdIn(List<Long> values) {
+        public Criteria andIdLike(String value) {
+            addCriterion("id like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotLike(String value) {
+            addCriterion("id not like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<String> values) {
             addCriterion("id in", values, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdNotIn(List<Long> values) {
+        public Criteria andIdNotIn(List<String> values) {
             addCriterion("id not in", values, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdBetween(Long value1, Long value2) {
+        public Criteria andIdBetween(String value1, String value2) {
             addCriterion("id between", value1, value2, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdNotBetween(Long value1, Long value2) {
+        public Criteria andIdNotBetween(String value1, String value2) {
             addCriterion("id not between", value1, value2, "id");
             return (Criteria) this;
         }

backend/src/main/java/io/metersphere/base/mapper/LoadTestReportLogMapper.java

@@ -11,7 +11,7 @@ public interface LoadTestReportLogMapper {
 
     int deleteByExample(LoadTestReportLogExample example);
 
-    int deleteByPrimaryKey(Long id);
+    int deleteByPrimaryKey(String id);
 
     int insert(LoadTestReportLog record);
 
@@ -21,7 +21,7 @@ public interface LoadTestReportLogMapper {
 
     List<LoadTestReportLog> selectByExample(LoadTestReportLogExample example);
 
-    LoadTestReportLog selectByPrimaryKey(Long id);
+    LoadTestReportLog selectByPrimaryKey(String id);
 
     int updateByExampleSelective(@Param("record") LoadTestReportLog record, @Param("example") LoadTestReportLogExample example);
 

backend/src/main/java/io/metersphere/base/mapper/LoadTestReportLogMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="io.metersphere.base.mapper.LoadTestReportLogMapper">
   <resultMap id="BaseResultMap" type="io.metersphere.base.domain.LoadTestReportLog">
-    <id column="id" jdbcType="BIGINT" property="id" />
+    <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="report_id" jdbcType="VARCHAR" property="reportId" />
     <result column="resource_id" jdbcType="VARCHAR" property="resourceId" />
   </resultMap>
@@ -103,17 +103,17 @@
       order by ${orderByClause}
     </if>
   </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="ResultMapWithBLOBs">
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="ResultMapWithBLOBs">
     select 
     <include refid="Base_Column_List" />
     ,
     <include refid="Blob_Column_List" />
     from load_test_report_log
-    where id = #{id,jdbcType=BIGINT}
+    where id = #{id,jdbcType=VARCHAR}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
     delete from load_test_report_log
-    where id = #{id,jdbcType=BIGINT}
+    where id = #{id,jdbcType=VARCHAR}
   </delete>
   <delete id="deleteByExample" parameterType="io.metersphere.base.domain.LoadTestReportLogExample">
     delete from load_test_report_log
@@ -124,7 +124,7 @@
   <insert id="insert" parameterType="io.metersphere.base.domain.LoadTestReportLog">
     insert into load_test_report_log (id, report_id, resource_id, 
       content)
-    values (#{id,jdbcType=BIGINT}, #{reportId,jdbcType=VARCHAR}, #{resourceId,jdbcType=VARCHAR}, 
+    values (#{id,jdbcType=VARCHAR}, #{reportId,jdbcType=VARCHAR}, #{resourceId,jdbcType=VARCHAR}, 
       #{content,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="io.metersphere.base.domain.LoadTestReportLog">
@@ -145,7 +145,7 @@
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
-        #{id,jdbcType=BIGINT},
+        #{id,jdbcType=VARCHAR},
       </if>
       <if test="reportId != null">
         #{reportId,jdbcType=VARCHAR},
@@ -168,7 +168,7 @@
     update load_test_report_log
     <set>
       <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
+        id = #{record.id,jdbcType=VARCHAR},
       </if>
       <if test="record.reportId != null">
         report_id = #{record.reportId,jdbcType=VARCHAR},
@@ -186,7 +186,7 @@
   </update>
   <update id="updateByExampleWithBLOBs" parameterType="map">
     update load_test_report_log
-    set id = #{record.id,jdbcType=BIGINT},
+    set id = #{record.id,jdbcType=VARCHAR},
       report_id = #{record.reportId,jdbcType=VARCHAR},
       resource_id = #{record.resourceId,jdbcType=VARCHAR},
       content = #{record.content,jdbcType=LONGVARCHAR}
@@ -196,7 +196,7 @@
   </update>
   <update id="updateByExample" parameterType="map">
     update load_test_report_log
-    set id = #{record.id,jdbcType=BIGINT},
+    set id = #{record.id,jdbcType=VARCHAR},
       report_id = #{record.reportId,jdbcType=VARCHAR},
       resource_id = #{record.resourceId,jdbcType=VARCHAR}
     <if test="_parameter != null">
@@ -216,19 +216,19 @@
         content = #{content,jdbcType=LONGVARCHAR},
       </if>
     </set>
-    where id = #{id,jdbcType=BIGINT}
+    where id = #{id,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeyWithBLOBs" parameterType="io.metersphere.base.domain.LoadTestReportLog">
     update load_test_report_log
     set report_id = #{reportId,jdbcType=VARCHAR},
       resource_id = #{resourceId,jdbcType=VARCHAR},
       content = #{content,jdbcType=LONGVARCHAR}
-    where id = #{id,jdbcType=BIGINT}
+    where id = #{id,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKey" parameterType="io.metersphere.base.domain.LoadTestReportLog">
     update load_test_report_log
     set report_id = #{reportId,jdbcType=VARCHAR},
       resource_id = #{resourceId,jdbcType=VARCHAR}
-    where id = #{id,jdbcType=BIGINT}
+    where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>
\ No newline at end of file

backend/src/main/java/io/metersphere/base/mapper/LoadTestReportResultMapper.java

@@ -11,7 +11,7 @@ public interface LoadTestReportResultMapper {
 
     int deleteByExample(LoadTestReportResultExample example);
 
-    int deleteByPrimaryKey(Long id);
+    int deleteByPrimaryKey(String id);
 
     int insert(LoadTestReportResult record);
 
@@ -21,7 +21,7 @@ public interface LoadTestReportResultMapper {
 
     List<LoadTestReportResult> selectByExample(LoadTestReportResultExample example);
 
-    LoadTestReportResult selectByPrimaryKey(Long id);
+    LoadTestReportResult selectByPrimaryKey(String id);
 
     int updateByExampleSelective(@Param("record") LoadTestReportResult record, @Param("example") LoadTestReportResultExample example);
 

backend/src/main/java/io/metersphere/base/mapper/LoadTestReportResultMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="io.metersphere.base.mapper.LoadTestReportResultMapper">
   <resultMap id="BaseResultMap" type="io.metersphere.base.domain.LoadTestReportResult">
-    <id column="id" jdbcType="BIGINT" property="id" />
+    <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="report_id" jdbcType="VARCHAR" property="reportId" />
     <result column="report_key" jdbcType="VARCHAR" property="reportKey" />
   </resultMap>
@@ -103,17 +103,17 @@
       order by ${orderByClause}
     </if>
   </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="ResultMapWithBLOBs">
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="ResultMapWithBLOBs">
     select 
     <include refid="Base_Column_List" />
     ,
     <include refid="Blob_Column_List" />
     from load_test_report_result
-    where id = #{id,jdbcType=BIGINT}
+    where id = #{id,jdbcType=VARCHAR}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
     delete from load_test_report_result
-    where id = #{id,jdbcType=BIGINT}
+    where id = #{id,jdbcType=VARCHAR}
   </delete>
   <delete id="deleteByExample" parameterType="io.metersphere.base.domain.LoadTestReportResultExample">
     delete from load_test_report_result
@@ -124,7 +124,7 @@
   <insert id="insert" parameterType="io.metersphere.base.domain.LoadTestReportResult">
     insert into load_test_report_result (id, report_id, report_key, 
       report_value)
-    values (#{id,jdbcType=BIGINT}, #{reportId,jdbcType=VARCHAR}, #{reportKey,jdbcType=VARCHAR}, 
+    values (#{id,jdbcType=VARCHAR}, #{reportId,jdbcType=VARCHAR}, #{reportKey,jdbcType=VARCHAR}, 
       #{reportValue,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="io.metersphere.base.domain.LoadTestReportResult">
@@ -145,7 +145,7 @@
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
-        #{id,jdbcType=BIGINT},
+        #{id,jdbcType=VARCHAR},
       </if>
       <if test="reportId != null">
         #{reportId,jdbcType=VARCHAR},
@@ -168,7 +168,7 @@
     update load_test_report_result
     <set>
       <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
+        id = #{record.id,jdbcType=VARCHAR},
       </if>
       <if test="record.reportId != null">
         report_id = #{record.reportId,jdbcType=VARCHAR},
@@ -186,7 +186,7 @@
   </update>
   <update id="updateByExampleWithBLOBs" parameterType="map">
     update load_test_report_result
-    set id = #{record.id,jdbcType=BIGINT},
+    set id = #{record.id,jdbcType=VARCHAR},
       report_id = #{record.reportId,jdbcType=VARCHAR},
       report_key = #{record.reportKey,jdbcType=VARCHAR},
       report_value = #{record.reportValue,jdbcType=LONGVARCHAR}
@@ -196,7 +196,7 @@
   </update>
   <update id="updateByExample" parameterType="map">
     update load_test_report_result
-    set id = #{record.id,jdbcType=BIGINT},
+    set id = #{record.id,jdbcType=VARCHAR},
       report_id = #{record.reportId,jdbcType=VARCHAR},
       report_key = #{record.reportKey,jdbcType=VARCHAR}
     <if test="_parameter != null">
@@ -216,19 +216,19 @@
         report_value = #{reportValue,jdbcType=LONGVARCHAR},
       </if>
     </set>
-    where id = #{id,jdbcType=BIGINT}
+    where id = #{id,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeyWithBLOBs" parameterType="io.metersphere.base.domain.LoadTestReportResult">
     update load_test_report_result
     set report_id = #{reportId,jdbcType=VARCHAR},
       report_key = #{reportKey,jdbcType=VARCHAR},
       report_value = #{reportValue,jdbcType=LONGVARCHAR}
-    where id = #{id,jdbcType=BIGINT}
+    where id = #{id,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKey" parameterType="io.metersphere.base.domain.LoadTestReportResult">
     update load_test_report_result
     set report_id = #{reportId,jdbcType=VARCHAR},
       report_key = #{reportKey,jdbcType=VARCHAR}
-    where id = #{id,jdbcType=BIGINT}
+    where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>
\ No newline at end of file

backend/src/main/java/io/metersphere/service/PerformanceTestService.java

@@ -228,6 +228,7 @@ public class PerformanceTestService {
             List<TestResource> testResourceList = testResourceService.getResourcesByPoolId(resourcePoolId);
             testResourceList.forEach(r -> {
                 LoadTestReportLog record = new LoadTestReportLog();
+                record.setId(UUID.randomUUID().toString());
                 record.setReportId(testReport.getId());
                 record.setResourceId(r.getId());
                 record.setContent(StringUtils.EMPTY);

backend/src/main/resources/db/migration/V2__metersphere_ddl.sql

 CREATE TABLE IF NOT EXISTS `file_content` (
-    `file_id` varchar(64) COLLATE utf8mb4_bin NOT NULL COMMENT 'File ID',
+    `file_id` varchar(64)  NOT NULL COMMENT 'File ID',
     `file`    longblob COMMENT 'File content',
     PRIMARY KEY (`file_id`)
 )
@@ -70,29 +70,24 @@ CREATE TABLE IF NOT EXISTS `load_test_report_detail` (
     DEFAULT CHARSET=utf8mb4
     COLLATE=utf8mb4_bin;
 
+CREATE TABLE IF NOT EXISTS `load_test_report_log` (
+  `id` varchar(50) NOT NULL,
+  `report_id` varchar(50)  NOT NULL,
+  `resource_id` varchar(50)  DEFAULT NULL,
+  `content` longtext ,
+  PRIMARY KEY (`id`),
+  KEY `load_test_report_log_report_id_resource_name_index` (`report_id`,`resource_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
+
 CREATE TABLE IF NOT EXISTS `load_test_report_result` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` varchar(50)  NOT NULL,
   `report_id` varchar(50)  NOT NULL,
   `report_key` varchar(64)  DEFAULT NULL,
-  `report_value` text,
+  `report_value` text ,
   PRIMARY KEY (`id`),
   KEY `load_test_report_result_report_id_report_key_index` (`report_id`,`report_key`)
-)
-    ENGINE=InnoDB
-    DEFAULT CHARSET=utf8mb4
-    COLLATE=utf8mb4_bin;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
 
-CREATE TABLE IF NOT EXISTS `load_test_report_log` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `report_id` varchar(50) NOT NULL,
-  `resource_id` varchar(50) DEFAULT NULL,
-  `content` longtext,
-  PRIMARY KEY (`id`),
-  KEY `load_test_report_log_report_id_resource_name_index` (`report_id`,`resource_id`)
-)
-    ENGINE=InnoDB
-    DEFAULT CHARSET=utf8mb4
-    COLLATE=utf8mb4_bin;
 
 CREATE TABLE IF NOT EXISTS `organization` (
     `id`          varchar(50) NOT NULL COMMENT 'Organization ID',
@@ -145,7 +140,7 @@ CREATE TABLE IF NOT EXISTS `system_parameter` (
 
 CREATE TABLE IF NOT EXISTS `test_resource` (
     `id`                    varchar(50) NOT NULL COMMENT 'Test resource ID',
-    `test_resource_pool_id` varchar(50) COLLATE utf8mb4_bin NOT NULL COMMENT 'Test resource pool ID this test resource belongs to',
+    `test_resource_pool_id` varchar(50)  NOT NULL COMMENT 'Test resource pool ID this test resource belongs to',
     `configuration`         longtext COMMENT 'Test resource configuration',
     `status`                varchar(64) NOT NULL COMMENT 'Test resource status',
     `create_time`           bigint(13)  NOT NULL COMMENT 'Create timestamp',
@@ -217,13 +212,13 @@ CREATE TABLE IF NOT EXISTS `workspace` (
 -- api start
 
 CREATE TABLE IF NOT EXISTS `api_test` (
-    `id` varchar(50) COLLATE utf8mb4_bin NOT NULL COMMENT 'Test ID',
-    `project_id` varchar(50) COLLATE utf8mb4_bin NOT NULL COMMENT 'Project ID this test belongs to',
-    `name` varchar(64) COLLATE utf8mb4_bin NOT NULL COMMENT 'Test name',
-    `description` varchar(255) COLLATE utf8mb4_bin DEFAULT NULL COMMENT 'Test description',
-    `scenario_definition` longtext COLLATE utf8mb4_bin COMMENT 'Scenario definition (JSON format)',
-    `schedule` longtext COLLATE utf8mb4_bin COMMENT 'Test schedule (cron list)',
-    `status` varchar(64) COLLATE utf8mb4_bin DEFAULT NULL,
+    `id` varchar(50)  NOT NULL COMMENT 'Test ID',
+    `project_id` varchar(50)  NOT NULL COMMENT 'Project ID this test belongs to',
+    `name` varchar(64)  NOT NULL COMMENT 'Test name',
+    `description` varchar(255)  DEFAULT NULL COMMENT 'Test description',
+    `scenario_definition` longtext  COMMENT 'Scenario definition (JSON format)',
+    `schedule` longtext  COMMENT 'Test schedule (cron list)',
+    `status` varchar(64)  DEFAULT NULL,
     `create_time` bigint(13) NOT NULL COMMENT 'Create timestamp',
     `update_time` bigint(13) NOT NULL COMMENT 'Update timestamp',
     PRIMARY KEY (`id`)