root/hanguodoushan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: NDC校验去除

Browse Source
This commit is contained in:
lishuai
2024-08-08 17:13:35 +08:00
parent 9514ce13fe
commit cafd59bc2c
3 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java
View File

@@ -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));

2
acs2/nladmin-system/nlsso-server/src/main/resources/config/application.yml
View File

@@ -6,7 +6,7 @@ spring:
freemarker:
check-template-location: false
profiles:
active: prod
active: dev
jackson:
time-zone: GMT+8
data:

3
acs2/nladmin-ui/src/layout/components/Sidebar/Logo.vue
View File

@@ -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'
}