From 079f3637db0822bcbbf43ff896e76e9d709447a1 Mon Sep 17 00:00:00 2001 From: haown <454902499@qq.com> Date: Tue, 8 Oct 2024 10:50:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=99=BE=E5=BA=A6=E6=99=BA?= =?UTF-8?q?=E8=83=BD=E5=A4=96=E5=91=BC=E5=AF=B9=E6=8E=A5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xinelu/manage/service/aibo/IAIOBService.java | 4 ++-- .../manage/service/aibo/impl/AIOBServiceImpl.java | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/aibo/IAIOBService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/aibo/IAIOBService.java index 14941612..4fb0d1a1 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/aibo/IAIOBService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/aibo/IAIOBService.java @@ -63,10 +63,10 @@ public interface IAIOBService { List importTask(ImportTaskDto importTaskDto); /** - * @description 任务单执行回调方法 + * @description 任务执行回调方法 * @param callbackType 回调数据类型， 0-任务呼叫单通电话回调 1-号码组终态回调 2-任务状态变更回调 3-实时呼叫单通电话回调 * @param data 任务单通电话回调传输data - * @return null + * @return JSONObject * @Author haown * @Date 2024-9-2 14:20 */ diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/aibo/impl/AIOBServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/aibo/impl/AIOBServiceImpl.java index 44f36916..2d9d27fb 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/aibo/impl/AIOBServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/aibo/impl/AIOBServiceImpl.java @@ -343,10 +343,10 @@ public class AIOBServiceImpl implements IAIOBService { } /** - * @description 任务单执行回调方法 + * @description 任务执行回调方法 * @param callbackType 回调数据类型， 0-任务呼叫单通电话回调 1-号码组终态回调 2-任务状态变更回调 3-实时呼叫单通电话回调 * @param data 任务单通电话回调传输data - * @return null + * @return JSONObject * @Author haown * @Date 2024-9-2 14:20 */ @@ -380,7 +380,7 @@ public class AIOBServiceImpl implements IAIOBService { PhoneDialRecord phoneDialRecordQuery = new PhoneDialRecord(); phoneDialRecordQuery.setManageRouteNodeId(signPatientManageRouteNode.getId()); List phoneDialRecordList = phoneDialRecordMapper.selectPhoneDialRecordList(phoneDialRecordQuery); - if (CollectionUtils.isEmpty(phoneDialRecordList) || phoneDialRecordList.size() + 1 < PhoneRedialTimesEnum.getValueByInfo(signPatientManageRouteNode.getPhoneRedialTimes()).getValue()) { + if ((CollectionUtils.isEmpty(phoneDialRecordList) && PhoneRedialTimesEnum.getValueByInfo(signPatientManageRouteNode.getPhoneRedialTimes()).getValue() > 0) || phoneDialRecordList.size() + 1 < PhoneRedialTimesEnum.getValueByInfo(signPatientManageRouteNode.getPhoneRedialTimes()).getValue()) { // 重拨 needRedial = true; } @@ -416,8 +416,8 @@ public class AIOBServiceImpl implements IAIOBService { // 发送短信 if (needSendSms) { - System.out.println("发送短信-------------------------------------------"); - //sendSms(signPatientManageRoute.getPatientId(), signPatientManageRouteNode); + //System.out.println("发送短信-------------------------------------------"); + sendSms(signPatientManageRoute.getPatientId(), signPatientManageRouteNode); } // 重拨 if (needRedial) {