refactor: 脚本测试兼容多种脚本类型

@@ -23,7 +23,6 @@ import org.thingsboard.server.common.data.DeviceProfileType;
 import org.thingsboard.server.common.data.DeviceTransportType;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
-import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
@@ -36,16 +35,18 @@ import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.TkScriptFunctionType;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.common.msg.queue.ServiceQueue;
-import org.thingsboard.server.transport.tcp.script.TkScriptInvokeService;
-import org.thingsboard.server.transport.tcp.script.TkScriptType;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceProfileService;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceScriptService;
+import org.thingsboard.server.transport.tcp.script.TkScriptInvokeService;
 
 import java.sql.Timestamp;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
@@ -174,16 +175,24 @@ public class TkDeviceScriptController extends BaseController {
       throws ThingsboardException {
     try {
       String script = inputParams.get("script").asText();
+      String scriptType = inputParams.get("type").asText();
+      String jsMethod = inputParams.has("method")?inputParams.get("method").asText():"";
       String jsParam = inputParams.get("params").asText();
 
       String output = "";
       String errorText = "";
       ScriptEngine engine = null;
       try {
-        UUID scriptId = jsEngine.eval(null,TkScriptType.TCP_TRANSPORT_SCRIPT, script).get();
+        UUID scriptId;
+        if(StringUtils.isEmpty(jsMethod)){
+          scriptId = jsEngine.eval(null,scriptType, script,jsParam).get();
+        }else{
+          scriptId = jsEngine.eval(null,scriptType, script,jsMethod,jsParam).get();
+        }
+
         ListenableFuture<String> result =
             Futures.transformAsync(
-                jsEngine.invokeFunction(scriptId, jsParam),
+                    StringUtils.isEmpty(jsMethod)?jsEngine.invokeFunction(scriptId, jsParam):jsEngine.invokeFunction(scriptId, jsMethod,jsParam),
                 o -> {
                   try {
                     JsonElement json = parser.parse(o.toString());

@@ -19,6 +19,7 @@ import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import lombok.extern.slf4j.Slf4j;
 import org.thingsboard.common.util.ThingsBoardThreadFactory;
+import org.thingsboard.server.common.data.yunteng.enums.TkScriptFunctionType;
 
 import java.util.Map;
 import java.util.UUID;
@@ -54,7 +55,7 @@ public abstract class AbstractTkScriptInvokeService implements TkScriptInvokeSer
     }
 
     @Override
-    public ListenableFuture<UUID> eval(UUID id,TkScriptType scriptType, String scriptBody, String... argNames) {
+    public ListenableFuture<UUID> eval(UUID id,String scriptType, String scriptBody, String... argNames) {
             UUID scriptId = id == null?UUID.randomUUID():id;
             String functionName = "invokeInternal_" + scriptId.toString().replace('-', '_');
             String jsScript = generateJsScript(scriptType, functionName, scriptBody, argNames);
@@ -109,8 +110,8 @@ public abstract class AbstractTkScriptInvokeService implements TkScriptInvokeSer
         disableListInfo.incrementAndGet();
     }
 
-    private String generateJsScript(TkScriptType scriptType, String functionName, String scriptBody, String... argNames) {
-        if (scriptType == TkScriptType.TCP_TRANSPORT_SCRIPT) {
+    private String generateJsScript(String scriptType, String functionName, String scriptBody, String... argNames) {
+        if (TkScriptFunctionType.valueOf(scriptType) != null) {
             return TkScriptFactory.generateTcpScript(functionName, scriptBody, argNames);
 
         }