From dddfe516843408ab2b395af391c586c77b52eced Mon Sep 17 00:00:00 2001
From: tuqiang <437016993@qq.com>
Date: Fri, 31 May 2024 13:38:39 +0800
Subject: [PATCH] =?UTF-8?q?rev:=E4=BC=98=E5=8C=96=E8=B7=AF=E7=94=B1?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/acs/route/service/impl/RouteLineServiceImpl.java     | 2 +-
 .../src/main/resources/language/error/error.properties          | 2 +-
 .../src/main/resources/language/error/error_en_US.properties    | 2 +-
 .../src/main/resources/language/error/error_in_ID.properties    | 2 +-
 .../src/main/resources/language/error/error_zh_CN.properties    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RouteLineServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RouteLineServiceImpl.java
index d9c6ed52a..f1303c1c2 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RouteLineServiceImpl.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RouteLineServiceImpl.java
@@ -343,7 +343,7 @@ public class RouteLineServiceImpl extends CommonServiceImpl<RouteLineMapper, Rou
                         list1.add(convert);
                     }
                 } else {
-                    throw new BadRequestException(LangProcess.msg("error_creat_route"));
+                    throw new BadRequestException(LangProcess.msg("error_creat_route")+dto.getDevice_code()+"==>"+dto.getNext_device_code());
                 }
             }
         }
diff --git a/acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error.properties b/acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error.properties
index 321af8bcd..23b328f5b 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error.properties
+++ b/acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error.properties
@@ -25,5 +25,5 @@ error_sysFile=\u4E0A\u4F20\u5931\u8D25
 error_sysLimit=\u8BBF\u95EE\u6B21\u6570\u9650\u5236\!
 zh_device_name_isNotNull = \u4E2D\u6587\u8BBE\u5907\u540D\u79F0\u4E0D\u80FD\u4F4D\u7A7A
 error_not_configured=\u5B57\u5178\u8868\u672A\u914D\u7F6E\u5BF9\u5E94\u7684\u62A5\u8B66\u4FE1\u606F
-error_creat_route=\u5DF2\u5B58\u5728\u8BE5\u8DEF\u7531\u8DEF\u7EBF\uFF01
+error_creat_route=\u5DF2\u5B58\u5728\u8BE5\u8DEF\u7531\u8DEF\u7EBF:
 error_regional_max=\u533A\u57DF\u6307\u4EE4\u6570\u91CF\u5DF2\u6700\u5927\u503C
diff --git a/acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error_en_US.properties b/acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error_en_US.properties
index ab59e1e55..0de312039 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error_en_US.properties
+++ b/acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error_en_US.properties
@@ -25,6 +25,6 @@ error_sysFile=Upload failed
 error_sysLimit=Access limit\!
 zh_device_name_isNotNull = Chinese device name cannot be empty\!
 error_not_configured=The dictionary table is not configured with alarm information
-error_creat_route=The route already exists!
+error_creat_route=The route already exists:
 error_regional_max=Maximum limit for regional instructions reached
 
diff --git a/acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error_in_ID.properties b/acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error_in_ID.properties
index 96369c52c..3308eeae6 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error_in_ID.properties
+++ b/acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error_in_ID.properties
@@ -25,5 +25,5 @@ error_sysFile=Upload gagal
 error_sysLimit=Batas akses\!
 zh_device_name_isNotNull= Nama perangkat dalam bahasa Cina tidak boleh kosong!
 error_not_configured=Informasi alarm tak dikonfigurasi dari tabel kamus
-error_creat_route=Itu sudah ada!
+error_creat_route=Itu sudah ada:
 error_regional_max=Jumlah maksimum instruksi wilayah telah tercapai
diff --git a/acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error_zh_CN.properties b/acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error_zh_CN.properties
index 3b79b0e55..549311e35 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error_zh_CN.properties
+++ b/acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error_zh_CN.properties
@@ -25,6 +25,6 @@ error_sysFile=\u4E0A\u4F20\u5931\u8D25
 error_sysLimit=\u8BBF\u95EE\u6B21\u6570\u9650\u5236\!
 zh_device_name_isNotNull = \u4E2D\u6587\u8BBE\u5907\u540D\u79F0\u4E0D\u80FD\u4E3A\u7A7A
 error_not_configured=\u5B57\u5178\u8868\u672A\u914D\u7F6E\u5BF9\u5E94\u7684\u62A5\u8B66\u4FE1\u606F
-error_creat_route=\u5DF2\u5B58\u5728\u8BE5\u8DEF\u7531\u8DEF\u7EBF\uFF01
+error_creat_route=\u5DF2\u5B58\u5728\u8BE5\u8DEF\u7531\u8DEF\u7EBF:
 error_regional_max=\u533A\u57DF\u6307\u4EE4\u6570\u91CF\u5DF2\u6700\u5927\u503C