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

opt:优化lms任务id获取校验。

Browse Source
This commit is contained in:
gongbaoxiong
2024-10-09 09:44:58 +08:00
parent a22740bb52
commit da2c52ab5c
1 changed files with 5 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files

412
acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/SyncDeviceStatus.java
View File

@@ -1,6 +1,7 @@
package org.nl.quartz.task;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.http.HttpResponse;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -55,320 +56,9 @@ public class SyncDeviceStatus {
private void rgv() {
try {
log.info("自动线程开始查询浙大RGV设备状态");
// HttpResponse response = agvService.queryAgvDeviceStatus("1");
// JSONArray jsonArray = JSONArray.parseArray(response.body());
HttpResponse response = agvService.queryAgvDeviceStatus("1");
JSONArray jsonArray = JSONArray.parseArray(response.body());
//查询RGV指令列表
String rgvInfo = "[\n" +
" {\n" +
" \"@type\": \"com.alibaba.fastjson.JSONObject\",\n" +
" \"error_time\": \"48948\",\n" +
" \"task_code\": \"\",\n" +
" \"Has_goods\": \"0\",\n" +
" \"end_time\": \"2012- 2- 18 0: 22: 44\",\n" +
" \"Error\": \"\",\n" +
" \"open_time\": \"2012- 2- 18 0: 24: 3\",\n" +
" \"production_time\": \"90922\",\n" +
" \"vehicle\": \"22\",\n" +
" \"standby_time\": \"9772298\",\n" +
" \"energyLevel\": \"0.0\",\n" +
" \"Relation_vehicle\": \"\",\n" +
" \"angle\": \"0.0\",\n" +
" \"rfid\": \"4-78-21\",\n" +
" \"status\": \"IDLE\"\n" +
" },\n" +
" {\n" +
" \"@type\": \"com.alibaba.fastjson.JSONObject\",\n" +
" \"error_time\": \"8288\",\n" +
" \"task_code\": \"\",\n" +
" \"Has_goods\": \"0\",\n" +
" \"end_time\": \"2024- 7- 6 23: 18: 42\",\n" +
" \"Error\": \"\",\n" +
" \"open_time\": \"2024- 7- 10 13: 38: 5\",\n" +
" \"production_time\": \"404589\",\n" +
" \"vehicle\": \"11\",\n" +
" \"standby_time\": \"7543490\",\n" +
" \"energyLevel\": \"95.41999816894531\",\n" +
" \"Relation_vehicle\": \"\",\n" +
" \"angle\": \"0.0\",\n" +
" \"rfid\": \"4-78-20\",\n" +
" \"status\": \"IDLE\"\n" +
" },\n" +
" {\n" +
" \"@type\": \"com.alibaba.fastjson.JSONObject\",\n" +
" \"error_time\": \"9702\",\n" +
" \"task_code\": \"\",\n" +
" \"Has_goods\": \"0\",\n" +
" \"end_time\": \"2024- 7- 18 9: 33: 33\",\n" +
" \"Error\": \"\",\n" +
" \"open_time\": \"2024- 9- 6 2: 33: 8\",\n" +
" \"production_time\": \"224840\",\n" +
" \"vehicle\": \"12\",\n" +
" \"standby_time\": \"7950135\",\n" +
" \"energyLevel\": \"51.61000061035156\",\n" +
" \"Relation_vehicle\": \"\",\n" +
" \"angle\": \"0.0\",\n" +
" \"rfid\": \"1-48-3\",\n" +
" \"status\": \"IDLE\"\n" +
" },\n" +
" {\n" +
" \"@type\": \"com.alibaba.fastjson.JSONObject\",\n" +
" \"error_time\": \"141089\",\n" +
" \"task_code\": \"\",\n" +
" \"Has_goods\": \"0\",\n" +
" \"end_time\": \"2024- 8- 26 8: 45: 31\",\n" +
" \"Error\": \"\",\n" +
" \"open_time\": \"2024- 8- 26 8: 46: 13\",\n" +
" \"production_time\": \"713764\",\n" +
" \"vehicle\": \"23\",\n" +
" \"standby_time\": \"9057202\",\n" +
" \"energyLevel\": \"0.0\",\n" +
" \"Relation_vehicle\": \"\",\n" +
" \"angle\": \"0.0\",\n" +
" \"rfid\": \"1-24-2\",\n" +
" \"status\": \"IDLE\"\n" +
" },\n" +
" {\n" +
" \"@type\": \"com.alibaba.fastjson.JSONObject\",\n" +
" \"error_time\": \"85041\",\n" +
" \"task_code\": \"\",\n" +
" \"Has_goods\": \"0\",\n" +
" \"end_time\": \"2012- 2- 20 16: 0: 17\",\n" +
" \"Error\": \"\",\n" +
" \"open_time\": \"2012- 2- 20 16: 0: 40\",\n" +
" \"production_time\": \"31417\",\n" +
" \"vehicle\": \"24\",\n" +
" \"standby_time\": \"14158946\",\n" +
" \"energyLevel\": \"0.0\",\n" +
" \"Relation_vehicle\": \"\",\n" +
" \"angle\": \"0.0\",\n" +
" \"rfid\": \"5-63-40\",\n" +
" \"status\": \"IDLE\"\n" +
" },\n" +
" {\n" +
" \"@type\": \"com.alibaba.fastjson.JSONObject\",\n" +
" \"error_time\": \"3439\",\n" +
" \"task_code\": \"\",\n" +
" \"Has_goods\": \"0\",\n" +
" \"end_time\": \"2012- 2- 24 17: 59: 46\",\n" +
" \"Error\": \"\",\n" +
" \"open_time\": \"2024- 8- 6 13: 36: 32\",\n" +
" \"production_time\": \"116749\",\n" +
" \"vehicle\": \"25\",\n" +
" \"standby_time\": \"9792348\",\n" +
" \"energyLevel\": \"0.0\",\n" +
" \"Relation_vehicle\": \"\",\n" +
" \"angle\": \"0.0\",\n" +
" \"rfid\": \"2-43-21\",\n" +
" \"status\": \"IDLE\"\n" +
" },\n" +
" {\n" +
" \"@type\": \"com.alibaba.fastjson.JSONObject\",\n" +
" \"error_time\": \"720\",\n" +
" \"task_code\": \"\",\n" +
" \"Has_goods\": \"0\",\n" +
" \"end_time\": \"2012- 3- 25 21: 38: 58\",\n" +
" \"Error\": \"\",\n" +
" \"open_time\": \"2012- 3- 27 22: 52: 2\",\n" +
" \"production_time\": \"20154\",\n" +
" \"vehicle\": \"26\",\n" +
" \"standby_time\": \"9551801\",\n" +
" \"energyLevel\": \"0.0\",\n" +
" \"Relation_vehicle\": \"\",\n" +
" \"angle\": \"0.0\",\n" +
" \"rfid\": \"3-35-40\",\n" +
" \"status\": \"IDLE\"\n" +
" },\n" +
" {\n" +
" \"@type\": \"com.alibaba.fastjson.JSONObject\",\n" +
" \"task_id\": \"1834031476203720704\",\n" +
" \"error_time\": \"45573\",\n" +
" \"task_code\": \"\",\n" +
" \"Has_goods\": \"0\",\n" +
" \"end_time\": \"2024- 8- 1 13: 23: 19\",\n" +
" \"Error\": \"\",\n" +
" \"open_time\": \"2024- 8- 1 13: 23: 31\",\n" +
" \"production_time\": \"480209\",\n" +
" \"vehicle\": \"1\",\n" +
" \"standby_time\": \"8710808\",\n" +
" \"energyLevel\": \"68.38999938964844\",\n" +
" \"Relation_vehicle\": \"\",\n" +
" \"angle\": \"0.0\",\n" +
" \"rfid\": \"5-63-39\",\n" +
" \"status\": \"WORK\"\n" +
" },\n" +
" {\n" +
" \"@type\": \"com.alibaba.fastjson.JSONObject\",\n" +
" \"error_time\": \"8001\",\n" +
" \"task_code\": \"\",\n" +
" \"Has_goods\": \"0\",\n" +
" \"end_time\": \"2024- 9- 10 5: 57: 21\",\n" +
" \"Error\": \"\",\n" +
" \"open_time\": \"2024- 9- 10 5: 57: 52\",\n" +
" \"production_time\": \"377075\",\n" +
" \"vehicle\": \"2\",\n" +
" \"standby_time\": \"8232806\",\n" +
" \"energyLevel\": \"50.560001373291016\",\n" +
" \"Relation_vehicle\": \"\",\n" +
" \"angle\": \"0.0\",\n" +
" \"rfid\": \"1-38-3\",\n" +
" \"status\": \"IDLE\"\n" +
" },\n" +
" {\n" +
" \"@type\": \"com.alibaba.fastjson.JSONObject\",\n" +
" \"error_time\": \"40925\",\n" +
" \"task_code\": \"\",\n" +
" \"Has_goods\": \"0\",\n" +
" \"end_time\": \"2024- 7- 10 22: 42: 4\",\n" +
" \"Error\": \"\",\n" +
" \"open_time\": \"2024- 8- 29 15: 43: 31\",\n" +
" \"production_time\": \"465561\",\n" +
" \"vehicle\": \"3\",\n" +
" \"standby_time\": \"6883401\",\n" +
" \"energyLevel\": \"68.94000244140625\",\n" +
" \"Relation_vehicle\": \"\",\n" +
" \"angle\": \"0.0\",\n" +
" \"rfid\": \"1-44-3\",\n" +
" \"status\": \"IDLE\"\n" +
" },\n" +
" {\n" +
" \"@type\": \"com.alibaba.fastjson.JSONObject\",\n" +
" \"error_time\": \"10041\",\n" +
" \"task_code\": \"\",\n" +
" \"Has_goods\": \"0\",\n" +
" \"end_time\": \"2024- 7- 23 7: 59: 21\",\n" +
" \"Error\": \"\",\n" +
" \"open_time\": \"2024- 7- 23 7: 58: 53\",\n" +
" \"production_time\": \"213821\",\n" +
" \"vehicle\": \"4\",\n" +
" \"standby_time\": \"8950011\",\n" +
" \"energyLevel\": \"65.37000274658203\",\n" +
" \"Relation_vehicle\": \"\",\n" +
" \"angle\": \"0.0\",\n" +
" \"rfid\": \"1-24-3\",\n" +
" \"status\": \"IDLE\"\n" +
" },\n" +
" {\n" +
" \"@type\": \"com.alibaba.fastjson.JSONObject\",\n" +
" \"error_time\": \"11798\",\n" +
" \"task_code\": \"\",\n" +
" \"Has_goods\": \"0\",\n" +
" \"end_time\": \"2024- 7- 14 10: 40: 2\",\n" +
" \"Error\": \"\",\n" +
" \"open_time\": \"2024- 7- 20 9: 9: 5\",\n" +
" \"production_time\": \"425080\",\n" +
" \"vehicle\": \"5\",\n" +
" \"standby_time\": \"7560725\",\n" +
" \"energyLevel\": \"55.34000015258789\",\n" +
" \"Relation_vehicle\": \"\",\n" +
" \"angle\": \"0.0\",\n" +
" \"rfid\": \"2-43-20\",\n" +
" \"status\": \"IDLE\"\n" +
" },\n" +
" {\n" +
" \"@type\": \"com.alibaba.fastjson.JSONObject\",\n" +
" \"error_time\": \"16034\",\n" +
" \"task_code\": \"\",\n" +
" \"Has_goods\": \"0\",\n" +
" \"end_time\": \"2024- 7- 1 15: 8: 12\",\n" +
" \"Error\": \"\",\n" +
" \"open_time\": \"2024- 7- 10 13: 39: 1\",\n" +
" \"production_time\": \"171190\",\n" +
" \"vehicle\": \"6\",\n" +
" \"standby_time\": \"7916560\",\n" +
" \"energyLevel\": \"64.12999725341797\",\n" +
" \"Relation_vehicle\": \"\",\n" +
" \"angle\": \"0.0\",\n" +
" \"rfid\": \"4-72-20\",\n" +
" \"status\": \"IDLE\"\n" +
" },\n" +
" {\n" +
" \"@type\": \"com.alibaba.fastjson.JSONObject\",\n" +
" \"error_time\": \"32339\",\n" +
" \"task_code\": \"\",\n" +
" \"Has_goods\": \"0\",\n" +
" \"end_time\": \"2024- 7- 15 0: 28: 31\",\n" +
" \"Error\": \"\",\n" +
" \"open_time\": \"2024- 9- 2 17: 29: 51\",\n" +
" \"production_time\": \"364371\",\n" +
" \"vehicle\": \"7\",\n" +
" \"standby_time\": \"7942815\",\n" +
" \"energyLevel\": \"60.650001525878906\",\n" +
" \"Relation_vehicle\": \"\",\n" +
" \"angle\": \"0.0\",\n" +
" \"rfid\": \"2-45-20\",\n" +
" \"status\": \"IDLE\"\n" +
" },\n" +
" {\n" +
" \"@type\": \"com.alibaba.fastjson.JSONObject\",\n" +
" \"error_time\": \"28019\",\n" +
" \"task_code\": \"\",\n" +
" \"Has_goods\": \"0\",\n" +
" \"end_time\": \"2024- 8- 15 20: 52: 23\",\n" +
" \"Error\": \"\",\n" +
" \"open_time\": \"2024- 8- 15 20: 52: 0\",\n" +
" \"production_time\": \"540534\",\n" +
" \"vehicle\": \"8\",\n" +
" \"standby_time\": \"8801165\",\n" +
" \"energyLevel\": \"100.48999786376953\",\n" +
" \"Relation_vehicle\": \"\",\n" +
" \"angle\": \"0.0\",\n" +
" \"rfid\": \"1-79-3\",\n" +
" \"status\": \"IDLE\"\n" +
" },\n" +
" {\n" +
" \"@type\": \"com.alibaba.fastjson.JSONObject\",\n" +
" \"error_time\": \"8138\",\n" +
" \"task_code\": \"\",\n" +
" \"Has_goods\": \"0\",\n" +
" \"end_time\": \"2024- 7- 14 17: 25: 12\",\n" +
" \"Error\": \"1\",\n" +
" \"open_time\": \"2024- 9- 2 10: 25: 9\",\n" +
" \"production_time\": \"445748\",\n" +
" \"vehicle\": \"9\",\n" +
" \"standby_time\": \"8255670\",\n" +
" \"energyLevel\": \"53.77000045776367\",\n" +
" \"Relation_vehicle\": \"\",\n" +
" \"angle\": \"0.0\",\n" +
" \"rfid\": \"3-35-39\",\n" +
" \"status\": \"IDLE\"\n" +
" },\n" +
" {\n" +
" \"@type\": \"com.alibaba.fastjson.JSONObject\",\n" +
" \"error_time\": \"234822\",\n" +
" \"task_code\": \"\",\n" +
" \"Has_goods\": \"0\",\n" +
" \"end_time\": \"2024- 7- 18 9: 38: 33\",\n" +
" \"Error\": \"\",\n" +
" \"open_time\": \"2024- 9- 6 2: 42: 27\",\n" +
" \"production_time\": \"805015\",\n" +
" \"vehicle\": \"21\",\n" +
" \"standby_time\": \"18739655\",\n" +
" \"energyLevel\": \"0.0\",\n" +
" \"Relation_vehicle\": \"\",\n" +
" \"angle\": \"0.0\",\n" +
" \"rfid\": \"1-48-2\",\n" +
" \"status\": \"IDLE\"\n" +
" },\n" +
" {\n" +
" \"@type\": \"com.alibaba.fastjson.JSONObject\",\n" +
" \"error_time\": \"34089\",\n" +
" \"task_code\": \"9758\",\n" +
" \"Has_goods\": \"0\",\n" +
" \"end_time\": \"2024- 7- 1 8: 25: 26\",\n" +
" \"Error\": \"\",\n" +
" \"open_time\": \"2024- 7- 1 8: 25: 6\",\n" +
" \"production_time\": \"357883\",\n" +
" \"vehicle\": \"10\",\n" +
" \"standby_time\": \"8148975\",\n" +
" \"energyLevel\": \"48.93000030517578\",\n" +
" \"Relation_vehicle\": \"\",\n" +
" \"angle\": \"0.0\",\n" +
" \"rfid\": \"1-65-3\",\n" +
" \"status\": \"IDLE\"\n" +
" }\n" +
"]";
JSONArray jsonArray = JSONArray.parseArray(rgvInfo);
Map<String, String> taskCodeToTaskIdMap = new HashMap<>();
List<String> task_codes = jsonArray.stream()
.map(r -> ((JSONObject) r).getString("task_code"))
@@ -399,7 +89,7 @@ public class SyncDeviceStatus {
});
redisUtils.set("RGV", jsonArray);
} catch (Exception e) {
log.error("自动线程查询浙大RGV设备状态失败{}{}", e, e.getMessage());
log.error("自动上报驱动状态，查询浙大RGV设备状态失败{}{}", e, e.getMessage());
}
}
@@ -493,98 +183,6 @@ public class SyncDeviceStatus {
redisUtils.set("baoshijian", baoshijian);
redisUtils.set("guhuashi", guhuashi);
redisUtils.set("site", site);
String agvInfo = "[\n" +
" {\n" +
" \"@type\": \"com.alibaba.fastjson.JSONObject\",\n" +
" \"positionY\": 0,\n" +
" \"device_status\": 6,\n" +
" \"transportOrder\": \"240912003\",\n" +
" \"device_name\": \"AGV08\",\n" +
" \"energyLevel\": 0,\n" +
" \"device_code\": \"AGV08\",\n" +
" \"positionAngle\": 0,\n" +
" \"positionX\": 0\n" +
" },\n" +
" {\n" +
" \"@type\": \"com.alibaba.fastjson.JSONObject\",\n" +
" \"positionY\": 10851,\n" +
" \"device_status\": 4,\n" +
" \"transportOrder\": \"\",\n" +
" \"device_name\": \"AGV03\",\n" +
" \"energyLevel\": 85,\n" +
" \"device_code\": \"AGV03\",\n" +
" \"positionAngle\": 270,\n" +
" \"positionX\": 4901\n" +
" },\n" +
" {\n" +
" \"@type\": \"com.alibaba.fastjson.JSONObject\",\n" +
" \"positionY\": 10852,\n" +
" \"device_status\": 4,\n" +
" \"transportOrder\": \"\",\n" +
" \"device_name\": \"AGV06\",\n" +
" \"energyLevel\": 96,\n" +
" \"device_code\": \"AGV06\",\n" +
" \"positionAngle\": 270,\n" +
" \"positionX\": 5161\n" +
" },\n" +
" {\n" +
" \"@type\": \"com.alibaba.fastjson.JSONObject\",\n" +
" \"positionY\": 16317,\n" +
" \"device_status\": 4,\n" +
" \"transportOrder\": \"\",\n" +
" \"device_name\": \"AGV05\",\n" +
" \"energyLevel\": 73,\n" +
" \"device_code\": \"AGV05\",\n" +
" \"positionAngle\": 271,\n" +
" \"positionX\": 9287\n" +
" },\n" +
" {\n" +
" \"@type\": \"com.alibaba.fastjson.JSONObject\",\n" +
" \"task_id\": \"1834024962374111232\",\n" +
" \"positionY\": 10851,\n" +
" \"device_status\": 2,\n" +
" \"transportOrder\": \"\",\n" +
" \"device_name\": \"AGV01\",\n" +
" \"energyLevel\": 70,\n" +
" \"device_code\": \"AGV01\",\n" +
" \"positionAngle\": 270,\n" +
" \"positionX\": 4380\n" +
" },\n" +
" {\n" +
" \"@type\": \"com.alibaba.fastjson.JSONObject\",\n" +
" \"positionY\": 10849,\n" +
" \"device_status\": 4,\n" +
" \"transportOrder\": \"\",\n" +
" \"device_name\": \"AGV07\",\n" +
" \"energyLevel\": 79,\n" +
" \"device_code\": \"AGV07\",\n" +
" \"positionAngle\": 270,\n" +
" \"positionX\": 5420\n" +
" },\n" +
" {\n" +
" \"@type\": \"com.alibaba.fastjson.JSONObject\",\n" +
" \"positionY\": 16315,\n" +
" \"device_status\": 4,\n" +
" \"transportOrder\": \"\",\n" +
" \"device_name\": \"AGV04\",\n" +
" \"energyLevel\": 68,\n" +
" \"device_code\": \"AGV04\",\n" +
" \"positionAngle\": 270,\n" +
" \"positionX\": 9030\n" +
" },\n" +
" {\n" +
" \"@type\": \"com.alibaba.fastjson.JSONObject\",\n" +
" \"positionY\": 10850,\n" +
" \"device_status\": 2,\n" +
" \"transportOrder\": \"240912005\",\n" +
" \"device_name\": \"AGV02\",\n" +
" \"energyLevel\": 84,\n" +
" \"device_code\": \"AGV02\",\n" +
" \"positionAngle\": 270,\n" +
" \"positionX\": 4640\n" +
" }\n" +
"]";
agv = JSONArray.parseArray(agvInfo);
if (ObjectUtil.isNotEmpty(agv)) {
List<String> deviceCodes = agv.stream()
.map(r -> {
@@ -616,7 +214,7 @@ public class SyncDeviceStatus {
redisUtils.set("agv", agv);
log.trace("自动上报驱动状态，完毕耗时{}", System.currentTimeMillis() - startTime);
} catch (Exception e) {
log.error("自动线程开始查询AGV设备状态失败{}{}", e, e.getMessage());
log.error("自动线程开始查询AGV设备，自动上报驱动状态失败{}{}", e, e.getMessage());
}
}
}