#

luxiaotao1123

2024-10-19 a8e98d400e784df056e5ffb3228d859d6fef6b0f

#

 zy-acs-flow/src/i18n/en.js

@@ -652,6 +652,7 @@
                observer: 'OBSERVER',
                movable: 'MOVABLE',
                settings: 'SETTINGS',
                roadmap: 'ROADMAP',
            },
            insight: {
                title: 'Insight',

 zy-acs-flow/src/i18n/zh.js

@@ -651,6 +651,7 @@
                observer: '观察模式',
                movable: '编辑模式',
                settings: '配置模式',
                roadmap: '路线模式',
            },
            insight: {
                title: '详情',

 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({

 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, {

 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);
    }





 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/MapRouteVo.java

New file
@@ -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;

}