opt:1.后端国际化完成。
This commit is contained in:
@@ -18,6 +18,7 @@ import lombok.extern.slf4j.Slf4j;
|
||||
import org.nl.api.schedule.task.api.ScheduleTaskAPI;
|
||||
import org.nl.api.schedule.task.core.ScheduleAPICreateOneClickTaskParam;
|
||||
import org.nl.api.schedule.task.core.ScheduleAPICreateTaskParam;
|
||||
import org.nl.config.language.LangProcess;
|
||||
import org.nl.enums.ScheduleTaskReportStatusEnum;
|
||||
import org.nl.enums.YesOrNoEnum;
|
||||
import org.nl.exception.BadRequestException;
|
||||
@@ -134,7 +135,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper,Task> implements Tas
|
||||
public WebResponse createTask(CreateTaskRequestParam createTaskRequestParam, String taskSource) {
|
||||
try {
|
||||
if (!TaskTypeEnum.validationTaskType(createTaskRequestParam.getType())) {
|
||||
throw new BadRequestException("任务类型不存在");
|
||||
throw new BadRequestException(LangProcess.msg("task_type_not_exist"));
|
||||
}
|
||||
Task task = BeanUtil.copyProperties(createTaskRequestParam, Task.class);
|
||||
task.setId(IdUtil.getStringId());
|
||||
@@ -152,12 +153,12 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper,Task> implements Tas
|
||||
ScheduleAPICreateTaskParam scheduleAPICreateTaskParam = BeanUtil.copyProperties(task, ScheduleAPICreateTaskParam.class);
|
||||
HttpResponse result = scheduleTaskAPI.createTask(scheduleAPICreateTaskParam);
|
||||
if (result == null || !result.isOk()){
|
||||
throw new BadRequestException("调度生成任务失败");
|
||||
throw new BadRequestException(LangProcess.msg("task_schedule_create_failed"));
|
||||
}
|
||||
return WebResponse.requestOk();
|
||||
}catch (Exception e){
|
||||
log.error("创建任务失败:{}",e.getMessage());
|
||||
throw new BadRequestException("创建任务失败:"+e.getMessage());
|
||||
throw new BadRequestException(LangProcess.msg("task_create_failed",e.getMessage()));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -178,7 +179,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper,Task> implements Tas
|
||||
public WebResponse cancelTask(CancelTaskRequestParam cancelTaskRequestParam) {
|
||||
try {
|
||||
if (StrUtil.isBlank(cancelTaskRequestParam.getTask_code())){
|
||||
throw new BadRequestException("任务号不能为空");
|
||||
throw new BadRequestException(LangProcess.msg("task_code_empty"));
|
||||
}
|
||||
|
||||
// HttpResponse result = scheduleTaskAPI.cancelTask(cancelTaskRequestParam.getTask_code());
|
||||
@@ -193,7 +194,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper,Task> implements Tas
|
||||
);
|
||||
}catch (Exception e){
|
||||
log.error("取消任务失败:{}",e.getMessage());
|
||||
throw new BadRequestException("取消任务失败:"+e.getMessage());
|
||||
throw new BadRequestException(LangProcess.msg("task_cancel_failed",e.getMessage()));
|
||||
}
|
||||
|
||||
return WebResponse.requestOk();
|
||||
@@ -204,12 +205,12 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper,Task> implements Tas
|
||||
public WebResponse pauseTask(PauseAndResumeTaskParam pauseAndResumeTaskParam) {
|
||||
try {
|
||||
if (StrUtil.isBlank(pauseAndResumeTaskParam.getTask_code())){
|
||||
throw new BadRequestException("任务号不能为空");
|
||||
throw new BadRequestException(LangProcess.msg("task_code_empty"));
|
||||
}
|
||||
|
||||
HttpResponse result = scheduleTaskAPI.pauseTask(pauseAndResumeTaskParam.getTask_code());
|
||||
if (result == null || !result.isOk()){
|
||||
throw new BadRequestException("暂停调度任务失败");
|
||||
throw new BadRequestException(LangProcess.msg("task_pause_schedule_failed"));
|
||||
}
|
||||
|
||||
taskMapper.update(new LambdaUpdateWrapper<>(Task.class)
|
||||
@@ -222,7 +223,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper,Task> implements Tas
|
||||
return WebResponse.requestOk();
|
||||
}catch (Exception e){
|
||||
log.error("暂停任务失败:{}",e.getMessage());
|
||||
throw new BadRequestException("暂停任务失败:"+e.getMessage());
|
||||
throw new BadRequestException(LangProcess.msg("task_pause_failed",e.getMessage()));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -231,12 +232,12 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper,Task> implements Tas
|
||||
public WebResponse resumeTask(PauseAndResumeTaskParam pauseAndResumeTaskParam) {
|
||||
try {
|
||||
if (StrUtil.isBlank(pauseAndResumeTaskParam.getTask_code())){
|
||||
throw new BadRequestException("任务号不能为空");
|
||||
throw new BadRequestException(LangProcess.msg("task_code_empty"));
|
||||
}
|
||||
|
||||
HttpResponse result = scheduleTaskAPI.resumeTask(pauseAndResumeTaskParam.getTask_code());
|
||||
if (result == null || !result.isOk()){
|
||||
throw new BadRequestException("恢复调度任务失败");
|
||||
throw new BadRequestException(LangProcess.msg("task_resume_schedule_failed"));
|
||||
}
|
||||
|
||||
taskMapper.update(new LambdaUpdateWrapper<>(Task.class)
|
||||
@@ -249,14 +250,14 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper,Task> implements Tas
|
||||
return WebResponse.requestOk();
|
||||
}catch (Exception e){
|
||||
log.error("恢复任务失败:{}",e.getMessage());
|
||||
throw new BadRequestException("恢复任务失败:"+e.getMessage());
|
||||
throw new BadRequestException(LangProcess.msg("task_resume_failed",e.getMessage()));
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public WebResponse queryNotFinishTaskInfoByVehicleNumber(String vehicle_number) {
|
||||
if (StrUtil.isBlank(vehicle_number)){
|
||||
throw new BadRequestException("车号不能为空");
|
||||
throw new BadRequestException(LangProcess.msg("schedule_vehicle_number_empty"));
|
||||
}
|
||||
return WebResponse.requestParamOk(taskInfoList.get(vehicle_number));
|
||||
}
|
||||
@@ -264,7 +265,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper,Task> implements Tas
|
||||
@Override
|
||||
public List<Task> queryCurrentTaskInfoByVehicleNumber(String vehicle_number) {
|
||||
if (StrUtil.isBlank(vehicle_number)){
|
||||
throw new BadRequestException("车号不能为空");
|
||||
throw new BadRequestException(LangProcess.msg("schedule_vehicle_number_empty"));
|
||||
}
|
||||
return taskInfoList.get(vehicle_number);
|
||||
}
|
||||
@@ -275,7 +276,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper,Task> implements Tas
|
||||
// 校验一下当前是否到达上报点位,如果未到达上报点位,不能触发确认到达。
|
||||
Task task = taskMapper.selectOne(new LambdaQueryWrapper<>(Task.class).eq(Task::getTask_code, task_code));
|
||||
if (!ScheduleTaskReportStatusEnum.REPORTED.getCode().equals(task.getVehicleReportStatus())) {
|
||||
throw new BadRequestException("未到达上报点位,无法确认到达");
|
||||
throw new BadRequestException(LangProcess.msg("task_report_not_arrived"));
|
||||
}
|
||||
|
||||
boolean reuslt = taskMapper.update(new LambdaUpdateWrapper<>(Task.class)
|
||||
@@ -284,7 +285,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper,Task> implements Tas
|
||||
.eq(Task::getTask_code,task_code)
|
||||
) > 0;
|
||||
if (!reuslt){
|
||||
throw new BadRequestException("任务操作确认失败");
|
||||
throw new BadRequestException(LangProcess.msg("task_confirm_arrival_failed"));
|
||||
}
|
||||
return WebResponse.requestOk();
|
||||
}
|
||||
@@ -311,12 +312,12 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper,Task> implements Tas
|
||||
scheduleAPICreateOneClickTaskParam.setType(OneClickTaskTypeEnum.mappingScheduleTypeByCode(oneClickOperationRequestParam.getType()));
|
||||
HttpResponse result = scheduleTaskAPI.oneClickOperationTask(scheduleAPICreateOneClickTaskParam);
|
||||
if (result == null || !result.isOk()){
|
||||
throw new BadRequestException("调度生成一键任务失败");
|
||||
throw new BadRequestException(LangProcess.msg("task_schedule_create_failed"));
|
||||
}
|
||||
return WebResponse.requestOk();
|
||||
}catch (Exception e){
|
||||
log.error("创建一键任务失败:{}",e.getMessage());
|
||||
throw new BadRequestException("创建一键任务失败:"+e.getMessage());
|
||||
throw new BadRequestException(LangProcess.msg("task_next_station_failed",e.getMessage()));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user