From bfdc738a7d11d7a132747c52fe51f6887405fae4 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 04 七月 2024 16:29:21 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/CommonTaskServiceImpl.java | 72 ++++++++++++++++++------------------
1 files changed, 36 insertions(+), 36 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 34d0dc1..ca3dcf8 100644
--- a/smartor/src/main/java/com/smartor/service/impl/CommonTaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/CommonTaskServiceImpl.java
@@ -9,7 +9,7 @@
import com.ruoyi.common.utils.DtoConversionUtils;
import com.smartor.domain.*;
import com.smartor.service.CommonTaskService;
-import com.smartor.service.IIvrTaskService;
+import com.smartor.service.IServiceTaskService;
import com.smartor.service.ISvyTaskService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -33,10 +33,10 @@
@Service
public class CommonTaskServiceImpl implements CommonTaskService {
@Autowired
- private IIvrTaskService ivrTaskService;
+ private IServiceTaskService ivrTaskService;
@Autowired
- private ISvyTaskService iSvyTaskService;
+ private IServiceTaskService iServiceTaskService;
@Autowired
private RedisCache redisCache;
@@ -60,14 +60,14 @@
}
public int sfSend(SendTaskVO sendTaskVO) {
- IvrTask ivrTask = ivrTaskService.selectIvrTaskByTaskid(sendTaskVO.getTaskId());
+ ServiceTask ivrTask = ivrTaskService.selectServiceTaskByTaskid(sendTaskVO.getTaskId());
if (sendTaskVO.getSendState() != null && sendTaskVO.getSendState() == 3 || sendTaskVO.getSendState() != null && sendTaskVO.getSendState() == 4) {
//浠诲姟鏆傚仠鎴栫粓姝�
- IvrTask ivrTask3 = new IvrTask();
- ivrTask3.setTaskid(sendTaskVO.getTaskId());
- ivrTask3.setStopState(ivrTask.getStopState() + 1);
- ivrTask3.setSendState(sendTaskVO.getSendState());
- ivrTaskService.updateIvrTask(ivrTask3);
+ ServiceTask serviceTask = new ServiceTask();
+ serviceTask.setTaskid(sendTaskVO.getTaskId());
+ serviceTask.setStopState(ivrTask.getStopState() + 1);
+ serviceTask.setSendState(sendTaskVO.getSendState());
+ ivrTaskService.updateServiceTask(serviceTask);
return 0;
}
@@ -82,10 +82,10 @@
redisCache.setCacheObject(content, content, 1, TimeUnit.SECONDS);
//灏嗕换鍔＄姸鎬佷慨鏀规垚鎵ц涓�
- IvrTask ivrTask2 = new IvrTask();
- ivrTask2.setTaskid(ivrTask.getTaskid());
- ivrTask2.setSendState(2);
- ivrTaskService.updateIvrTask(ivrTask2);
+ ServiceTask serviceTask = new ServiceTask();
+ serviceTask.setTaskid(ivrTask.getTaskid());
+ serviceTask.setSendState(2);
+ ivrTaskService.updateServiceTask(serviceTask);
} else if (StringUtils.isNotEmpty(sendTaskVO.getSendType()) && sendTaskVO.getSendType().equals("1") || StringUtils.isNotEmpty(sendTaskVO.getSendType()) && sendTaskVO.getSendType().equals("3")) {
//鏃堕棿娈靛彂閫�
ObjectMapper objectMapper = new ObjectMapper();
@@ -121,50 +121,50 @@
redisCache.setCacheObject(content, content, milliseconds / 1000, TimeUnit.SECONDS);
}
//灏嗕换鍔＄姸鎬佷慨鏀规垚鎵ц涓�
- IvrTask ivrTask2 = new IvrTask();
- ivrTask2.setTaskid(ivrTask.getTaskid());
- ivrTask2.setSendState(2);
- ivrTaskService.updateIvrTask(ivrTask2);
+ ServiceTask serviceTask = new ServiceTask();
+ serviceTask.setTaskid(ivrTask.getTaskid());
+ serviceTask.setSendState(2);
+ ivrTaskService.updateServiceTask(serviceTask);
}
}
return 1;
}
public int wjSend(SendTaskVO sendTaskVO) {
- SvyTask svyTask = iSvyTaskService.selectSvyTaskByTaskid(sendTaskVO.getTaskId());
+ ServiceTask serviceTask1 = iServiceTaskService.selectServiceTaskByTaskid(sendTaskVO.getTaskId());
if (sendTaskVO.getSendState() != null && sendTaskVO.getSendState() == 3 || sendTaskVO.getSendState() != null && sendTaskVO.getSendState() == 4) {
//浠诲姟鏆傚仠鎴栫粓姝�
- SvyTask svyTask1 = new SvyTask();
- svyTask1.setTaskid(sendTaskVO.getTaskId());
- svyTask1.setStopState(svyTask.getStopState() + 1);
- svyTask1.setSendState(sendTaskVO.getSendState().toString());
- iSvyTaskService.updateSvyTask(svyTask1);
+ ServiceTask serviceTask = new ServiceTask();
+ serviceTask.setTaskid(sendTaskVO.getTaskId());
+ serviceTask.setStopState(serviceTask1.getStopState() + 1);
+ serviceTask.setSendState(sendTaskVO.getSendState());
+ iServiceTaskService.updateServiceTask(serviceTask);
return 0;
}
//鍒ゆ柇鍙戦�佺姸鎬佹槸鍚︿负绌�
if (StringUtils.isEmpty(sendTaskVO.getSendType())) {
- sendTaskVO.setSendType(svyTask.getSendType().toString());
+ sendTaskVO.setSendType(serviceTask1.getSendType().toString());
}
//鍒ゆ柇浠诲姟鏄惁鏄珛鍗冲彂閫�
if (StringUtils.isNotEmpty(sendTaskVO.getSendType()) && sendTaskVO.getSendType().equals("2")) {
- String content = sendMQContent(sendTaskVO, svyTask.getTemplateid(), svyTask.getPreachform(), svyTask.getStopState(), null);
+ String content = sendMQContent(sendTaskVO, serviceTask1.getTemplateid().toString(), serviceTask1.getPreachform(), serviceTask1.getStopState(), null);
//绔嬪嵆鍙戦��
redisCache.setCacheObject(content, content, 1, TimeUnit.SECONDS);
//灏嗕换鍔＄姸鎬佷慨鏀规垚鎵ц涓�
- SvyTask svyTask2 = new SvyTask();
- svyTask2.setTaskid(svyTask.getTaskid());
- svyTask2.setSendState("2");
- iSvyTaskService.updateSvyTask(svyTask2);
+ ServiceTask serviceTask = new ServiceTask();
+ serviceTask.setTaskid(serviceTask1.getTaskid());
+ serviceTask.setSendState(2);
+ iServiceTaskService.updateServiceTask(serviceTask);
} else if (StringUtils.isNotEmpty(sendTaskVO.getSendType()) && sendTaskVO.getSendType().equals("1") || StringUtils.isNotEmpty(sendTaskVO.getSendType()) && sendTaskVO.getSendType().equals("3")) {
//鏃堕棿娈靛彂閫�
ObjectMapper objectMapper = new ObjectMapper();
- if (StringUtils.isNotEmpty(svyTask.getSendTimeSlot())) {
+ if (StringUtils.isNotEmpty(serviceTask1.getSendTimeSlot())) {
List<TaskSendTimeVO> taskSendTimeVOList = null;
try {
- taskSendTimeVOList = objectMapper.readValue(svyTask.getSendTimeSlot(), new TypeReference<List<TaskSendTimeVO>>() {
+ taskSendTimeVOList = objectMapper.readValue(serviceTask1.getSendTimeSlot(), new TypeReference<List<TaskSendTimeVO>>() {
});
} catch (JsonProcessingException e) {
log.error("JsonProcessingException鎶ラ敊浜嗭細{}", e.getMessage());
@@ -189,14 +189,14 @@
SendTaskVO sendTaskVO1 = DtoConversionUtils.sourceToTarget(sendTaskVO, SendTaskVO.class);
sendTaskVO1.setSendType("1");
- String content = sendMQContent(sendTaskVO1, svyTask.getTemplateid(), svyTask.getPreachform(), svyTask.getStopState(), list);
+ String content = sendMQContent(sendTaskVO1, serviceTask1.getTemplateid().toString(), serviceTask1.getPreachform(), serviceTask1.getStopState(), list);
redisCache.setCacheObject(content, content, milliseconds / 1000, TimeUnit.SECONDS);
}
//灏嗕换鍔＄姸鎬佷慨鏀规垚鎵ц涓�
- SvyTask svyTask3 = new SvyTask();
- svyTask3.setTaskid(svyTask.getTaskid());
- svyTask3.setSendState("2");
- iSvyTaskService.updateSvyTask(svyTask3);
+ ServiceTask serviceTask = new ServiceTask();
+ serviceTask.setTaskid(serviceTask1.getTaskid());
+ serviceTask.setSendState(2);
+ iServiceTaskService.updateServiceTask(serviceTask);
}
}
return 1;
--
Gitblit v1.9.3