增加对外接口 修改java执行日志

byit-myth-admin/src/main/java/com/byit/api/ApiCallbackController.java

 package com.byit.api;
 
 import com.byit.conf.MythJobAutoConfigure;
+import com.byit.dto.api.JavaCallbackLogDto;
 import com.byit.dto.executor.JobRunResultDto;
+import com.byit.dto.web.ReturnResult;
 import com.byit.packet.response.PluginRpcResponsePacket;
 import com.byit.thread.JavaTaskCallbackThread;
 import com.byit.thread.LogCallbackThread;
@@ -11,6 +13,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Map;
+
 /**
  * @author huangfu
  */
@@ -22,4 +26,16 @@ public class ApiCallbackController {
     public void callbackRes(@RequestBody PluginRpcResponsePacket pluginRpcResponsePacket){
         MythJobAutoConfigure.LOG_CALLBACK.execute(new JavaTaskCallbackThread(pluginRpcResponsePacket));
     }
+
+    /**
+     * 供ddmp平台回调
+     * @param javaCallbackLogDto
+     */
+    @PostMapping(value = "ddmp/callbackRes")
+    public void ddmpCallbackRes(@RequestBody JavaCallbackLogDto javaCallbackLogDto){
+        PluginRpcResponsePacket pluginRpcResponsePacket = new PluginRpcResponsePacket();
+        pluginRpcResponsePacket.setExtension(javaCallbackLogDto.getLogId());
+        pluginRpcResponsePacket.setResult(javaCallbackLogDto.getReturnResult());
+        MythJobAutoConfigure.LOG_CALLBACK.execute(new JavaTaskCallbackThread(pluginRpcResponsePacket));
+    }
 }

byit-myth-core/myth-dto-core/src/main/java/com/byit/dto/api/JavaCallbackLogDto.java

+package com.byit.dto.api;
+
+import com.byit.dto.web.ReturnResult;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author huangfu
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class JavaCallbackLogDto implements Serializable {
+
+
+    private static final long serialVersionUID = -2975178830254824276L;
+
+    private String logId;
+    private ReturnResult returnResult;
+}

byit-myth-executor/myth-executor-plugin/src/main/java/com/byit/utils/JobUtils.java

@@ -2,9 +2,11 @@ package com.byit.utils;
 
 import cn.hutool.http.HttpRequest;
 import com.alibaba.fastjson.JSON;
+import com.byit.dto.api.JavaCallbackLogDto;
 import com.byit.dto.executor.PluginBeanJobInfo;
 import com.byit.dto.plugin.*;
 import com.byit.dto.web.ResponseResult;
+import com.byit.dto.web.ReturnResult;
 import com.byit.executor.handler.interfaces.IJobHandler;
 import lombok.extern.slf4j.Slf4j;
 
@@ -108,6 +110,11 @@ public class JobUtils {
      * 获取节点运行的统计数据
      */
     public static final String REQUEST_LOADNODESTATISTICDATA = "/api/flow/loadNodeStatisticData";
+
+    /**
+     * ddmp平台修改java接口
+     */
+    public static final String JAVA_LOG_CALLBACK_DDMP = "/api/callback/ddmp/callbackRes";
     /**
      * 获取当前的工作流运行状态
      */
@@ -198,19 +205,6 @@ public class JobUtils {
         return JSON.parseObject(response, ResponseResult.class);
     }
 
-    public static void main(String[] args) {
-        JobUtils.setTOKEN("qqq");
-        JobUtils.setRequestUrl("http://10.0.120.208:8998/myth-job-admin");
-        JavaTask javaTask = new JavaTask();
-        javaTask.setTaskName("BaseLineWarnJob");
-        javaTask.setJobName("BaseLineWarnJob");
-        t t = new t();
-        t.setId("0000");
-        t.setTenant("");
-        javaTask.setParam(JSON.toJSONString(t));
-        System.out.println(JobUtils.runTask(javaTask));
-    }
-
     /**
      * 暂停指定的工作流
      * @param runId
@@ -236,6 +230,22 @@ public class JobUtils {
         return JSON.parseObject(response, ResponseResult.class);
     }
 
+    public static ResponseResult javaUpdateStatusRunResult(JavaCallbackLogDto javaCallbackLogDto){
+        log.debug("---------------开始修改任务{}---------------------", javaCallbackLogDto);
+        String httpRequest = createHttpRequest(JAVA_LOG_CALLBACK_DDMP, JSON.toJSONString(javaCallbackLogDto));
+        log.debug("--------------------修改任务完成，添加结果为：{}------------------------", httpRequest);
+        return JSON.parseObject(httpRequest, ResponseResult.class);
+    }
+
+    public static void main(String[] args) {
+        JobUtils.setTOKEN("qqq");
+        JobUtils.setRequestUrl("http://127.0.0.1:8998/myth-job-admin");
+        JavaCallbackLogDto javaCallbackLogDto = new JavaCallbackLogDto();
+        javaCallbackLogDto.setLogId("123");
+        javaCallbackLogDto.setReturnResult(ReturnResult.SUCCESS);
+        JobUtils.javaUpdateStatusRunResult(javaCallbackLogDto);
+    }
+
     /**
      * 发布一个工作流
      * @param pluginPackage
@@ -737,24 +747,4 @@ public class JobUtils {
         return path;
     }
 
-}
-class t{
-    private String tenant;
-    private String id;
-
-    public String getTenant() {
-        return tenant;
-    }
-
-    public void setTenant(String tenant) {
-        this.tenant = tenant;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
 }
\ No newline at end of file