#

luxiaotao1123

2024-11-29 fb0e407cf53d37d55fce3294b54379b5caa8270e

#

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/MapWsAgvVo.java

@@ -25,6 +25,8 @@

    private Integer battery;

    private String error;

//    public int getBackpackLoadedCount() {
//        if (Cools.isEmpty(this.backpack)) {
//            return 0;

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java

@@ -88,6 +88,7 @@
            vo.setDirection(agvDetail.getAgvAngle());
            vo.setBackpack(GsonUtils.fromJsonToList(agvDetail.getBackpack(), BackpackDto.class));
            vo.setBattery(agvDetail.getSoc());
            vo.setError(agvDetail.getError());

            vo.setDynamicRoute(mapDataDispatcher.queryCodeListFromDynamicNode(null, agv.getUuid()));


 zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvDataService.java

@@ -130,7 +130,7 @@
        }

        // 故障复位
        if (!Cools.isEmpty(detail.getError()) && !"NONE".equals(detail.getError())) {
        if (!Cools.isEmpty(detail.getError())) {
            assert detail.getErrorTime() != null;
            if (DateUtils.diffToSeconds(detail.getErrorTime(), new Date()) > 20) {
                detail.setError("NONE");

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/AgvDetail.java

@@ -302,4 +302,12 @@
        return null;
    }

    public String getError() {
        if (!Cools.isEmpty(this.error) && !"NONE".equals(this.error)) {
            return this.error;
        } else {
            return "";
        }
    }

}