From ca31f4ba1dc353a529c526b12a688216610ed804 Mon Sep 17 00:00:00 2001 From: liejiu946 Date: Mon, 6 Jul 2026 08:56:17 +0800 Subject: [PATCH] =?UTF-8?q?add:1.=E5=A2=9E=E5=8A=A0=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E5=88=B0=E8=BE=BE=E7=AB=99=E7=82=B9=E6=93=8D=E4=BD=9C=E5=90=8E?= =?UTF-8?q?=E5=88=B7=E6=96=B0=E5=80=92=E8=AE=A1=E6=97=B6=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/nl/api/task/api/TaskAPI.java | 2 +- .../modular/task/service/impl/ScheduleTaskServiceImpl.java | 5 ++++- .../java/org/nl/setting/modular/enums/SettingCodeEnum.java | 4 ++++ .../nl/setting/modular/service/impl/SettingServiceImpl.java | 3 +++ nl-business-task/src/main/java/org/nl/task/entity/Task.java | 6 ++++++ .../src/main/java/org/nl/task/provider/TaskAPIProvider.java | 3 ++- 6 files changed, 20 insertions(+), 3 deletions(-) diff --git a/nl-business-api/src/main/java/org/nl/api/task/api/TaskAPI.java b/nl-business-api/src/main/java/org/nl/api/task/api/TaskAPI.java index 1ca0d8b..a23ecd7 100644 --- a/nl-business-api/src/main/java/org/nl/api/task/api/TaskAPI.java +++ b/nl-business-api/src/main/java/org/nl/api/task/api/TaskAPI.java @@ -25,7 +25,7 @@ public interface TaskAPI { * @param newReportStatus * @return */ - boolean updateTaskReportStatusByCode(String taskCode,String newReportStatus,String waiting_time); + boolean updateTaskReportStatusByCode(String taskCode,String newReportStatus,String waiting_time,String wait_time_after_operation); /** * 查询当前任务上报状态阶段 diff --git a/nl-business-schedule/src/main/java/org/nl/schedule/modular/task/service/impl/ScheduleTaskServiceImpl.java b/nl-business-schedule/src/main/java/org/nl/schedule/modular/task/service/impl/ScheduleTaskServiceImpl.java index fc2a2df..842908f 100644 --- a/nl-business-schedule/src/main/java/org/nl/schedule/modular/task/service/impl/ScheduleTaskServiceImpl.java +++ b/nl-business-schedule/src/main/java/org/nl/schedule/modular/task/service/impl/ScheduleTaskServiceImpl.java @@ -57,12 +57,15 @@ public class ScheduleTaskServiceImpl implements ScheduleTaskService { boolean flag = false; // 到达时等待设置参数 JSONObject jsonObject = settingAPI.querySettingParamByCode("call_arrival_waiting_time").getJSONObject("data"); + JSONObject jsonObjectOperation = settingAPI.querySettingParamByCode("wait_time_after_operation").getJSONObject("data"); String is_active = jsonObject.getString("is_active"); String arrive_waiting_time = jsonObject.getString("value"); + String wait_time_after_operation = jsonObjectOperation.getString("value"); + if (StrUtil.isNotBlank(is_active) && YesOrNoEnum.YES.getCode().equals(is_active)){ switch (scheduleTaskReportStatusEnum){ case NOT_REPORTED: - boolean result = taskAPI.updateTaskReportStatusByCode(task_code, ScheduleTaskReportStatusEnum.REPORTED.getCode(),arrive_waiting_time); + boolean result = taskAPI.updateTaskReportStatusByCode(task_code, ScheduleTaskReportStatusEnum.REPORTED.getCode(),arrive_waiting_time,wait_time_after_operation); if (!result) { log.info("更新调度上报状态失败"); } diff --git a/nl-business-setting/src/main/java/org/nl/setting/modular/enums/SettingCodeEnum.java b/nl-business-setting/src/main/java/org/nl/setting/modular/enums/SettingCodeEnum.java index 4fa04c3..b7c1fb7 100644 --- a/nl-business-setting/src/main/java/org/nl/setting/modular/enums/SettingCodeEnum.java +++ b/nl-business-setting/src/main/java/org/nl/setting/modular/enums/SettingCodeEnum.java @@ -30,6 +30,10 @@ public enum SettingCodeEnum { * 呼叫时等待时间 */ WAITING_TIME_WHEN_MAKING_A_CALL("4", "waiting_time_when_making_a_call", "呼叫时等待时间"), + /** + * 操作后等待时间 + */ + WAITING_TIME_AFTER_OPERATION("4", "wait_time_after_operation", "操作后等待时间"), /** * 自动回充 */ diff --git a/nl-business-setting/src/main/java/org/nl/setting/modular/service/impl/SettingServiceImpl.java b/nl-business-setting/src/main/java/org/nl/setting/modular/service/impl/SettingServiceImpl.java index 6540efe..13c7130 100644 --- a/nl-business-setting/src/main/java/org/nl/setting/modular/service/impl/SettingServiceImpl.java +++ b/nl-business-setting/src/main/java/org/nl/setting/modular/service/impl/SettingServiceImpl.java @@ -94,6 +94,9 @@ public class SettingServiceImpl extends ServiceImpl impl case WAITING_TIME_WHEN_MAKING_A_CALL: log.info("修改呼叫时等待时间"); break; + case WAITING_TIME_AFTER_OPERATION: + log.info("操作后等待时间"); + break; case AUTOMATIC_RECHARGE: log.info("修改自动回充"); if (StrUtil.isBlank(setting_value) || StrUtil.isBlank(is_active) ){ diff --git a/nl-business-task/src/main/java/org/nl/task/entity/Task.java b/nl-business-task/src/main/java/org/nl/task/entity/Task.java index 4b188b9..0b97051 100644 --- a/nl-business-task/src/main/java/org/nl/task/entity/Task.java +++ b/nl-business-task/src/main/java/org/nl/task/entity/Task.java @@ -47,6 +47,12 @@ public class Task { * 到达等待时间 */ private Integer arrive_waiting_time; + + /** + * 操作后等待时间 + */ + private Integer wait_time_after_operation; + /** * 任务优先级 */ diff --git a/nl-business-task/src/main/java/org/nl/task/provider/TaskAPIProvider.java b/nl-business-task/src/main/java/org/nl/task/provider/TaskAPIProvider.java index 3c7bfb4..9a6c125 100644 --- a/nl-business-task/src/main/java/org/nl/task/provider/TaskAPIProvider.java +++ b/nl-business-task/src/main/java/org/nl/task/provider/TaskAPIProvider.java @@ -56,10 +56,11 @@ public class TaskAPIProvider implements TaskAPI { } @Override - public boolean updateTaskReportStatusByCode(String taskCode, String newReportStatus,String waiting_time) { + public boolean updateTaskReportStatusByCode(String taskCode, String newReportStatus,String waiting_time,String wait_time_after_operation) { return taskService.update(new LambdaUpdateWrapper<>(Task.class) .set(Task::getVehicleReportStatus, newReportStatus) .set(StrUtil.isNotBlank(waiting_time),Task::getArrive_waiting_time,Integer.parseInt(waiting_time)) + .set(StrUtil.isNotBlank(wait_time_after_operation),Task::getWait_time_after_operation,Integer.parseInt(wait_time_after_operation)) .set(Task::getUpdate_time, DateUtil.now()) .eq(Task::getTask_code,taskCode) );