feat(基础): 增加了测试数据类，修改了测试用例类的字段

kt-base/src/main/java/org/matrix/actuators/sql/SqlExpActuator.java

@@ -19,6 +19,7 @@ import org.matrix.database.service.IDynamicVariableService;
 import org.matrix.database.service.ITestCaseService;
 import org.matrix.enums.DynamicVarType;
 import org.matrix.exception.GlobalException;
+import org.springframework.http.ResponseEntity;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Component;
 
@@ -87,13 +88,14 @@ public class SqlExpActuator implements Actuator {
      *
      * @param varId     动态变量ID
      * @param envId     环境ID - 环境共享变量需要
-     * @param projectId 项目id，防止SQL表达式中带的嵌合动态变量名字重复
+     * @param projectId 项目id，防止SzxQL表达式中带的嵌合动态变量名字重复
      * @return 变量递归解析后的值
      */
     public String parseVarById(Long varId, Long envId, Long projectId) {
         DynamicVariable dynamicVar = Optional.of(varService.getById(varId))
                 .map(DynamicVariable::parseSqlDetail)
                 .orElseThrow(() -> new GlobalException(String.format("没有找到ID = %d 的动态变量", varId)));
+
         return parseVar(envId, 0, projectId, dynamicVar);
     }
 

kt-base/src/main/java/org/matrix/config/ProcessLogFilter.java

+package org.matrix.config;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.filter.Filter;
+import ch.qos.logback.core.spi.FilterReply;
+
+
+/**
+ * ProcessLogFilter.
+ * 监听测试用例的运行日志
+ * @author Matrix <xhyrzldf@gmail.com>
+ * @since 2022/1/26 at 4:38 PM
+ * Suffering is the most powerful teacher of life.
+ */
+public class ProcessLogFilter extends Filter<ILoggingEvent> {
+    @Override
+    public FilterReply decide(ILoggingEvent iLoggingEvent) {
+        return null;
+    }
+}

kt-base/src/main/java/org/matrix/database/entity/BaseEntity.java

@@ -8,8 +8,10 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;

kt-base/src/main/java/org/matrix/database/entity/TestCase.java

@@ -39,24 +39,6 @@ public class TestCase extends BaseEntity {
     @ApiModelProperty("测试执行后行动ID组，例如：1，2，3")
     private String moveAferTest;
 
-    @ApiModelProperty("是否进行异常检验,0为否,1为是")
-    private Integer abnormalCheckpoint = 0;
-
-    @ApiModelProperty("是否进行非空检验,0为否,1为是")
-    private Integer noEmptyCheckpoint = 0;
-
-    @ApiModelProperty("包含某字段检验（例如 张三,李四） 则对检查结果中是否包含张三或者李四")
-    private String containCheckpoint;
-
-    @ApiModelProperty("不包含某字段检验（例如 张三,李四） 则对检查结果中是否不包含张三或者李四")
-    private String noContainCheckpoint;
-
-    @ApiModelProperty("数据库检验点，以JSON形式存放")
-    private String databaseCheckpoint;
-
-    @ApiModelProperty("jsonpath检验点，以json形式存放")
-    private String jsonpathCheckpoint;
-
     @ApiModelProperty("详细参数")
     private String detail;
 

kt-base/src/main/java/org/matrix/database/entity/TestData.java

+package org.matrix.database.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+/**
+ * TestData.
+ *
+ * @author Matrix <xhyrzldf@gmail.com>
+ * @since 2022/2/21 at 5:06 PM
+ * Suffering is the most powerful teacher of life.
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@TableName("kt_test_data")
+@ApiModel(value = "TestData对象", description = "测试用例用到的数据组")
+public class TestData extends BaseEntity {
+
+    @ApiModelProperty("是否进行异常检验,0为否,1为是")
+    private Integer abnormalCheckpoint = 0;
+
+    @ApiModelProperty("是否进行非空检验,0为否,1为是")
+    private Integer noEmptyCheckpoint = 0;
+
+    @ApiModelProperty("包含某字段检验（例如 张三,李四） 则对检查结果中是否包含张三或者李四")
+    private String containCheckpoint;
+
+    @ApiModelProperty("不包含某字段检验（例如 张三,李四） 则对检查结果中是否不包含张三或者李四")
+    private String noContainCheckpoint;
+
+    @ApiModelProperty("数据库检验点，以JSON形式存放")
+    private String databaseCheckpoint;
+
+    @ApiModelProperty("jsonpath检验点，以json形式存放")
+    private String jsonpathCheckpoint;
+
+    @ApiModelProperty("数据组绑定的测试用例的主键id")
+    private Long testCaseId;
+}

kt-base/src/main/java/org/matrix/database/mapper/TestDataMapper.java

+package org.matrix.database.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.matrix.database.entity.TestData;
+import org.springframework.stereotype.Repository;
+
+/**
+ * TestDataMapper.
+ *
+ * @author Matrix <xhyrzldf@gmail.com>
+ * @since 2022/2/21 at 5:08 PM
+ * Suffering is the most powerful teacher of life.
+ */
+@Repository
+public interface TestDataMapper extends BaseMapper<TestData> {
+
+}

kt-base/src/main/java/org/matrix/database/service/ITestDataService.java

+package org.matrix.database.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.matrix.database.entity.TestData;
+
+/**
+ * ITestDataService.
+ *
+ * @author Matrix <xhyrzldf@gmail.com>
+ * @since 2022/2/22 at 3:05 PM
+ * Suffering is the most powerful teacher of life.
+ */
+public interface ITestDataService extends IService<TestData> {
+}

kt-base/src/main/java/org/matrix/database/service/impl/TestDataServiceImpl.java

+package org.matrix.database.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.matrix.database.entity.TestData;
+import org.matrix.database.mapper.TestDataMapper;
+import org.matrix.database.service.ITestDataService;
+import org.springframework.stereotype.Service;
+
+/**
+ * ITestDataServiceImpl.
+ *
+ * @author Matrix <xhyrzldf@gmail.com>
+ * @since 2022/2/22 at 3:06 PM
+ * Suffering is the most powerful teacher of life.
+ */
+@Service
+public class TestDataServiceImpl extends ServiceImpl<TestDataMapper, TestData>implements ITestDataService {
+}