From bda423b1aae1d5322116511651ae03a54cdcd231 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 26 十一月 2024 17:25:39 +0800
Subject: [PATCH] 1、几个测试模块系统的log4j.xml配置中的编码修改; 2、RTU升级模拟器增加命令行设置服务端IP和端口功能; 3、应王江海要求,井电双控协议中也实现远程升级功能,因井电双控协议、阀控器协议不同,而双方协议中的升级子协议相同,所以通信中间件做增量开发、适应性修改,以适应这种混合协议情况,同时也提高通信中间件运行效率。

---
 pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/clientCard/LastOperateENUM.java |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/clientCard/LastOperateENUM.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/clientCard/LastOperateENUM.java
index 46ee9d6..b7f7ed9 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/clientCard/LastOperateENUM.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/clientCard/LastOperateENUM.java
@@ -14,13 +14,15 @@
 @AllArgsConstructor
 public enum LastOperateENUM {
     ACTIVE((byte)1, "寮�鍗�"),
-    REPLACE((byte)2, "琛ュ崱"),
-    RECHARGE((byte)3, "鍏呭��"),
-    LOSS((byte)4, "鎸傚け"),
-    CANCEL((byte)5, "娉ㄩ攢"),
-    UNLOCK((byte)6, "瑙i攣"),
+    RECHARGE((byte)2, "鍏呭��"),
+    CANCEL((byte)3, "娉ㄩ攢"),
+    REPLACE((byte)4, "琛ュ崱"),
+    REFUND((byte)5, "琛ユ墸"),
+    LOSS((byte)6, "鎸傚け"),
     REVERSAL((byte)7, "鍐叉"),
-    CONSUME((byte)8, "娑堣垂");
+    UNLOCK((byte)8, "瑙i攣"),
+    CONSUME((byte)9, "娑堣垂"),
+    WRITE_BACK((byte)10, "鍙嶅啓");
 
     private final Byte code;
     private final String message;

--
Gitblit v1.8.0