From cd9dc41da6749bf2ae965eb2651e494d0ef89ad5 Mon Sep 17 00:00:00 2001 From: majintao Date: Sun, 27 Apr 2025 15:32:49 +0800 Subject: [PATCH] =?UTF-8?q?BaseBatch=E8=84=9A=E6=9C=AC=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E6=8F=90=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fangjia/script/BaseBatch.groovy | 32 ++++++++++++++++--- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/BaseBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/BaseBatch.groovy index 39edb1dfe..9293f2bac 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/BaseBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/BaseBatch.groovy @@ -96,7 +96,7 @@ abstract class BaseBatch { exception = true e.printStackTrace() __jms.monitor(batchName, '', extraData, e) - def msg = "脚本发生异常 BatchName:${batchName}\t" + def msg = "脚本发生异常错误 BatchName:${batchName}\t" def batchOwner = getBatchOwner(batch) if(batchOwner && batchOwner.size() > 0){ def owner = null @@ -110,8 +110,9 @@ abstract class BaseBatch { if(e){ msg += "\tException:" + e.getClass().name } - if(SystemUtils.IS_OS_LINUX){ - sendDingDingMsg("2307d2fec8314b3e8b4b83dd1d42da2e2051638e3e668f21e77ca01258bf682c",msg) + def phoneNum = getBatchPhones(batch) + if(true){ + sendDingDingMsg("ae14f50045e9375c354940a2afb86f14e453bd1f08f78da0ba6e788d35bccec4",msg, phoneNum) try { Map params = new HashMap(); @@ -174,6 +175,27 @@ abstract class BaseBatch { return ret } + static def getBatchPhones(BaseBatch bb) { + def phones = [] + try { + BatchOwner annotation = AnnotationUtils.findAnnotation(bb.getClass(), BatchOwner.class) + if (annotation) { + annotation.value().each { + def map = it.toMap() + if (map?.mobile) { + phones << map.mobile + } + } + } else { + bb.logWarn('!!!请使用' + BatchOwner.class.getName() + '注解标明本Batch的拥有者!!!') + } + } catch (Exception e) { + bb.logWarn('!!!解析BatchOwner失败!!!', e) + } + return phones[0] ? phones[0] : "" + } + + static def getBatchDescribe(BaseBatch bb){ try { BatchOwner annotation = AnnotationUtils.findAnnotation(bb.getClass(), BatchOwner.class) @@ -217,8 +239,8 @@ abstract class BaseBatch { __jms.sendDingMsg(mobile, msg) } - def static sendDingDingMsg(String token, String msg){ - DingDingMessageUtil.sendTextMessage(token, msg); + def static sendDingDingMsg(String token, String msg, String phoneNum){ + DingDingMessageUtil.sendTextMessageAndAt(token, msg, phoneNum); } // def static getProp(String key){