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-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CommonV1_0_1.java | 26 ++++++++++++++------------ 1 files changed, 14 insertions(+), 12 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CommonV1_0_1.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CommonV1_0_1.java index 7ffbfa9..ed0f132 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CommonV1_0_1.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CommonV1_0_1.java @@ -147,7 +147,7 @@ return b ; } /** - * 寰楀埌IC鍗＄被鍨嬪悕绉� 锛� 鍗＄被鍨�(1:鐢ㄦ埛鍗★紱2锛氱鐞嗗憳鍗★紱3锛氳皟璇曞崱锛�4锛氬紑鍏抽榾鍗★紱5锛氭竻绌哄崱)锛� + * 寰楀埌IC鍗＄被鍨嬪悕绉� 锛� 鍗＄被鍨�(1:鐢ㄦ埛鍗★紱2锛氱鐞嗗憳鍗★紱3锛氳皟璇曞崱锛�4锛氬贰妫�鍗★紱5锛氭竻绌哄崱)锛� * @param type 瀛楄妭 * @return 鍚嶇О */ @@ -157,7 +157,7 @@ case 1 -> "鐢ㄦ埛鍗�"; case 2 -> "绠＄悊鍛樺崱"; case 3 -> "璋冭瘯鍗�"; - case 4 -> "寮�鍏抽榾鍗�"; + case 4 -> "宸℃鍗�"; case 5 -> "娓呯┖鍗�"; default -> "鏈煡"; }; @@ -170,16 +170,17 @@ * 2:鍒峰崱鍏抽榾锛� * 3:涓績绔欏紑闃�锛� * 4:涓績绔欏叧闃�锛� - * 5:娆犺垂鍏抽榾锛� + * 5:浣欓涓嶈冻鍏抽榾锛� * 6:娴侀噺璁℃晠闅滃叧闃�锛� * 7:绱ф�ュ叧闂紱 * 8:鐢ㄦ埛杩滅▼寮�闃�锛� * 9:鐢ㄦ埛杩滅▼鍏抽榾锛� - * 10:寮�鍏抽榾鍗″叧闃�锛� - * 11:寮�鍏抽榾鍗″埛鍗″崱寮�闃�锛� + * 10:宸℃鍗″叧闃�锛� + * 11:宸℃鍗″埛鍗″崱寮�闃�锛� * 12:榛戝悕鍗曞懡浠ゅ叧闃�锛� - * 13:杩滅▼瀹氭椂鍏抽榾寮忓紑闃�锛� - * 14:杩滅▼瀹氶噺鍏抽榾寮忓紑闃�锛� + * 13:杩滅▼瀹氭椂鍏抽榾锛� + * 14:杩滅▼瀹氶噺鍏抽榾锛� + * 16:绠￠亾鏃犳按鑷姩鍏抽榾锛�(鐜嬫睙娴峰崗璁�) * ) * @param type 瀛楄妭 * @return 鍚嶇О @@ -190,16 +191,17 @@ case 2 -> "鍒峰崱鍏抽榾"; case 3 -> "涓績绔欏紑闃�"; case 4 -> "涓績绔欏叧闃�"; - case 5 -> "娆犺垂鍏抽榾"; + case 5 -> "浣欓涓嶈冻鍏抽榾"; case 6 -> "娴侀噺璁℃晠闅滃叧闃�"; case 7 -> "绱ф�ュ叧闃�"; case 8 -> "鐢ㄦ埛杩滅▼寮�闃�"; case 9 -> "鐢ㄦ埛杩滅▼鍏抽榾"; - case 10 -> "寮�鍏抽榾鍗″叧闃�"; - case 11 -> "寮�鍏抽榾鍗″紑闃�"; + case 10 -> "宸℃鍗″叧闃�"; + case 11 -> "宸℃鍗″紑闃�"; case 12 -> "榛戝悕鍗曞懡浠ゅ叧闃�"; - case 13 -> "杩滅▼瀹氭椂鍏抽榾寮忓紑闃�"; - case 14 -> "杩滅▼瀹氶噺鍏抽榾寮忓紑闃�"; + case 13 -> "杩滅▼瀹氭椂鍏抽榾"; + case 14 -> "杩滅▼瀹氶噺鍏抽榾"; + case 16 -> "绠￠亾鏃犳按鑷姩鍏抽榾"; default -> "鏈煡"; }; } -- Gitblit v1.8.0