From 4513ef24bf9b188c2a77d6ce94f1a6b7e9ebf0e6 Mon Sep 17 00:00:00 2001 From: zuoxiao <470321431@qq.com> Date: 星期日, 27 四月 2025 20:40:19 +0800 Subject: [PATCH] fix(irrigatePlan): 修正灌溉计划开始时间逻辑 --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeRtu.java | 127 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 127 insertions(+), 0 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeRtu.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeRtu.java new file mode 100644 index 0000000..7c13c3a --- /dev/null +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeRtu.java @@ -0,0 +1,127 @@ +package com.dy.common.softUpgrade.state; + +import com.alibaba.fastjson2.annotation.JSONField; +import com.dy.common.mw.protocol.Command; +import com.dy.common.util.Callback; +import lombok.Data; + +/** + * @Author: liurunyu + * @Date: 2024/11/11 17:33 + * @Description + */ +@Data +public class UpgradeRtu { + + @JSONField(serialize = false) + public static final int STATE_OPEN = -2 ;//-1-闃�寮�锛堟车寮�锛変笉鑳藉崌绾� + @JSONField(serialize = false) + public static final int STATE_OFFLINE = -1 ;//-1-绂荤嚎 + @JSONField(serialize = false) + public static final int STATE_UNSTART = 0 ;//0-鏈紑濮� + @JSONField(serialize = false) + public static final int STATE_RUNNING = 1 ;//1-鍗囩骇涓� + @JSONField(serialize = false) + public static final int STATE_SUCCESS = 2 ;//2-鍗囩骇鎴愬姛 + @JSONField(serialize = false) + public static final int STATE_FAILONE = 3 ;//3-鍗囩骇澶辫触锛堜竴鍖呮锛� + @JSONField(serialize = false) + public static final int STATE_FAIL = 4 ;//4-鍗囩骇澶辫触锛堝鍖呮锛� + @JSONField(serialize = false) + public static final int STATE_FAILOFFLINE = 5 ;//5-鍗囩骇澶辫触锛堢绾匡級 + @JSONField(serialize = false) + public static final int STATE_FAILOPEN = 6 ;//6-鍗囩骇澶辫触锛堥榾寮�锛� + @JSONField(serialize = false) + public static final int STATE_FAILRTU = 7 ;//7-鍗囩骇澶辫触锛圧TU鑷繁澶辫触锛� + @JSONField(serialize = false) + public static final int RAMADDRADD = 0x200 ;//绋嬪簭瀛樺偍鍐呭瓨鍦ㄥ潃澧為噺 + + public String rtuAddr ; + public int state ;// -1-绂荤嚎锛�0-鏈紑濮嬶紝1-鍗囩骇涓紝2-鍗囩骇鎴愬姛锛�3-鍗囩骇澶辫触锛�1鍖呮锛夛紝4-鍗囩骇澶辫触锛堥潪1鍖呮锛夛紝5-鍗囩骇澶辫触锛堢绾匡級锛�6-鍗囩骇澶辫触锛堥榾寮�锛夛紝7-鍗囩骇澶辫触锛圧TU锛� + public int totalPackage ;// 鎬诲寘鏁� + public int currentPackage ;// 褰撳墠涓嬪彂鍗囩骇鍖呮暟 + public int currentRamAddr ;// 褰撳墠涓嬪彂鍗囩骇鍖匯TU瀛樺偍鍦板潃 + public String lastDownDt ;// 鏈�鍚庝笅鍙戝崌绾ф暟鎹寘鏃堕棿锛坹yyy-mm-dd HH:HH:SS锛� + public Long lastDownDtAt ;// 鏈�鍚庝笅鍙戝崌绾ф暟鎹寘鏃跺埢 + public int reTryTimes ;//鍗囩骇涓嶆垚鍔燂紝閲嶈瘯娆℃暟 + public boolean isOver ;//鏄惁鍗囩骇杩囩▼缁撴潫锛�1锛氱粨鏉燂紝0锛氭湭缁撴潫 + + public String toString(){ + StringBuilder sb = new StringBuilder(); + sb.append("RTU锛�" + rtuAddr + "锛夊崌绾х姸鎬侊細") ; + sb.append(" \n褰� 鍓� 鐘� 鎬侊細" + getStateName(state)) ; + sb.append(" \n闇�涓嬪彂鏁版嵁鍖呮�绘暟锛�" + totalPackage) ; + sb.append(" \n褰撳墠涓嬪彂鍗囩骇鍖呮暟锛�" + currentPackage) ; + sb.append(" \n褰撳墠涓嬪彂瀛樺偍鍦板潃锛�" + currentRamAddr) ; + sb.append(" \n褰撳墠涓嬪彂鏁版嵁鏃堕棿锛�" + lastDownDt) ; + sb.append(" \n鍗囩骇澶辫触閲嶈瘯娆℃暟锛�" + reTryTimes) ; + sb.append(" \n鍗囩骇杩囩▼鏄惁缁撴潫锛�" + (isOver?"鏄�":"鍚�")) ; + return sb.toString() ; + } + + public static String getStateName(int state){ + switch (state) { + case STATE_OPEN: + return "闃�寮�"; + case STATE_OFFLINE: + return "绂荤嚎"; + case STATE_UNSTART: + return "鏈紑濮�"; + case STATE_RUNNING: + return "鍗囩骇涓�"; + case STATE_SUCCESS: + return "鍗囩骇鎴愬姛"; + case STATE_FAILONE: + return "涓�鍖呮"; + case STATE_FAIL: + return "澶氬寘姝�"; + case STATE_FAILOFFLINE: + return "绂荤嚎澶辫触"; + case STATE_FAILOPEN: + return "闃�寮�澶辫触"; + case STATE_FAILRTU: + return "RTU澶辫触"; + default: + return "鏈煡"; + } + } + + /** + * 瑙﹀彂鍗囩骇 + * @param code + * @param softData + * @param callbackCom + * @param objects + */ + public void trigger(String code, + String protocolName, + Short protocolVersion, + byte[][] softData, + Callback callbackCom, + Object ...objects){ + return ; + } + + public Command createCommand1601(String protocolName, + Short protocolVersion){ + return null ; + } + + public Command createCommand1602(String protocolName, + Short protocolVersion, + int currentPackage, + Integer ramAddr, + byte[][] softData){ + return null ; + } + + public Command createCommand1603(String protocolName, + Short protocolVersion){ + return null ; + } + + public Command createCommand1600(String protocolName, + Short protocolVersion){ + return null ; + } +} -- Gitblit v1.8.0