From a24d7c5345cddb9454c351aae0637ed90333a934 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 16 七月 2024 17:57:07 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/CommonTaskServiceImpl.java | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/impl/CommonTaskServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/CommonTaskServiceImpl.java
index 12442f3..0ebbae6 100644
--- a/smartor/src/main/java/com/smartor/service/impl/CommonTaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/CommonTaskServiceImpl.java
@@ -44,17 +44,19 @@
@Override
public Integer taskSend(SendTaskVO sendTaskVO) {
- if (sendTaskVO.getTaskId() == null || sendTaskVO.getTaskType() == null)
- throw new BaseException("浠诲姟ID鎴栬�呬换鍔＄被鍨嬩笉鑳戒负绌猴紝璇锋鏌ュ悗锛屽啀杩涜鎵ц");
- if (sendTaskVO.getTaskType() == 1) {
- //闅忚
- return sfSend(sendTaskVO);
- } else if (sendTaskVO.getTaskType() == 2) {
- //闂嵎
- return wjSend(sendTaskVO);
- } else if (sendTaskVO.getTaskType() == 3) {
- //瀹ｆ暀
- xjSend(sendTaskVO);
+ synchronized (CommonTaskServiceImpl.class) {
+ if (sendTaskVO.getTaskId() == null || sendTaskVO.getTaskType() == null)
+ throw new BaseException("浠诲姟ID鎴栬�呬换鍔＄被鍨嬩笉鑳戒负绌猴紝璇锋鏌ュ悗锛屽啀杩涜鎵ц");
+ if (sendTaskVO.getTaskType() == 1) {
+ //闅忚
+ return sfSend(sendTaskVO);
+ } else if (sendTaskVO.getTaskType() == 2) {
+ //闂嵎
+ return wjSend(sendTaskVO);
+ } else if (sendTaskVO.getTaskType() == 3) {
+ //瀹ｆ暀
+ xjSend(sendTaskVO);
+ }
}
return null;
}
@@ -80,11 +82,11 @@
String content = sendMQContent(sendTaskVO, ivrTask.getTemplateid().toString(), ivrTask.getPreachform(), ivrTask.getStopState(), null);
//绔嬪嵆鍙戦��
redisCache.setCacheObject(content, content, 1, TimeUnit.SECONDS);
-
//灏嗕换鍔＄姸鎬佷慨鏀规垚鎵ц涓�
ServiceTask serviceTask = new ServiceTask();
serviceTask.setTaskid(ivrTask.getTaskid());
serviceTask.setSendState(2);
+ serviceTask.setStopState(ivrTask.getStopState());
ivrTaskService.updateServiceTask(serviceTask);
log.error("娑堟伅鍙戦�佹垚鍔�");
} else if (StringUtils.isNotEmpty(sendTaskVO.getSendType()) && sendTaskVO.getSendType().equals("1") || StringUtils.isNotEmpty(sendTaskVO.getSendType()) && sendTaskVO.getSendType().equals("3")) {
@@ -118,8 +120,7 @@
redisCache.setCacheObject(content, content, milliseconds / 1000, TimeUnit.SECONDS);
} catch (Exception e) {
e.printStackTrace();
- if (milliseconds < 0)
- throw new BaseException("璇锋鏌ヤ换鍔″紑濮嬫椂闂达紝涓嶈兘灏忎簬褰撳墠鏃堕棿");
+ if (milliseconds < 0) throw new BaseException("璇锋鏌ヤ换鍔″紑濮嬫椂闂达紝涓嶈兘灏忎簬褰撳墠鏃堕棿");
}
}
//灏嗕换鍔＄姸鎬佷慨鏀规垚鎵ц涓�
@@ -128,7 +129,8 @@
serviceTask.setSendState(2);
ivrTaskService.updateServiceTask(serviceTask);
}
- } return 1;
+ }
+ return 1;
}
public int wjSend(SendTaskVO sendTaskVO) {
--
Gitblit v1.9.3