From f8cb69b9e1b0e8443942e13bbd3f46b9d4203269 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期日, 28 四月 2024 08:54:08 +0800
Subject: [PATCH] 靳总离职前，应元谋二期项目要求（慧图），做了通信协议修改，在他离职后，从韩月处得到最新协议，并做了部分协议软件实现修改，发现新协议中有一些协议定义有重复，也有错误的，所以这版本协议未全部实现，但实现的部分可以用来测试测控一体阀（与段志强一起测试过）。目前情况下，这版本协议实现不能应用于实际项目中，如果必须实现，还需要结合硬件协议具体实现内容再实现通信中间件的协议解析与构造部分，还需要实现上行数据处理任务树部分。
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoClient.java | 40 +++++++++++++++++++++++++++++++++++++---
1 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoClient.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoClient.java
index 64e4fed..e895f37 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoClient.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoClient.java
@@ -23,6 +23,36 @@
@Schema(title = "ID")
private Long id;
+ @Schema(title = "鍘縄D")
+ private String countyId;
+ @Schema(title = "鍘垮悕绉�")
+ private String countryName;
+
+ @Schema(title = "闀嘔D")
+ private String townId;
+ @Schema(title = "闀囧悕绉�")
+ private String townName;
+
+ @Schema(title = "鏉慖D")
+ private String villageId;
+ @Schema(title = "鏉戝悕绉�")
+ private String villageName;
+
+ @Schema(title = "鐗囧尯ID")
+ private String blockid;
+ @Schema(title = "鐗囧尯鍚嶇О")
+ private String bolckName;
+
+ @Schema(title = "鍒嗘按鎴縄D")
+ private String divideId;
+ @Schema(title = "鍒嗘按鎴垮悕绉�")
+ private String divideName;
+
+ @Schema(title = "鐢ㄦ埛绫诲瀷ID")
+ private String waterTypeId;
+ @Schema(title = "鐢ㄦ埛绫诲瀷鍚嶇О")
+ private String waterTypeName;
+
@Schema(title = "鍐滄埛ID")
private String clientId;
@@ -36,7 +66,10 @@
private String phone;
@Schema(title = "韬唤璇佸彿")
- private String idCard;
+ private String idcard;
+
+ @Schema(title = "绉嶆闈㈢Н")
+ private Double area;
@Schema(title = "鍗＄墖鏁伴噺")
private Integer cardCount;
@@ -44,10 +77,11 @@
@Schema(title = "鍦板潃")
private String address;
+ @Schema(title = "澶囨敞")
+ private String remarks;
+
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Schema(title = "娉ㄥ唽鏃堕棿")
private Date operateDt;
-
-
}
--
Gitblit v1.8.0