From 7f70cb15d035f0c233b9e62b9e43aa985317c908 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 04 十一月 2024 10:22:45 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java | 213 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 200 insertions(+), 13 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java
index 5c27759..09035a8 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java
@@ -5,6 +5,7 @@
import com.zy.acs.manager.core.domain.BackpackDto;
import com.zy.acs.manager.core.domain.MapWsAgvVo;
import com.zy.acs.manager.core.domain.MapWsVo;
+import com.zy.acs.manager.core.service.astart.MapDataDispatcher;
import com.zy.acs.manager.manager.entity.Agv;
import com.zy.acs.manager.manager.entity.AgvDetail;
import com.zy.acs.manager.manager.entity.Code;
@@ -16,8 +17,11 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import javax.annotation.PostConstruct;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
/**
* Created by vincent on 10/14/2024
@@ -31,18 +35,33 @@
private AgvDetailService agvDetailService;
@Autowired
private CodeService codeService;
+ @Autowired
+ private MapDataDispatcher mapDataDispatcher;
+
+ int i = 0;
@Scheduled(cron = "0/1 * * * * ? ")
public void broadcast() {
+ i++;
+ int key;
+ if (i > 10) {
+ i=0;
+ }
+ key = i /2;
+ MapWebSocket.broadcast(mockData.get(key));
+
+
MapWsVo mapWsVo = new MapWsVo();
mapWsVo.setAgvVos(syncAgv());
- MapWebSocket.broadcast(GsonUtils.toJson(mapWsVo));
+// MapWebSocket.broadcast(GsonUtils.toJson(mapWsVo));
}
private List<MapWsAgvVo> syncAgv() {
List<MapWsAgvVo> agvVos = new ArrayList<>();
- List<Agv> agvList = agvService.list(new LambdaQueryWrapper<Agv>().eq(Agv::getStatus, 1));
+ List<Agv> agvList = agvService.list(new LambdaQueryWrapper<Agv>()
+// .eq(Agv::getStatus, 1)
+ );
for (Agv agv : agvList) {
AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
if (null == agvDetail) { continue; }
@@ -54,24 +73,192 @@
vo.setAgvNo(agv.getUuid());
vo.setCode(code.getData());
vo.setDirection(agvDetail.getAgvAngle());
- vo.setBackpack(GsonUtils.fromJson(agvDetail.getBackpack(), List.class));
+ vo.setBackpack(GsonUtils.fromJsonToList(agvDetail.getBackpack(), BackpackDto.class));
vo.setBattery(agvDetail.getSoc());
+
+ vo.setDynamicRoute(mapDataDispatcher.queryCodeListFromDynamicNode(null, agv.getUuid()));
+
agvVos.add(vo);
}
return agvVos;
}
- public static void main(String[] args) {
- List<BackpackDto> backpackDtoList = new ArrayList<>();
- backpackDtoList.add(new BackpackDto(1, true));
- backpackDtoList.add(new BackpackDto(2, true));
- backpackDtoList.add(new BackpackDto(3, false));
- backpackDtoList.add(new BackpackDto(4, false));
- backpackDtoList.add(new BackpackDto(5, false));
- backpackDtoList.add(new BackpackDto(6, false));
- backpackDtoList.add(new BackpackDto(7, false));
- System.out.println(GsonUtils.toJson(backpackDtoList));
+
+
+
+
+
+ private static final Map<Integer, String> mockData = new ConcurrentHashMap<>();
+
+ @PostConstruct
+ public void init() {
+ mockData.put(1,
+ "{\n" +
+ " \"agvVos\": [\n" +
+ " {\n" +
+ " \"agvNo\": \"1\",\n" +
+ " \"code\": \"00000002\",\n" +
+ " \"direction\": 90,\n" +
+ " \"dynamicRoute\": [\n" +
+ " \"00000002\",\n" +
+ " \"00000003\",\n" +
+ " \"00000004\"\n" +
+ " ]\n" +
+ " },\n" +
+ " {\n" +
+ " \"agvNo\": \"2\",\n" +
+ " \"code\": \"00000063\",\n" +
+ " \"direction\": 90,\n" +
+ " \"dynamicRoute\": [\n" +
+ " \"00000063\",\n" +
+ " \"00000062\",\n" +
+ " \"00000061\",\n" +
+ " \"00000060\",\n" +
+ " \"00000059\"\n" +
+ " ]\n" +
+ " }\n" +
+ " ]\n" +
+ "}"
+ );
+ mockData.put(2,
+"{\n" +
+ " \"agvVos\": [\n" +
+ " {\n" +
+ " \"agvNo\": \"1\",\n" +
+ " \"code\": \"00000003\",\n" +
+ " \"direction\": 90,\n" +
+ " \"dynamicRoute\": [\n" +
+ " \"00000003\",\n" +
+ " \"00000004\"\n" +
+ " ]\n" +
+ " },\n" +
+ " {\n" +
+ " \"agvNo\": \"2\",\n" +
+ " \"code\": \"00000062\",\n" +
+ " \"direction\": 90,\n" +
+ " \"dynamicRoute\": [\n" +
+ " \n" +
+ " \"00000062\",\n" +
+ " \"00000061\",\n" +
+ " \"00000060\",\n" +
+ " \"00000059\"\n" +
+ " ]\n" +
+ " }\n" +
+ " ]\n" +
+ "}"
+
+ );
+
+ mockData.put(3,
+ "{\n" +
+ " \"agvVos\": [\n" +
+ " {\n" +
+ " \"agvNo\": \"1\",\n" +
+ " \"code\": \"00000004\",\n" +
+ " \"direction\": 90,\n" +
+ " \"dynamicRoute\": [\n" +
+ " \n" +
+ " \"00000004\"\n" +
+ " ]\n" +
+ " },\n" +
+ " {\n" +
+ " \"agvNo\": \"2\",\n" +
+ " \"code\": \"00000061\",\n" +
+ " \"direction\": 90,\n" +
+ " \"dynamicRoute\": [\n" +
+ "\n" +
+ " \"00000061\",\n" +
+ " \"00000060\",\n" +
+ " \"00000059\"\n" +
+ " ]\n" +
+ " }\n" +
+ " ]\n" +
+ "}"
+ );
+
+ mockData.put(4,
+ "{\n" +
+ " \"agvVos\": [\n" +
+ " {\n" +
+ " \"agvNo\": \"1\",\n" +
+ " \"code\": \"00000004\",\n" +
+ " \"direction\": 120,\n" +
+ " \"dynamicRoute\": [\n" +
+ " \"00000004\"\n" +
+ " ]\n" +
+ " },\n" +
+ " {\n" +
+ " \"agvNo\": \"2\",\n" +
+ " \"code\": \"00000060\",\n" +
+ " \"direction\": 90,\n" +
+ " \"dynamicRoute\": [\n" +
+ "\n" +
+ " \"00000060\",\n" +
+ " \"00000059\"\n" +
+ " ]\n" +
+ " }\n" +
+ " ]\n" +
+ "}"
+ );
+
+ mockData.put(5,
+ "{\n" +
+ " \"agvVos\": [\n" +
+ " {\n" +
+ " \"agvNo\": \"1\",\n" +
+ " \"code\": \"00000004\",\n" +
+ " \"direction\": 180,\n" +
+ " \"dynamicRoute\": [\n" +
+ " \"00000004\"\n" +
+ " ]\n" +
+ " },\n" +
+ " {\n" +
+ " \"agvNo\": \"2\",\n" +
+ " \"code\": \"00000059\",\n" +
+ " \"direction\": 90,\n" +
+ " \"dynamicRoute\": [\n" +
+ "\n" +
+ " \"00000059\"\n" +
+ " ]\n" +
+ " }\n" +
+ " ]\n" +
+ "}"
+
+ );
}
}
+
+
+/**
+
+ {
+ "agvVos": [
+ {
+ "agvNo": "1",
+ "code": "00000002",
+ "direction": 90,
+ "dynamicRoute": [
+ "00000002",
+ "00000003",
+ "00000004"
+ ]
+ },
+ {
+ "agvNo": "2",
+ "code": "00000063",
+ "direction": 90,
+ "dynamicRoute": [
+ "00000063",
+ "00000062",
+ "00000061",
+ "00000060",
+ "00000059"
+ ]
+ }
+ ]
+ }
+ ]
+ }
+ */
\ No newline at end of file
--
Gitblit v1.9.1