修改user字段为user_id

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

@@ -1,8 +1,7 @@
 package io.metersphere.base.domain;
 
-import lombok.Data;
-
 import java.io.Serializable;
+import lombok.Data;
 
 @Data
 public class LoadTest implements Serializable {
@@ -22,7 +21,7 @@ public class LoadTest implements Serializable {
 
     private String testResourcePoolId;
 
-    private String user;
+    private String userId;
 
     private static final long serialVersionUID = 1L;
 }

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

@@ -644,73 +644,73 @@ public class LoadTestExample {
             return (Criteria) this;
         }
 
-        public Criteria andUserIsNull() {
-            addCriterion("user is null");
+        public Criteria andUserIdIsNull() {
+            addCriterion("user_id is null");
             return (Criteria) this;
         }
 
-        public Criteria andUserIsNotNull() {
-            addCriterion("user is not null");
+        public Criteria andUserIdIsNotNull() {
+            addCriterion("user_id is not null");
             return (Criteria) this;
         }
 
-        public Criteria andUserEqualTo(String value) {
-            addCriterion("user =", value, "user");
+        public Criteria andUserIdEqualTo(String value) {
+            addCriterion("user_id =", value, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andUserNotEqualTo(String value) {
-            addCriterion("user <>", value, "user");
+        public Criteria andUserIdNotEqualTo(String value) {
+            addCriterion("user_id <>", value, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andUserGreaterThan(String value) {
-            addCriterion("user >", value, "user");
+        public Criteria andUserIdGreaterThan(String value) {
+            addCriterion("user_id >", value, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andUserGreaterThanOrEqualTo(String value) {
-            addCriterion("user >=", value, "user");
+        public Criteria andUserIdGreaterThanOrEqualTo(String value) {
+            addCriterion("user_id >=", value, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andUserLessThan(String value) {
-            addCriterion("user <", value, "user");
+        public Criteria andUserIdLessThan(String value) {
+            addCriterion("user_id <", value, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andUserLessThanOrEqualTo(String value) {
-            addCriterion("user <=", value, "user");
+        public Criteria andUserIdLessThanOrEqualTo(String value) {
+            addCriterion("user_id <=", value, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andUserLike(String value) {
-            addCriterion("user like", value, "user");
+        public Criteria andUserIdLike(String value) {
+            addCriterion("user_id like", value, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andUserNotLike(String value) {
-            addCriterion("user not like", value, "user");
+        public Criteria andUserIdNotLike(String value) {
+            addCriterion("user_id not like", value, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andUserIn(List<String> values) {
-            addCriterion("user in", values, "user");
+        public Criteria andUserIdIn(List<String> values) {
+            addCriterion("user_id in", values, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andUserNotIn(List<String> values) {
-            addCriterion("user not in", values, "user");
+        public Criteria andUserIdNotIn(List<String> values) {
+            addCriterion("user_id not in", values, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andUserBetween(String value1, String value2) {
-            addCriterion("user between", value1, value2, "user");
+        public Criteria andUserIdBetween(String value1, String value2) {
+            addCriterion("user_id between", value1, value2, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andUserNotBetween(String value1, String value2) {
-            addCriterion("user not between", value1, value2, "user");
+        public Criteria andUserIdNotBetween(String value1, String value2) {
+            addCriterion("user_id not between", value1, value2, "userId");
             return (Criteria) this;
         }
     }

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

@@ -1,8 +1,7 @@
 package io.metersphere.base.domain;
 
-import lombok.Data;
-
 import java.io.Serializable;
+import lombok.Data;
 
 @Data
 public class LoadTestReport implements Serializable {
@@ -18,7 +17,7 @@ public class LoadTestReport implements Serializable {
 
     private String status;
 
-    private String user;
+    private String userId;
 
     private String description;
 

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

@@ -504,73 +504,73 @@ public class LoadTestReportExample {
             return (Criteria) this;
         }
 
-        public Criteria andUserIsNull() {
-            addCriterion("user is null");
+        public Criteria andUserIdIsNull() {
+            addCriterion("user_id is null");
             return (Criteria) this;
         }
 
-        public Criteria andUserIsNotNull() {
-            addCriterion("user is not null");
+        public Criteria andUserIdIsNotNull() {
+            addCriterion("user_id is not null");
             return (Criteria) this;
         }
 
-        public Criteria andUserEqualTo(String value) {
-            addCriterion("user =", value, "user");
+        public Criteria andUserIdEqualTo(String value) {
+            addCriterion("user_id =", value, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andUserNotEqualTo(String value) {
-            addCriterion("user <>", value, "user");
+        public Criteria andUserIdNotEqualTo(String value) {
+            addCriterion("user_id <>", value, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andUserGreaterThan(String value) {
-            addCriterion("user >", value, "user");
+        public Criteria andUserIdGreaterThan(String value) {
+            addCriterion("user_id >", value, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andUserGreaterThanOrEqualTo(String value) {
-            addCriterion("user >=", value, "user");
+        public Criteria andUserIdGreaterThanOrEqualTo(String value) {
+            addCriterion("user_id >=", value, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andUserLessThan(String value) {
-            addCriterion("user <", value, "user");
+        public Criteria andUserIdLessThan(String value) {
+            addCriterion("user_id <", value, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andUserLessThanOrEqualTo(String value) {
-            addCriterion("user <=", value, "user");
+        public Criteria andUserIdLessThanOrEqualTo(String value) {
+            addCriterion("user_id <=", value, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andUserLike(String value) {
-            addCriterion("user like", value, "user");
+        public Criteria andUserIdLike(String value) {
+            addCriterion("user_id like", value, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andUserNotLike(String value) {
-            addCriterion("user not like", value, "user");
+        public Criteria andUserIdNotLike(String value) {
+            addCriterion("user_id not like", value, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andUserIn(List<String> values) {
-            addCriterion("user in", values, "user");
+        public Criteria andUserIdIn(List<String> values) {
+            addCriterion("user_id in", values, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andUserNotIn(List<String> values) {
-            addCriterion("user not in", values, "user");
+        public Criteria andUserIdNotIn(List<String> values) {
+            addCriterion("user_id not in", values, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andUserBetween(String value1, String value2) {
-            addCriterion("user between", value1, value2, "user");
+        public Criteria andUserIdBetween(String value1, String value2) {
+            addCriterion("user_id between", value1, value2, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andUserNotBetween(String value1, String value2) {
-            addCriterion("user not between", value1, value2, "user");
+        public Criteria andUserIdNotBetween(String value1, String value2) {
+            addCriterion("user_id not between", value1, value2, "userId");
             return (Criteria) this;
         }
     }

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

@@ -1,11 +1,10 @@
 package io.metersphere.base.domain;
 
+import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
-import java.io.Serializable;
-
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)

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

@@ -10,7 +10,7 @@
     <result column="update_time" jdbcType="BIGINT" property="updateTime" />
     <result column="status" jdbcType="VARCHAR" property="status" />
     <result column="test_resource_pool_id" jdbcType="VARCHAR" property="testResourcePoolId" />
-    <result column="user" jdbcType="VARCHAR" property="user"/>
+    <result column="user_id" jdbcType="VARCHAR" property="userId" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.metersphere.base.domain.LoadTestWithBLOBs">
     <result column="load_configuration" jdbcType="LONGVARCHAR" property="loadConfiguration" />
@@ -76,15 +76,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-          id,
-          project_id,
-          name,
-          description,
-          create_time,
-          update_time,
-          status,
-          test_resource_pool_id,
-          user
+    id, project_id, name, description, create_time, update_time, status, test_resource_pool_id, 
+    user_id
   </sql>
   <sql id="Blob_Column_List">
     load_configuration, advanced_configuration, schedule
@@ -138,15 +131,15 @@
     </if>
   </delete>
   <insert id="insert" parameterType="io.metersphere.base.domain.LoadTestWithBLOBs">
-      insert into load_test (id, project_id, name,
-      description, create_time, update_time,
-      status, test_resource_pool_id, user,
-      load_configuration, advanced_configuration,
+    insert into load_test (id, project_id, name, 
+      description, create_time, update_time, 
+      status, test_resource_pool_id, user_id, 
+      load_configuration, advanced_configuration, 
       schedule)
-      values (#{id,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR},
-      #{description,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT},
-      #{status,jdbcType=VARCHAR}, #{testResourcePoolId,jdbcType=VARCHAR}, #{user,jdbcType=VARCHAR},
-      #{loadConfiguration,jdbcType=LONGVARCHAR}, #{advancedConfiguration,jdbcType=LONGVARCHAR},
+    values (#{id,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
+      #{description,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, 
+      #{status,jdbcType=VARCHAR}, #{testResourcePoolId,jdbcType=VARCHAR}, #{userId,jdbcType=VARCHAR}, 
+      #{loadConfiguration,jdbcType=LONGVARCHAR}, #{advancedConfiguration,jdbcType=LONGVARCHAR}, 
       #{schedule,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="io.metersphere.base.domain.LoadTestWithBLOBs">
@@ -165,29 +158,29 @@
         description,
       </if>
       <if test="createTime != null">
-          create_time,
+        create_time,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+      <if test="status != null">
+        status,
+      </if>
+      <if test="testResourcePoolId != null">
+        test_resource_pool_id,
+      </if>
+      <if test="userId != null">
+        user_id,
+      </if>
+      <if test="loadConfiguration != null">
+        load_configuration,
+      </if>
+      <if test="advancedConfiguration != null">
+        advanced_configuration,
+      </if>
+      <if test="schedule != null">
+        schedule,
       </if>
-        <if test="updateTime != null">
-            update_time,
-        </if>
-        <if test="status != null">
-            status,
-        </if>
-        <if test="testResourcePoolId != null">
-            test_resource_pool_id,
-        </if>
-        <if test="user != null">
-            user,
-        </if>
-        <if test="loadConfiguration != null">
-            load_configuration,
-        </if>
-        <if test="advancedConfiguration != null">
-            advanced_configuration,
-        </if>
-        <if test="schedule != null">
-            schedule,
-        </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -205,27 +198,27 @@
       <if test="createTime != null">
         #{createTime,jdbcType=BIGINT},
       </if>
-        <if test="updateTime != null">
-            #{updateTime,jdbcType=BIGINT},
-        </if>
-        <if test="status != null">
-            #{status,jdbcType=VARCHAR},
-        </if>
-        <if test="testResourcePoolId != null">
-            #{testResourcePoolId,jdbcType=VARCHAR},
-        </if>
-        <if test="user != null">
-            #{user,jdbcType=VARCHAR},
-        </if>
-        <if test="loadConfiguration != null">
-            #{loadConfiguration,jdbcType=LONGVARCHAR},
-        </if>
-        <if test="advancedConfiguration != null">
-            #{advancedConfiguration,jdbcType=LONGVARCHAR},
-        </if>
-        <if test="schedule != null">
-            #{schedule,jdbcType=LONGVARCHAR},
-        </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=BIGINT},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=VARCHAR},
+      </if>
+      <if test="testResourcePoolId != null">
+        #{testResourcePoolId,jdbcType=VARCHAR},
+      </if>
+      <if test="userId != null">
+        #{userId,jdbcType=VARCHAR},
+      </if>
+      <if test="loadConfiguration != null">
+        #{loadConfiguration,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="advancedConfiguration != null">
+        #{advancedConfiguration,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="schedule != null">
+        #{schedule,jdbcType=LONGVARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="io.metersphere.base.domain.LoadTestExample" resultType="java.lang.Long">
@@ -250,37 +243,37 @@
         description = #{record.description,jdbcType=VARCHAR},
       </if>
       <if test="record.createTime != null">
-          create_time = #{record.createTime,jdbcType=BIGINT},
+        create_time = #{record.createTime,jdbcType=BIGINT},
+      </if>
+      <if test="record.updateTime != null">
+        update_time = #{record.updateTime,jdbcType=BIGINT},
+      </if>
+      <if test="record.status != null">
+        status = #{record.status,jdbcType=VARCHAR},
+      </if>
+      <if test="record.testResourcePoolId != null">
+        test_resource_pool_id = #{record.testResourcePoolId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.userId != null">
+        user_id = #{record.userId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.loadConfiguration != null">
+        load_configuration = #{record.loadConfiguration,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="record.advancedConfiguration != null">
+        advanced_configuration = #{record.advancedConfiguration,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="record.schedule != null">
+        schedule = #{record.schedule,jdbcType=LONGVARCHAR},
       </if>
-        <if test="record.updateTime != null">
-            update_time = #{record.updateTime,jdbcType=BIGINT},
-        </if>
-        <if test="record.status != null">
-            status = #{record.status,jdbcType=VARCHAR},
-        </if>
-        <if test="record.testResourcePoolId != null">
-            test_resource_pool_id = #{record.testResourcePoolId,jdbcType=VARCHAR},
-        </if>
-        <if test="record.user != null">
-            user = #{record.user,jdbcType=VARCHAR},
-        </if>
-        <if test="record.loadConfiguration != null">
-            load_configuration = #{record.loadConfiguration,jdbcType=LONGVARCHAR},
-        </if>
-        <if test="record.advancedConfiguration != null">
-            advanced_configuration = #{record.advancedConfiguration,jdbcType=LONGVARCHAR},
-        </if>
-        <if test="record.schedule != null">
-            schedule = #{record.schedule,jdbcType=LONGVARCHAR},
-        </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
   <update id="updateByExampleWithBLOBs" parameterType="map">
-      update load_test
-      set id = #{record.id,jdbcType=VARCHAR},
+    update load_test
+    set id = #{record.id,jdbcType=VARCHAR},
       project_id = #{record.projectId,jdbcType=VARCHAR},
       name = #{record.name,jdbcType=VARCHAR},
       description = #{record.description,jdbcType=VARCHAR},
@@ -288,17 +281,17 @@
       update_time = #{record.updateTime,jdbcType=BIGINT},
       status = #{record.status,jdbcType=VARCHAR},
       test_resource_pool_id = #{record.testResourcePoolId,jdbcType=VARCHAR},
-      user = #{record.user,jdbcType=VARCHAR},
+      user_id = #{record.userId,jdbcType=VARCHAR},
       load_configuration = #{record.loadConfiguration,jdbcType=LONGVARCHAR},
       advanced_configuration = #{record.advancedConfiguration,jdbcType=LONGVARCHAR},
       schedule = #{record.schedule,jdbcType=LONGVARCHAR}
-      <if test="_parameter != null">
+    <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
   <update id="updateByExample" parameterType="map">
-      update load_test
-      set id = #{record.id,jdbcType=VARCHAR},
+    update load_test
+    set id = #{record.id,jdbcType=VARCHAR},
       project_id = #{record.projectId,jdbcType=VARCHAR},
       name = #{record.name,jdbcType=VARCHAR},
       description = #{record.description,jdbcType=VARCHAR},
@@ -306,8 +299,8 @@
       update_time = #{record.updateTime,jdbcType=BIGINT},
       status = #{record.status,jdbcType=VARCHAR},
       test_resource_pool_id = #{record.testResourcePoolId,jdbcType=VARCHAR},
-      user = #{record.user,jdbcType=VARCHAR}
-      <if test="_parameter != null">
+      user_id = #{record.userId,jdbcType=VARCHAR}
+    <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
@@ -326,55 +319,55 @@
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=BIGINT},
       </if>
-        <if test="updateTime != null">
-            update_time = #{updateTime,jdbcType=BIGINT},
-        </if>
-        <if test="status != null">
-            status = #{status,jdbcType=VARCHAR},
-        </if>
-        <if test="testResourcePoolId != null">
-            test_resource_pool_id = #{testResourcePoolId,jdbcType=VARCHAR},
-        </if>
-        <if test="user != null">
-            user = #{user,jdbcType=VARCHAR},
-        </if>
-        <if test="loadConfiguration != null">
-            load_configuration = #{loadConfiguration,jdbcType=LONGVARCHAR},
-        </if>
-        <if test="advancedConfiguration != null">
-            advanced_configuration = #{advancedConfiguration,jdbcType=LONGVARCHAR},
-        </if>
-        <if test="schedule != null">
-            schedule = #{schedule,jdbcType=LONGVARCHAR},
-        </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=BIGINT},
+      </if>
+      <if test="status != null">
+        status = #{status,jdbcType=VARCHAR},
+      </if>
+      <if test="testResourcePoolId != null">
+        test_resource_pool_id = #{testResourcePoolId,jdbcType=VARCHAR},
+      </if>
+      <if test="userId != null">
+        user_id = #{userId,jdbcType=VARCHAR},
+      </if>
+      <if test="loadConfiguration != null">
+        load_configuration = #{loadConfiguration,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="advancedConfiguration != null">
+        advanced_configuration = #{advancedConfiguration,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="schedule != null">
+        schedule = #{schedule,jdbcType=LONGVARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeyWithBLOBs" parameterType="io.metersphere.base.domain.LoadTestWithBLOBs">
-      update load_test
-      set project_id = #{projectId,jdbcType=VARCHAR},
+    update load_test
+    set project_id = #{projectId,jdbcType=VARCHAR},
       name = #{name,jdbcType=VARCHAR},
       description = #{description,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=BIGINT},
       update_time = #{updateTime,jdbcType=BIGINT},
       status = #{status,jdbcType=VARCHAR},
       test_resource_pool_id = #{testResourcePoolId,jdbcType=VARCHAR},
-      user = #{user,jdbcType=VARCHAR},
+      user_id = #{userId,jdbcType=VARCHAR},
       load_configuration = #{loadConfiguration,jdbcType=LONGVARCHAR},
       advanced_configuration = #{advancedConfiguration,jdbcType=LONGVARCHAR},
       schedule = #{schedule,jdbcType=LONGVARCHAR}
-      where id = #{id,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKey" parameterType="io.metersphere.base.domain.LoadTest">
-      update load_test
-      set project_id = #{projectId,jdbcType=VARCHAR},
+    update load_test
+    set project_id = #{projectId,jdbcType=VARCHAR},
       name = #{name,jdbcType=VARCHAR},
       description = #{description,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=BIGINT},
       update_time = #{updateTime,jdbcType=BIGINT},
       status = #{status,jdbcType=VARCHAR},
       test_resource_pool_id = #{testResourcePoolId,jdbcType=VARCHAR},
-      user = #{user,jdbcType=VARCHAR}
-      where id = #{id,jdbcType=VARCHAR}
+      user_id = #{userId,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>

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

@@ -2,9 +2,8 @@ package io.metersphere.base.mapper;
 
 import io.metersphere.base.domain.LoadTestReport;
 import io.metersphere.base.domain.LoadTestReportExample;
-import org.apache.ibatis.annotations.Param;
-
 import java.util.List;
+import org.apache.ibatis.annotations.Param;
 
 public interface LoadTestReportMapper {
     long countByExample(LoadTestReportExample example);

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

@@ -8,10 +8,10 @@
     <result column="create_time" jdbcType="BIGINT" property="createTime" />
     <result column="update_time" jdbcType="BIGINT" property="updateTime" />
     <result column="status" jdbcType="VARCHAR" property="status" />
-    <result column="user" jdbcType="VARCHAR" property="user"/>
+    <result column="user_id" jdbcType="VARCHAR" property="userId" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.metersphere.base.domain.LoadTestReport">
-      <result column="description" jdbcType="LONGVARCHAR" property="description"/>
+    <result column="description" jdbcType="LONGVARCHAR" property="description" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -72,16 +72,10 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-          id,
-          test_id,
-          name,
-          create_time,
-          update_time,
-          status,
-          user
+    id, test_id, name, create_time, update_time, status, user_id
   </sql>
   <sql id="Blob_Column_List">
-          description
+    description
   </sql>
   <select id="selectByExampleWithBLOBs" parameterType="io.metersphere.base.domain.LoadTestReportExample" resultMap="ResultMapWithBLOBs">
     select
@@ -121,52 +115,52 @@
     from load_test_report
     where id = #{id,jdbcType=VARCHAR}
   </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-        DELETE FROM load_test_report
-        WHERE id = #{id,jdbcType=VARCHAR}
-    </delete>
-    <delete id="deleteByExample" parameterType="io.metersphere.base.domain.LoadTestReportExample">
-        DELETE FROM load_test_report
-        <if test="_parameter != null">
-            <include refid="Example_Where_Clause"/>
-        </if>
-    </delete>
-    <insert id="insert" parameterType="io.metersphere.base.domain.LoadTestReport">
-        INSERT INTO load_test_report (id, test_id, name,
-        create_time, update_time, status,
-        user, description)
-        VALUES (#{id,jdbcType=VARCHAR}, #{testId,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR},
-        #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, #{status,jdbcType=VARCHAR},
-        #{user,jdbcType=VARCHAR}, #{description,jdbcType=LONGVARCHAR})
-    </insert>
-    <insert id="insertSelective" parameterType="io.metersphere.base.domain.LoadTestReport">
-        insert into load_test_report
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">
-                id,
-            </if>
-            <if test="testId != null">
-                test_id,
-            </if>
-            <if test="name != null">
-                name,
-            </if>
-            <if test="createTime != null">
-                create_time,
-            </if>
-            <if test="updateTime != null">
-                update_time,
-            </if>
-            <if test="status != null">
-                status,
-            </if>
-            <if test="user != null">
-                user,
-            </if>
-            <if test="description != null">
-                description,
-            </if>
-        </trim>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from load_test_report
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="io.metersphere.base.domain.LoadTestReportExample">
+    delete from load_test_report
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="io.metersphere.base.domain.LoadTestReport">
+    insert into load_test_report (id, test_id, name, 
+      create_time, update_time, status, 
+      user_id, description)
+    values (#{id,jdbcType=VARCHAR}, #{testId,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, #{status,jdbcType=VARCHAR}, 
+      #{userId,jdbcType=VARCHAR}, #{description,jdbcType=LONGVARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="io.metersphere.base.domain.LoadTestReport">
+    insert into load_test_report
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="testId != null">
+        test_id,
+      </if>
+      <if test="name != null">
+        name,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+      <if test="status != null">
+        status,
+      </if>
+      <if test="userId != null">
+        user_id,
+      </if>
+      <if test="description != null">
+        description,
+      </if>
+    </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
         #{id,jdbcType=VARCHAR},
@@ -177,21 +171,21 @@
       <if test="name != null">
         #{name,jdbcType=VARCHAR},
       </if>
-        <if test="createTime != null">
-            #{createTime,jdbcType=BIGINT},
-        </if>
-        <if test="updateTime != null">
-            #{updateTime,jdbcType=BIGINT},
-        </if>
-        <if test="status != null">
-            #{status,jdbcType=VARCHAR},
-        </if>
-        <if test="user != null">
-            #{user,jdbcType=VARCHAR},
-        </if>
-        <if test="description != null">
-            #{description,jdbcType=LONGVARCHAR},
-        </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=BIGINT},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=BIGINT},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=VARCHAR},
+      </if>
+      <if test="userId != null">
+        #{userId,jdbcType=VARCHAR},
+      </if>
+      <if test="description != null">
+        #{description,jdbcType=LONGVARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="io.metersphere.base.domain.LoadTestReportExample" resultType="java.lang.Long">
@@ -212,99 +206,99 @@
       <if test="record.name != null">
         name = #{record.name,jdbcType=VARCHAR},
       </if>
-        <if test="record.createTime != null">
-            create_time = #{record.createTime,jdbcType=BIGINT},
-        </if>
-        <if test="record.updateTime != null">
-            update_time = #{record.updateTime,jdbcType=BIGINT},
-        </if>
-        <if test="record.status != null">
-            status = #{record.status,jdbcType=VARCHAR},
-        </if>
-        <if test="record.user != null">
-            user = #{record.user,jdbcType=VARCHAR},
-        </if>
-        <if test="record.description != null">
-            description = #{record.description,jdbcType=LONGVARCHAR},
-        </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=BIGINT},
+      </if>
+      <if test="record.updateTime != null">
+        update_time = #{record.updateTime,jdbcType=BIGINT},
+      </if>
+      <if test="record.status != null">
+        status = #{record.status,jdbcType=VARCHAR},
+      </if>
+      <if test="record.userId != null">
+        user_id = #{record.userId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.description != null">
+        description = #{record.description,jdbcType=LONGVARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
   <update id="updateByExampleWithBLOBs" parameterType="map">
-      update load_test_report
-      set id = #{record.id,jdbcType=VARCHAR},
+    update load_test_report
+    set id = #{record.id,jdbcType=VARCHAR},
       test_id = #{record.testId,jdbcType=VARCHAR},
       name = #{record.name,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=BIGINT},
       update_time = #{record.updateTime,jdbcType=BIGINT},
       status = #{record.status,jdbcType=VARCHAR},
-      user = #{record.user,jdbcType=VARCHAR},
+      user_id = #{record.userId,jdbcType=VARCHAR},
       description = #{record.description,jdbcType=LONGVARCHAR}
-      <if test="_parameter != null">
-          <include refid="Update_By_Example_Where_Clause"/>
-      </if>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
   </update>
   <update id="updateByExample" parameterType="map">
-      UPDATE load_test_report
-      SET id = #{record.id,jdbcType=VARCHAR},
+    update load_test_report
+    set id = #{record.id,jdbcType=VARCHAR},
       test_id = #{record.testId,jdbcType=VARCHAR},
       name = #{record.name,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=BIGINT},
       update_time = #{record.updateTime,jdbcType=BIGINT},
       status = #{record.status,jdbcType=VARCHAR},
-      user = #{record.user,jdbcType=VARCHAR}
-      <if test="_parameter != null">
-          <include refid="Update_By_Example_Where_Clause"/>
-      </if>
+      user_id = #{record.userId,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
   </update>
-    <update id="updateByPrimaryKeySelective" parameterType="io.metersphere.base.domain.LoadTestReport">
-        UPDATE load_test_report
-        <set>
-            <if test="testId != null">
-                test_id = #{testId,jdbcType=VARCHAR},
-            </if>
-            <if test="name != null">
-                name = #{name,jdbcType=VARCHAR},
-            </if>
-            <if test="createTime != null">
-                create_time = #{createTime,jdbcType=BIGINT},
-            </if>
-            <if test="updateTime != null">
-                update_time = #{updateTime,jdbcType=BIGINT},
-            </if>
-            <if test="status != null">
-                status = #{status,jdbcType=VARCHAR},
-            </if>
-            <if test="user != null">
-                user = #{user,jdbcType=VARCHAR},
-            </if>
-            <if test="description != null">
-                description = #{description,jdbcType=LONGVARCHAR},
-            </if>
-        </set>
-        WHERE id = #{id,jdbcType=VARCHAR}
-    </update>
-    <update id="updateByPrimaryKeyWithBLOBs" parameterType="io.metersphere.base.domain.LoadTestReport">
-        UPDATE load_test_report
-        SET test_id = #{testId,jdbcType=VARCHAR},
+  <update id="updateByPrimaryKeySelective" parameterType="io.metersphere.base.domain.LoadTestReport">
+    update load_test_report
+    <set>
+      <if test="testId != null">
+        test_id = #{testId,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
         name = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
         create_time = #{createTime,jdbcType=BIGINT},
+      </if>
+      <if test="updateTime != null">
         update_time = #{updateTime,jdbcType=BIGINT},
+      </if>
+      <if test="status != null">
         status = #{status,jdbcType=VARCHAR},
-        user = #{user,jdbcType=VARCHAR},
-        description = #{description,jdbcType=LONGVARCHAR}
-        WHERE id = #{id,jdbcType=VARCHAR}
-    </update>
-    <update id="updateByPrimaryKey" parameterType="io.metersphere.base.domain.LoadTestReport">
-        UPDATE load_test_report
-        SET test_id = #{testId,jdbcType=VARCHAR},
-        name = #{name,jdbcType=VARCHAR},
-        create_time = #{createTime,jdbcType=BIGINT},
-        update_time = #{updateTime,jdbcType=BIGINT},
-        status = #{status,jdbcType=VARCHAR},
-        user = #{user,jdbcType=VARCHAR}
-        WHERE id = #{id,jdbcType=VARCHAR}
-    </update>
+      </if>
+      <if test="userId != null">
+        user_id = #{userId,jdbcType=VARCHAR},
+      </if>
+      <if test="description != null">
+        description = #{description,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="io.metersphere.base.domain.LoadTestReport">
+    update load_test_report
+    set test_id = #{testId,jdbcType=VARCHAR},
+      name = #{name,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=BIGINT},
+      update_time = #{updateTime,jdbcType=BIGINT},
+      status = #{status,jdbcType=VARCHAR},
+      user_id = #{userId,jdbcType=VARCHAR},
+      description = #{description,jdbcType=LONGVARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="io.metersphere.base.domain.LoadTestReport">
+    update load_test_report
+    set test_id = #{testId,jdbcType=VARCHAR},
+      name = #{name,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=BIGINT},
+      update_time = #{updateTime,jdbcType=BIGINT},
+      status = #{status,jdbcType=VARCHAR},
+      user_id = #{userId,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
 </mapper>

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

@@ -32,7 +32,7 @@ CREATE TABLE `load_test` (
   `update_time` bigint(13) NOT NULL COMMENT 'Update timestamp',
   `status` varchar(64) DEFAULT NULL COMMENT 'Test Status Running, Completed, Error, etc.',
   `test_resource_pool_id` varchar(50) DEFAULT NULL,
-  `user` varchar(64) DEFAULT NULL,
+  `user_id` varchar(64) DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
@@ -52,7 +52,7 @@ CREATE TABLE `load_test_report` (
   `create_time` bigint(13) NOT NULL COMMENT 'Create timestamp',
   `update_time` bigint(13) NOT NULL COMMENT 'Update timestamp',
   `status` varchar(64) NOT NULL COMMENT 'Status of this test run',
-  `user` varchar(64) DEFAULT NULL,
+  `user_id` varchar(64) DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;