From a8e98d400e784df056e5ffb3228d859d6fef6b0f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 19 十月 2024 16:11:07 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/constants.js | 1
zy-acs-flow/src/map/http.js | 18 +++++++++
zy-acs-flow/src/i18n/en.js | 1
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/MapRouteVo.java | 23 +++++++++++
zy-acs-flow/src/i18n/zh.js | 1
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java | 18 +++++++++
6 files changed, 62 insertions(+), 0 deletions(-)
diff --git a/zy-acs-flow/src/i18n/en.js b/zy-acs-flow/src/i18n/en.js
index 63b7c8f..933ea92 100644
--- a/zy-acs-flow/src/i18n/en.js
+++ b/zy-acs-flow/src/i18n/en.js
@@ -652,6 +652,7 @@
observer: 'OBSERVER',
movable: 'MOVABLE',
settings: 'SETTINGS',
+ roadmap: 'ROADMAP',
},
insight: {
title: 'Insight',
diff --git a/zy-acs-flow/src/i18n/zh.js b/zy-acs-flow/src/i18n/zh.js
index 5353584..f54e55b 100644
--- a/zy-acs-flow/src/i18n/zh.js
+++ b/zy-acs-flow/src/i18n/zh.js
@@ -651,6 +651,7 @@
observer: '瑙傚療妯″紡',
movable: '缂栬緫妯″紡',
settings: '閰嶇疆妯″紡',
+ roadmap: '璺嚎妯″紡',
},
insight: {
title: '璇︽儏',
diff --git a/zy-acs-flow/src/map/constants.js b/zy-acs-flow/src/map/constants.js
index 43b1e95..e30e4c5 100644
--- a/zy-acs-flow/src/map/constants.js
+++ b/zy-acs-flow/src/map/constants.js
@@ -4,6 +4,7 @@
OBSERVER_MODE: "1",
MOVABLE_MODE: "2",
SETTINGS_MODE: "3",
+ ROADMAP_MODE: "4",
})
export const DEVICE_TYPE = Object.freeze({
diff --git a/zy-acs-flow/src/map/http.js b/zy-acs-flow/src/map/http.js
index 5fa8812..f78cfe5 100644
--- a/zy-acs-flow/src/map/http.js
+++ b/zy-acs-flow/src/map/http.js
@@ -181,6 +181,24 @@
})
}
+export const getRouteList = async (zoneId, callback) => {
+ await request.post('/map/route/list', {
+ zoneId: zoneId,
+ }, {
+ headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
+ }).then((res) => {
+ const { code, msg, data } = res.data;
+ if (code === 200) {
+ callback(data)
+ } else {
+ notify.error(msg);
+ }
+ }).catch((error) => {
+ notify.error(error.message);
+ console.error(error.message);
+ })
+}
+
export const handleControlAgv = async (param, callback) => {
await request.post('/handler/control/agv', param, {
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java
index 20c77a8..d47ab68 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java
@@ -20,6 +20,7 @@
import com.zy.acs.manager.manager.controller.param.MapParam;
import com.zy.acs.manager.manager.controller.result.MapAgvVo;
import com.zy.acs.manager.manager.controller.result.MapPointVo;
+import com.zy.acs.manager.manager.controller.result.MapRouteVo;
import com.zy.acs.manager.manager.entity.Map;
import com.zy.acs.manager.manager.entity.*;
import com.zy.acs.manager.manager.enums.AgvStsType;
@@ -180,6 +181,23 @@
return R.ok().add(vo);
}
+ @PostMapping("/route/list")
+ public R routeList(@RequestParam(required = false) Long zoneId) {
+ List<MapRouteVo> result = new ArrayList<>();
+ List<Route> routeList = routeService.list(new LambdaQueryWrapper<Route>().eq(Route::getStatus, 1));
+ for (Route route : routeList) {
+ MapRouteVo vo = new MapRouteVo();
+ vo.setRouteId(route.getId());
+ vo.setStartCode(route.getStartCode());
+ vo.setStartCodeStr(route.getStartCode$());
+ vo.setEndCode(route.getEndCode());
+ vo.setEndCodeStr(route.getEndCode$());
+ vo.setDirection(route.getDirection());
+ result.add(vo);
+ }
+ return R.ok().add(result);
+ }
+
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/MapRouteVo.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/MapRouteVo.java
new file mode 100644
index 0000000..348ec49
--- /dev/null
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/MapRouteVo.java
@@ -0,0 +1,23 @@
+package com.zy.acs.manager.manager.controller.result;
+
+import lombok.Data;
+
+/**
+ * Created by vincent on 10/17/2024
+ */
+@Data
+public class MapRouteVo {
+
+ private Long routeId;
+
+ private Long startCode;
+
+ private Long endCode;
+
+ private String startCodeStr;
+
+ private String endCodeStr;
+
+ private Integer direction;
+
+}
--
Gitblit v1.9.1