代码提交

liusheng

2024-09-24 562a960261b75d70abd65aa10528f09aeece94e8

 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;
    }

@@ -80,11 +82,13 @@
            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")) {
@@ -118,17 +122,18 @@
                        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("请检查任务开始时间，不能小于当前时间");
                    }
                }
                //将任务状态修改成执行中
                ServiceTask serviceTask = new ServiceTask();
                serviceTask.setTaskid(ivrTask.getTaskid());
                serviceTask.setSendState(2);
                serviceTask.setSendState(2L);
                serviceTask.setStopState(null);
                ivrTaskService.updateServiceTask(serviceTask);
            }
        } return 1;
        }
        return 1;
    }

    public int wjSend(SendTaskVO sendTaskVO) {
@@ -139,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;
        }

        //判断发送状态是否为空
@@ -157,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")) {
            //时间段发送
@@ -183,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();
@@ -196,7 +205,8 @@
                //将任务状态修改成执行中
                ServiceTask serviceTask = new ServiceTask();
                serviceTask.setTaskid(serviceTask1.getTaskid());
                serviceTask.setSendState(2);
                serviceTask.setSendState(2L);
                serviceTask.setStopState(null);
                iServiceTaskService.updateServiceTask(serviceTask);
            }
        }
@@ -229,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")) {
            //时间段发送
@@ -268,7 +280,8 @@
                //将任务状态修改成执行中
                ServiceTask serviceTask = new ServiceTask();
                serviceTask.setTaskid(serviceTask1.getTaskid());
                serviceTask.setSendState(2);
                serviceTask.setSendState(2L);
                serviceTask.setStopState(null);
                iServiceTaskService.updateServiceTask(serviceTask);
            }
        }