diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/SyncAccountsJobAbstract.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/SyncAccountsJobAbstract.java index 3d8c028..282378e 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/SyncAccountsJobAbstract.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/SyncAccountsJobAbstract.java @@ -91,25 +91,26 @@ public abstract class SyncAccountsJobAbstract { private static final String REQUEST_GENERATE_TOKEN_PATH = REQUEST_ROOT_PATH + "/v1/common/auth/selfBuiltApp/generateToken"; private Boolean asynchronousCheck(LocalDateTime now, String cjt) { - int hour = now.getHour(); - if ((hour == 1 && CjtAccountEnum.ONE.getCode().equals(cjt)) - || (hour == 3 && CjtAccountEnum.TWO.getCode().equals(cjt))) { - //目前只给畅捷通账号二加工单开补偿 -// if ((AppType.SYNC_CJT_MANUFACTURE_ORDER_DATA_TO_MULTI_TABLE.getCode().equals(syncLarkAppType().getCode()) -// && CjtAccountEnum.TWO.getCode().equals(cjt)) || (AppType.SYNC_CJT_SALE_DISPATCH_DATA_TO_MULTI_TABLE.getCode().equals(syncLarkAppType().getCode()) -// && CjtAccountEnum.ONE.getCode().equals(cjt))) { - String asynchronous = getAsynchronousKey(cjt); - Object cacheObject = redisCache.getCacheObject(asynchronous); - if (cacheObject != null) { - return Boolean.FALSE; - } - redisCache.setCacheObject(asynchronous, asynchronous, 2, TimeUnit.HOURS); - return Boolean.TRUE; -// } else { -// return false; -// } - } return false; +// int hour = now.getHour(); +// if ((hour == 1 && CjtAccountEnum.ONE.getCode().equals(cjt)) +// || (hour == 3 && CjtAccountEnum.TWO.getCode().equals(cjt))) { +// //目前只给畅捷通账号二加工单开补偿 +//// if ((AppType.SYNC_CJT_MANUFACTURE_ORDER_DATA_TO_MULTI_TABLE.getCode().equals(syncLarkAppType().getCode()) +//// && CjtAccountEnum.TWO.getCode().equals(cjt)) || (AppType.SYNC_CJT_SALE_DISPATCH_DATA_TO_MULTI_TABLE.getCode().equals(syncLarkAppType().getCode()) +//// && CjtAccountEnum.ONE.getCode().equals(cjt))) { +// String asynchronous = getAsynchronousKey(cjt); +// Object cacheObject = redisCache.getCacheObject(asynchronous); +// if (cacheObject != null) { +// return Boolean.FALSE; +// } +// redisCache.setCacheObject(asynchronous, asynchronous, 2, TimeUnit.HOURS); +// return Boolean.TRUE; +//// } else { +//// return false; +//// } +// } +// return false; } private String getAsynchronousKey(String cjt) { @@ -192,7 +193,7 @@ public abstract class SyncAccountsJobAbstract { redisCache.deleteObject(asynchronous); } else { String errorInfo = buildRobotErrorCountMessage2(e, queryFromTime, queryToTime); - if (!StringUtils.isEmpty(errorInfo) && !errorInfo.contains("openToken已失效")) { + if (!StringUtils.isEmpty(errorInfo) && !errorInfo.contains("openToken已失效") && !errorInfo.contains("会话过期请重新登录")) { larkRobotHelper.sendMessageByBot(ROBOT_GROUP, errorInfo); } // CJTRetryRequest request = new CJTRetryRequest(now, 1, cjt);