From 5159a57904369185dfd06a5ee8ad90115d129848 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期一, 09 十二月 2024 10:00:53 +0800 Subject: [PATCH] # --- zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-) diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java index 068c61b..1136ac6 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java @@ -72,7 +72,7 @@ } @Override - public Boolean judgeEnable(Long agvId, Boolean withBattery) { + public Boolean judgeEnable(Long agvId, Boolean isLowBattery) { Agv agv = this.getById(agvId); AgvModel agvModel = agvModelService.getById(agv.getAgvModel()); if (0 < segmentService.count(new LambdaQueryWrapper<Segment>() @@ -85,14 +85,6 @@ log.warn("[{}]鍙稟gv姝e湪蹇欑 - segment......", agv.getUuid()); return false; } -// if (0 < taskService.count(new LambdaQueryWrapper<Task>() -// .eq(Task::getAgvId, agvId) -// .eq(Task::getTaskType, TaskTypeType.TO_CHARGE.val()) -// .in(Task::getTaskSts, TaskStsType.ASSIGN.val(), TaskStsType.PROGRESS.val()) -// )){ -// log.warn("[{}]鍙稟gv姝e湪鍘诲厖鐢� - task......", agv.getUuid()); -// return false; -// } if (!this.judgeOnline(agv.getId())) { log.warn("[{}]鍙稟gv涓嶆槸鍦ㄧ嚎鐘舵��......", agv.getUuid()); return false; @@ -125,7 +117,7 @@ } } // with battery - if (withBattery) { + if (isLowBattery) { if (agvDetailService.isPowerLoss(agv, agvDetail, agvModel)) { log.warn("[{}]鍙稟gv鐢甸噺涓嶈冻......", agv.getUuid()); return false; -- Gitblit v1.9.1