From 70aeac289c132085e91d59dc82bc1facd41889fa Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 24 二月 2025 15:33:53 +0800
Subject: [PATCH] 有关表阀一体机（王江海制定）通信协议： 1、根据新版本协议，解析部分更新； 2、根据测试一体阀协议数据处理需求与逻辑，进行表阀一体机数据处理。
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoDivide.java | 43 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 39 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoDivide.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoDivide.java
index 63190d4..28edc55 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoDivide.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoDivide.java
@@ -21,7 +21,7 @@
@Data
@Schema(title = "鍒嗘按鎴胯鍥惧璞�")
public class VoDivide implements BaseEntity {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 202401241704004L;
@Schema(title = "ID")
@ExcelProperty("ID")
@@ -31,15 +31,20 @@
@Schema(title = "鍒嗘按鎴跨紪鍙�")
@ExcelProperty("鍒嗘按鎴跨紪鍙�")
@ColumnWidth(15)
- private Long divideId;
+ private String divideId;
@Schema(title = "鍒嗘按鎴垮悕绉�")
@ExcelProperty("鍒嗘按鎴垮悕绉�")
@ColumnWidth(15)
private String divideName;
- @Schema(title = "鎵�灞炵墖鍖�")
- @ExcelProperty("鎵�灞炵墖鍖�")
+ @Schema(title = "鎵�灞炵墖鍖篒D")
+ @ExcelProperty("鎵�灞炵墖鍖篒D")
+ @ColumnWidth(19)
+ private String blockId;
+
+ @Schema(title = "鎵�灞炵墖鍖哄悕绉�")
+ @ExcelProperty("鎵�灞炵墖鍖哄悕绉�")
@ColumnWidth(15)
private String blockName;
@@ -58,9 +63,39 @@
@ColumnWidth(25)
private String address;
+ @Schema(title = "瑕嗙洊鏉�")
+ @ExcelProperty("瑕嗙洊鏉�")
+ @ColumnWidth(25)
+ private String villages;
+
+ @Schema(title = "瑕嗙洊闈㈢Н")
+ @ExcelProperty("瑕嗙洊闈㈢Н")
+ @ColumnWidth(25)
+ private String area;
+
+ @Schema(title = "缁忓害")
+ @ExcelProperty("缁忓害")
+ @ColumnWidth(25)
+ private String lng;
+
+ @Schema(title = "绾害")
+ @ExcelProperty("绾害")
+ @ColumnWidth(25)
+ private String lat;
+
+ @Schema(title = "鎿嶄綔浜�")
+ @ExcelProperty("鎿嶄綔浜�")
+ @ColumnWidth(25)
+ private String operator;
+
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Schema(title = "鎿嶄綔鏃堕棿")
@ExcelIgnore
private Date operateDt;
+
+ @Schema(title = "澶囨敞")
+ @ExcelProperty("澶囨敞")
+ @ColumnWidth(250)
+ private String remarks;
}
--
Gitblit v1.8.0