From 8d913e5594f45ca2a4ce656ea9feb99ffe715913 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 29 十一月 2024 18:44:58 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/CommonTaskServiceImpl.java | 55 +++++++++++++++++++++++++++++++++----------------------
1 files changed, 33 insertions(+), 22 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 668da8d..22ce775 100644
--- a/smartor/src/main/java/com/smartor/service/impl/CommonTaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/CommonTaskServiceImpl.java
@@ -44,20 +44,20 @@
@Override
public Integer taskSend(SendTaskVO 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) {
- //瀹ｆ暀
- return xjSend(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) {
+ //瀹ｆ暀
+ return xjSend(sendTaskVO);
}
+ log.error("璧板埌杩欓噷浜嗗槢");
return null;
}
@@ -85,8 +85,10 @@
//灏嗕换鍔＄姸鎬佷慨鏀规垚鎵ц涓�
ServiceTask serviceTask = new ServiceTask();
serviceTask.setTaskid(ivrTask.getTaskid());
- serviceTask.setSendState(2);
- serviceTask.setStopState(ivrTask.getStopState());
+ serviceTask.setSendState(2L);
+ //涓嶇煡涓哄暐杩欐牱鍐欙紝鍏堝皢stopstate缃负null
+// serviceTask.setStopState(ivrTask.getStopState());
+ serviceTask.setStopState(null);
ivrTaskService.updateServiceTask(serviceTask);
log.error("娑堟伅鍙戦�佹垚鍔�");
} else if (StringUtils.isNotEmpty(sendTaskVO.getSendType()) && sendTaskVO.getSendType().equals("1") || StringUtils.isNotEmpty(sendTaskVO.getSendType()) && sendTaskVO.getSendType().equals("3")) {
@@ -126,7 +128,8 @@
//灏嗕换鍔＄姸鎬佷慨鏀规垚鎵ц涓�
ServiceTask serviceTask = new ServiceTask();
serviceTask.setTaskid(ivrTask.getTaskid());
- serviceTask.setSendState(2);
+ serviceTask.setSendState(2L);
+ serviceTask.setStopState(null);
ivrTaskService.updateServiceTask(serviceTask);
}
}
@@ -141,8 +144,8 @@
serviceTask.setTaskid(sendTaskVO.getTaskId());
serviceTask.setStopState(serviceTask1.getStopState() + 1);
serviceTask.setSendState(sendTaskVO.getSendState());
- iServiceTaskService.updateServiceTask(serviceTask);
- return 0;
+ int i = iServiceTaskService.updateServiceTask(serviceTask);
+ return i;
}
//鍒ゆ柇鍙戦�佺姸鎬佹槸鍚︿负绌�
@@ -159,7 +162,8 @@
//灏嗕换鍔＄姸鎬佷慨鏀规垚鎵ц涓�
ServiceTask serviceTask = new ServiceTask();
serviceTask.setTaskid(serviceTask1.getTaskid());
- serviceTask.setSendState(2);
+ serviceTask.setSendState(2L);
+ serviceTask.setStopState(null);
iServiceTaskService.updateServiceTask(serviceTask);
} else if (StringUtils.isNotEmpty(sendTaskVO.getSendType()) && sendTaskVO.getSendType().equals("1") || StringUtils.isNotEmpty(sendTaskVO.getSendType()) && sendTaskVO.getSendType().equals("3")) {
//鏃堕棿娈靛彂閫�
@@ -185,6 +189,9 @@
try {
Date date = sdf.parse(begantime);
milliseconds = date.getTime() - System.currentTimeMillis();
+ if (milliseconds < 0) {
+ milliseconds = 1000L;
+ }
System.out.println("鏃ユ湡姣鏁帮細" + milliseconds);
} catch (Exception e) {
e.printStackTrace();
@@ -198,7 +205,8 @@
//灏嗕换鍔＄姸鎬佷慨鏀规垚鎵ц涓�
ServiceTask serviceTask = new ServiceTask();
serviceTask.setTaskid(serviceTask1.getTaskid());
- serviceTask.setSendState(2);
+ serviceTask.setSendState(2L);
+ serviceTask.setStopState(null);
iServiceTaskService.updateServiceTask(serviceTask);
}
}
@@ -231,7 +239,9 @@
//灏嗕换鍔＄姸鎬佷慨鏀规垚鎵ц涓�
ServiceTask serviceTask = new ServiceTask();
serviceTask.setTaskid(serviceTask1.getTaskid());
- serviceTask.setSendState(2);
+ serviceTask.setSendState(2L);
+ serviceTask.setSendType(1L);
+ serviceTask.setStopState(null);
iServiceTaskService.updateServiceTask(serviceTask);
} else if (StringUtils.isNotEmpty(sendTaskVO.getSendType()) && sendTaskVO.getSendType().equals("1") || StringUtils.isNotEmpty(sendTaskVO.getSendType()) && sendTaskVO.getSendType().equals("3")) {
//鏃堕棿娈靛彂閫�
@@ -270,7 +280,8 @@
//灏嗕换鍔＄姸鎬佷慨鏀规垚鎵ц涓�
ServiceTask serviceTask = new ServiceTask();
serviceTask.setTaskid(serviceTask1.getTaskid());
- serviceTask.setSendState(2);
+ serviceTask.setSendState(2L);
+ serviceTask.setStopState(null);
iServiceTaskService.updateServiceTask(serviceTask);
}
}
--
Gitblit v1.9.3