From b539f46899603aeb8d5d4cc222102bb28e5f9636 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=89=91=E5=B3=B0?= <jeff_jianfeng@163.com>
Date: Fri, 16 May 2025 10:32:09 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0=E5=AF=B9=20HarmonyOS?=
 =?UTF-8?q?=20=E8=84=9A=E6=9C=AC=E7=9A=84=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/AtuPlanInfoApiServiceImpl.java    |  1 +
 .../AtuPlanSceneCaseTaskApiServiceImpl.java   |  3 ++-
 .../service/AtuPlanTaskApiServiceImpl.java    |  1 +
 .../consumer/TaskExecResultConsumer.java      |  3 ++-
 .../service/AtuScriptInfoApiServiceImpl.java  | 24 ++++++++++++++-----
 .../service/AtuCaseDataSetApiServiceImpl.java |  3 ++-
 .../coordinate/SceneCoordinatorService.java   | 14 +++++++----
 .../scriptcase/constants/ScriptConstant.java  |  1 +
 8 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/cctp-atu/atu-execute-plan/src/main/java/net/northking/cctp/executePlan/api/service/AtuPlanInfoApiServiceImpl.java b/cctp-atu/atu-execute-plan/src/main/java/net/northking/cctp/executePlan/api/service/AtuPlanInfoApiServiceImpl.java
index b363aa8..79c07a8 100644
--- a/cctp-atu/atu-execute-plan/src/main/java/net/northking/cctp/executePlan/api/service/AtuPlanInfoApiServiceImpl.java
+++ b/cctp-atu/atu-execute-plan/src/main/java/net/northking/cctp/executePlan/api/service/AtuPlanInfoApiServiceImpl.java
@@ -499,6 +499,7 @@ public class AtuPlanInfoApiServiceImpl extends AbstractExcelService<AtuPlanInfo>
         idList.add(one.getScriptId());
         if (one.getScriptType().equals(PlanConstant.SCRIPT_TYPE_ANDROID) ||
                 one.getScriptType().equals(PlanConstant.SCRIPT_TYPE_IOS) ||
+                one.getScriptType().equals(PlanConstant.SCRIPT_TYPE_HARMONY) ||
                 one.getScriptType().equals(PlanConstant.SCRIPT_TYPE_SCENE)){
           isMobile.set(true);
         }
diff --git a/cctp-atu/atu-execute-plan/src/main/java/net/northking/cctp/executePlan/api/service/AtuPlanSceneCaseTaskApiServiceImpl.java b/cctp-atu/atu-execute-plan/src/main/java/net/northking/cctp/executePlan/api/service/AtuPlanSceneCaseTaskApiServiceImpl.java
index 84f7cdf..c8cc230 100644
--- a/cctp-atu/atu-execute-plan/src/main/java/net/northking/cctp/executePlan/api/service/AtuPlanSceneCaseTaskApiServiceImpl.java
+++ b/cctp-atu/atu-execute-plan/src/main/java/net/northking/cctp/executePlan/api/service/AtuPlanSceneCaseTaskApiServiceImpl.java
@@ -205,7 +205,8 @@ public class AtuPlanSceneCaseTaskApiServiceImpl implements AtuPlanSceneCaseTaskA
 
         // 记录性能数据
         if (PlanConstant.SCRIPT_TYPE_ANDROID.equals(planSceneCaseTask.getNodeType())
-                || PlanConstant.SCRIPT_TYPE_IOS.equals(planSceneCaseTask.getNodeType())) {
+                || PlanConstant.SCRIPT_TYPE_IOS.equals(planSceneCaseTask.getNodeType())
+                || PlanConstant.SCRIPT_TYPE_HARMONY.equals(planSceneCaseTask.getNodeType())) {
             logger.debug("处理场景移动端性能文件数据");
             planSceneCaseTask.setPerDataPath(parseMobilePerformanceFile(taskExecResult));
         }
diff --git a/cctp-atu/atu-execute-plan/src/main/java/net/northking/cctp/executePlan/api/service/AtuPlanTaskApiServiceImpl.java b/cctp-atu/atu-execute-plan/src/main/java/net/northking/cctp/executePlan/api/service/AtuPlanTaskApiServiceImpl.java
index 8f94b63..f16527c 100644
--- a/cctp-atu/atu-execute-plan/src/main/java/net/northking/cctp/executePlan/api/service/AtuPlanTaskApiServiceImpl.java
+++ b/cctp-atu/atu-execute-plan/src/main/java/net/northking/cctp/executePlan/api/service/AtuPlanTaskApiServiceImpl.java
@@ -564,6 +564,7 @@ public class AtuPlanTaskApiServiceImpl extends AbstractExcelService<AtuPlanTask>
                 break;
             case PlanConstant.SCRIPT_TYPE_ANDROID:
             case PlanConstant.SCRIPT_TYPE_IOS:
+            case PlanConstant.SCRIPT_TYPE_HARMONY:
                 batchDeviceLink.setDeviceType(PlanConstant.DEVICE_TYPE_MOBILE);
                 break;
         }
diff --git a/cctp-atu/atu-execute-plan/src/main/java/net/northking/cctp/executePlan/consumer/TaskExecResultConsumer.java b/cctp-atu/atu-execute-plan/src/main/java/net/northking/cctp/executePlan/consumer/TaskExecResultConsumer.java
index c389d64..d9547b6 100644
--- a/cctp-atu/atu-execute-plan/src/main/java/net/northking/cctp/executePlan/consumer/TaskExecResultConsumer.java
+++ b/cctp-atu/atu-execute-plan/src/main/java/net/northking/cctp/executePlan/consumer/TaskExecResultConsumer.java
@@ -148,7 +148,8 @@ public class TaskExecResultConsumer {
             }
 
             if (PlanConstant.SCRIPT_TYPE_ANDROID.equals(planTask.getCaseType())
-                    || PlanConstant.SCRIPT_TYPE_IOS.equals(planTask.getCaseType())) {
+                    || PlanConstant.SCRIPT_TYPE_IOS.equals(planTask.getCaseType())
+                    || PlanConstant.SCRIPT_TYPE_HARMONY.equals(planTask.getCaseType())) {
                 logger.debug("处理移动端性能文件数据");
                 planTask.setPerDataPath(sceneCaseTaskApiService.parseMobilePerformanceFile(taskExecResult));
             }
diff --git a/cctp-atu/atu-script-case/src/main/java/net/northking/cctp/scriptcase/api/atuScript/service/AtuScriptInfoApiServiceImpl.java b/cctp-atu/atu-script-case/src/main/java/net/northking/cctp/scriptcase/api/atuScript/service/AtuScriptInfoApiServiceImpl.java
index 28c98e4..9e977f3 100644
--- a/cctp-atu/atu-script-case/src/main/java/net/northking/cctp/scriptcase/api/atuScript/service/AtuScriptInfoApiServiceImpl.java
+++ b/cctp-atu/atu-script-case/src/main/java/net/northking/cctp/scriptcase/api/atuScript/service/AtuScriptInfoApiServiceImpl.java
@@ -267,7 +267,9 @@ public class AtuScriptInfoApiServiceImpl extends AbstractExcelService<AtuScriptI
       }
       String scriptType = script.getScriptType();
       FileBusinessTypeEnum businessCode = null;
-      if (scriptType.equals(SCRIPT_TYPE_ANDROID) || scriptType.equals(SCRIPT_TYPE_IOS)) {
+      if (scriptType.equals(SCRIPT_TYPE_ANDROID)
+              || scriptType.equals(SCRIPT_TYPE_IOS)
+              || scriptType.equals(SCRIPT_TYPE_HARMONY) ) {
         businessCode = FileBusinessTypeEnum.MOBILE_RECORD_SCREENSHOT;
       } else if (scriptType.equals(SCRIPT_TYPE_BS) || scriptType.equals(SCRIPT_TYPE_CS)) {
         businessCode = FileBusinessTypeEnum.PC_RECORD_SCREENSHOT;
@@ -386,7 +388,9 @@ public class AtuScriptInfoApiServiceImpl extends AbstractExcelService<AtuScriptI
       // 关联截图文件
       String scriptType = script.getScriptType();
       FileBusinessTypeEnum businessCode = null;
-      if (scriptType.equals(SCRIPT_TYPE_ANDROID) || scriptType.equals(SCRIPT_TYPE_IOS)) {
+      if (scriptType.equals(SCRIPT_TYPE_ANDROID)
+              || scriptType.equals(SCRIPT_TYPE_IOS)
+              || scriptType.equals(SCRIPT_TYPE_HARMONY)) {
         businessCode = FileBusinessTypeEnum.MOBILE_RECORD_SCREENSHOT;
       } else if (scriptType.equals(SCRIPT_TYPE_BS) || scriptType.equals(SCRIPT_TYPE_CS)) {
         businessCode = FileBusinessTypeEnum.PC_RECORD_SCREENSHOT;
@@ -546,7 +550,9 @@ public class AtuScriptInfoApiServiceImpl extends AbstractExcelService<AtuScriptI
       script.setUpdatedBy(NKSecurityContext.getUserId());
       String scriptType = script.getScriptType();
       FileBusinessTypeEnum businessCode = null;
-      if (scriptType.equals(SCRIPT_TYPE_ANDROID) || scriptType.equals(SCRIPT_TYPE_IOS)) {
+      if (scriptType.equals(SCRIPT_TYPE_ANDROID)
+              || scriptType.equals(SCRIPT_TYPE_IOS)
+              || scriptType.equals(SCRIPT_TYPE_HARMONY)) {
         businessCode = FileBusinessTypeEnum.MOBILE_RECORD_SCREENSHOT;
       } else if (scriptType.equals(SCRIPT_TYPE_BS) || scriptType.equals(SCRIPT_TYPE_CS)) {
         businessCode = FileBusinessTypeEnum.PC_RECORD_SCREENSHOT;
@@ -669,7 +675,9 @@ public class AtuScriptInfoApiServiceImpl extends AbstractExcelService<AtuScriptI
       // 关联截图文件
       String scriptType = script.getScriptType();
       FileBusinessTypeEnum businessCode = null;
-      if (scriptType.equals(SCRIPT_TYPE_ANDROID) || scriptType.equals(SCRIPT_TYPE_IOS)) {
+      if (scriptType.equals(SCRIPT_TYPE_ANDROID)
+              || scriptType.equals(SCRIPT_TYPE_IOS)
+              || scriptType.equals(SCRIPT_TYPE_HARMONY)) {
         businessCode = FileBusinessTypeEnum.MOBILE_RECORD_SCREENSHOT;
       } else if (scriptType.equals(SCRIPT_TYPE_BS) || scriptType.equals(SCRIPT_TYPE_CS)) {
         businessCode = FileBusinessTypeEnum.PC_RECORD_SCREENSHOT;
@@ -1063,7 +1071,9 @@ public class AtuScriptInfoApiServiceImpl extends AbstractExcelService<AtuScriptI
     AtuScriptVersion newVersion = generateScriptVersion(newScript);
     String scriptType = script.getScriptType();
     FileBusinessTypeEnum businessCode = null;
-    if (scriptType.equals(SCRIPT_TYPE_ANDROID) || scriptType.equals(SCRIPT_TYPE_IOS)) {
+    if (scriptType.equals(SCRIPT_TYPE_ANDROID)
+            || scriptType.equals(SCRIPT_TYPE_IOS)
+            || scriptType.equals(SCRIPT_TYPE_HARMONY)) {
       businessCode = FileBusinessTypeEnum.MOBILE_RECORD_SCREENSHOT;
     } else if (scriptType.equals(SCRIPT_TYPE_BS) || scriptType.equals(SCRIPT_TYPE_CS)) {
       businessCode = FileBusinessTypeEnum.PC_RECORD_SCREENSHOT;
@@ -1743,7 +1753,9 @@ public class AtuScriptInfoApiServiceImpl extends AbstractExcelService<AtuScriptI
       JSONObject jsonObject = JSON.parseObject(copyScriptStr, JSONObject.class);
       String scriptType = autoScript.getScriptType();
       FileBusinessTypeEnum businessCode = null;
-      if (scriptType.equals(SCRIPT_TYPE_ANDROID) || scriptType.equals(SCRIPT_TYPE_IOS)) {
+      if (scriptType.equals(SCRIPT_TYPE_ANDROID)
+              || scriptType.equals(SCRIPT_TYPE_IOS)
+              || scriptType.equals(SCRIPT_TYPE_HARMONY)) {
         businessCode = FileBusinessTypeEnum.MOBILE_RECORD_SCREENSHOT;
       } else if (scriptType.equals(SCRIPT_TYPE_BS) || scriptType.equals(SCRIPT_TYPE_CS)) {
         businessCode = FileBusinessTypeEnum.PC_RECORD_SCREENSHOT;
diff --git a/cctp-atu/atu-script-case/src/main/java/net/northking/cctp/scriptcase/api/caseDataSet/service/AtuCaseDataSetApiServiceImpl.java b/cctp-atu/atu-script-case/src/main/java/net/northking/cctp/scriptcase/api/caseDataSet/service/AtuCaseDataSetApiServiceImpl.java
index da8a730..2e3c328 100644
--- a/cctp-atu/atu-script-case/src/main/java/net/northking/cctp/scriptcase/api/caseDataSet/service/AtuCaseDataSetApiServiceImpl.java
+++ b/cctp-atu/atu-script-case/src/main/java/net/northking/cctp/scriptcase/api/caseDataSet/service/AtuCaseDataSetApiServiceImpl.java
@@ -710,7 +710,8 @@ public class AtuCaseDataSetApiServiceImpl extends AbstractExcelService<AtuCaseDa
         //场景脚本
         sceneList.add(one.getScriptId());
       } else if (one.getScriptType().equals(ScriptConstant.SCRIPT_TYPE_ANDROID)
-              || one.getScriptType().equals(ScriptConstant.SCRIPT_TYPE_IOS)) {
+              || one.getScriptType().equals(ScriptConstant.SCRIPT_TYPE_IOS)
+              || one.getScriptType().equals(ScriptConstant.SCRIPT_TYPE_HARMONY)) {
         //安卓 IOS脚本
         scriptSet.add(one.getScriptId());
       }
diff --git a/cctp-atu/atu-script-case/src/main/java/net/northking/cctp/scriptcase/api/scenescript/service/coordinate/SceneCoordinatorService.java b/cctp-atu/atu-script-case/src/main/java/net/northking/cctp/scriptcase/api/scenescript/service/coordinate/SceneCoordinatorService.java
index e334f22..632ca1f 100644
--- a/cctp-atu/atu-script-case/src/main/java/net/northking/cctp/scriptcase/api/scenescript/service/coordinate/SceneCoordinatorService.java
+++ b/cctp-atu/atu-script-case/src/main/java/net/northking/cctp/scriptcase/api/scenescript/service/coordinate/SceneCoordinatorService.java
@@ -169,7 +169,8 @@ public class SceneCoordinatorService {
         reqNodeInfoDto.nodeInfo.setCaseParam(CaseParamMap);
         reqNodeInfoDto.nodeInfo.setNodeType(convertNodeType(nextNode.get().getNodeType()));
         if (ScriptConstant.NODE_TYPE_ANDROID.equals(nextNode.get().getNodeType()) ||
-                ScriptConstant.NODE_TYPE_IOS.equals(nextNode.get().getNodeType())) {
+                ScriptConstant.NODE_TYPE_IOS.equals(nextNode.get().getNodeType()) ||
+                ScriptConstant.NODE_TYPE_HARMONY.equals(nextNode.get().getNodeType())) {
             SceneNodeInfoDto dto = GetOneNodeInfo(nextNode.get());
             if (dto != null) {
                 reqNodeInfoDto.nodeInfo.setAppPackage(dto.getAppPackage());
@@ -275,7 +276,8 @@ public class SceneCoordinatorService {
             return ScriptConstant.SCRIPT_TYPE_ANDROID;
         else if (ScriptConstant.NODE_TYPE_IOS.equals(nodeType))
             return ScriptConstant.SCRIPT_TYPE_IOS;
-
+        else if (ScriptConstant.NODE_TYPE_HARMONY.equals(nodeType))
+            return ScriptConstant.SCRIPT_TYPE_HARMONY;
         logger.debug("无效的节点类型nodeType=" + nodeType);
         return "";
     }
@@ -596,7 +598,9 @@ public class SceneCoordinatorService {
         reqNodeInfoDto.nodeInfo.setCaseParam(CaseParamMap);
         reqNodeInfoDto.nodeInfo.setNodeType(convertNodeType(nextNode.getNodeType()));
 
-        if (ScriptConstant.NODE_TYPE_ANDROID.equals(nextNode.getNodeType()) || ScriptConstant.NODE_TYPE_IOS.equals(nextNode.getNodeType())) {
+        if (ScriptConstant.NODE_TYPE_ANDROID.equals(nextNode.getNodeType())
+                || ScriptConstant.NODE_TYPE_IOS.equals(nextNode.getNodeType())
+                || ScriptConstant.NODE_TYPE_HARMONY.equals(nextNode.getNodeType())) {
             SceneNodeInfoDto dto = GetOneNodeInfo(nextNode);
             if (dto != null) {
                 reqNodeInfoDto.nodeInfo.setPlatformType(dto.getPlatform());
@@ -690,7 +694,9 @@ public class SceneCoordinatorService {
         dto.setAppPackage("");
         dto.setPlatform("");
         logger.debug("场景脚本节点信息 SceneNodeInfoDto:{}, scriptId:{}", dto, n.getScriptId());
-        if (ScriptConstant.NODE_TYPE_ANDROID.equals(n.getNodeType()) || ScriptConstant.NODE_TYPE_IOS.equals(n.getNodeType())) {
+        if (ScriptConstant.NODE_TYPE_ANDROID.equals(n.getNodeType())
+                || ScriptConstant.NODE_TYPE_IOS.equals(n.getNodeType())
+                || ScriptConstant.NODE_TYPE_HARMONY.equals(n.getNodeType())) {
             AtuScriptInfo appScriptInfo = atuScriptInfoService.findByPrimaryKey(n.getScriptId());
             if (appScriptInfo == null) {
                 logger.error("查询移动端脚本不存在.脚本Id:{}, 脚本名:{}", n.getScriptId(), n.getScriptName());
diff --git a/cctp-atu/atu-script-case/src/main/java/net/northking/cctp/scriptcase/constants/ScriptConstant.java b/cctp-atu/atu-script-case/src/main/java/net/northking/cctp/scriptcase/constants/ScriptConstant.java
index 45d8dac..d315d1a 100644
--- a/cctp-atu/atu-script-case/src/main/java/net/northking/cctp/scriptcase/constants/ScriptConstant.java
+++ b/cctp-atu/atu-script-case/src/main/java/net/northking/cctp/scriptcase/constants/ScriptConstant.java
@@ -353,5 +353,6 @@ public class ScriptConstant {
     public static final String NODE_TYPE_PCCS = "pccs";
     public static final String NODE_TYPE_ANDROID = "andrio";
     public static final String NODE_TYPE_IOS = "ios";
+    public static final String NODE_TYPE_HARMONY = "harmony";
 
 }