From cafd59bc2c3be418d9de86780245f26099d48b57 Mon Sep 17 00:00:00 2001
From: lishuai <1793460677@qq.com>
Date: Thu, 8 Aug 2024 17:13:35 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20NDC=E6=A0=A1=E9=AA=8C=E5=8E=BB=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../agv/server/impl/NDCAgvServiceImpl.java    | 30 +++++++++----------
 .../src/main/resources/config/application.yml |  2 +-
 .../src/layout/components/Sidebar/Logo.vue    |  3 +-
 3 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java
index 693a799..273657c 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java
@@ -111,22 +111,20 @@ public class NDCAgvServiceImpl implements NDCAgvService {
 
 
             byte[] b = new byte[]{};
-            if (type == 1) {
-                b = new byte[]{(byte) 0X87, (byte) 0XCD,
-                        (byte) 0X00, (byte) 0X08,
-                        (byte) 0X00, (byte) 0X12,
-                        (byte) 0X00, (byte) 0X01,
-                        (byte) 0X00, (byte) 0X71,
-                        (byte) 0X00, (byte) 0X0E,
-                        (byte) 0X01, (byte) 0X80,
-                        (byte) 0X00, (byte) 0X01,
-                        (byte) ikeyhigh, (byte) ikeylow,
-                        (byte) ikeyhigh, (byte) ikeylow,
-                        (byte) typehigh, (byte) typelow,
-                        (byte) qhdhigh, (byte) qhdlow,
-                        (byte) fhdhigh, (byte) fhdlow,
-                };
-            }
+            b = new byte[]{(byte) 0X87, (byte) 0XCD,
+                    (byte) 0X00, (byte) 0X08,
+                    (byte) 0X00, (byte) 0X12,
+                    (byte) 0X00, (byte) 0X01,
+                    (byte) 0X00, (byte) 0X71,
+                    (byte) 0X00, (byte) 0X0E,
+                    (byte) 0X01, (byte) 0X80,
+                    (byte) 0X00, (byte) 0X01,
+                    (byte) ikeyhigh, (byte) ikeylow,
+                    (byte) ikeyhigh, (byte) ikeylow,
+                    (byte) typehigh, (byte) typelow,
+                    (byte) qhdhigh, (byte) qhdlow,
+                    (byte) fhdhigh, (byte) fhdlow,
+            };
             log.info("下发AGV作业指令 --{}", str1);
             log.info("下发AGV作业指令--{}", str);
             log.info("下发agv指令数据--{}", Bytes2HexString(b));
diff --git a/acs2/nladmin-system/nlsso-server/src/main/resources/config/application.yml b/acs2/nladmin-system/nlsso-server/src/main/resources/config/application.yml
index 709369d..6eb5a1c 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/resources/config/application.yml
+++ b/acs2/nladmin-system/nlsso-server/src/main/resources/config/application.yml
@@ -6,7 +6,7 @@ spring:
   freemarker:
     check-template-location: false
   profiles:
-    active: prod
+    active: dev
   jackson:
     time-zone: GMT+8
   data:
diff --git a/acs2/nladmin-ui/src/layout/components/Sidebar/Logo.vue b/acs2/nladmin-ui/src/layout/components/Sidebar/Logo.vue
index 604f069..ca80be8 100644
--- a/acs2/nladmin-ui/src/layout/components/Sidebar/Logo.vue
+++ b/acs2/nladmin-ui/src/layout/components/Sidebar/Logo.vue
@@ -16,7 +16,6 @@
 <script>
 import Logo from '@/assets/images/newloge.png'
 import variables from '@/assets/styles/variables.scss'
-import i18n from '@/i18n'
 export default {
   name: 'SidebarLogo',
   props: {
@@ -27,7 +26,7 @@ export default {
   },
   data() {
     return {
-      title: '斗山山猫ACS',
+      title: '두산 밥캣스 acs',
       logo: Logo,
       title_param: 'platform'
     }