'修改qtask相关'

src/main/java/net/tccn/qtask/TaskKit.java

@@ -1,9 +1,11 @@
 package net.tccn.qtask;
 
+import com.google.gson.Gson;
 import net.tccn.base.Kv;
 import net.tccn.base.MetaKit;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 
@@ -19,14 +21,28 @@ public class TaskKit {
 
     public static Task buildTask(String name, String platToken, Kv para) {
         TaskEntity taskEntity = getTaskEntity(name, platToken);
+        return buildTask(taskEntity, para);
+    }
 
+    public static Task buildTask(TaskEntity taskEntity, Kv para) {
         Task task = new Task();
         task.setName(taskEntity.getName());
         task.setComment(taskEntity.getComment());
+        task.setContent(taskEntity.getContent());
         task.setDbPlatId(taskEntity.getDbPlatId());
-        task.setPara(taskEntity.getPara().putAll(para));
-        task.setDbAccount(MetaKit.getDbPlat(taskEntity.getDbPlatId()));
+        task.setCatalog(taskEntity.getCatalog());
 
+        Kv _para = Kv.of().putAll(para);
+        if (taskEntity.getPara() != null) {
+            try {
+                Map map = new Gson().fromJson(taskEntity.getPara(), Map.class);
+                map.forEach((k,v) -> _para.put(k, v));
+            } catch (Exception e) {
+                new IllegalArgumentException(String.format("fromJson error:[%s]",taskEntity.getPara()), e);
+            }
+        }
+        task.setPara(_para);
+        task.setDbAccount(MetaKit.getDbPlat(taskEntity.getDbPlatId()));
         return task;
     }
 
@@ -44,4 +60,9 @@ public class TaskKit {
         Task task = buildTask(name, platToken, para);
         return QRuner.query(task);
     }
+
+    public static Object taskRun(TaskEntity entity) {
+        Task task = buildTask(entity, Kv.of());
+        return QRuner.query(task);
+    }
 }