src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/core/MainProcess.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/core/model/protocol/SteProtocol.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1942,4 +1942,25 @@ } } /** * 小车电量检测 */ public void loopSteCharge() { for (SteSlave ste : slaveProperties.getSte()) { SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, ste.getId()); SteProtocol steProtocol = steThread.getSteProtocol(); BasSte basSte = basSteService.selectById(ste.getId()); if (Cools.isEmpty(steProtocol, basSte)) { continue; } try { if (steProtocol.getCharge() > Float.parseFloat(basSte.getChargeLine())) { continue; } } catch (Exception e) { log.error("fail", e); } } } } src/main/java/com/zy/core/MainProcess.java
@@ -61,7 +61,8 @@ mainService.ledExecute(); // 其他 ===>> LED显示器复位,显示默认信息 mainService.ledReset(); // 穿梭车 ===>> mainService.loopSteCharge(); } catch (Exception e) { e.printStackTrace(); } src/main/java/com/zy/core/model/protocol/SteProtocol.java
@@ -1,15 +1,19 @@ package com.zy.core.model.protocol; import com.core.common.Cools; import com.core.common.SpringUtils; import com.zy.asrs.entity.BasSte; import com.zy.asrs.service.BasSteService; import com.zy.core.enums.SteHisTaskStatusType; import com.zy.core.enums.SteLocaType; import com.zy.core.enums.SteStatusType; import lombok.Data; import lombok.extern.slf4j.Slf4j; /** * Created by vincent on 2020/8/7 */ @Slf4j @Data public class SteProtocol { @@ -239,9 +243,21 @@ // 是否处于空闲待命状态 public Boolean isIdle() { return this.statusType.equals(SteStatusType.IDLE) boolean res = this.statusType.equals(SteStatusType.IDLE) && this.pakMk.equals("N") && !isAlarm(); if (!res) { return res; } else { // 电量 try { String chargeLine = SpringUtils.getBean(BasSteService.class).selectById(this.steNo).getChargeLine(); return charge > Float.parseFloat(chargeLine); } catch (Exception e) { log.error("fail", e); return false; } } } // 是否处于报警状态