modify

src/main/java/cn/qg/holmes/service/auto/AutoUtilsService.java

@@ -16,5 +16,5 @@ public interface AutoUtilsService {
 
     boolean assertResponse(String response, List<Map> validateList);
 
-    Map<String, Object> handlePreCondition(String namespace, String preString, UUID uuid);
+    Map<String, Object> handlePreCondition(String namespace, String preString);
 }

src/main/java/cn/qg/holmes/service/auto/impl/AutoUtilsServiceImpl.java

@@ -151,11 +151,10 @@ public class AutoUtilsServiceImpl implements AutoUtilsService {
      *
      * @param namespace
      * @param preString
-     * @param uuid
      * @return
      */
     @Override
-    public Map<String, Object> handlePreCondition(String namespace, String preString, UUID uuid) {
+    public Map<String, Object> handlePreCondition(String namespace, String preString) {
         Map<String, Object> resultMap = new HashMap<>();
         try {
             List<Map> preList = JSON.parseArray(preString, Map.class);
@@ -174,7 +173,9 @@ public class AutoUtilsServiceImpl implements AutoUtilsService {
 //                String redisKey = uuid + "_" + key;
 //                redisUtils.set(redisKey, JsonPath.read("$.data", result));
 //                redisUtils.expire(redisKey, 120);
-                resultMap.put(key, JsonPath.read("$.data", result));
+                if (sql.startsWith("select") || sql.startsWith("SELECT")) {
+                    resultMap.put(key, JsonPath.read(result, "$.data." + key));
+                }
             }
             return resultMap;
         } catch (Exception e) {

src/main/java/cn/qg/holmes/service/auto/impl/SceneTestcaseServiceImpl.java

@@ -47,9 +47,16 @@ public class SceneTestcaseServiceImpl extends ServiceImpl<SceneTestcaseMapper, S
     @Autowired
     SceneService sceneService;
 
+    /**
+     * 执行场景用例
+     * @param namespace 环境
+     * @param sceneId 场景id
+     * @param batch 批次号
+     * @return
+     */
     @Override
     public String executeSceneTestcase(String namespace, Integer sceneId, String batch) {
-        QueryWrapper queryWrapper = new QueryWrapper();
+        QueryWrapper<SceneTestcase> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("scene_id", sceneId);
         queryWrapper.orderByAsc("sequence");
         List<SceneTestcase> sceneTestcaseList =  sceneTestcaseMapper.selectList(queryWrapper);
@@ -57,6 +64,13 @@ public class SceneTestcaseServiceImpl extends ServiceImpl<SceneTestcaseMapper, S
         // 全局变量Map
         Map<String, Object> globalMap = new HashMap<>();
         for (SceneTestcase sceneTestcase: sceneTestcaseList) {
+            String preAction = sceneTestcase.getPreAction();
+            if (preAction != null && !preAction.isEmpty()) {
+                Map<String, Object> preMap = autoUtilsService.handlePreCondition(namespace, preAction);
+                if (preMap != null) {
+                    globalMap.putAll(preMap);
+                }
+            }
 //            resultList.add(JSON.parseObject(sceneTestcaseExecution(namespace, sceneId, sceneTestcase.getInterfaceId(), sceneTestcase.getSequence(), uuid, batch), Map.class));
             Map<String, Object> tempMap = sceneTestcaseExecution(namespace, sceneId, sceneTestcase.getInterfaceId(), sceneTestcase.getSequence(), batch, globalMap);
             Map<String, Object> reportMap = (Map<String, Object>) tempMap.get("report");