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

rev:修改首页任务显示问题

Browse Source
This commit is contained in:
baoge
2023-11-17 17:01:11 +08:00
parent fec1a43540
commit 2571beb3ba
8 changed files with 312 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nladmin-system/pom.xml
View File

@@ -255,7 +255,7 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version>
<version>8.0.28</version>
</dependency>
<dependency>

40
nladmin-system/src/main/java/org/nl/agv/rest/SortingExample.java Normal file
View File

@@ -0,0 +1,40 @@
package org.nl.agv.rest;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Queue;
import java.util.concurrent.LinkedBlockingQueue;
public class SortingExample {
public static void main(String[] args) {
// 假设 itemArray 是你的JSONArray
JSONArray itemArray = new JSONArray();
// 假设你有一个 Queue 用于存储排序后的元素
Queue<JSONObject> sortedQueue = new LinkedBlockingQueue<>();
// 将JSONArray中的元素按照num字段从小到大进行排序
List<JSONObject> listToSort = new ArrayList<>();
for (int i = 0; i < itemArray.size(); i++) {
listToSort.add(itemArray.getJSONObject(i));
}
// 使用Comparator按照num字段从小到大排序
Collections.sort(listToSort, Comparator.comparingInt(o -> o.getIntValue("num")));
// 将排序后的元素放入队列中
sortedQueue.addAll(listToSort);
// 遍历队列中的元素，按照顺序执行相关操作
while (!sortedQueue.isEmpty()) {
JSONObject element = sortedQueue.poll();
// 在这里执行你需要的操作，例如处理元素中的num字段
int num = element.getIntValue("num");
// 执行其他操作...
}
}
}

3
nladmin-system/src/main/java/org/nl/agv/rest/TaskController.java
View File

@@ -1,6 +1,4 @@
package org.nl.agv.rest;
import cn.dev33.satoken.annotation.SaIgnore;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -14,7 +12,6 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.Map;
/**

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

@@ -22,12 +22,12 @@ import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HttpUtil;
import com.esotericsoftware.minlog.Log;
import edu.wpi.rail.jrosbridge.Ros;
import edu.wpi.rail.jrosbridge.Topic;
import edu.wpi.rail.jrosbridge.callback.TopicCallback;
import edu.wpi.rail.jrosbridge.messages.Message;
import edu.wpi.rail.jrosbridge.services.ServiceResponse;
import jline.internal.Log;
import lombok.RequiredArgsConstructor;
import com.alibaba.fastjson.JSONObject;
import org.nl.agv.enu.TaskSendBackStatusEnum;
@@ -41,6 +41,8 @@ import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
@@ -66,12 +68,13 @@ public class HomeServiceImpl implements HomeService{
@Override
public void qeryDebuggerInfo() {
Map<String,String> urlInfo = RosUtil.getRosHostInfo();
//todo RosJons模拟数据用，正式需改回
//String result1 = HttpUtil.get("http://localhost:8011/api/pcsIfPurchaseorder/queryApt");
//todo 用，正式需改回
//String result1 = "{\"Msg_DisplayState\":{\"AGV_ID\":255,\"Auto_In_Line_State\":0,\"Bosch_Car_Global_Theta\":-90.19221757272916,\"Bosch_Car_Global_rx\":-1.0619603784858553,\"Bosch_Car_Global_ry\":0.0020978358374357303,\"Bosch_Loc_State\":-2,\"Bosch_No_Rec_State\":0,\"Bosch_raw_age\":0.01389455795288086,\"Bosch_raw_epoch\":1,\"Bosch_raw_locState\":-2,\"Bosch_raw_qw\":0.9999999908132869,\"Bosch_raw_qx\":0.0,\"Bosch_raw_qy\":0.0,\"Bosch_raw_qz\":0.00013554861104682667,\"Bosch_raw_timestamp\":1695633231.1093392,\"Bosch_raw_uniqueId\":0,\"Bosch_raw_x\":0.0008994877773440588,\"Bosch_raw_x_odo\":0.0008994877773440588,\"Bosch_raw_y\":0.0006906610801896382,\"Bosch_raw_y_odo\":0.0006906610801896382,\"Bosch_raw_yaw\":0.00027109722292381746,\"Bosch_raw_yaw_odo\":0.0006906610801896382,\"Bosch_raw_z\":0.0,\"CAD_Or_TCS_Ctrl\":0,\"Car_Global_Theta\":-90.19221757272916,\"Car_Global_rx\":-1.0619603784858553,\"Car_Global_ry\":0.0020978358374357303,\"CurNodeID\":0,\"Cur_Stop_Info1_Authorized_Pass\":1,\"Cur_Stop_Info1_High_Precious_Enable\":1,\"Cur_Stop_Info1_Reached_Stop\":0,\"Cur_Stop_Info1_Set_Patht\":0.0,\"Cur_Stop_Info1_Set_Pathx\":0.0,\"Cur_Stop_Info1_Set_Pathy\":0.0,\"Cur_Stop_Info1_Single_Request_Sch\":0,\"Cur_Stop_Info1_Single_Stop_Sch\":0,\"Cur_Stop_Info1_StopEndNode\":0,\"Cur_Stop_Info1_StopStartNode\":0,\"Cur_Stop_Info1_Stop_Endt\":0.0,\"Cur_Stop_Info1_Stop_Endx\":0.0,\"Cur_Stop_Info1_Stop_Endy\":0.0,\"Cur_Stop_Info1_Stop_Num\":0,\"Cur_Stop_Info2_Authorized_Pass\":1,\"Cur_Stop_Info2_High_Precious_Enable\":1,\"Cur_Stop_Info2_Reached_Stop\":0,\"Cur_Stop_Info2_Set_Patht\":0.0,\"Cur_Stop_Info2_Set_Pathx\":0.0,\"Cur_Stop_Info2_Set_Pathy\":0.0,\"Cur_Stop_Info2_Single_Request_Sch\":0,\"Cur_Stop_Info2_Single_Stop_Sch\":0,\"Cur_Stop_Info2_StopEndNode\":0,\"Cur_Stop_Info2_StopStartNode\":0,\"Cur_Stop_Info2_Stop_Endt\":0.0,\"Cur_Stop_Info2_Stop_Endx\":0.0,\"Cur_Stop_Info2_Stop_Endy\":0.0,\"Cur_Stop_Info2_Stop_Num\":0,\"Curtis_Warning_Code_Pump\":0,\"Curtis_Warning_Code_Speed\":82,\"Curtis_Warning_Code_Steer\":0,\"EndNode\":0,\"Env_CustomName\":\"NobleLift\",\"Env_HMIUseJavaApp\":\"true\",\"Env_LearnEnable\":\"true\",\"Env_Lu_ROS_IP2\":\"\",\"Env_SoftwareVersion\":\"[Version]Magic4.1[Info]2023_09_21_20_41_37_Lu_ROS_magic4_waypointab_v31\",\"Env_VehicleType\":\"PS10LMT_HuaHai\",\"Get_Nav350_Curr_Layer\":0,\"Language\":1022739087,\"LastAltitudeExpectValue_mm\":0,\"LastGantryXExpectValue_mm\":0,\"LastGantryYExpectValue_mm\":0,\"Lateral_Deviation_m\":0.0,\"License_Info\":\"EC060800FFFBEBBF 6B7685747EBC EC060800FFFBEBBF 6B7685747EBC 2021/8/26 13:46:47 2021/8/26 13:46:47 1 UserClass5 Magic4_1\",\"LindeAgwSteerCenterPivotPlateAng\":0,\"LindeAgwSteerErrorFlag\":0,\"LindeAgwSteerModeSelectorState\":0,\"LindeAgwTracLiftErrorFlag\":0,\"LindeAgwTracLiftModeSelectorState\":0,\"LindeDriveErrCode1\":0,\"LindeDriveErrCode2\":0,\"LindeDriveErrCode3\":0,\"LindeDriveErrCode4\":0,\"LindeLiftErrCode1\":0,\"LindeLiftErrCode2\":0,\"LindeLiftErrCode3\":0,\"LindeLiftErrCode4\":0,\"LindeSteerErrCode1\":0,\"LindeSteerErrCode2\":0,\"LindeSteerErrCode3\":0,\"LindeSteerErrCode4\":0,\"Login_Info\":\"\",\"Min_Dist\":0.0,\"MissionCompleteAltitude_mm_RemoteOrHMI_FB\":0,\"MissionCompleteGantryX_mm_RemoteOrHMI_FB\":0,\"MissionCompleteGantryY_mm_RemoteOrHMI_FB\":0,\"Navi_Method\":3,\"ObstacleDetectState\":0,\"ObstacleTouchState\":0,\"Out_Of_Path_Times\":0,\"PFC_Sch\":0,\"PFC_State\":\"[PathFollow_Control_Handle_WLANJSON][PathFollow_Schedule_WLANJSON=0]\\n\",\"PLC_Warning_Code\":0,\"PWR_Percent\":100,\"PWR_Warn\":0,\"PathFollow_Enable\":0,\"PathFollow_Expect_AltitudeCtrlEnable\":0,\"PathFollow_Expect_GantryXCtrlEnable\":0,\"PathFollow_Expect_GantryYCtrlEnable\":0,\"Plate_Check_Err_Code\":0,\"ReachState\":0,\"RealAutoChargeState\":0,\"Ref_std_rt\":0.0,\"Ref_std_rx\":0.0,\"Ref_std_ry\":0.0,\"Remote_Or_HMI_Ctrl\":1,\"SVreal_angle\":0.0,\"Sche_JSON_Sche_Enable\":0,\"Speedm_Tmp\":0.0,\"StartNode\":0,\"Sub_Warning_Code0\":0,\"Sys_Mode\":4,\"Task_Sch\":0,\"Task_State\":\"\",\"Update_Sch\":0,\"Update_State\":\"\",\"VehicleCtrlExpThrottle\":0,\"VehicleCtrlRealAltitude_mm\":998,\"VehicleCtrlRealCustomStateByte0\":0,\"VehicleCtrlRealCustomStateByte1\":0,\"VehicleCtrlRealCustomStateByte2\":0,\"VehicleCtrlRealCustomStateByte3\":0,\"VehicleCtrlRealGantryX_mm\":0,\"VehicleCtrlRealGantryY_mm\":0,\"VehicleCtrlRealJoyEnable\":0,\"VehicleCtrlRealRCEnable\":0,\"VehicleCtrl_CAN_Err_Info\":0,\"Vertical_Deviation_deg\":0.0,\"Warning_Code\":754529,\"header\":{\"frame_id\":\"\",\"seq\":1904,\"stamp\":{\"nsec\":160948865,\"sec\":1695633231}}}}";
//JSONObject json = JSONObject.parseObject(result1);
String result = HttpUtil.get(urlInfo.get("javaUrl"));
JSONObject json = JSONObject.parseObject(result);
String result1 = "{\"Msg_DisplayState\":{\"AGV_ID\":255,\"Auto_In_Line_State\":0,\"Bosch_Car_Global_Theta\":-90.19221757272916,\"Bosch_Car_Global_rx\":-1.0619603784858553,\"Bosch_Car_Global_ry\":0.0020978358374357303,\"Bosch_Loc_State\":-2,\"Bosch_No_Rec_State\":0,\"Bosch_raw_age\":0.01389455795288086,\"Bosch_raw_epoch\":1,\"Bosch_raw_locState\":-2,\"Bosch_raw_qw\":0.9999999908132869,\"Bosch_raw_qx\":0.0,\"Bosch_raw_qy\":0.0,\"Bosch_raw_qz\":0.00013554861104682667,\"Bosch_raw_timestamp\":1695633231.1093392,\"Bosch_raw_uniqueId\":0,\"Bosch_raw_x\":0.0008994877773440588,\"Bosch_raw_x_odo\":0.0008994877773440588,\"Bosch_raw_y\":0.0006906610801896382,\"Bosch_raw_y_odo\":0.0006906610801896382,\"Bosch_raw_yaw\":0.00027109722292381746,\"Bosch_raw_yaw_odo\":0.0006906610801896382,\"Bosch_raw_z\":0.0,\"CAD_Or_TCS_Ctrl\":0,\"Car_Global_Theta\":-90.19221757272916,\"Car_Global_rx\":-1.0619603784858553,\"Car_Global_ry\":0.0020978358374357303,\"CurNodeID\":0,\"Cur_Stop_Info1_Authorized_Pass\":1,\"Cur_Stop_Info1_High_Precious_Enable\":1,\"Cur_Stop_Info1_Reached_Stop\":0,\"Cur_Stop_Info1_Set_Patht\":0.0,\"Cur_Stop_Info1_Set_Pathx\":0.0,\"Cur_Stop_Info1_Set_Pathy\":0.0,\"Cur_Stop_Info1_Single_Request_Sch\":0,\"Cur_Stop_Info1_Single_Stop_Sch\":0,\"Cur_Stop_Info1_StopEndNode\":0,\"Cur_Stop_Info1_StopStartNode\":0,\"Cur_Stop_Info1_Stop_Endt\":0.0,\"Cur_Stop_Info1_Stop_Endx\":0.0,\"Cur_Stop_Info1_Stop_Endy\":0.0,\"Cur_Stop_Info1_Stop_Num\":0,\"Cur_Stop_Info2_Authorized_Pass\":1,\"Cur_Stop_Info2_High_Precious_Enable\":1,\"Cur_Stop_Info2_Reached_Stop\":0,\"Cur_Stop_Info2_Set_Patht\":0.0,\"Cur_Stop_Info2_Set_Pathx\":0.0,\"Cur_Stop_Info2_Set_Pathy\":0.0,\"Cur_Stop_Info2_Single_Request_Sch\":0,\"Cur_Stop_Info2_Single_Stop_Sch\":0,\"Cur_Stop_Info2_StopEndNode\":0,\"Cur_Stop_Info2_StopStartNode\":0,\"Cur_Stop_Info2_Stop_Endt\":0.0,\"Cur_Stop_Info2_Stop_Endx\":0.0,\"Cur_Stop_Info2_Stop_Endy\":0.0,\"Cur_Stop_Info2_Stop_Num\":0,\"Curtis_Warning_Code_Pump\":0,\"Curtis_Warning_Code_Speed\":82,\"Curtis_Warning_Code_Steer\":0,\"EndNode\":0,\"Env_CustomName\":\"NobleLift\",\"Env_HMIUseJavaApp\":\"true\",\"Env_LearnEnable\":\"true\",\"Env_Lu_ROS_IP2\":\"\",\"Env_SoftwareVersion\":\"[Version]Magic4.1[Info]2023_09_21_20_41_37_Lu_ROS_magic4_waypointab_v31\",\"Env_VehicleType\":\"PS10LMT_HuaHai\",\"Get_Nav350_Curr_Layer\":0,\"Language\":1022739087,\"LastAltitudeExpectValue_mm\":0,\"LastGantryXExpectValue_mm\":0,\"LastGantryYExpectValue_mm\":0,\"Lateral_Deviation_m\":0.0,\"License_Info\":\"EC060800FFFBEBBF 6B7685747EBC EC060800FFFBEBBF 6B7685747EBC 2021/8/26 13:46:47 2021/8/26 13:46:47 1 UserClass5 Magic4_1\",\"LindeAgwSteerCenterPivotPlateAng\":0,\"LindeAgwSteerErrorFlag\":0,\"LindeAgwSteerModeSelectorState\":0,\"LindeAgwTracLiftErrorFlag\":0,\"LindeAgwTracLiftModeSelectorState\":0,\"LindeDriveErrCode1\":0,\"LindeDriveErrCode2\":0,\"LindeDriveErrCode3\":0,\"LindeDriveErrCode4\":0,\"LindeLiftErrCode1\":0,\"LindeLiftErrCode2\":0,\"LindeLiftErrCode3\":0,\"LindeLiftErrCode4\":0,\"LindeSteerErrCode1\":0,\"LindeSteerErrCode2\":0,\"LindeSteerErrCode3\":0,\"LindeSteerErrCode4\":0,\"Login_Info\":\"\",\"Min_Dist\":0.0,\"MissionCompleteAltitude_mm_RemoteOrHMI_FB\":0,\"MissionCompleteGantryX_mm_RemoteOrHMI_FB\":0,\"MissionCompleteGantryY_mm_RemoteOrHMI_FB\":0,\"Navi_Method\":3,\"ObstacleDetectState\":0,\"ObstacleTouchState\":0,\"Out_Of_Path_Times\":0,\"PFC_Sch\":0,\"PFC_State\":\"[PathFollow_Control_Handle_WLANJSON][PathFollow_Schedule_WLANJSON=0]\\n\",\"PLC_Warning_Code\":0,\"PWR_Percent\":100,\"PWR_Warn\":0,\"PathFollow_Enable\":0,\"PathFollow_Expect_AltitudeCtrlEnable\":0,\"PathFollow_Expect_GantryXCtrlEnable\":0,\"PathFollow_Expect_GantryYCtrlEnable\":0,\"Plate_Check_Err_Code\":0,\"ReachState\":0,\"RealAutoChargeState\":0,\"Ref_std_rt\":0.0,\"Ref_std_rx\":0.0,\"Ref_std_ry\":0.0,\"Remote_Or_HMI_Ctrl\":1,\"SVreal_angle\":0.0,\"Sche_JSON_Sche_Enable\":0,\"Speedm_Tmp\":0.0,\"StartNode\":0,\"Sub_Warning_Code0\":0,\"Sys_Mode\":4,\"Task_Sch\":0,\"Task_State\":\"\",\"Update_Sch\":0,\"Update_State\":\"\",\"VehicleCtrlExpThrottle\":0,\"VehicleCtrlRealAltitude_mm\":998,\"VehicleCtrlRealCustomStateByte0\":0,\"VehicleCtrlRealCustomStateByte1\":0,\"VehicleCtrlRealCustomStateByte2\":0,\"VehicleCtrlRealCustomStateByte3\":0,\"VehicleCtrlRealGantryX_mm\":0,\"VehicleCtrlRealGantryY_mm\":0,\"VehicleCtrlRealJoyEnable\":0,\"VehicleCtrlRealRCEnable\":0,\"VehicleCtrl_CAN_Err_Info\":0,\"Vertical_Deviation_deg\":0.0,\"Warning_Code\":754529,\"header\":{\"frame_id\":\"\",\"seq\":1904,\"stamp\":{\"nsec\":160948865,\"sec\":1695633231}}}}";
JSONObject json = JSONObject.parseObject(result1);
try {
//String result = HttpUtil.get(urlInfo.get("javaUrl"));
//JSONObject json = JSONObject.parseObject(result);
JSONObject jo = JSONObject.parseObject(json.getString("Msg_DisplayState"));
debugInfoJson.put("Msg_Timestamp", jo.getJSONObject("header").getJSONObject("stamp").getString("sec"));
debugInfoJson.put("AGV_ID", jo.getString("AGV_ID"));
@@ -140,6 +143,11 @@ public class HomeServiceImpl implements HomeService{
}
debugInfoJson.put("PathFollow_Enable", PathFollow_Enable);
}
catch(Exception e) {
Log.error("通信失败:" + e.getMessage());
throw new BadRequestException(e.getMessage() == null ? "通信失败，请检查系统参数中的Ros连接信息" : e.getMessage());
}
}
public void QueryDebuggerInfo2() {
debugInfoJson = new JSONObject();
@@ -230,7 +238,7 @@ public class HomeServiceImpl implements HomeService{
//手自动是Sys_Mode 3 REMA手动 4自动 5 IO手持方式的手动，这个车不装
String automatic_status = debugInfoJson.getString("Sys_Mode");
if(StrUtil.equals(automatic_status, "3")) {
agvrun_status_name = "REMA手动";
agvrun_status_name = "手动";
}
if(StrUtil.equals(automatic_status, "4")) {
agvrun_status_name = "自动";
@@ -256,11 +264,13 @@ public class HomeServiceImpl implements HomeService{
String automatic_status_name = "";
String device_info = "";
String task_name = "";
String task_info = "";
Integer electric = 0;
String speed = "";
String error_name = "正常运行";
JSONObject returnjo = new JSONObject();
JSONObject row = new JSONObject();
try {
//查询调试信息
CompletableFuture.runAsync(this::qeryDebuggerInfo, pool);
JSONObject tasking = WQLObject.getWQLObject("ST_TASK_INFO").query("is_delete= 0 and task_status='01' and task_type='1'").uniqueResult(0);
@@ -271,14 +281,21 @@ public class HomeServiceImpl implements HomeService{
if(tasking == null) {
task_status = "无任务";
}
JSONObject tasked = WQLObject.getWQLObject("ST_TASK_INFO").query("is_delete= 0 and task_status='00'and task_type='1'").uniqueResult(0);
//JSONObject tasked = WQLObject.getWQLObject("ST_TASK_INFO").query("is_delete= 0 and task_status='00'and task_type='1' order by seq_num ").uniqueResult(0);
JSONObject tasked = WQLObject.getWQLObject("ST_TASK_INFO").query("is_delete= 0 and task_status='00'and task_type='1' order by seq_num ").uniqueResult(0);
if(tasked != null) {
task_status = "有任务未执行";
}
if(tasking != null) {
task_status = "执行中";
task_name = "任务号：" + tasking.getString("task_code") + "-" + "目标点：" + tasking.getString("next_point_code");
task_name = "任务号：" + tasking.getString("task_code");
task_info = "目标点：" + tasking.getString("next_point_code");
}
// else if(tasked!=null)
// {
// task_name = "任务号：" + tasked.getString("task_code");
// task_info = "目标点：" + tasked.getString("next_point_code");
// }
JSONObject unManFinishTask = WQLObject.getWQLObject("ST_TASK_INFO").query("is_delete= 0 and task_status='02' and is_manualfinished='0'and task_type='1'").uniqueResult(0);
if(unManFinishTask != null && tasked == null) {
button_code = "1";
@@ -330,17 +347,18 @@ public class HomeServiceImpl implements HomeService{
//手自动是Sys_Mode 3 REMA手动 4自动 5 IO手持方式的手动，这个车不装
String automatic_status = debugInfoJson.getString("Sys_Mode");
if(StrUtil.equals(automatic_status, "3")) {
agvrun_status_name = "REMA手动";
agvrun_status_name = "手动";
}
if(StrUtil.equals(automatic_status, "4")) {
agvrun_status_name = "自动";
}
if(StrUtil.equals(automatic_status, "5")) {
agvrun_status_name = "IO手持方式的手动";
agvrun_status_name = "IO";
}
//速度
speed = debugInfoJson.getString("Speedm_Tmp") == null ? "0" : debugInfoJson.getString("Speedm_Tmp");
row.put("speed", speed + "m/s");
BigDecimal e = new BigDecimal(speed).setScale(3, RoundingMode.HALF_UP);
row.put("speed", e + "m/s");
//agv状态枚举
row.put("agvrun_status", agvrun_status);
//agv状态名称，1为运行 0为待机
@@ -377,6 +395,7 @@ public class HomeServiceImpl implements HomeService{
row.put("task_status", task_status);
//当前任务
row.put("task_name", task_name);
row.put("task_info", task_info);
row.put("task_num", task_num);
row.put("button_code", button_code);
row.put("button_name", button_name);
@@ -385,6 +404,11 @@ public class HomeServiceImpl implements HomeService{
returnjo.put("result", row);
return returnjo;
}
catch(Exception e) {
Log.error("通信失败:" + e.getMessage());
throw new BadRequestException(e.getMessage() == null ? "通信失败，请检查系统参数中的Ros连接信息" : e.getMessage());
}
}
@Override
public Map<String,Object> clickSave(Map<String,String> jsonObject) {
@@ -460,7 +484,7 @@ public class HomeServiceImpl implements HomeService{
JSONObject doingtaskjo = WQLObject.getWQLObject("ST_TASK_INFO").query("is_delete= 0 and task_status='01' ").uniqueResult(0);
if(ObjectUtil.isNotEmpty(doingtaskjo)) {
returnjo.put("code", "0");
returnjo.put("desc", "有正在执行的任务，不能生产返回休息点的任务");
returnjo.put("desc", "有正在执行的任务，不能生成返回休息点的任务");
return returnjo;
}
String rest_pointcode = (String) taskServiceServiceImpl.queryPoint(new HashMap<>()).get("rest_pointcode");

18
nladmin-system/src/main/java/org/nl/agv/service/impl/TaskServiceServiceImpl.java
View File

@@ -53,7 +53,9 @@ public class TaskServiceServiceImpl implements TaskService{
@Override
public Map<String,Object> queryPoint(Map<String,String> jsonObject) {
JSONObject jsonObject1 = new JSONObject();
JSONObject returnjo = new JSONObject();
try {
String rest_pointcode = "";
ServiceResponse response = sendToAgvUtil.send("GetStationFloorIndexTable");
String result_info = JSONObject.parseObject(response.toString()).getString("ROS_String_Output");
@@ -76,12 +78,15 @@ public class TaskServiceServiceImpl implements TaskService{
}
arr.add(row);
}
JSONObject jsonObject1 = new JSONObject();
jsonObject1.put("result_info", result_info);
returnjo.put("code", "1");
returnjo.put("desc", "查询成功!");
returnjo.put("rest_pointcode", rest_pointcode);
returnjo.put("result", arr);
}
catch(Exception ex) {
String sfd = ex.getMessage();
}
return returnjo;
}
@@ -179,15 +184,8 @@ public class TaskServiceServiceImpl implements TaskService{
}
for(int i = 0; i < jsonArray.size(); i++) {
JSONObject taskjo = jsonArray.getJSONObject(i);
String task_num = taskjo.getString("task_num");
String seq_num = taskjo.getString("seq_num");
JSONObject taskrow = taskTable.query("task_code='" + task_num + "'").uniqueResult(0);
/* String task_status = taskjo.getString("task_status");
if (StrUtil.equals(task_status,"01")){
taskrow.put("seq_num", 1);
}else{
taskrow.put("seq_num", i + 2);
}*/
String taskNum = taskjo.getString("task_code");
JSONObject taskrow = taskTable.query("task_code='" + taskNum + "'").uniqueResult(0);
taskrow.put("seq_num", i + 1);
taskrow.put("is_delete", "0");
taskTable.update(taskrow);

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

@@ -22,6 +22,7 @@ import com.alibaba.fastjson.JSONObject;
import com.esotericsoftware.minlog.Log;
import edu.wpi.rail.jrosbridge.services.ServiceResponse;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.nl.agv.enu.VehicleOperateEnum;
import org.nl.agv.service.VehicleInfoService;
import org.nl.agv.unit.sendToAgvUtil;
@@ -145,9 +146,11 @@ public class VehicleInfoServiceImpl implements VehicleInfoService{
break;
}
}
String code = "0".equals(response.toJsonObject().get("result").toString()) ? "1" : "0";
String desc = "0".equals(response.toJsonObject().get("result").toString()) ? "操作成功！" : "操作失败！";
JSONObject returnjo = new JSONObject();
returnjo.put("code", "1");
returnjo.put("desc", "操作成功");
returnjo.put("code", code);
returnjo.put("desc", desc);
return returnjo;
}
@@ -214,8 +217,10 @@ public class VehicleInfoServiceImpl implements VehicleInfoService{
//航向角度
BigDecimal z = new BigDecimal(debugInfoJson.getString("Car_Global_Theta")).setScale(3, RoundingMode.HALF_UP);
row.put("z", z);
row.put("send_speed", debugInfoJson.getString("VehicleCtrlExpThrottle"));
row.put("real_speed", debugInfoJson.getString("Speedm_Tmp"));
BigDecimal s = new BigDecimal(debugInfoJson.getString("VehicleCtrlExpThrottle")).setScale(3, RoundingMode.HALF_UP);
row.put("send_speed", s);
BigDecimal m = new BigDecimal(debugInfoJson.getString("Speedm_Tmp")).setScale(3, RoundingMode.HALF_UP);
row.put("real_speed", m);
//舵轮角度
BigDecimal u = new BigDecimal(debugInfoJson.getString("SVreal_angle")).setScale(3, RoundingMode.HALF_UP);
row.put("carrier", u);

20
nladmin-system/src/main/java/org/nl/agv/wql/QAGVERROR.wql
View File

@@ -60,9 +60,8 @@ ENDIF
QUERY
SELECT
task.task_uuid,
task.task_code AS task_num,
task.next_point_code AS target_point,
task.next_point_code AS target_point,
task.task_code,
task.next_point_code,
task.task_status,
task.task_status_name,
task.seq_num,
@@ -91,18 +90,3 @@ ENDIF
ENDSELECT
ENDQUERY
ENDIF
IF 输入.flag = "4"
QUERY
SELECT
*
FROM
ST_AGV_ERROR as agv
WHERE
1=1
OPTION 输入.error_code <> ""
agv.error_code = 输入.error_code
ENDOPTION
ENDSELECT
ENDQUERY
ENDIF

BIN
nladmin-system/src/main/java/org/nl/agv/wql/agv.xls
View File

Binary file not shown.