From 907641e56c2085aaa81f267946dc3e3e9fca73e7 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 18 九月 2024 09:39:02 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/CommonTaskServiceImpl.java | 68 ++++++++++++++++++++-------------
1 files changed, 41 insertions(+), 27 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 a51c4e9..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,6 +44,7 @@
@Override
public Integer taskSend(SendTaskVO sendTaskVO) {
+
if (sendTaskVO.getTaskId() == null || sendTaskVO.getTaskType() == null)
throw new BaseException("浠诲姟ID鎴栬�呬换鍔＄被鍨嬩笉鑳戒负绌猴紝璇锋鏌ュ悗锛屽啀杩涜鎵ц");
if (sendTaskVO.getTaskType() == 1) {
@@ -54,8 +55,9 @@
return wjSend(sendTaskVO);
} else if (sendTaskVO.getTaskType() == 3) {
//瀹ｆ暀
- xjSend(sendTaskVO);
+ return xjSend(sendTaskVO);
}
+ log.error("璧板埌杩欓噷浜嗗槢");
return null;
}
@@ -67,8 +69,8 @@
serviceTask.setTaskid(sendTaskVO.getTaskId());
serviceTask.setStopState(ivrTask.getStopState() + 1);
serviceTask.setSendState(sendTaskVO.getSendState());
- ivrTaskService.updateServiceTask(serviceTask);
- return 0;
+ int i = ivrTaskService.updateServiceTask(serviceTask);
+ return i;
}
//鍒ゆ柇鍙戦�佺姸鎬佹槸鍚︿负绌�
@@ -80,12 +82,15 @@
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.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")) {
//鏃堕棿娈靛彂閫�
ObjectMapper objectMapper = new ObjectMapper();
@@ -98,9 +103,9 @@
log.error("JsonProcessingException鎶ラ敊浜嗭細{}", e.getMessage());
}
for (TaskSendTimeVO taskSendTimeVO : taskSendTimeVOList) {
- //鍘籗endTimeslot涓紝鑾峰彇鎵�鏈夌殑鏃堕棿娈�
- List<TaskSendTimeVO> list = new ArrayList<>();
- list.add(taskSendTimeVO);
+// //鍘籗endTimeslot涓紝鑾峰彇鎵�鏈夌殑鏃堕棿娈�
+// List<TaskSendTimeVO> list = new ArrayList<>();
+// list.add(taskSendTimeVO);
//鑾峰彇寮�濮嬪彂閫佹椂闂�
String begantime = taskSendTimeVO.getBegantime();
@@ -111,19 +116,20 @@
Date date = sdf.parse(begantime);
milliseconds = date.getTime() - System.currentTimeMillis();
System.out.println("鏃ユ湡姣鏁帮細" + milliseconds);
+ SendTaskVO sendTaskVO1 = DtoConversionUtils.sourceToTarget(sendTaskVO, SendTaskVO.class);
+ sendTaskVO1.setSendType("1");
+ String content = sendMQContent(sendTaskVO1, ivrTask.getTemplateid().toString(), ivrTask.getPreachform(), ivrTask.getStopState(), taskSendTimeVO);
+ redisCache.setCacheObject(content, content, milliseconds / 1000, TimeUnit.SECONDS);
} catch (Exception e) {
e.printStackTrace();
+ if (milliseconds < 0) throw new BaseException("璇锋鏌ヤ换鍔″紑濮嬫椂闂达紝涓嶈兘灏忎簬褰撳墠鏃堕棿");
}
-
- SendTaskVO sendTaskVO1 = DtoConversionUtils.sourceToTarget(sendTaskVO, SendTaskVO.class);
- sendTaskVO1.setSendType("1");
- String content = sendMQContent(sendTaskVO1, ivrTask.getTemplateid().toString(), ivrTask.getPreachform(), ivrTask.getStopState(), list);
- redisCache.setCacheObject(content, content, milliseconds / 1000, TimeUnit.SECONDS);
}
//灏嗕换鍔＄姸鎬佷慨鏀规垚鎵ц涓�
ServiceTask serviceTask = new ServiceTask();
serviceTask.setTaskid(ivrTask.getTaskid());
- serviceTask.setSendState(2);
+ serviceTask.setSendState(2L);
+ serviceTask.setStopState(null);
ivrTaskService.updateServiceTask(serviceTask);
}
}
@@ -138,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;
}
//鍒ゆ柇鍙戦�佺姸鎬佹槸鍚︿负绌�
@@ -156,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")) {
//鏃堕棿娈靛彂閫�
@@ -171,8 +178,8 @@
}
for (TaskSendTimeVO taskSendTimeVO : taskSendTimeVOList) {
//鍘籗endTimeslot涓紝鑾峰彇鎵�鏈夌殑鏃堕棿娈�
- List<TaskSendTimeVO> list = new ArrayList<>();
- list.add(taskSendTimeVO);
+// List<TaskSendTimeVO> list = new ArrayList<>();
+// list.add(taskSendTimeVO);
//鑾峰彇寮�濮嬪彂閫佹椂闂�
String begantime = taskSendTimeVO.getBegantime();
@@ -182,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();
@@ -189,13 +199,14 @@
SendTaskVO sendTaskVO1 = DtoConversionUtils.sourceToTarget(sendTaskVO, SendTaskVO.class);
sendTaskVO1.setSendType("1");
- String content = sendMQContent(sendTaskVO1, serviceTask1.getTemplateid().toString(), serviceTask1.getPreachform(), serviceTask1.getStopState(), list);
+ String content = sendMQContent(sendTaskVO1, serviceTask1.getTemplateid().toString(), serviceTask1.getPreachform(), serviceTask1.getStopState(), taskSendTimeVO);
redisCache.setCacheObject(content, content, milliseconds / 1000, TimeUnit.SECONDS);
}
//灏嗕换鍔＄姸鎬佷慨鏀规垚鎵ц涓�
ServiceTask serviceTask = new ServiceTask();
serviceTask.setTaskid(serviceTask1.getTaskid());
- serviceTask.setSendState(2);
+ serviceTask.setSendState(2L);
+ serviceTask.setStopState(null);
iServiceTaskService.updateServiceTask(serviceTask);
}
}
@@ -228,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")) {
//鏃堕棿娈靛彂閫�
@@ -243,8 +256,8 @@
}
for (TaskSendTimeVO taskSendTimeVO : taskSendTimeVOList) {
//鍘籗endTimeslot涓紝鑾峰彇鎵�鏈夌殑鏃堕棿娈�
- List<TaskSendTimeVO> list = new ArrayList<>();
- list.add(taskSendTimeVO);
+// List<TaskSendTimeVO> list = new ArrayList<>();
+// list.add(taskSendTimeVO);
//鑾峰彇寮�濮嬪彂閫佹椂闂�
String begantime = taskSendTimeVO.getBegantime();
@@ -261,13 +274,14 @@
SendTaskVO sendTaskVO1 = DtoConversionUtils.sourceToTarget(sendTaskVO, SendTaskVO.class);
sendTaskVO1.setSendType("1");
- String content = sendMQContent(sendTaskVO1, serviceTask1.getTemplateid().toString(), serviceTask1.getPreachform(), serviceTask1.getStopState(), list);
+ String content = sendMQContent(sendTaskVO1, serviceTask1.getTemplateid().toString(), serviceTask1.getPreachform(), serviceTask1.getStopState(), taskSendTimeVO);
redisCache.setCacheObject(content, content, milliseconds / 1000, TimeUnit.SECONDS);
}
//灏嗕换鍔＄姸鎬佷慨鏀规垚鎵ц涓�
ServiceTask serviceTask = new ServiceTask();
serviceTask.setTaskid(serviceTask1.getTaskid());
- serviceTask.setSendState(2);
+ serviceTask.setSendState(2L);
+ serviceTask.setStopState(null);
iServiceTaskService.updateServiceTask(serviceTask);
}
}
@@ -284,7 +298,7 @@
* @param sendTimeslot
* @return
*/
- private String sendMQContent(SendTaskVO sendTaskVO, String templateid, String preachform, Long stopState, List<TaskSendTimeVO> sendTimeslot) {
+ private String sendMQContent(SendTaskVO sendTaskVO, String templateid, String preachform, Long stopState, TaskSendTimeVO sendTimeslot) {
CommonTaskcallMQ commonTaskcallMQ = new CommonTaskcallMQ();
commonTaskcallMQ.setTaskid(sendTaskVO.getTaskId());
commonTaskcallMQ.setSendType(sendTaskVO.getSendType());
--
Gitblit v1.9.3