refactor(接口测试): 用例结果表调整

backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiReportBlob.java

@@ -15,12 +15,12 @@ public class ApiReportBlob implements Serializable {
     @Size(min = 1, max = 50, message = "{api_report_blob.id.length_range}", groups = {Created.class, Updated.class})
     private String id;
 
+    @Schema(description = "执行环境配置")
+    private String environmentId;
+
     @Schema(description = "结果内容详情")
     private byte[] content;
 
-    @Schema(description = "执行环境配置")
-    private byte[] config;
-
     @Schema(description = "执行过程日志")
     private byte[] console;
 
@@ -28,8 +28,8 @@ public class ApiReportBlob implements Serializable {
 
     public enum Column {
         id("id", "id", "VARCHAR", false),
+        environmentId("environment_id", "environmentId", "VARCHAR", false),
         content("content", "content", "LONGVARBINARY", false),
-        config("config", "config", "LONGVARBINARY", false),
         console("console", "console", "LONGVARBINARY", false);
 
         private static final String BEGINNING_DELIMITER = "`";

backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiReportBlobExample.java

@@ -173,6 +173,76 @@ public class ApiReportBlobExample {
             addCriterion("id not between", value1, value2, "id");
             return (Criteria) this;
         }
+
+        public Criteria andEnvironmentIdIsNull() {
+            addCriterion("environment_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnvironmentIdIsNotNull() {
+            addCriterion("environment_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnvironmentIdEqualTo(String value) {
+            addCriterion("environment_id =", value, "environmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnvironmentIdNotEqualTo(String value) {
+            addCriterion("environment_id <>", value, "environmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnvironmentIdGreaterThan(String value) {
+            addCriterion("environment_id >", value, "environmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnvironmentIdGreaterThanOrEqualTo(String value) {
+            addCriterion("environment_id >=", value, "environmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnvironmentIdLessThan(String value) {
+            addCriterion("environment_id <", value, "environmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnvironmentIdLessThanOrEqualTo(String value) {
+            addCriterion("environment_id <=", value, "environmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnvironmentIdLike(String value) {
+            addCriterion("environment_id like", value, "environmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnvironmentIdNotLike(String value) {
+            addCriterion("environment_id not like", value, "environmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnvironmentIdIn(List<String> values) {
+            addCriterion("environment_id in", values, "environmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnvironmentIdNotIn(List<String> values) {
+            addCriterion("environment_id not in", values, "environmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnvironmentIdBetween(String value1, String value2) {
+            addCriterion("environment_id between", value1, value2, "environmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnvironmentIdNotBetween(String value1, String value2) {
+            addCriterion("environment_id not between", value1, value2, "environmentId");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

backend/framework/domain/src/main/java/io/metersphere/api/mapper/ApiReportBlobMapper.java

@@ -32,6 +32,8 @@ public interface ApiReportBlobMapper {
 
     int updateByPrimaryKeyWithBLOBs(ApiReportBlob record);
 
+    int updateByPrimaryKey(ApiReportBlob record);
+
     int batchInsert(@Param("list") List<ApiReportBlob> list);
 
     int batchInsertSelective(@Param("list") List<ApiReportBlob> list, @Param("selective") ApiReportBlob.Column ... selective);

backend/framework/domain/src/main/java/io/metersphere/api/mapper/ApiReportBlobMapper.xml

@@ -3,10 +3,10 @@
 <mapper namespace="io.metersphere.api.mapper.ApiReportBlobMapper">
   <resultMap id="BaseResultMap" type="io.metersphere.api.domain.ApiReportBlob">
     <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="environment_id" jdbcType="VARCHAR" property="environmentId" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.metersphere.api.domain.ApiReportBlob">
     <result column="content" jdbcType="LONGVARBINARY" property="content" />
-    <result column="config" jdbcType="LONGVARBINARY" property="config" />
     <result column="console" jdbcType="LONGVARBINARY" property="console" />
   </resultMap>
   <sql id="Example_Where_Clause">
@@ -68,10 +68,10 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id
+    id, environment_id
   </sql>
   <sql id="Blob_Column_List">
-    content, config, console
+    content, console
   </sql>
   <select id="selectByExampleWithBLOBs" parameterType="io.metersphere.api.domain.ApiReportBlobExample" resultMap="ResultMapWithBLOBs">
     select
@@ -122,9 +122,9 @@
     </if>
   </delete>
   <insert id="insert" parameterType="io.metersphere.api.domain.ApiReportBlob">
-    insert into api_report_blob (id, content, config, 
+    insert into api_report_blob (id, environment_id, content, 
       console)
-    values (#{id,jdbcType=VARCHAR}, #{content,jdbcType=LONGVARBINARY}, #{config,jdbcType=LONGVARBINARY}, 
+    values (#{id,jdbcType=VARCHAR}, #{environmentId,jdbcType=VARCHAR}, #{content,jdbcType=LONGVARBINARY}, 
       #{console,jdbcType=LONGVARBINARY})
   </insert>
   <insert id="insertSelective" parameterType="io.metersphere.api.domain.ApiReportBlob">
@@ -133,12 +133,12 @@
       <if test="id != null">
         id,
       </if>
+      <if test="environmentId != null">
+        environment_id,
+      </if>
       <if test="content != null">
         content,
       </if>
-      <if test="config != null">
-        config,
-      </if>
       <if test="console != null">
         console,
       </if>
@@ -147,12 +147,12 @@
       <if test="id != null">
         #{id,jdbcType=VARCHAR},
       </if>
+      <if test="environmentId != null">
+        #{environmentId,jdbcType=VARCHAR},
+      </if>
       <if test="content != null">
         #{content,jdbcType=LONGVARBINARY},
       </if>
-      <if test="config != null">
-        #{config,jdbcType=LONGVARBINARY},
-      </if>
       <if test="console != null">
         #{console,jdbcType=LONGVARBINARY},
       </if>
@@ -170,12 +170,12 @@
       <if test="record.id != null">
         id = #{record.id,jdbcType=VARCHAR},
       </if>
+      <if test="record.environmentId != null">
+        environment_id = #{record.environmentId,jdbcType=VARCHAR},
+      </if>
       <if test="record.content != null">
         content = #{record.content,jdbcType=LONGVARBINARY},
       </if>
-      <if test="record.config != null">
-        config = #{record.config,jdbcType=LONGVARBINARY},
-      </if>
       <if test="record.console != null">
         console = #{record.console,jdbcType=LONGVARBINARY},
       </if>
@@ -187,8 +187,8 @@
   <update id="updateByExampleWithBLOBs" parameterType="map">
     update api_report_blob
     set id = #{record.id,jdbcType=VARCHAR},
+      environment_id = #{record.environmentId,jdbcType=VARCHAR},
       content = #{record.content,jdbcType=LONGVARBINARY},
-      config = #{record.config,jdbcType=LONGVARBINARY},
       console = #{record.console,jdbcType=LONGVARBINARY}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -196,7 +196,8 @@
   </update>
   <update id="updateByExample" parameterType="map">
     update api_report_blob
-    set id = #{record.id,jdbcType=VARCHAR}
+    set id = #{record.id,jdbcType=VARCHAR},
+      environment_id = #{record.environmentId,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -204,12 +205,12 @@
   <update id="updateByPrimaryKeySelective" parameterType="io.metersphere.api.domain.ApiReportBlob">
     update api_report_blob
     <set>
+      <if test="environmentId != null">
+        environment_id = #{environmentId,jdbcType=VARCHAR},
+      </if>
       <if test="content != null">
         content = #{content,jdbcType=LONGVARBINARY},
       </if>
-      <if test="config != null">
-        config = #{config,jdbcType=LONGVARBINARY},
-      </if>
       <if test="console != null">
         console = #{console,jdbcType=LONGVARBINARY},
       </if>
@@ -218,17 +219,22 @@
   </update>
   <update id="updateByPrimaryKeyWithBLOBs" parameterType="io.metersphere.api.domain.ApiReportBlob">
     update api_report_blob
-    set content = #{content,jdbcType=LONGVARBINARY},
+    set environment_id = #{environmentId,jdbcType=VARCHAR},
-      config = #{config,jdbcType=LONGVARBINARY},
+      content = #{content,jdbcType=LONGVARBINARY},
       console = #{console,jdbcType=LONGVARBINARY}
     where id = #{id,jdbcType=VARCHAR}
   </update>
+  <update id="updateByPrimaryKey" parameterType="io.metersphere.api.domain.ApiReportBlob">
+    update api_report_blob
+    set environment_id = #{environmentId,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
   <insert id="batchInsert" parameterType="map">
     insert into api_report_blob
-    (id, content, config, console)
+    (id, environment_id, content, console)
     values
     <foreach collection="list" item="item" separator=",">
-      (#{item.id,jdbcType=VARCHAR}, #{item.content,jdbcType=LONGVARBINARY}, #{item.config,jdbcType=LONGVARBINARY}, 
+      (#{item.id,jdbcType=VARCHAR}, #{item.environmentId,jdbcType=VARCHAR}, #{item.content,jdbcType=LONGVARBINARY}, 
         #{item.console,jdbcType=LONGVARBINARY})
     </foreach>
   </insert>
@@ -245,12 +251,12 @@
         <if test="'id'.toString() == column.value">
           #{item.id,jdbcType=VARCHAR}
         </if>
+        <if test="'environment_id'.toString() == column.value">
+          #{item.environmentId,jdbcType=VARCHAR}
+        </if>
         <if test="'content'.toString() == column.value">
           #{item.content,jdbcType=LONGVARBINARY}
         </if>
-        <if test="'config'.toString() == column.value">
-          #{item.config,jdbcType=LONGVARBINARY}
-        </if>
         <if test="'console'.toString() == column.value">
           #{item.console,jdbcType=LONGVARBINARY}
         </if>

backend/framework/domain/src/main/resources/migration/3.0.0/ddl/V3.0.0_5__api_test.sql

@@ -450,7 +450,7 @@ CREATE TABLE IF NOT EXISTS api_definition_blob(
 CREATE TABLE IF NOT EXISTS api_report_blob(
   `id` VARCHAR(50) NOT NULL   COMMENT '接口报告fk' ,
   `content` LONGBLOB    COMMENT '结果内容详情' ,
-  `config` BLOB    COMMENT '执行环境配置' ,
+  `environment_id` VARCHAR(50)    COMMENT '执行环境配置' ,
   `console` BLOB    COMMENT '执行过程日志' ,
   PRIMARY KEY (id)
 )  ENGINE = InnoDB