From 6f04f99ffcfc294280d65455f2430e01bc5126f8 Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期五, 03 十一月 2023 13:09:33 +0800 Subject: [PATCH] #路径锁定问题(temp) --- src/main/java/com/zy/asrs/controller/ShuttleController.java | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/ShuttleController.java b/src/main/java/com/zy/asrs/controller/ShuttleController.java index 7ed35f3..d2f0e51 100644 --- a/src/main/java/com/zy/asrs/controller/ShuttleController.java +++ b/src/main/java/com/zy/asrs/controller/ShuttleController.java @@ -7,6 +7,7 @@ import com.core.common.BaseRes; import com.core.common.Cools; import com.core.common.R; +import com.core.common.SpringUtils; import com.core.exception.CoolException; import com.zy.asrs.domain.param.ShuttleOperatorParam; import com.zy.asrs.domain.vo.*; @@ -100,6 +101,12 @@ } } + Integer chargeLine = basShuttleService.selectById(slave.getId()).getChargeLine(); + String lowerPower = "N"; + if (chargeLine != null && shuttleProtocol.getPowerPercent() != null) { + lowerPower = shuttleProtocol.getPowerPercent() <= chargeLine ? "Y" : "N"; + } + shuttleData.put("lowerPower", lowerPower);//鏄惁浣庣數閲� baseObj.putAll(shuttleData); } return R.ok().add(list); -- Gitblit v1.9.1