From e407fcf19e50ed0972e7262d99da4b3a83d08706 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期五, 11 十月 2024 17:08:23 +0800 Subject: [PATCH] 1、修改协议驱动RTU上行数据解析出错时,RTU上下行数据日志中的RTU地址不正确的bug; 2、83功能码上行数据测试main方法实现。 --- pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoController.java | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoController.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoController.java index 3b870e8..1042061 100644 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoController.java +++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoController.java @@ -51,8 +51,24 @@ @ColumnWidth(30) private Date findDt; - @Schema(title = "鍦ㄧ嚎鐘舵��") - @ExcelProperty("鍦ㄧ嚎鐘舵��") - @ColumnWidth(6) - private String onlineState; +// @Schema(title = "鍦ㄧ嚎鐘舵��") +// @ExcelProperty("鍦ㄧ嚎鐘舵��") +// @ColumnWidth(6) +// private String onlineState; + + /** + * 鏄惁鍦ㄧ嚎 + */ + private Boolean isOnLine; + + + @Schema(title = "閫氳鍗忚") + @ExcelProperty("閫氳鍗忚") + @ColumnWidth(10) + private String protocol; + + @Schema(title = "澶囨敞") + @ExcelProperty("澶囨敞") + @ColumnWidth(10) + private String remarks; } -- Gitblit v1.8.0