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-global/src/main/java/com/dy/pipIrrGlobal/util/Constant.java | 50 ++++----------------------------------------------
1 files changed, 4 insertions(+), 46 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Constant.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Constant.java
index 159948d..3dd0089 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Constant.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Constant.java
@@ -13,6 +13,10 @@
public static final Integer no = 0 ;
public static final String YES = "1" ;
public static final String NO = "0" ;
+//
+// // 鍗忚鍒楄〃
+// public static final String[] protocol = {"DYJS_2023", "DYJS_2024"};
+
public static List<String[]> yesNo(){
List<String[]> list = new ArrayList<>() ;
list.add(new String[]{YES , "鏄�"}) ;
@@ -44,51 +48,5 @@
return null ;
}
- // 1銆佸埛鍗″紑闃�锛�2鍒峰崱鍏抽榾锛�3銆佷腑蹇冪珯寮�闃�锛�4銆佷腑蹇冪珯鍏抽榾锛�5銆佹瑺璐瑰叧闃�锛�
- // 6銆佹祦閲忚鏁呴殰鍏抽榾锛�7銆佺揣鎬ュ叧闃�锛�8銆佺敤鎴疯繙绋嬪紑闃�锛�9銆佺敤鎴疯繙绋嬪叧闃�锛�
- // 16锛岀敤鎴峰紑闃�鍚庣閬撳唴娌℃湁姘达紝鑷姩鍏抽榾銆傜閬撲笉鍑烘按鑷姩鍏抽榾
- public static final Integer valveOpenByIC = 1 ;//鍒峰崱寮�闃�
- public static final Integer valveCloseByIC = 2 ;//鍒峰崱鍏抽榾
- public static final Integer valveOpenByCenter = 3 ;//涓績绔欏紑闃�
- public static final Integer valveCloseByCenter = 4 ;//涓績绔欏叧闃�
- public static final Integer valveCloseByFee = 5 ;//娆犺垂鍏抽榾
- public static final Integer valveCloseByFlowMeterFault = 6 ;//娴侀噺璁℃晠闅滃叧闃�
- public static final Integer valveCloseByEmergency = 7 ;//绱ф�ュ叧闃�
- public static final Integer valveOpenByRemoteUser = 8 ;//鐢ㄦ埛杩滅▼寮�闃�
- public static final Integer valveCloseByRemoteUser = 9 ;//鐢ㄦ埛杩滅▼鍏抽榾锛�
- public static final Integer valveCloseByNoWater = 16 ;//绠￠亾鏃犳按鑷姩鍏抽榾锛�
-
- public static Map<Integer, String> openCloseValveTypes(){
- Map<Integer, String> map = new HashMap<>() ;
- map.put(valveOpenByIC, "鍒峰崱寮�闃�");
- map.put(valveCloseByIC , "鍒峰崱鍏抽榾") ;
- map.put(valveOpenByCenter , "涓績绔欏紑闃�") ;
- map.put(valveCloseByCenter , "涓績绔欏叧闃�") ;
- map.put(valveCloseByFee , "娆犺垂鍏抽榾") ;
- map.put(valveCloseByFlowMeterFault , "娴侀噺璁℃晠闅滃叧闃�") ;
- map.put(valveCloseByEmergency , "绱ф�ュ叧闃�") ;
- map.put(valveOpenByRemoteUser , "鐢ㄦ埛杩滅▼寮�闃�") ;
- map.put(valveCloseByRemoteUser , "鐢ㄦ埛杩滅▼鍏抽榾") ;
- map.put(valveCloseByNoWater , "绠￠亾鏃犳按鑷姩鍏抽榾") ;
- return map ;
- }
- public static String openCloseValveTypeName(Integer type){
- if(type != null){
- return switch (type.intValue()) {
- case 1 -> "鍒峰崱寮�闃�";
- case 2 -> "鍒峰崱鍏抽榾";
- case 3 -> "涓績绔欏紑闃�";
- case 4 -> "涓績绔欏叧闃�";
- case 5 -> "娆犺垂鍏抽榾";
- case 6 -> "娴侀噺璁℃晠闅滃叧闃�";
- case 7 -> "绱ф�ュ叧闃�";
- case 8 -> "鐢ㄦ埛杩滅▼寮�闃�";
- case 9 -> "鐢ㄦ埛杩滅▼鍏抽榾";
- case 16 -> "绠￠亾鏃犳按鑷姩鍏抽榾";
- default -> "鏈煡";
- };
- }
- return null ;
- }
}
--
Gitblit v1.8.0