diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java index 1262dd652..42c0f28c5 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java @@ -425,10 +425,14 @@ public class EmisCommonController extends EmisBaseController } - @RequestMapping("/autoDoSendSmsTest") - public AjaxResult autoDoSendSmsTest(){ - String lockKey="autoDoSendSmsTest"; - log.error("autoDoSendSmsTest start"); + /** + * 短信发送触发 + * @return + */ + @RequestMapping("/autoDoSendSmsTrigger") + public AjaxResult autoDoSendSmsTrigger(){ + String lockKey="autoDoSendSmsTrigger"; + log.error("autoDoSendSmsTrigger start"); // 加锁查询 redissonService.lock(lockKey,300); @@ -436,13 +440,37 @@ public class EmisCommonController extends EmisBaseController emisBaseService.autoDoSmsSend(); }catch(Exception ex){ ex.printStackTrace(); - log.error("autoDoSendSmsTest exception:"+ex.getMessage()); + log.error("autoDoSendSmsTrigger exception:"+ex.getMessage()); } - log.error("autoDoSendSmsTest end"); + log.error("autoDoSendSmsTrigger end"); redissonService.unlock(lockKey); return AjaxResult.success("发送成功"); } + + /** + * 物流轨迹采集触发 + * @return + */ + @RequestMapping("/autoDoQueryTransferInfoTrigger") + public AjaxResult autoDoQueryTransferInfoTrigger(){ + String lockKey="autoDoQueryTransferInfoTrigger"; + log.error("autoDoQueryTransferInfoTrigger start"); + + // 加锁查询 + redissonService.lock(lockKey,300); + try{ + emisBaseService.doTransferTraceUpdate(); + }catch(Exception ex){ + ex.printStackTrace(); + log.error("autoDoQueryTransferInfoTrigger exception:"+ex.getMessage()); + } + log.error("autoDoQueryTransferInfoTrigger end"); + + redissonService.unlock(lockKey); + return AjaxResult.success("发送成功"); + } + } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/task/LogisticTask.java b/emis-biz/src/main/java/com/xdadan/erp/emis/task/LogisticTask.java index 1996683b7..1178fd3b1 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/task/LogisticTask.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/task/LogisticTask.java @@ -35,24 +35,24 @@ public class LogisticTask { /** * 自动查询转件物流信息 */ - @Async - @Scheduled(fixedRate = 1000L * 60 * 5) - public void autoDoQueryTransferInfo() { - String lockKey="autoDoQueryTransferInfo"; - log.error("autoDoQueryTransferInfo start"); - - // 加锁查询 - redissonService.lock(lockKey,300); - try{ - emisBaseService.doTransferTraceUpdate(); - }catch(Exception ex){ - ex.printStackTrace(); - log.error("autoDoQueryTransferInfo exception:"+ex.getMessage()); - } - log.error("autoDoQueryTransferInfo end"); - - redissonService.unlock(lockKey); - } +// @Async +// @Scheduled(fixedRate = 1000L * 60 * 5) +// public void autoDoQueryTransferInfo() { +// String lockKey="autoDoQueryTransferInfo"; +// log.error("autoDoQueryTransferInfo start"); +// +// // 加锁查询 +// redissonService.lock(lockKey,300); +// try{ +// emisBaseService.doTransferTraceUpdate(); +// }catch(Exception ex){ +// ex.printStackTrace(); +// log.error("autoDoQueryTransferInfo exception:"+ex.getMessage()); +// } +// log.error("autoDoQueryTransferInfo end"); +// +// redissonService.unlock(lockKey); +// } /**