代码提交

liusheng

2024-09-18 907641e56c2085aaa81f267946dc3e3e9fca73e7

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