#

zyx

2024-04-07 7ad79ee463adbdbc51e37c12ae025fb8598ab670

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

@@ -34,10 +34,10 @@
    @ManagerAuth
    public String getMapData(@RequestParam Integer lev,@RequestParam Integer area) {
        try {
            String mapFilename = "AMap.json";
            String mapFilename = "map.json";
//            String fileName ="file:" + new ClassPathResource(mapFilename).getPath();
            //获取当前楼层库位数据
            List<LocMast> locMasts = locMastService.selectNodeCLocByLev(lev);
            List<LocMast> locMasts = locMastService.selectNodeLocByLev(lev);

            String fileName = this.getClass().getClassLoader().getResource(mapFilename).getPath();//获取文件路径
//            File file = new File("D:\\workspace\\zy-asrs\\src\\main\\resources\\map.json");
@@ -78,99 +78,6 @@
                    Integer row = locMast.getRow1();
                    Integer bay = locMast.getBay1();

//                    switch (area){
//                        case 1:
//                            if (row % 4 == 0 || (row+1) % 4 == 0) {
//                                row=row+locMast.getCrnNo();
//                            }else{
//                                row=row+locMast.getCrnNo()-1;
//                            }
//                            bay=32-bay;
//                            break;
//                        case 2:
//                        case 3:
////                            if (row<=3 || row>=5){
////                                if (row%1==0){
////                                    row=row+(row/1)-1;
////                                }else {
////                                    row=row+((row+1)/1)-1;
////                                }
////                            }else {
////                                if (row%2==0){
////                                    row=row+(row/2);
////                                }else {
////                                    row=row+((row-1)/2);
////                                }
////                            }
////                            if (row == 9){
////                                row= row -1;
////                            }
//
//                            if (row ==7) {
//                                row=row+2;
//                            }else{
//                                if (row>7){
//                                    row=row+locMast.getCrnNo()+1;
//                                }else {
//                                    row=row+locMast.getCrnNo()-1;
//                                }
//                            }
//                            break;
////                        case 4:
//////                            if (row<=11){
////////                                if (row%2==0){
////////                                    row=row+(row/2)-1;
////////                                }else {
////////                                    row=row+((row+1)/2)-1;
////////                                }
////////                            }else {
////////                                if (row%2==0){
////////                                    row=row+(row/2);
////////                                }else {
////////                                    row=row+((row-1)/2);
////////                                }
////////                            }
////
////                            if (row % 10 == 0) {
////                                row=row+2;
////                            }else{
////                                if (row>10){
////                                    row=row+locMast.getCrnNo()+1;
////                                }else {
////                                    row=row+locMast.getCrnNo()-1;
////                                }
////                            }
////                            break;
//                        case 5:
////                            if (row<=11){
////                                if (row%2==0){
////                                    row=row+(row/2)-1;
////                                }else {
////                                    row=row+((row+1)/2)-1;
////                                }
////                            }else {
////                                if (row%2==0){
////                                    row=row+(row/2);
////                                }else {
////                                    row=row+((row-1)/2);
////                                }
////                            }
//
//                            if (row % 7 == 0) {
//                                row=row+2;
//                            }else{
//                                if (row>7){
//                                    row=row+locMast.getCrnNo()+1;
//                                }else {
//                                    row=row+locMast.getCrnNo()-1;
//                                }
//                            }
//                            break;
//
//
//
//                    }

                    ArrayList rowData = arrayLists.get(row);
                    Object o = rowData.get(bay);
                    JSONObject jsonObject = JSON.parseObject(o.toString());
@@ -180,32 +87,6 @@
                    //更新list
                    rowData.set(bay, jsonObject);
                    arrayLists.set(row, rowData);



//                    if (area == 1 || area == 6){
//                        ArrayList rowData = arrayLists.get(row);
//                        Object o = rowData.get(bay);
//                        JSONObject jsonObject = JSON.parseObject(o.toString());
//                        jsonObject.put("locNo", locMast.getLocNo());//设置库位号
//                        jsonObject.put("locSts", locMast.getLocSts());//库位状态
//                        //jsonObject.put("locSts$", locMast.getLocSts$());//库位状态
//                        //更新list
//                        rowData.set(bay, jsonObject);
//                        arrayLists.set(row, rowData);
//                    }else {
//                        ArrayList rowData = arrayLists.get(bay);
//                        Object o = rowData.get(row);
//                        JSONObject jsonObject = JSON.parseObject(o.toString());
//                        jsonObject.put("locNo", locMast.getLocNo());//设置库位号
//                        jsonObject.put("locSts", locMast.getLocSts());//库位状态
//                        //jsonObject.put("locSts$", locMast.getLocSts$());//库位状态
//                        //更新list
//                        rowData.set(row, jsonObject);
//                        arrayLists.set(bay, rowData);
//                    }



                }