Merge branch 'refs/heads/rcs_master' into jdxaj

zhang

12 小时以前 70930071a49190f414c8d8bc9c9e9795a4096739

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

@@ -7,7 +7,6 @@
import com.zy.acs.framework.common.RadixTools;
import com.zy.acs.framework.common.SnowflakeIdWorker;
import com.zy.acs.manager.core.domain.VehicleFaultDto;
import com.zy.acs.manager.manager.entity.Agv;
import com.zy.acs.manager.manager.entity.VehFaultRec;
import com.zy.acs.manager.manager.service.AgvDetailService;
import com.zy.acs.manager.manager.service.AgvService;
@@ -16,6 +15,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import com.zy.acs.common.utils.News;

import java.util.Date;

@@ -44,11 +44,11 @@

            AgvErrorType errorType = AgvErrorType.query(agv_04_up.getHexFaultId());

            Agv agv = agvService.selectByUuid(vehicle);
            Long agvId = agvService.getAgvId(vehicle);

            VehFaultRec vehFaultRec = new VehFaultRec();
            vehFaultRec.setUuid(String.valueOf(snowflakeIdWorker.nextId()).substring(3));
            vehFaultRec.setAgvId(agv.getId());
            vehFaultRec.setAgvId(agvId);
            vehFaultRec.setFaultNo(String.valueOf(agv_04_up.getFaultId()));
            vehFaultRec.setFaultHex(agv_04_up.getHexFaultId());
            vehFaultRec.setFaultName(null != errorType ? errorType.desc : "undefined");
@@ -58,12 +58,12 @@
            vehFaultRec.setProtocol(RadixTools.bytesToHexStr(agv_04_up.writeToBytes()));

            if (!vehFaultRecService.save(vehFaultRec)) {
                log.error("{}号车辆故障！记录故障信息失败......", dto.getVehicle());
                News.error("{}号车辆故障！记录故障信息失败......", dto.getVehicle());
            }

        } catch (Exception e) {
            log.error("FaultProcessor", e);
            News.error("FaultProcessor", e);
        }
    }

}
}