aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-06-18 00:19:15 +08:00
parent bc924cd3ee
commit ea833287db
2 changed files with 52 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
View File

@ -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("发送成功");
}
}

36
emis-biz/src/main/java/com/xdadan/erp/emis/task/LogisticTask.java
View File

@ -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);
// }
/**