|
|
|
@ -520,7 +520,6 @@ public class PatrolTaskStatusController extends BaseController { |
|
|
|
return AjaxResult.error(501, "THERE TASK IS RUNNING!"); |
|
|
|
} else { |
|
|
|
PatrolTask patrol = patrolTaskService.selectPatrolTaskByTaskId(patrolTask.getTaskId()); |
|
|
|
patrolTaskController.issueTask(patrol); //type=101 下发任务 |
|
|
|
issueToRobot(patrol); //type=41 立即执行任务 |
|
|
|
// sendTaskToVideo(patrol); |
|
|
|
return toAjax(1); |
|
|
|
@ -580,12 +579,12 @@ public class PatrolTaskStatusController extends BaseController { |
|
|
|
if (StringUtils.isNotEmpty(patrolTask.getDevNo())) { |
|
|
|
String[] devNos = patrolTask.getDevNo().split(StringUtils.COMMA); |
|
|
|
for (String devNo : devNos) { |
|
|
|
// BasedataEqpBookMoMain basedataEqpbookMomain = new BasedataEqpBookMoMain(); |
|
|
|
// basedataEqpbookMomain.setPatrolDeviceCode(devNo); |
|
|
|
// List<BasedataEqpBookMoMain> eqpBookMoMains = this.patrolResultService.selectBasedataEqpBookList(basedataEqpbookMomain); |
|
|
|
// if (!eqpBookMoMains.isEmpty() && eqpBookMoMains.get(0).getMainSystemCode() != null) { |
|
|
|
// receiveCode = eqpBookMoMains.get(0).getMainSystemCode(); |
|
|
|
// } |
|
|
|
BasedataEqpBookMoMain basedataEqpbookMomain = new BasedataEqpBookMoMain(); |
|
|
|
basedataEqpbookMomain.setPatrolDeviceCode(devNo); |
|
|
|
List<BasedataEqpBookMoMain> eqpBookMoMains = this.patrolResultService.selectBasedataEqpBookList(basedataEqpbookMomain); |
|
|
|
if (!eqpBookMoMains.isEmpty() && eqpBookMoMains.get(0).getMainSystemCode() != null) { |
|
|
|
receiveCode = eqpBookMoMains.get(0).getMainSystemCode(); |
|
|
|
} |
|
|
|
// |
|
|
|
// SendTask sendTaskcontrol = new SendTask(); |
|
|
|
// sendTaskcontrol.setReceiveCode(receiveCode); |
|
|
|
|