From a39807064a500875d89bc46edcd2d0b3654575a9 Mon Sep 17 00:00:00 2001 From: wuzeyu <1223318623@qq.com> Date: 星期三, 24 七月 2024 15:14:46 +0800 Subject: [PATCH] 取水口日取水量漏损(历史) 取水口日取水量漏损(最新) 修改控制器报警与状态查询的排序、 修改农户日用水量统计的排序、日期类型 重构代码放置结构 --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataStateVo.java | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataStateVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataStateVo.java index 1e12bd4..096404e 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataStateVo.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataStateVo.java @@ -5,20 +5,20 @@ @Data public class DataStateVo { public Byte icCard;// IC鍗″姛鑳� - public Byte working;//宸ヤ綔鐘舵�� + public Byte valveState;//闃�闂ㄧ姸鎬� public Byte powerType ;//鐢垫簮鐘舵�侊紙0锛�220V渚涚數锛�1锛氱暅鐢垫睜渚涚數锛� public String toString(){ StringBuilder str = new StringBuilder() ; str.append(" 鐘舵��:\n"); - str.append(" IC 鍗″姛鑳斤細"); - str.append(icCard ==null?"":(icCard ==1?"鏈夋晥":"鏃犳晥")); + str.append(" IC鍗″姛鑳斤細"); + str.append(icCard ==null?"":(icCard ==1?"鏈夋晥(1)":"鏃犳晥(0)")); str.append("\n"); - str.append(" 宸ヤ綔鐘舵�侊細"); - str.append(working ==null?"":(working ==1?"鍚姩":"鍋滄")); + str.append(" 闃�闂ㄧ姸鎬侊細"); + str.append(valveState ==null?"":(valveState ==1?"鍏抽棴(1)":"鎵撳紑(0)")); str.append("\n"); str.append(" 鐢垫簮鐘舵�侊細"); - str.append(powerType==null?"":(powerType==1?"鐣滅數姹犱緵鐢�":"220V渚涚數")); + str.append(powerType==null?"":(powerType==1?"鐣滅數姹犱緵鐢�(1)":"220V渚涚數(0)")); return str.toString() ; } } -- Gitblit v1.8.0