# version merge

vincentlu

8 天以前 583b31d46bb8abbee7410d29ca229120ee589cba

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

@@ -134,13 +134,13 @@
            // detail
            String errorMSg = errorType != null ? errorType.getMsg() : agv_04_up.getHexFaultId();
            detail.setError(errorMSg);
            detail.setErrorTime(new Date());
            detail.setErrorTime(now);
        }

        // 故障复位
        if (!Cools.isEmpty(detail.realError())) {
            assert detail.getErrorTime() != null;
            if (DateUtils.diffToSeconds(detail.getErrorTime(), new Date()) > 20) {
            if (DateUtils.diffToSeconds(detail.getErrorTime(), now) > 10) {
                detail.setError(MapDataConstant.EMPTY_OF_ERROR);
            }
        }