#库位地图

zjj

2023-08-31 32230b1676850d776bb882315d06bdda31403ce5

#库位地图

 pom.xml

@@ -106,7 +106,7 @@
    </dependencies>

    <build>
        <finalName>stwms</finalName>
        <finalName>hzjzwms</finalName>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>

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

@@ -11,7 +11,6 @@
import com.zy.asrs.utils.Utils;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.ClassPathResource;
import org.springframework.web.bind.annotation.*;

import java.io.*;
@@ -35,33 +34,11 @@
    @ManagerAuth
    public String getMapData(@RequestParam Integer lev,@RequestParam Integer area) {
        try {
            String mapFilename = "map.json";
            String mapFilename = "AMap.json";
//            String fileName ="file:" + new ClassPathResource(mapFilename).getPath();
            //获取当前楼层库位数据
            List<LocMast> locMasts = locMastService.selectLocByLev(lev);
            switch (area){
                case 1:
                    break;
                case 2:
                case 3:
                    mapFilename = "DTBnode.json";
                    locMasts = locMastService.selectNodeBLocByLev(lev);
                    break;
                case 4:
                    mapFilename = "DTCnode.json";
                    locMasts = locMastService.selectNodeCLocByLev(lev);
                    break;
                case 5:
                    mapFilename = "DTDnode.json";
                    locMasts = locMastService.selectNodeDLocByLev(lev);
                    break;
                case 6:
                    mapFilename = "DTEnode.json";
                    locMasts = locMastService.selectNodeELocByLev(lev);
                    break;
            List<LocMast> locMasts = locMastService.selectNodeCLocByLev(lev);


            }
            String fileName = this.getClass().getClassLoader().getResource(mapFilename).getPath();//获取文件路径
//            File file = new File("D:\\workspace\\zy-asrs\\src\\main\\resources\\map.json");
            File file = new File(fileName);
@@ -101,46 +78,71 @@
                    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;
//                    switch (area){
//                        case 1:
//                            if (row % 4 == 0 || (row+1) % 4 == 0) {
//                                row=row+locMast.getCrnNo();
//                                }else {
//                                    row=row+((row+1)/1)-1;
//                                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%2==0){
//                                    row=row+(row/2);
//                                if (row>7){
//                                    row=row+locMast.getCrnNo()+1;
//                                }else {
//                                    row=row+((row-1)/2);
//                                    row=row+locMast.getCrnNo()-1;
//                                }
//                            }
//                            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){
//                            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 {
@@ -153,46 +155,21 @@
////                                    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;
//
//                            if (row % 7 == 0) {
//                                row=row+2;
//                                }else {
//                                    row=row+((row+1)/2)-1;
//                                }
//                                if (row>7){
//                                    row=row+locMast.getCrnNo()+1;
//                            }else {
//                                if (row%2==0){
//                                    row=row+(row/2);
//                                }else {
//                                    row=row+((row-1)/2);
//                                    row=row+locMast.getCrnNo()-1;
//                                }
//                            }

                            if (row % 7 == 0) {
                                row=row+2;
                            }else{
                                if (row>7){
                                    row=row+locMast.getCrnNo()+1;
                                }else {
                                    row=row+locMast.getCrnNo()-1;
                                }
                            }
                            break;



                    }
//                            break;
//
//
//
//                    }

                    ArrayList rowData = arrayLists.get(row);
                    Object o = rowData.get(bay);

 src/main/resources/AMap.json

New file
@@ -0,0 +1 @@
[[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":0,"y":0},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":0,"y":1},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":0,"y":2},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":0,"y":3},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":0,"y":4},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":0,"y":5},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":0,"y":6}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":1,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":1,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":1,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":1,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":1,"y":4},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":1,"y":5},{"value":-17,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":1,"y":6}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":2,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":2,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":2,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":2,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":2,"y":4},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":2,"y":5},{"value":-16,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":2,"y":6}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":3,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":3,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":3,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":3,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":3,"y":4},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":3,"y":5},{"value":-15,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":3,"y":6}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":4,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":4,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":4,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":4,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":4,"y":4},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":4,"y":5},{"value":-14,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":4,"y":6}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":5,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":5,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":5,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":5,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":5,"y":4},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":5,"y":5},{"value":-13,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":5,"y":6}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":6,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":6,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":6,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":6,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":6,"y":4},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":6,"y":5},{"value":-12,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":6,"y":6}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":7,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":7,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":7,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":7,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":7,"y":4},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":7,"y":5},{"value":-11,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":7,"y":6}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":8,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":8,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":8,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":8,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":8,"y":4},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":8,"y":5},{"value":-10,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":8,"y":6}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":9,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":9,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":9,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":9,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":9,"y":4},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":9,"y":5},{"value":-9,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":9,"y":6}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":10,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":10,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":10,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":10,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":10,"y":4},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":10,"y":5},{"value":-8,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":10,"y":6}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":11,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":11,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":11,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":11,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":11,"y":4},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":11,"y":5},{"value":-7,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":11,"y":6}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":12,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":12,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":12,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":12,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":12,"y":4},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":12,"y":5},{"value":-6,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":12,"y":6}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":13,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":13,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":13,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":13,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":13,"y":4},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":13,"y":5},{"value":-5,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":13,"y":6}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":14,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":14,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":14,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":14,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":14,"y":4},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":14,"y":5},{"value":-4,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":14,"y":6}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":15,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":15,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":15,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":15,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":15,"y":4},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":15,"y":5},{"value":-3,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":15,"y":6}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":16,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":16,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":16,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":16,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":16,"y":4},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":16,"y":5},{"value":-2,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":16,"y":6}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":17,"y":0},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":17,"y":1},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":17,"y":2},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":17,"y":3},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":17,"y":4},{"value":0,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":17,"y":5},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":17,"y":6}],[{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":18,"y":0},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":18,"y":1},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":18,"y":2},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":18,"y":3},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":18,"y":4},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":18,"y":5},{"value":-1,"data":"","top":1000,"bottom":1000,"left":1000,"right":1000,"x":18,"y":6}]]

 src/main/resources/BMap.json

 src/main/resources/CMap.json

 src/main/resources/DMap.json

 src/main/resources/DTCnode.json

File was deleted

 src/main/webapp/static/js/common.js

@@ -1,4 +1,4 @@
var baseUrl = "/stwms";
var baseUrl = "/hzjzwms";

// 详情窗口-高度
var detailHeight = '80%';

 src/main/webapp/views/home/map.html

@@ -533,41 +533,33 @@
                            <input id="02" type="radio" v-model="currentLev" name="r" value="2">
                            <label for="03">3F</label>
                            <input id="03" type="radio" v-model="currentLev" name="r" value="3">
                            <label for="04">4F</label>
                            <input id="04" type="radio" v-model="currentLev" name="r" value="4">
                            <label for="05">5F</label>
                            <input id="05" type="radio" v-model="currentLev" name="r" value="5">
                            <label for="06">6F</label>
                            <input id="06" type="radio" v-model="currentLev" name="r" value="6">
                            <label for="07">7F</label>
                            <input id="07" type="radio" v-model="currentLev" name="r" value="7">

                        </div>
                    </div>
                </div>
                <button class="card-button">楼层 {{currentLev}}F</button>
            </div>

            <div class="hoverCard">
                <div class="card-details">
                    <p class="text-title" style="text-align: center;">库区 {{areaName}}</p>
                    <div class="text-body" style="display: flex;">
                        <div class="floorSelect">
                            <label for="area01">A区</label>
                            <input id="area01" type="radio" name="r" v-model="area" value="1" checked="">
                            <label for="area03">B区</label>
                            <input id="area03" type="radio" v-model="area" name="r" value="3">
                            <label for="area04">C区</label>
                            <input id="area04" type="radio" v-model="area" name="r" value="4">
                            <label for="area05">D区</label>
                            <input id="area05" type="radio" v-model="area" name="r" value="5">
                            <label for="area06">E区</label>
                            <input id="area06" type="radio" v-model="area" name="r" value="6">
<!--            <div class="hoverCard">-->
<!--                <div class="card-details">-->
<!--                    <p class="text-title" style="text-align: center;">库区 {{areaName}}</p>-->
<!--                    <div class="text-body" style="display: flex;">-->
<!--                        <div class="floorSelect">-->
<!--                            <label for="area01">A区</label>-->
<!--                            <input id="area01" type="radio" name="r" v-model="area" value="1" checked="">-->
<!--                            <label for="area03">B区</label>-->
<!--                            <input id="area03" type="radio" v-model="area" name="r" value="3">-->
<!--                            <label for="area04">C区</label>-->
<!--                            <input id="area04" type="radio" v-model="area" name="r" value="4">-->
<!--                            <label for="area05">D区</label>-->
<!--                            <input id="area05" type="radio" v-model="area" name="r" value="5">-->

                        </div>
                    </div>
                </div>
                <button class="card-button">库区 {{areaName}}</button>
            </div>

<!--                        </div>-->
<!--                    </div>-->
<!--                </div>-->
<!--                <button class="card-button">库区 {{areaName}}</button>-->
<!--            </div>-->

            <div class="hoverCard">
                <div class="card-details">
@@ -837,7 +829,7 @@
                    if (this.area == 1){
                        if (rowData[i].locNo != undefined) {
                            let locNo = rowData[i].locNo;
                            return "#" + parseInt(locNo.substr(0, 2));
                            return "#" + parseInt(locNo.substr(2, 2));
                        }
                    }else if (this.area == 6){
                        if (rowData[i].locNo != undefined) {