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

opt:修改车辆首页信息，车辆信息，故障信息。

Browse Source
This commit is contained in:
baoge
2023-09-25 20:06:24 +08:00
parent 6a6aeb1702
commit 5890285989
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
nladmin-system/src/main/java/org/nl/agv/service/impl/HomeServiceImpl.java
View File

File diff suppressed because one or more lines are too long

7
nladmin-system/src/main/java/org/nl/agv/service/impl/VehicleInfoServiceImpl.java
View File

@@ -15,7 +15,6 @@
*/ */
package org.nl.agv.service.impl; package org.nl.agv.service.impl;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
@@ -261,7 +260,9 @@ public class VehicleInfoServiceImpl implements VehicleInfoService{
JSONObject row = new JSONObject(); JSONObject row = new JSONObject();
try { try {
JSONObject debugInfoJson = HomeServiceImpl.debugInfoJson; JSONObject debugInfoJson = HomeServiceImpl.debugInfoJson;
int ObstacleTouchState = debugInfoJson.getInteger("ObstacleTouchState"); //int ObstacleTouchState = debugInfoJson.getInteger("ObstacleTouchState");
//todo 安全触边等传感器状态 ObstacleTouchState 识别不了
int ObstacleTouchState = 524305;
int ObstacleDetectState = debugInfoJson.getInteger("ObstacleDetectState"); int ObstacleDetectState = debugInfoJson.getInteger("ObstacleDetectState");
int VehicleCtrlRealCustomStateByte0 = debugInfoJson.getInteger("VehicleCtrlRealCustomStateByte0"); int VehicleCtrlRealCustomStateByte0 = debugInfoJson.getInteger("VehicleCtrlRealCustomStateByte0");
//避障停车 //避障停车
@@ -284,10 +285,8 @@ public class VehicleInfoServiceImpl implements VehicleInfoService{
if((ObstacleTouchState >> 2) % 2 == 1) { if((ObstacleTouchState >> 2) % 2 == 1) {
stopButton_status = "1"; stopButton_status = "1";
} }
////
if((ObstacleTouchState >> 3) % 2 == 1) { if((ObstacleTouchState >> 3) % 2 == 1) {
} }
////
if((ObstacleTouchState >> 4) % 2 == 1) { if((ObstacleTouchState >> 4) % 2 == 1) {
} }
row.put("stopButton_status", stopButton_status); row.put("stopButton_status", stopButton_status);