From 6a58a5a148c27c9ff66901bfbae6e52c1a56b5d2 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 04 七月 2024 17:17:53 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/CommonTaskServiceImpl.java | 112 ++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 92 insertions(+), 20 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 0067dc4..a51c4e9 100644
--- a/smartor/src/main/java/com/smartor/service/impl/CommonTaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/CommonTaskServiceImpl.java
@@ -36,7 +36,7 @@
private IServiceTaskService ivrTaskService;
@Autowired
- private ISvyTaskService iSvyTaskService;
+ private IServiceTaskService iServiceTaskService;
@Autowired
private RedisCache redisCache;
@@ -54,7 +54,7 @@
return wjSend(sendTaskVO);
} else if (sendTaskVO.getTaskType() == 3) {
//瀹ｆ暀
-
+ xjSend(sendTaskVO);
}
return null;
}
@@ -131,40 +131,40 @@
}
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 serviceTask = new SvyTask();
+ ServiceTask serviceTask = new ServiceTask();
serviceTask.setTaskid(sendTaskVO.getTaskId());
- serviceTask.setStopState(svyTask.getStopState() + 1);
- serviceTask.setSendState(sendTaskVO.getSendState().toString());
- iSvyTaskService.updateSvyTask(serviceTask);
+ 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 serviceTask = new SvyTask();
- serviceTask.setTaskid(svyTask.getTaskid());
- serviceTask.setSendState("2");
- iSvyTaskService.updateSvyTask(serviceTask);
+ 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,86 @@
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 serviceTask = new SvyTask();
- serviceTask.setTaskid(svyTask.getTaskid());
- serviceTask.setSendState("2");
- iSvyTaskService.updateSvyTask(serviceTask);
+ ServiceTask serviceTask = new ServiceTask();
+ serviceTask.setTaskid(serviceTask1.getTaskid());
+ serviceTask.setSendState(2);
+ iServiceTaskService.updateServiceTask(serviceTask);
+ }
+ }
+ return 1;
+ }
+
+ public int xjSend(SendTaskVO sendTaskVO) {
+ ServiceTask serviceTask1 = iServiceTaskService.selectServiceTaskByTaskid(sendTaskVO.getTaskId());
+ if (sendTaskVO.getSendState() != null && sendTaskVO.getSendState() == 3 || sendTaskVO.getSendState() != null && sendTaskVO.getSendState() == 4) {
+ //浠诲姟鏆傚仠鎴栫粓姝�
+ 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(serviceTask1.getSendType().toString());
+ }
+ //鍒ゆ柇浠诲姟鏄惁鏄珛鍗冲彂閫�
+ if (StringUtils.isNotEmpty(sendTaskVO.getSendType()) && sendTaskVO.getSendType().equals("2")) {
+
+ String content = sendMQContent(sendTaskVO, serviceTask1.getTemplateid().toString(), serviceTask1.getPreachform(), serviceTask1.getStopState(), null);
+ //绔嬪嵆鍙戦��
+ redisCache.setCacheObject(content, content, 1, TimeUnit.SECONDS);
+
+ //灏嗕换鍔＄姸鎬佷慨鏀规垚鎵ц涓�
+ 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(serviceTask1.getSendTimeSlot())) {
+ List<TaskSendTimeVO> taskSendTimeVOList = null;
+ try {
+ taskSendTimeVOList = objectMapper.readValue(serviceTask1.getSendTimeSlot(), new TypeReference<List<TaskSendTimeVO>>() {
+ });
+ } catch (JsonProcessingException e) {
+ log.error("JsonProcessingException鎶ラ敊浜嗭細{}", e.getMessage());
+ }
+ for (TaskSendTimeVO taskSendTimeVO : taskSendTimeVOList) {
+ //鍘籗endTimeslot涓紝鑾峰彇鎵�鏈夌殑鏃堕棿娈�
+ List<TaskSendTimeVO> list = new ArrayList<>();
+ list.add(taskSendTimeVO);
+
+ //鑾峰彇寮�濮嬪彂閫佹椂闂�
+ String begantime = taskSendTimeVO.getBegantime();
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ //璁板綍鐩墠鍒板彂閫佹椂闂寸殑姣鍊� 锛堝彂閫佹椂闂寸殑姣鍊� - 褰撳墠鏃堕棿鐨勬绉掑�硷級
+ Long milliseconds = 1000L;
+ try {
+ Date date = sdf.parse(begantime);
+ milliseconds = date.getTime() - System.currentTimeMillis();
+ System.out.println("鏃ユ湡姣鏁帮細" + milliseconds);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ SendTaskVO sendTaskVO1 = DtoConversionUtils.sourceToTarget(sendTaskVO, SendTaskVO.class);
+ sendTaskVO1.setSendType("1");
+ String content = sendMQContent(sendTaskVO1, serviceTask1.getTemplateid().toString(), serviceTask1.getPreachform(), serviceTask1.getStopState(), list);
+ redisCache.setCacheObject(content, content, milliseconds / 1000, TimeUnit.SECONDS);
+ }
+ //灏嗕换鍔＄姸鎬佷慨鏀规垚鎵ц涓�
+ ServiceTask serviceTask = new ServiceTask();
+ serviceTask.setTaskid(serviceTask1.getTaskid());
+ serviceTask.setSendState(2);
+ iServiceTaskService.updateServiceTask(serviceTask);
}
}
return 1;
--
Gitblit v1.9.3