From 1f46976c9ee72d7889fceee968db9c8aef885eca Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期一, 28 十月 2024 17:28:15 +0800 Subject: [PATCH] 远程监控中开关阀记录查询重构,增加了水价信息,调整了显示内容,优化SQL语句,开闭阀类型改为通信协议中的Common*.*.java中的统一匹配。 --- pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Constant.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 58 insertions(+), 0 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 c523017..34e972d 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 @@ -1,7 +1,9 @@ package com.dy.pipIrrGlobal.util; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; public class Constant { /** @@ -11,6 +13,14 @@ public static final Integer no = 0 ; public static final String YES = "1" ; public static final String NO = "0" ; + + // 椤圭洰缂栧彿 + public static final Integer projectCode_ym = 100; + public static final Integer projectCode_pj = 101; + + // 鍗忚鍒楄〃 + public static final String[] protocol = {"DYJS_2023", "DYJS_2024"}; + public static List<String[]> yesNo(){ List<String[]> list = new ArrayList<>() ; list.add(new String[]{YES , "鏄�"}) ; @@ -41,5 +51,53 @@ } 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