添加user字段

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

@@ -22,5 +22,7 @@ public class LoadTest implements Serializable {
 
     private String testResourcePoolId;
 
+    private String user;
+
     private static final long serialVersionUID = 1L;
 }

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

@@ -643,6 +643,76 @@ public class LoadTestExample {
             addCriterion("test_resource_pool_id not between", value1, value2, "testResourcePoolId");
             return (Criteria) this;
         }
+
+        public Criteria andUserIsNull() {
+            addCriterion("user is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIsNotNull() {
+            addCriterion("user is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserEqualTo(String value) {
+            addCriterion("user =", value, "user");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNotEqualTo(String value) {
+            addCriterion("user <>", value, "user");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserGreaterThan(String value) {
+            addCriterion("user >", value, "user");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserGreaterThanOrEqualTo(String value) {
+            addCriterion("user >=", value, "user");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserLessThan(String value) {
+            addCriterion("user <", value, "user");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserLessThanOrEqualTo(String value) {
+            addCriterion("user <=", value, "user");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserLike(String value) {
+            addCriterion("user like", value, "user");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNotLike(String value) {
+            addCriterion("user not like", value, "user");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIn(List<String> values) {
+            addCriterion("user in", values, "user");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNotIn(List<String> values) {
+            addCriterion("user not in", values, "user");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserBetween(String value1, String value2) {
+            addCriterion("user between", value1, value2, "user");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNotBetween(String value1, String value2) {
+            addCriterion("user not between", value1, value2, "user");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

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

@@ -18,6 +18,8 @@ public class LoadTestReport implements Serializable {
 
     private String status;
 
+    private String user;
+
     private String description;
 
     private static final long serialVersionUID = 1L;

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

@@ -503,6 +503,76 @@ public class LoadTestReportExample {
             addCriterion("status not between", value1, value2, "status");
             return (Criteria) this;
         }
+
+        public Criteria andUserIsNull() {
+            addCriterion("user is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIsNotNull() {
+            addCriterion("user is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserEqualTo(String value) {
+            addCriterion("user =", value, "user");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNotEqualTo(String value) {
+            addCriterion("user <>", value, "user");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserGreaterThan(String value) {
+            addCriterion("user >", value, "user");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserGreaterThanOrEqualTo(String value) {
+            addCriterion("user >=", value, "user");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserLessThan(String value) {
+            addCriterion("user <", value, "user");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserLessThanOrEqualTo(String value) {
+            addCriterion("user <=", value, "user");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserLike(String value) {
+            addCriterion("user like", value, "user");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNotLike(String value) {
+            addCriterion("user not like", value, "user");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIn(List<String> values) {
+            addCriterion("user in", values, "user");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNotIn(List<String> values) {
+            addCriterion("user not in", values, "user");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserBetween(String value1, String value2) {
+            addCriterion("user between", value1, value2, "user");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNotBetween(String value1, String value2) {
+            addCriterion("user not between", value1, value2, "user");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

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

@@ -10,6 +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"/>
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.metersphere.base.domain.LoadTestWithBLOBs">
     <result column="load_configuration" jdbcType="LONGVARCHAR" property="loadConfiguration" />
@@ -75,7 +76,15 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, project_id, name, description, create_time, update_time, status, test_resource_pool_id
+          id,
+          project_id,
+          name,
+          description,
+          create_time,
+          update_time,
+          status,
+          test_resource_pool_id,
+          user
   </sql>
   <sql id="Blob_Column_List">
     load_configuration, advanced_configuration, schedule
@@ -131,14 +140,14 @@
   <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, load_configuration, 
+      status, test_resource_pool_id, user,
-      advanced_configuration, schedule
+      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}, #{loadConfiguration,jdbcType=LONGVARCHAR}, 
+      #{status,jdbcType=VARCHAR}, #{testResourcePoolId,jdbcType=VARCHAR}, #{user,jdbcType=VARCHAR},
-      #{advancedConfiguration,jdbcType=LONGVARCHAR}, #{schedule,jdbcType=LONGVARCHAR}
+      #{loadConfiguration,jdbcType=LONGVARCHAR}, #{advancedConfiguration,jdbcType=LONGVARCHAR},
-      )
+      #{schedule,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="io.metersphere.base.domain.LoadTestWithBLOBs">
     insert into load_test
@@ -167,6 +176,9 @@
         <if test="testResourcePoolId != null">
             test_resource_pool_id,
         </if>
+        <if test="user != null">
+            user,
+        </if>
         <if test="loadConfiguration != null">
             load_configuration,
         </if>
@@ -202,6 +214,9 @@
         <if test="testResourcePoolId != null">
             #{testResourcePoolId,jdbcType=VARCHAR},
         </if>
+        <if test="user != null">
+            #{user,jdbcType=VARCHAR},
+        </if>
         <if test="loadConfiguration != null">
             #{loadConfiguration,jdbcType=LONGVARCHAR},
         </if>
@@ -246,6 +261,9 @@
         <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>
@@ -270,6 +288,7 @@
       update_time = #{record.updateTime,jdbcType=BIGINT},
       status = #{record.status,jdbcType=VARCHAR},
       test_resource_pool_id = #{record.testResourcePoolId,jdbcType=VARCHAR},
+      user = #{record.user,jdbcType=VARCHAR},
       load_configuration = #{record.loadConfiguration,jdbcType=LONGVARCHAR},
       advanced_configuration = #{record.advancedConfiguration,jdbcType=LONGVARCHAR},
       schedule = #{record.schedule,jdbcType=LONGVARCHAR}
@@ -286,7 +305,8 @@
       create_time = #{record.createTime,jdbcType=BIGINT},
       update_time = #{record.updateTime,jdbcType=BIGINT},
       status = #{record.status,jdbcType=VARCHAR},
-      test_resource_pool_id = #{record.testResourcePoolId,jdbcType=VARCHAR}
+      test_resource_pool_id = #{record.testResourcePoolId,jdbcType=VARCHAR},
+      user = #{record.user,jdbcType=VARCHAR}
       <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -315,6 +335,9 @@
         <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>
@@ -336,6 +359,7 @@
       update_time = #{updateTime,jdbcType=BIGINT},
       status = #{status,jdbcType=VARCHAR},
       test_resource_pool_id = #{testResourcePoolId,jdbcType=VARCHAR},
+      user = #{user,jdbcType=VARCHAR},
       load_configuration = #{loadConfiguration,jdbcType=LONGVARCHAR},
       advanced_configuration = #{advancedConfiguration,jdbcType=LONGVARCHAR},
       schedule = #{schedule,jdbcType=LONGVARCHAR}
@@ -349,7 +373,8 @@
       create_time = #{createTime,jdbcType=BIGINT},
       update_time = #{updateTime,jdbcType=BIGINT},
       status = #{status,jdbcType=VARCHAR},
-      test_resource_pool_id = #{testResourcePoolId,jdbcType=VARCHAR}
+      test_resource_pool_id = #{testResourcePoolId,jdbcType=VARCHAR},
+      user = #{user,jdbcType=VARCHAR}
       where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>

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

@@ -8,6 +8,7 @@
     <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"/>
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.metersphere.base.domain.LoadTestReport">
       <result column="description" jdbcType="LONGVARCHAR" property="description"/>
@@ -71,7 +72,13 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, test_id, name, create_time, update_time, status
+          id,
+          test_id,
+          name,
+          create_time,
+          update_time,
+          status,
+          user
   </sql>
   <sql id="Blob_Column_List">
           description
@@ -115,11 +122,11 @@
     where id = #{id,jdbcType=VARCHAR}
   </select>
     <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-    delete from load_test_report
+        DELETE FROM load_test_report
-    where id = #{id,jdbcType=VARCHAR}
+        WHERE id = #{id,jdbcType=VARCHAR}
     </delete>
     <delete id="deleteByExample" parameterType="io.metersphere.base.domain.LoadTestReportExample">
-    delete from load_test_report
+        DELETE FROM load_test_report
         <if test="_parameter != null">
             <include refid="Example_Where_Clause"/>
         </if>
@@ -127,10 +134,10 @@
     <insert id="insert" parameterType="io.metersphere.base.domain.LoadTestReport">
         INSERT INTO load_test_report (id, test_id, name,
         create_time, update_time, status,
-        description)
+        user, description)
         VALUES (#{id,jdbcType=VARCHAR}, #{testId,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR},
         #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, #{status,jdbcType=VARCHAR},
-        #{description,jdbcType=LONGVARCHAR})
+        #{user,jdbcType=VARCHAR}, #{description,jdbcType=LONGVARCHAR})
     </insert>
     <insert id="insertSelective" parameterType="io.metersphere.base.domain.LoadTestReport">
         insert into load_test_report
@@ -153,6 +160,9 @@
             <if test="status != null">
                 status,
             </if>
+            <if test="user != null">
+                user,
+            </if>
             <if test="description != null">
                 description,
             </if>
@@ -176,6 +186,9 @@
         <if test="status != null">
             #{status,jdbcType=VARCHAR},
         </if>
+        <if test="user != null">
+            #{user,jdbcType=VARCHAR},
+        </if>
         <if test="description != null">
             #{description,jdbcType=LONGVARCHAR},
         </if>
@@ -208,6 +221,9 @@
         <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>
@@ -224,25 +240,27 @@
       create_time = #{record.createTime,jdbcType=BIGINT},
       update_time = #{record.updateTime,jdbcType=BIGINT},
       status = #{record.status,jdbcType=VARCHAR},
+      user = #{record.user,jdbcType=VARCHAR},
       description = #{record.description,jdbcType=LONGVARCHAR}
       <if test="_parameter != null">
           <include refid="Update_By_Example_Where_Clause"/>
       </if>
   </update>
   <update id="updateByExample" parameterType="map">
-    update load_test_report
+      UPDATE load_test_report
-    set id = #{record.id,jdbcType=VARCHAR},
+      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}
+      status = #{record.status,jdbcType=VARCHAR},
+      user = #{record.user,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
+        UPDATE load_test_report
         <set>
             <if test="testId != null">
                 test_id = #{testId,jdbcType=VARCHAR},
@@ -259,11 +277,14 @@
             <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}
+        WHERE id = #{id,jdbcType=VARCHAR}
     </update>
     <update id="updateByPrimaryKeyWithBLOBs" parameterType="io.metersphere.base.domain.LoadTestReport">
         UPDATE load_test_report
@@ -272,16 +293,18 @@
         create_time = #{createTime,jdbcType=BIGINT},
         update_time = #{updateTime,jdbcType=BIGINT},
         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
+        UPDATE load_test_report
-    set test_id = #{testId,jdbcType=VARCHAR},
+        SET test_id = #{testId,jdbcType=VARCHAR},
         name = #{name,jdbcType=VARCHAR},
         create_time = #{createTime,jdbcType=BIGINT},
         update_time = #{updateTime,jdbcType=BIGINT},
-      status = #{status,jdbcType=VARCHAR}
+        status = #{status,jdbcType=VARCHAR},
-    where id = #{id,jdbcType=VARCHAR}
+        user = #{user,jdbcType=VARCHAR}
+        WHERE id = #{id,jdbcType=VARCHAR}
     </update>
 </mapper>

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

@@ -20,7 +20,7 @@ CREATE TABLE IF NOT EXISTS `file_metadata` (
     DEFAULT CHARSET = utf8mb4
     COLLATE = utf8mb4_general_ci;
 
-CREATE TABLE IF NOT EXISTS `load_test` (
+CREATE TABLE `load_test` (
   `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',
@@ -32,11 +32,9 @@ CREATE TABLE IF NOT EXISTS `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,
   PRIMARY KEY (`id`)
-)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-    ENGINE = InnoDB
-    DEFAULT CHARSET = utf8mb4
-    COLLATE = utf8mb4_general_ci;
 
 CREATE TABLE IF NOT EXISTS `load_test_file` (
     `test_id` varchar(64) DEFAULT NULL,
@@ -46,19 +44,17 @@ CREATE TABLE IF NOT EXISTS `load_test_file` (
     ENGINE = InnoDB
     DEFAULT CHARSET = utf8mb4 COMMENT ='测试和文件的关联表';
 
-CREATE TABLE IF NOT EXISTS `load_test_report` (
+CREATE TABLE `load_test_report` (
   `id` varchar(50) NOT NULL COMMENT 'Test report ID',
   `test_id` varchar(50) NOT NULL COMMENT 'Test ID this test report belongs to',
   `name` varchar(64) NOT NULL COMMENT 'Test report name',
-    `description` varchar(255) DEFAULT NULL COMMENT 'Test report name',
+  `description` text COMMENT 'Test report message',
   `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,
   PRIMARY KEY (`id`)
-)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-    ENGINE = InnoDB
-    DEFAULT CHARSET = utf8mb4
-    COLLATE = utf8mb4_general_ci;
 
 CREATE TABLE IF NOT EXISTS `load_test_report_detail` (
   `report_id` varchar(50) NOT NULL,

backend/src/main/resources/generatorConfig.xml

@@ -60,6 +60,7 @@
         <!--要生成的数据库表 -->
 
         <table tableName="load_test_report"/>
+        <table tableName="load_test"/>
 
     </context>
 </generatorConfiguration>