From 1ee4a59f7dc153ab303dda8e5c85d40f05c456c5 Mon Sep 17 00:00:00 2001
From: Andy Yang <10339434@qq.com>
Date: Wed, 4 Mar 2026 16:53:18 +0800
Subject: [PATCH] feat: fix i18n string in service implementation

---
 .../skyeye/jm/service/impl/JmJobStatusServiceImpl.java       | 5 +++--
 .../src/main/resources/i18n/messages.properties              | 2 ++
 .../src/main/resources/i18n/messages_zh_CN.properties        | 2 ++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/jm/service/impl/JmJobStatusServiceImpl.java b/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/jm/service/impl/JmJobStatusServiceImpl.java
index 21e0233..4542597 100644
--- a/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/jm/service/impl/JmJobStatusServiceImpl.java
+++ b/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/jm/service/impl/JmJobStatusServiceImpl.java
@@ -1,6 +1,7 @@
 package com.zhangy.skyeye.jm.service.impl;
 
 import com.zhangy.skyeye.common.extend.exception.ServiceException;
+import com.zhangy.skyeye.common.extend.util.MessageUtils;
 import com.zhangy.skyeye.jm.dto.*;
 import com.zhangy.skyeye.jm.entity.JmJobPayload;
 import com.zhangy.skyeye.jm.entity.JmJobUav;
@@ -173,11 +174,11 @@ public class JmJobStatusServiceImpl implements JmJobStatusService {
         // 校验新任务中的无人机和载荷是否冲突
         for (JmJobUav newUav : newJobUavs) {
             if (runningUavIds.contains(newUav.getUavId())) {
-                throw ServiceException.warnLog("无人机正在任务中，无法执行新任务");
+                throw ServiceException.warnLog(MessageUtils.message("sar.control.turnon.euavinexec"));
             }
             for (JmJobPayload payload : newUav.getPayloadList()) {
                 if (runningPayloadIds.contains(payload.getPayloadId())) {
-                    throw ServiceException.warnLog("载荷正在任务中，无法执行新任务");
+                    throw ServiceException.warnLog(MessageUtils.message("sar.control.turnon.esarinexec"));
                 }
             }
         }
diff --git a/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/resources/i18n/messages.properties b/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/resources/i18n/messages.properties
index ac72633..2d97afb 100644
--- a/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/resources/i18n/messages.properties
+++ b/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/resources/i18n/messages.properties
@@ -30,6 +30,8 @@ sar.control.send.failed=Send failed
 sar.control.turnon.success=Send success
 sar.control.turnon.enoip=Failed to extract payload IP address
 sar.control.turnon.eexcept=Failed to parse request body
+sar.control.turnon.euavinexec=Configured UAV in middle of executing
+sar.control.turnon.esarinexec=Configured SAR in middle of executing
 sar.control.endall.success=Send success
 sar.control.endall.enoip=Failed to extract payload IP address
 sar.control.endall.eexcept=Failed to parse request body
diff --git a/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/resources/i18n/messages_zh_CN.properties b/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/resources/i18n/messages_zh_CN.properties
index c3ed8d6..ba7ba1b 100644
--- a/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/resources/i18n/messages_zh_CN.properties
+++ b/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/resources/i18n/messages_zh_CN.properties
@@ -28,6 +28,8 @@ sar.control.send.failed=发送失败
 sar.control.turnon.success=发送成功
 sar.control.turnon.enoip=请求体中缺少 'payloadId' 或其值为空
 sar.control.turnon.eexcept=请求体JSON格式错误
+sar.control.turnon.euavinexec=无人机正在任务中，无法执行新任务
+sar.control.turnon.esarinexec=载荷正在任务中，无法执行新任务
 sar.control.endall.success=发送成功
 sar.control.endall.enoip=请求体中缺少 'payloadId' 或其值为空
 sar.control.endall.eexcept=请求体JSON格式错误