#

zyx

2024-04-30 6f088dc1cb716e345da064a5e89f148bd248c75d

 src/main/java/com/zy/asrs/controller/AgvMapController.java

@@ -51,7 +51,7 @@
    public String getMapData(@PathVariable("floor") Integer floor, @PathVariable("lev") Integer lev) {

        //to do
        floor = 2;
//        floor = 2;

        BasMap basMap = agvBasMapService.selectLatestMap(1,floor);
        //解析json地图数据
@@ -73,10 +73,10 @@
                //y = generateMap2Bay(bay);
            }
            ////3楼
            //if(floor == 3){
            //    y = generateMap3Row(row);
            //    x = generateMap3Bay(bay);
            //}
            if(floor == 3){
                y = generateMap3Row(row);
//                x = generateMap3Bay(bay);
            }

            ArrayList rowData = arrayLists.get(x);
            Object o = rowData.get(y);
@@ -121,12 +121,13 @@

    private Integer generateMap3Row(int row){
        int x = row;
        Integer[] rowAdd = {2,4,6,7,8,10,12,13,15,17,19,21,23,24,26,28,30,32};
        Integer[] rowAdd = {2,4,6,8,10,12,14,15,17,19,21,22,24,26,28,30,32};
        for(int i=0; i<rowAdd.length; i++){
            if(row >= rowAdd[i]){
                x ++;
            }
        }
        if(row >8) x += 9;
        return x;
    }