From 67ae97d6dac2aecafd130fc54e285182b0555be1 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Fri, 12 Apr 2024 10:57:20 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=90=8E=E7=AB=AF=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/wms/sch/task_manage/AbstractTask.java | 8 ++++---- .../second_floor_area/CallEmpReelTask.java | 19 ++++++++++--------- .../language/task/CallEmpReelTask.properties | 9 +++++++++ .../task/CallEmpReelTask_en_US.properties | 9 +++++++++ .../task/CallEmpReelTask_id_ID.properties | 9 +++++++++ .../task/CallEmpReelTask_in_ID.properties | 9 +++++++++ .../task/CallEmpReelTask_zh_CN.properties | 9 +++++++++ .../resources/language/task/common.properties | 3 +++ .../language/task/common_en_US.properties | 3 +++ .../language/task/common_id_ID.properties | 3 +++ .../language/task/common_in_ID.properties | 3 +++ .../language/task/common_zh_CN.properties | 3 +++ 12 files changed, 74 insertions(+), 13 deletions(-) create mode 100644 lms/nladmin-system/nlsso-server/src/main/resources/language/task/CallEmpReelTask.properties create mode 100644 lms/nladmin-system/nlsso-server/src/main/resources/language/task/CallEmpReelTask_en_US.properties create mode 100644 lms/nladmin-system/nlsso-server/src/main/resources/language/task/CallEmpReelTask_id_ID.properties create mode 100644 lms/nladmin-system/nlsso-server/src/main/resources/language/task/CallEmpReelTask_in_ID.properties create mode 100644 lms/nladmin-system/nlsso-server/src/main/resources/language/task/CallEmpReelTask_zh_CN.properties create mode 100644 lms/nladmin-system/nlsso-server/src/main/resources/language/task/common.properties create mode 100644 lms/nladmin-system/nlsso-server/src/main/resources/language/task/common_en_US.properties create mode 100644 lms/nladmin-system/nlsso-server/src/main/resources/language/task/common_id_ID.properties create mode 100644 lms/nladmin-system/nlsso-server/src/main/resources/language/task/common_in_ID.properties create mode 100644 lms/nladmin-system/nlsso-server/src/main/resources/language/task/common_zh_CN.properties diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java index 90720e8..fa69cfc 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java @@ -12,6 +12,7 @@ import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.nl.common.exception.BadRequestException; import org.nl.config.SpringContextHolder; +import org.nl.config.language.LangProcess; import org.nl.wms.ext.acs.service.WmsToAcsService; import org.nl.wms.ext.acs.service.dto.to.wms.AcsResponse; import org.nl.wms.sch.point.service.ISchBasePointService; @@ -259,7 +260,7 @@ public abstract class AbstractTask { // 1、校验数据 SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper() .eq(SchBaseTaskconfig::getConfig_code, configCode)); - Assert.notNull(taskConfig, "找不到配置文件，请确认[" + configCode + "]配置是否存在！"); + Assert.notNull(taskConfig, LangProcess.msg("common_configTip", configCode)); // 最大任务数 Integer tcmn = taskConfig.getTask_create_max_num(); @@ -267,14 +268,13 @@ public abstract class AbstractTask { // 获取执行中的任务（由配置文件设置，一般是最大值） List unFinishTasksByTaskConfig = taskService.findUnFinishTasksByTaskConfig( taskConfig.getConfig_code(), taskConfig.getTask_direction()); - Assert.isFalse(unFinishTasksByTaskConfig.size() >= tcmn, - applyPointCode + "该点位申请的任务未完成数已超过上限，无法申请任务"); + Assert.isFalse(unFinishTasksByTaskConfig.size() >= tcmn, LangProcess.msg("common_maxTaskTip", applyPointCode)); // 校验同个点位,同种任务是否多次请求创建任务（固定只能1个任务） List applyPointTask = taskService.findUnFinishTasksByTaskConfig( taskConfig.getConfig_code(), applyPointCode, taskConfig.getTask_direction()); if (applyPointTask.size() == 1) { - throw new BadRequestException("点位[ " + applyPointCode + "] 已经创建过任务"); + throw new BadRequestException(LangProcess.msg("common_taskCreatedTip", applyPointCode)); } String vehicleType = param.getString("vehicle_type"); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/second_floor_area/CallEmpReelTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/second_floor_area/CallEmpReelTask.java index 29117c3..3a5609c 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/second_floor_area/CallEmpReelTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/second_floor_area/CallEmpReelTask.java @@ -9,6 +9,7 @@ import com.alibaba.fastjson2.TypeReference; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import lombok.extern.slf4j.Slf4j; import org.nl.common.exception.BadRequestException; +import org.nl.config.language.LangProcess; import org.nl.wms.sch.task.service.ISchBaseTaskService; import org.nl.wms.sch.task.service.dao.SchBaseTask; import org.nl.wms.sch.task_manage.AbstractTask; @@ -62,7 +63,7 @@ public class CallEmpReelTask extends AbstractTask { SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper() .eq(SchBaseTask::getTask_code, task_code), false); if (schBaseTask == null) { - throw new BadRequestException("CallEmpReelTask任务更新接口任务号为空！"); + throw new BadRequestException(LangProcess.msg("CallEmpReelTask_update1")); } // 执行中 if (TaskStatus.EXECUTING.getCode().equals(status.getCode())) { @@ -77,7 +78,7 @@ public class CallEmpReelTask extends AbstractTask { // 取消 if (status.getCode().equals(IOSEnum.IS_NOTANDYES.code("否"))) { if (Integer.parseInt(schBaseTask.getTask_status()) > Integer.parseInt(TaskStatus.ISSUE.getCode())) { - throw new BadRequestException("CallEmpReelTask任务已执行不能取消"); + throw new BadRequestException(LangProcess.msg("CallEmpReelTask_update2")); } // 更新任务表删除字段 schBaseTask.setIs_delete(true); @@ -89,22 +90,22 @@ public class CallEmpReelTask extends AbstractTask { @Override public void createCompletion(SchBaseTask task) { - Assert.notNull(task, "请求参数不能为空"); + Assert.notNull(task, LangProcess.msg("CallEmpReelTask_createTaskTip1")); String taskType = task.getTask_type(); if (StrUtil.isBlank(taskType)) { - throw new BadRequestException("业务类型不能为空"); + throw new BadRequestException(LangProcess.msg("CallEmpReelTask_createTaskTip2")); } String vehicleCode = task.getVehicle_code(); if (StrUtil.isBlank(vehicleCode)) { - throw new BadRequestException("载具号不能为空"); + throw new BadRequestException(LangProcess.msg("CallEmpReelTask_createTaskTip3")); } String pointCode1 = task.getPoint_code1(); if (StrUtil.isBlank(pointCode1)) { - throw new BadRequestException("起点不能为空"); + throw new BadRequestException(LangProcess.msg("CallEmpReelTask_createTaskTip4")); } String pointCode2 = task.getPoint_code2(); if (StrUtil.isBlank(pointCode2)) { - throw new BadRequestException("下一点不能为空"); + throw new BadRequestException(LangProcess.msg("CallEmpReelTask_createTaskTip5")); } //是否立即下发 boolean isSend = !StrUtil.isNotBlank(task.getIs_send()) || BooleanUtil.toBoolean(task.getIs_send()); @@ -128,7 +129,7 @@ public class CallEmpReelTask extends AbstractTask { SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper() .eq(SchBaseTask::getTask_id, taskId), false); if (schBaseTask == null) { - throw new BadRequestException("CallEmpReelTask任务强制完成接口任务号为空！"); + throw new BadRequestException(LangProcess.msg("CallEmpReelTask_forceFinish")); } schBaseTask.setTask_status(TaskStatus.FINISHED.getCode()); TaskUtils.setUpdateByDefault(schBaseTask); @@ -140,7 +141,7 @@ public class CallEmpReelTask extends AbstractTask { SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper() .eq(SchBaseTask::getTask_id, taskId), false); if (schBaseTask == null) { - throw new BadRequestException("CallEmpReelTask任务取消接口任务号为空！"); + throw new BadRequestException(LangProcess.msg("CallEmpReelTask_forceCancel")); } schBaseTask.setTask_status(IOSEnum.ACS_RESULT.code("取消")); TaskUtils.setUpdateByDefault(schBaseTask); diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/language/task/CallEmpReelTask.properties b/lms/nladmin-system/nlsso-server/src/main/resources/language/task/CallEmpReelTask.properties new file mode 100644 index 0000000..64d3f42 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/resources/language/task/CallEmpReelTask.properties @@ -0,0 +1,9 @@ +CallEmpReelTask_createTaskTip1=请求参数不能为空 +CallEmpReelTask_createTaskTip2=业务类型不能为空 +CallEmpReelTask_createTaskTip3=载具号不能为空 +CallEmpReelTask_createTaskTip4=起点不能为空 +CallEmpReelTask_createTaskTip5=下一点不能为空 +CallEmpReelTask_forceFinish=CallEmpReelTask任务取消接口任务号为空! +CallEmpReelTask_forceCancel=CallEmpReelTask任务取消接口任务号为空! +CallEmpReelTask_update1=CallEmpReelTask任务更新接口任务号为空 +CallEmpReelTask_update2=CallEmpReelTask任务已执行不能取消 diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/language/task/CallEmpReelTask_en_US.properties b/lms/nladmin-system/nlsso-server/src/main/resources/language/task/CallEmpReelTask_en_US.properties new file mode 100644 index 0000000..c3c3d66 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/resources/language/task/CallEmpReelTask_en_US.properties @@ -0,0 +1,9 @@ +CallEmpReelTask_createTaskTip1=Request parameters cannot be empty +CallEmpReelTask_createTaskTip2=Business type cannot be empty +CallEmpReelTask_createTaskTip3=The vehicle number cannot be empty +CallEmpReelTask_createTaskTip4=The starting point cannot be empty +CallEmpReelTask_createTaskTip5=The next point cannot be empty +CallEmpReelTask_forceFinish=CallEmpReelTask task cancellation interface task number is empty! +CallEmpReelTask_forceCancel=CallEmpReelTask task cancellation interface task number is empty! +CallEmpReelTask_update1=CallEmpReelTask task update interface task number is empty +CallEmpReelTask_update2=The CallEmpReelTask task has been executed and cannot be canceled diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/language/task/CallEmpReelTask_id_ID.properties b/lms/nladmin-system/nlsso-server/src/main/resources/language/task/CallEmpReelTask_id_ID.properties new file mode 100644 index 0000000..1e0a42e --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/resources/language/task/CallEmpReelTask_id_ID.properties @@ -0,0 +1,9 @@ +CallEmpReelTask_createTaskTip1=Parameter permintaan tidak boleh kosong +CallEmpReelTask_createTaskTip2=Jenis bisnis tidak boleh kosong +CallEmpReelTask_createTaskTip3=Nomor kendaraan tidak boleh kosong +CallEmpReelTask_createTaskTip4=Titik awal tidak boleh kosong +CallEmpReelTask_createTaskTip5=Poin selanjutnya tidak boleh kosong +CallEmpReelTask_forceFinish=Nomor tugas antarmuka pembatalan tugas CallEmpReelTask kosong! +CallEmpReelTask_forceCancel=Nomor tugas antarmuka pembatalan tugas CallEmpReelTask kosong! +CallEmpReelTask_update1=Nomor tugas antarmuka pembaruan tugas CallEmpReelTask kosong +CallEmpReelTask_update2=Tugas CallEmpReelTask telah dijalankan dan tidak dapat dibatalkan diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/language/task/CallEmpReelTask_in_ID.properties b/lms/nladmin-system/nlsso-server/src/main/resources/language/task/CallEmpReelTask_in_ID.properties new file mode 100644 index 0000000..1e0a42e --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/resources/language/task/CallEmpReelTask_in_ID.properties @@ -0,0 +1,9 @@ +CallEmpReelTask_createTaskTip1=Parameter permintaan tidak boleh kosong +CallEmpReelTask_createTaskTip2=Jenis bisnis tidak boleh kosong +CallEmpReelTask_createTaskTip3=Nomor kendaraan tidak boleh kosong +CallEmpReelTask_createTaskTip4=Titik awal tidak boleh kosong +CallEmpReelTask_createTaskTip5=Poin selanjutnya tidak boleh kosong +CallEmpReelTask_forceFinish=Nomor tugas antarmuka pembatalan tugas CallEmpReelTask kosong! +CallEmpReelTask_forceCancel=Nomor tugas antarmuka pembatalan tugas CallEmpReelTask kosong! +CallEmpReelTask_update1=Nomor tugas antarmuka pembaruan tugas CallEmpReelTask kosong +CallEmpReelTask_update2=Tugas CallEmpReelTask telah dijalankan dan tidak dapat dibatalkan diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/language/task/CallEmpReelTask_zh_CN.properties b/lms/nladmin-system/nlsso-server/src/main/resources/language/task/CallEmpReelTask_zh_CN.properties new file mode 100644 index 0000000..64d3f42 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/resources/language/task/CallEmpReelTask_zh_CN.properties @@ -0,0 +1,9 @@ +CallEmpReelTask_createTaskTip1=请求参数不能为空 +CallEmpReelTask_createTaskTip2=业务类型不能为空 +CallEmpReelTask_createTaskTip3=载具号不能为空 +CallEmpReelTask_createTaskTip4=起点不能为空 +CallEmpReelTask_createTaskTip5=下一点不能为空 +CallEmpReelTask_forceFinish=CallEmpReelTask任务取消接口任务号为空! +CallEmpReelTask_forceCancel=CallEmpReelTask任务取消接口任务号为空! +CallEmpReelTask_update1=CallEmpReelTask任务更新接口任务号为空 +CallEmpReelTask_update2=CallEmpReelTask任务已执行不能取消 diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/language/task/common.properties b/lms/nladmin-system/nlsso-server/src/main/resources/language/task/common.properties new file mode 100644 index 0000000..2313b45 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/resources/language/task/common.properties @@ -0,0 +1,3 @@ +common_configTip=找不到配置文件，请确认[{0}]配置是否存在！ +common_maxTaskTip={0}该点位申请的任务未完成数已超过上限，无法申请任务！ +common_taskCreatedTip=点位[{0}]已经创建过任务 diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/language/task/common_en_US.properties b/lms/nladmin-system/nlsso-server/src/main/resources/language/task/common_en_US.properties new file mode 100644 index 0000000..e1bbe84 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/resources/language/task/common_en_US.properties @@ -0,0 +1,3 @@ +common_configTip=The configuration file cannot be found, please confirm whether the [{0}] configuration exists! +common_maxTaskTip={0}The number of unfinished tasks applied for at this point has exceeded the upper limit, and the task cannot be applied! +common_taskCreatedTip=Point[{0}] has already created a task diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/language/task/common_id_ID.properties b/lms/nladmin-system/nlsso-server/src/main/resources/language/task/common_id_ID.properties new file mode 100644 index 0000000..5deac2d --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/resources/language/task/common_id_ID.properties @@ -0,0 +1,3 @@ +common_configTip=File konfigurasi tidak dapat ditemukan, harap konfirmasi apakah konfigurasi [{0}] ada! +common_maxTaskTip={0}Jumlah tugas yang belum selesai yang diajukan pada saat ini telah melampaui batas atas, dan tugas tersebut tidak dapat diterapkan! +common_taskCreatedTip=Point[{0}] telah membuat tugas diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/language/task/common_in_ID.properties b/lms/nladmin-system/nlsso-server/src/main/resources/language/task/common_in_ID.properties new file mode 100644 index 0000000..5deac2d --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/resources/language/task/common_in_ID.properties @@ -0,0 +1,3 @@ +common_configTip=File konfigurasi tidak dapat ditemukan, harap konfirmasi apakah konfigurasi [{0}] ada! +common_maxTaskTip={0}Jumlah tugas yang belum selesai yang diajukan pada saat ini telah melampaui batas atas, dan tugas tersebut tidak dapat diterapkan! +common_taskCreatedTip=Point[{0}] telah membuat tugas diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/language/task/common_zh_CN.properties b/lms/nladmin-system/nlsso-server/src/main/resources/language/task/common_zh_CN.properties new file mode 100644 index 0000000..2313b45 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/resources/language/task/common_zh_CN.properties @@ -0,0 +1,3 @@ +common_configTip=找不到配置文件，请确认[{0}]配置是否存在！ +common_maxTaskTip={0}该点位申请的任务未完成数已超过上限，无法申请任务！ +common_taskCreatedTip=点位[{0}]已经创建过任务