#update
This commit is contained in:
@@ -68,4 +68,6 @@ public class DevicePlanTask extends OrgBaseDO {
|
|||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private double progress;
|
private double progress;
|
||||||
|
|
||||||
|
private String failedReason;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -249,11 +249,12 @@ public class NettyDevice extends Connector {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public synchronized Long failedTask() {
|
public synchronized Long failedTask(String failedReason) {
|
||||||
if (task != null) {
|
if (task != null) {
|
||||||
Long taskId = task.getId();
|
Long taskId = task.getId();
|
||||||
task.setTaskStaus(DeviceTaskStaus.FAILED);
|
task.setTaskStaus(DeviceTaskStaus.FAILED);
|
||||||
task.setUpdateTime(LocalDateTime.now());
|
task.setUpdateTime(LocalDateTime.now());
|
||||||
|
task.setFailedReason(failedReason);
|
||||||
devicePlanTaskMapper.saveOrUpdate(task);
|
devicePlanTaskMapper.saveOrUpdate(task);
|
||||||
SiteMemory siteMemory = GlobalMemory.getSiteMemory(task.getOrgId(), task.getSiteId());
|
SiteMemory siteMemory = GlobalMemory.getSiteMemory(task.getOrgId(), task.getSiteId());
|
||||||
siteMemory.removeDevicePlanPrepare(task);
|
siteMemory.removeDevicePlanPrepare(task);
|
||||||
@@ -420,9 +421,8 @@ public class NettyDevice extends Connector {
|
|||||||
// task.setTaskStaus(DeviceTaskStaus.FAILED);
|
// task.setTaskStaus(DeviceTaskStaus.FAILED);
|
||||||
// devicePlanTaskMapper.saveOrUpdate(task);
|
// devicePlanTaskMapper.saveOrUpdate(task);
|
||||||
// task = null;
|
// task = null;
|
||||||
failedTask();
|
failedTask("车辆未接受");
|
||||||
}
|
}
|
||||||
|
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
log.error("任务执行异常,次数={}", current, e);
|
log.error("任务执行异常,次数={}", current, e);
|
||||||
|
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ public class HostTaskStatusDetailDTO {
|
|||||||
private double speed;
|
private double speed;
|
||||||
private Integer task_phase;
|
private Integer task_phase;
|
||||||
|
|
||||||
private String error_code;
|
private Integer error_code;
|
||||||
private String error_message;
|
private String error_message;
|
||||||
private double total_distance_m;
|
private double total_distance_m;
|
||||||
private double distance_traveled_m;
|
private double distance_traveled_m;
|
||||||
|
|||||||
@@ -303,7 +303,8 @@ public class HostMessageHandler implements CustomMqttMessageHandler {
|
|||||||
return webStatusMessageDTO;
|
return webStatusMessageDTO;
|
||||||
}
|
}
|
||||||
|
|
||||||
public WebStatusMessageDTO createWebDeviceRealtimeMessage(HostVehicleRelTimeDTO vehicleRelTimeDTO) {
|
public WebStatusMessageDTO createWebDeviceRealtimeMessage(HostVehicleRelTimeDTO vehicleRelTimeDTO,
|
||||||
|
boolean localControlChange, boolean modeNotMatch) {
|
||||||
// todo 状态消息
|
// todo 状态消息
|
||||||
|
|
||||||
WebStatusMessageDTO webStatusMessageDTO = new WebStatusMessageDTO();
|
WebStatusMessageDTO webStatusMessageDTO = new WebStatusMessageDTO();
|
||||||
@@ -477,6 +478,18 @@ public class HostMessageHandler implements CustomMqttMessageHandler {
|
|||||||
system_mode.setUnit("");
|
system_mode.setUnit("");
|
||||||
transferData.add(system_mode);
|
transferData.add(system_mode);
|
||||||
|
|
||||||
|
DeviceStatusDetail localControlChangedDetail = new DeviceStatusDetail();
|
||||||
|
localControlChangedDetail.setName("localControlChange");
|
||||||
|
localControlChangedDetail.setValue(String.valueOf(localControlChange));
|
||||||
|
localControlChangedDetail.setUnit("");
|
||||||
|
transferData.add(localControlChangedDetail);
|
||||||
|
|
||||||
|
DeviceStatusDetail modeNotMatchDetail = new DeviceStatusDetail();
|
||||||
|
modeNotMatchDetail.setName("modeNotMatch");
|
||||||
|
modeNotMatchDetail.setValue(String.valueOf(modeNotMatch));
|
||||||
|
modeNotMatchDetail.setUnit("");
|
||||||
|
transferData.add(modeNotMatchDetail);
|
||||||
|
|
||||||
webStatusMessageDTO.setData(transferData);
|
webStatusMessageDTO.setData(transferData);
|
||||||
webStatusMessageDTO.setType(MesType.deviceInfo);
|
webStatusMessageDTO.setType(MesType.deviceInfo);
|
||||||
return webStatusMessageDTO;
|
return webStatusMessageDTO;
|
||||||
@@ -493,7 +506,7 @@ public class HostMessageHandler implements CustomMqttMessageHandler {
|
|||||||
// todo 更新里程数 里程数 * 割幅0.8
|
// todo 更新里程数 里程数 * 割幅0.8
|
||||||
NettyDevice nettyDevice = deviceSessionManager.getDevice(deviceId);
|
NettyDevice nettyDevice = deviceSessionManager.getDevice(deviceId);
|
||||||
boolean localControlChange = false; // 切换到本地遥控提示
|
boolean localControlChange = false; // 切换到本地遥控提示
|
||||||
boolean modeNotMatch = false; //
|
boolean modeNotMatch = false; //
|
||||||
if (nettyDevice != null) {
|
if (nettyDevice != null) {
|
||||||
Long orgId = nettyDevice.getDevice().getOrgId();
|
Long orgId = nettyDevice.getDevice().getOrgId();
|
||||||
Long siteId = nettyDevice.getDevice().getSiteId();
|
Long siteId = nettyDevice.getDevice().getSiteId();
|
||||||
@@ -517,11 +530,20 @@ public class HostMessageHandler implements CustomMqttMessageHandler {
|
|||||||
|
|
||||||
Integer controlMode = vehicleRelTimeDTO.getData().getControl_mode();
|
Integer controlMode = vehicleRelTimeDTO.getData().getControl_mode();
|
||||||
|
|
||||||
|
Integer systemMode = vehicleRelTimeDTO.getData().getSystem_mode();
|
||||||
|
|
||||||
if (Objects.equals(oldControlMode, 0) && Objects.equals(controlMode, 1)) {
|
if (Objects.equals(oldControlMode, 0) && Objects.equals(controlMode, 1)) {
|
||||||
// 提示切换到遥控器
|
// 提示切换到遥控器
|
||||||
localControlChange = true;
|
localControlChange = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (Objects.equals(controlMode, 2) || Objects.equals(controlMode, 3)) {
|
||||||
|
if (!Objects.equals(systemMode, controlMode)) {
|
||||||
|
// 提示不匹配
|
||||||
|
modeNotMatch = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
siteMemory.saveVehicleMessage(deviceId, vehicleRelTimeDTO.getData());
|
siteMemory.saveVehicleMessage(deviceId, vehicleRelTimeDTO.getData());
|
||||||
|
|
||||||
// 故障处理
|
// 故障处理
|
||||||
@@ -536,7 +558,8 @@ public class HostMessageHandler implements CustomMqttMessageHandler {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
WebStatusMessageDTO dto = createWebDeviceRealtimeMessage(vehicleRelTimeDTO, boolean localControlChange, boolean modeNotMatch);
|
WebStatusMessageDTO dto = createWebDeviceRealtimeMessage(vehicleRelTimeDTO, localControlChange,
|
||||||
|
modeNotMatch);
|
||||||
List<NettyDevice> controlMasters = deviceSessionManager
|
List<NettyDevice> controlMasters = deviceSessionManager
|
||||||
.getAllSlaveControl(deviceId);
|
.getAllSlaveControl(deviceId);
|
||||||
if (!CollectionUtils.isEmpty(controlMasters)) {
|
if (!CollectionUtils.isEmpty(controlMasters)) {
|
||||||
@@ -791,7 +814,19 @@ public class HostMessageHandler implements CustomMqttMessageHandler {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ("failed".equals(dto.getStatus())) {
|
if ("failed".equals(dto.getStatus())) {
|
||||||
Long taskId = nettyDevice.failedTask();
|
Integer e = dto.getData().getError_code();
|
||||||
|
String failedReason = "";
|
||||||
|
if (e == 1) {
|
||||||
|
failedReason = "规划失败";
|
||||||
|
} else if (e == 2) {
|
||||||
|
failedReason = "执行失败";
|
||||||
|
} else if (e == 3) {
|
||||||
|
failedReason = "取消";
|
||||||
|
} else if (e == 4) {
|
||||||
|
failedReason = "路径非法或不可执行";
|
||||||
|
}
|
||||||
|
Long taskId = nettyDevice.failedTask(failedReason);
|
||||||
|
|
||||||
pushTaskChangeMessage(deviceId, taskId, DeviceTaskStaus.FAILED.toString());
|
pushTaskChangeMessage(deviceId, taskId, DeviceTaskStaus.FAILED.toString());
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user