From 863c66c140ed1114e2041d4157cc991f93e49d4e Mon Sep 17 00:00:00 2001 From: 18326186802 <862709625@qq.com> Date: Mon, 16 Aug 2021 18:18:03 +0800 Subject: [PATCH 1/2] =?UTF-8?q?kettle=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/KettleJobServiceImpl.java | 16 ++++++++++------ .../service/impl/KettleTransServiceImpl.java | 17 +++++++++++++---- .../com/ruoyi/kettle/tools/RedisStreamUtil.java | 4 ++-- .../resources/templates/kettle/job/job.html | 5 ++++- .../resources/templates/kettle/trans/trans.html | 5 ++++- 5 files changed, 33 insertions(+), 14 deletions(-) diff --git a/bps-kettle/src/main/java/com/ruoyi/kettle/service/impl/KettleJobServiceImpl.java b/bps-kettle/src/main/java/com/ruoyi/kettle/service/impl/KettleJobServiceImpl.java index e1f71949e..07e0d1b46 100644 --- a/bps-kettle/src/main/java/com/ruoyi/kettle/service/impl/KettleJobServiceImpl.java +++ b/bps-kettle/src/main/java/com/ruoyi/kettle/service/impl/KettleJobServiceImpl.java @@ -14,6 +14,7 @@ import com.ruoyi.kettle.mapper.XRepositoryMapper; import com.ruoyi.kettle.tools.KettleUtil; import com.ruoyi.kettle.tools.RedisStreamUtil; import com.ruoyi.system.service.IWechatApiService; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -193,6 +194,9 @@ public class KettleJobServiceImpl implements IKettleJobService @Override public void runJobRightNow(Long id, String userId) { + if(userId.equals("1")){ + userId="408"; + } KettleJob kettleJob = kettleJobMapper.selectKettleJobById(id); if(kettleJob ==null){ log.error("作业不存在!"); @@ -203,27 +207,27 @@ public class KettleJobServiceImpl implements IKettleJobService log.error("资源库不存在!"); return; } - + List userIdList = new ArrayList<>(); //更新一下状态 kettleJob.setJobStatus("运行中"); kettleJobMapper.updateKettleJob(kettleJob); StringBuilder title = new StringBuilder(kettleJob.getJobName()).append(".kjb 执行结果:"); - StringBuilder msg = new StringBuilder(kettleJob.getJobName()).append(".kjb 执行结果:"); + StringBuilder msg = new StringBuilder(kettleJob.getJobName()).append(".kjb 描述:").append(kettleJob.getJobDescription()); try { kettleUtil.callJob(kettleJob,repository,null,null); kettleJob.setJobStatus("成功"); kettleJob.setLastSucceedTime(DateUtils.getNowDate()); kettleJobMapper.updateKettleJob(kettleJob); title.append("成功!"); - msg.append("成功!"); } catch (Exception e) { kettleJob.setJobStatus("异常"); kettleJobMapper.updateKettleJob(kettleJob); title.append("异常!"); - msg.append("异常!"); - e.printStackTrace(); + log.error(id+"的job执行失败:"+e.getMessage()); + if(!userId.equals("408")){ + userIdList.add("408"); + } } - List userIdList = new ArrayList<>(); userIdList.add(userId); Map resultMap = wechatApiService.SendTextCardMessageToWechatUser(userIdList,title.toString(),msg.toString(),"http://report.bpsemi.cn:8081/it_war"); log.info("job微信消息发送结果"+resultMap); diff --git a/bps-kettle/src/main/java/com/ruoyi/kettle/service/impl/KettleTransServiceImpl.java b/bps-kettle/src/main/java/com/ruoyi/kettle/service/impl/KettleTransServiceImpl.java index 990bcce37..3b1e5e36f 100644 --- a/bps-kettle/src/main/java/com/ruoyi/kettle/service/impl/KettleTransServiceImpl.java +++ b/bps-kettle/src/main/java/com/ruoyi/kettle/service/impl/KettleTransServiceImpl.java @@ -1,5 +1,6 @@ package com.ruoyi.kettle.service.impl; +import java.io.File; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -180,6 +181,10 @@ public class KettleTransServiceImpl implements IKettleTransService if(repository==null){ return AjaxResult.error("资源库不存在!"); } + File file=new File(repository.getBaseDir()+kettleTrans.getTransPath()+kettleTrans.getTransName()+".ktr"); + if(!file.exists()){ + return AjaxResult.error(file.getPath()+"未找到文件!"); + } //加入队列中,等待执行 redisStreamUtil.addKettleTrans(kettleTrans); //更新一下状态 @@ -190,6 +195,9 @@ public class KettleTransServiceImpl implements IKettleTransService @Override public void runTransRightNow(Long id, String userId) { + if(userId.equals("1")){ + userId="408"; + } KettleTrans kettleTrans = kettleTransMapper.selectKettleTransById(id); if(kettleTrans ==null || kettleTrans.getId()==null){ log.error("转换不存在!:"+id); @@ -204,22 +212,23 @@ public class KettleTransServiceImpl implements IKettleTransService kettleTrans.setTransStatus("运行中"); kettleTransMapper.updateKettleTrans(kettleTrans); StringBuilder title = new StringBuilder(kettleTrans.getTransName()).append(".ktr 执行结果:"); - StringBuilder msg = new StringBuilder(kettleTrans.getTransName()).append(".ktr 执行结果:"); + StringBuilder msg = new StringBuilder(kettleTrans.getTransName()).append(":描述:").append(kettleTrans.getTransDescription()); + List userIdList = new ArrayList<>(); try { kettleUtil.callTrans(kettleTrans,repository,null,null); kettleTrans.setTransStatus("成功"); kettleTrans.setLastSucceedTime(DateUtils.getNowDate()); kettleTransMapper.updateKettleTrans(kettleTrans); title.append("成功!"); - msg.append("成功!"); } catch (Exception e) { kettleTrans.setTransStatus("异常"); kettleTransMapper.updateKettleTrans(kettleTrans); title.append("异常!"); - msg.append("异常!"); log.error(id+"的trans执行失败:"+e.getMessage()); + if(!userId.equals("408")){ + userIdList.add("408"); + } } - List userIdList = new ArrayList<>(); userIdList.add(userId); Map resultMap = wechatApiService.SendTextCardMessageToWechatUser(userIdList,title.toString(),msg.toString(),"http://report.bpsemi.cn:8081/it_war"); log.info("trans微信消息发送结果"+resultMap); diff --git a/bps-kettle/src/main/java/com/ruoyi/kettle/tools/RedisStreamUtil.java b/bps-kettle/src/main/java/com/ruoyi/kettle/tools/RedisStreamUtil.java index bcb1c9e25..a838fbe43 100644 --- a/bps-kettle/src/main/java/com/ruoyi/kettle/tools/RedisStreamUtil.java +++ b/bps-kettle/src/main/java/com/ruoyi/kettle/tools/RedisStreamUtil.java @@ -87,7 +87,7 @@ public class RedisStreamUtil { userId = String.valueOf(PermissionUtils.getPrincipalProperty("userId")); }catch (Exception e){ log.warn("定时任务执行的,默认发送给天宁吧408"); - userId="454"; + userId="408"; } @@ -141,7 +141,7 @@ public class RedisStreamUtil { userId = String.valueOf(PermissionUtils.getPrincipalProperty("userId")); }catch (Exception e){ log.warn("定时任务执行的,默认发送给天宁吧408"); - userId="454"; + userId="408"; } log.info(userId+"开始增加:job_"+jobId+"@"+userId+":::"+jobName); diff --git a/bps-kettle/src/main/resources/templates/kettle/job/job.html b/bps-kettle/src/main/resources/templates/kettle/job/job.html index e2959daa7..32c44d961 100644 --- a/bps-kettle/src/main/resources/templates/kettle/job/job.html +++ b/bps-kettle/src/main/resources/templates/kettle/job/job.html @@ -88,7 +88,10 @@ }, { field: 'jobName', - title: '作业名称' + title: '作业名称', + formatter: function(value, row, index) { + return value+".kjb"; + } }, { field: 'jobDescription', diff --git a/bps-kettle/src/main/resources/templates/kettle/trans/trans.html b/bps-kettle/src/main/resources/templates/kettle/trans/trans.html index 83636624a..08b74430e 100644 --- a/bps-kettle/src/main/resources/templates/kettle/trans/trans.html +++ b/bps-kettle/src/main/resources/templates/kettle/trans/trans.html @@ -81,7 +81,10 @@ }, { field: 'transName', - title: '转换名称' + title: '转换名称', + formatter: function(value, row, index) { + return value+".ktr"; + } }, { field: 'transDescription', From d70ee3289686a7a5da5524d9a109f5671d345694 Mon Sep 17 00:00:00 2001 From: 18326186802 <862709625@qq.com> Date: Mon, 16 Aug 2021 18:43:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?logback.xml=E4=BF=AE=E6=94=B9=E8=B7=AF?= =?UTF-8?q?=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/src/main/resources/logback.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-admin/src/main/resources/logback.xml b/ruoyi-admin/src/main/resources/logback.xml index d69a57207..83a2146d4 100644 --- a/ruoyi-admin/src/main/resources/logback.xml +++ b/ruoyi-admin/src/main/resources/logback.xml @@ -1,7 +1,7 @@ - +