#

Junjie

2023-09-19 edacfca5a8e4e3abd4498eb81a34696b9ccd4c73

#

 src/main/java/com/zy/core/model/protocol/NyShuttleProtocol.java

@@ -3,18 +3,17 @@
import com.alibaba.fastjson.JSON;
import com.core.common.SpringUtils;
import com.zy.asrs.entity.BasShuttle;
import com.zy.asrs.entity.BasShuttleErr;
import com.zy.asrs.service.BasShuttleErrService;
import com.zy.asrs.service.BasShuttleService;
import com.zy.asrs.utils.Utils;
import com.zy.common.utils.NavigatePositionConvert;
import com.zy.core.News;
import com.zy.core.enums.ShuttleErrorCodeType;
import com.zy.core.enums.ShuttleProtocolStatusType;
import com.zy.core.enums.ShuttleStatusType;
import com.zy.core.model.command.ShuttleAssignCommand;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;

import java.util.List;

/**
 * 牛眼四向穿梭车
@@ -414,6 +413,18 @@
        return JSON.toJSONString(this.getCoord());
    }

    public String getErrCode$() {
        if (this.getErrCode() == null) {
            return "";
        }
        BasShuttleErrService basShuttleErrService = SpringUtils.getBean(BasShuttleErrService.class);
        BasShuttleErr basShuttleErr = basShuttleErrService.selectById(this.getErrCode());
        if (basShuttleErr == null) {
            return this.getErrCode().toString();
        }
        return basShuttleErr.getErrName();
    }

    public void setPoint(NyShuttlePointClass point) {
        String locNo = NavigatePositionConvert.nyXyzToLocNo(point.getX(), point.getY(), point.getZ());
        this.point = point;

 src/main/webapp/views/console.html

@@ -77,6 +77,7 @@
                    </div>
                    <div>
                        <el-button @click="testMove()">测试移动车</el-button>
                        <el-button @click="resetMap()">重置地图</el-button>
                    </div>
                </div>
            </div>
@@ -371,6 +372,7 @@
                                for (let i = 1; i < data.length - 1; i++) {
                                    tmp.push(data[i])
                                }
                                console.log(tmp)
                                this.map = tmp
                            }
                        })
@@ -638,6 +640,24 @@
                            }
                        }
                        return data;//返回小车号集合
                    },
                    resetMap() {
                        //重置地图
                        let that = this
                        $.ajax({
                            url:baseUrl+"/console/map/resetMap/auth",
                            headers:{
                                'token': localStorage.getItem('token')
                            },
                            data:{},
                            method:'get',
                            success:function (res) {
                                that.$message({
                                    message: '重置完成',
                                    type: 'success'
                                });
                            }
                        })
                    }
                }
            })

 src/main/webapp/views/shuttle.html

@@ -315,7 +315,7 @@
                        setVal(tr.children("td").eq(11), table[i-1].runDir2$);
                        setVal(tr.children("td").eq(12), table[i-1].chargState$);
                        setVal(tr.children("td").eq(13), table[i-1].errState$);
                        setVal(tr.children("td").eq(14), table[i-1].errCode);
                        setVal(tr.children("td").eq(14), table[i-1].errCode$);
                        setVal(tr.children("td").eq(15), table[i-1].suspendState$);
                    }
                } else if (res.code === 403){