JAVA节点支持 日志信息推送

byit-myth-admin/src/main/java/com/byit/service/impl/ApiNodeServiceImpl.java

@@ -208,7 +208,6 @@ public class ApiNodeServiceImpl implements ApiNodeService {
         if (null != javaTask.getAlarmlAction() && "0".equals(javaTask.getRepeatCount())){
             ValidationUtil.dataNotBank(javaTask.getAlarmEmail(), "设置为告警时告警邮箱不允许为空");
         }
-
         TimerTask timerTask = new JavaTaskJobTask(javaTask);
         WorkRoulette.addJob(timerTask, System.currentTimeMillis());
     }

byit-myth-core/myth-admin-core/src/main/java/com/byit/task/JavaTaskJobTask.java

 package com.byit.task;
 
+import com.alibaba.fastjson.JSON;
 import com.byit.conf.MythJobAutoConfigure;
 import com.byit.dto.plugin.JavaTask;
+import com.byit.dto.plugin.RunLog;
 import com.byit.enums.NodeRunStatusPropertyEnum;
 import com.byit.enums.ScheduleTypeEnum;
 import com.byit.enums.task.RunResultEnum;
@@ -15,9 +17,13 @@ import com.byit.util.ServiceInfoUtil;
 import com.byit.util.SpringUtil;
 import io.netty.util.Timeout;
 import io.netty.util.TimerTask;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.data.redis.core.StringRedisTemplate;
 
 import java.util.Date;
 
+import static com.alibaba.fastjson.serializer.SerializerFeature.WriteClassName;
+
 /**
  * java节点的执行器
  * @author huangfu
@@ -37,6 +43,7 @@ public class JavaTaskJobTask implements TimerTask {
     }
 
     private void runJob(){
+        String noticeKey = javaTask.getNoticeKey();
         RunJavaServiceImpl service = SpringUtil.getBean(RunJavaServiceImpl.class);
         PluginRpcRequestPacket request = new PluginRpcRequestPacket();
         //保存到日志
@@ -49,6 +56,9 @@ public class JavaTaskJobTask implements TimerTask {
         communicationParam.setLogId(logId+"");
         communicationParam.setCallbackUrl(callbackUrl);
         communicationParam.setBody(javaTask.getParam());
+        if(StringUtils.isNoneBlank(noticeKey)) {
+            communicationParam.setExpand1(noticeKey);
+        }
 
         request.setParam(communicationParam);
         request.setJobName(javaTask.getTaskName());
@@ -63,11 +73,26 @@ public class JavaTaskJobTask implements TimerTask {
             }
             log.setTriggerMsg(pluginRpcResponsePacket.getMsg());
             log.setJobGroupIp(pluginRpcResponsePacket.getRunIp());
+            //如果需要通知redis
+            if(StringUtils.isNoneBlank(noticeKey)) {
+                StringRedisTemplate stringRedisTemplate = (StringRedisTemplate) SpringUtil.getBean("stringRedisTemplate");
+                RunLog runLog = RunLog.builder().isEnd(false).isSuccess(true).runLog("资源调用成功！").build();
+                stringRedisTemplate.opsForList().rightPush(noticeKey , JSON.toJSONString(runLog, WriteClassName));
+            }
         }catch (Exception e){
+
             log.setTriggerCode(RunResultEnum.TRIGGER_ERROR.getCode());
             log.setRunCode(RunResultEnum.RUN_ERROR.getCode());
             log.setRunMsg(javaTask.getTaskName()+":"+e.getMessage());
             log.setTriggerMsg(javaTask.getTaskName()+":"+e.getMessage());
+            //如果需要通知redis
+            if(StringUtils.isNoneBlank(noticeKey)) {
+                StringRedisTemplate stringRedisTemplate = (StringRedisTemplate) SpringUtil.getBean("stringRedisTemplate");
+                RunLog runLog = RunLog.builder().isEnd(true).isSuccess(false).runLog("执行资源异常" +  javaTask.getTaskName()+":"+e.getMessage()).build();
+                stringRedisTemplate.opsForList().rightPush(noticeKey , JSON.toJSONString(runLog, WriteClassName));
+            }
+
+
         }
         JobTaskRunLogServiceImpl jobTaskRunLogService = SpringUtil.getBean(JobTaskRunLogServiceImpl.class);
         jobTaskRunLogService.updateJobTaskRunLogWithBLOBs(log);

byit-myth-core/myth-dto-core/src/main/java/com/byit/dto/plugin/JavaTask.java

@@ -86,6 +86,11 @@ public class JavaTask implements Serializable {
     private String jobType;
 
     /**
+     * 通知主键
+     */
+    private String noticeKey;
+
+    /**
      */
     private static final long serialVersionUID = 1L;
 }

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

@@ -159,7 +159,7 @@ public class JobUtils {
      */
     private static final String REQUEST_LOADSTATUS_JAVATASK = "/api/node/loadCurrentStatusByJobName";
     private static final String STOP_SCHEDULE_BY_RUNID = "/api/flow/stopScheduleByRunId";
-    /**
+    /*J*
      * 当前项目运行环境   jar    file
      */
     private static final String OPERATING_ENVIRONMENT_JAR = "jar";

byit-plugin-core/byit-plugin-rpc-common/src/main/java/com/byit/param/CommunicationParam.java

@@ -22,4 +22,20 @@ public class CommunicationParam implements Serializable {
      * 服务端参数
      */
     private String body;
+    /**
+     * 扩展字段1
+     */
+    private String expand1;
+    /**
+     * 扩展字段2
+     */
+    private String expand2;
+    /**
+     * 扩展字段3
+     */
+    private String expand3;
+    /**
+     * 扩展字段4
+     */
+    private String expand4;
 }