From 2559fd781a2f627e8c769bae69bc0840f9f7bc3b Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期三, 21 九月 2022 10:47:06 +0800 Subject: [PATCH] # --- src/main/java/com/zy/core/model/protocol/SteProtocol.java | 18 +++++++++++++++++- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 21 +++++++++++++++++++++ src/main/java/com/zy/core/MainProcess.java | 3 ++- 3 files changed, 40 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java index b5895a4..41f0586 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/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); + } + } + } + } diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java index 35e797f..e0e3cc3 100644 --- a/src/main/java/com/zy/core/MainProcess.java +++ b/src/main/java/com/zy/core/MainProcess.java @@ -61,7 +61,8 @@ mainService.ledExecute(); // 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅 mainService.ledReset(); - + // 绌挎杞� ===>> + mainService.loopSteCharge(); } catch (Exception e) { e.printStackTrace(); } diff --git a/src/main/java/com/zy/core/model/protocol/SteProtocol.java b/src/main/java/com/zy/core/model/protocol/SteProtocol.java index cab04bd..726504c 100644 --- a/src/main/java/com/zy/core/model/protocol/SteProtocol.java +++ b/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; + } + } } // 鏄惁澶勪簬鎶ヨ鐘舵�� -- Gitblit v1.9.1