From 21989973eb90e0fbf60c60ef9343a117fa67d354 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期日, 28 四月 2024 08:55:56 +0800
Subject: [PATCH] 靳总离职前，应元谋二期项目要求（慧图），做了通信协议修改，在他离职后，从韩月处得到最新协议，并做了部分协议软件实现修改，发现新协议中有一些协议定义有重复，也有错误的，所以这版本协议未全部实现，但实现的部分可以用来测试测控一体阀（与段志强一起测试过）。目前情况下，这版本协议实现不能应用于实际项目中，如果必须实现，还需要结合硬件协议具体实现内容再实现通信中间件的协议解析与构造部分，还需要实现上行数据处理任务树部分。
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/DtoClient.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/DtoClient.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/DtoClient.java
index 7d417ca..fc3ce80 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/DtoClient.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/DtoClient.java
@@ -22,25 +22,31 @@
public static final long serialVersionUID = 1L;
/**
+ * ID
+ */
+ @Schema(description = "鍐滄埛ID", requiredMode = Schema.RequiredMode.REQUIRED)
+ private Long id;
+
+ /**
* 鏉慖D
*/
@Schema(description = "鎵�鍦ㄦ潙ID", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "鎵�鍦ㄦ潙涓嶈兘涓虹┖")
- private Long villageid;
+ private Long villageId;
/**
* 鐗囧尯ID
*/
@Schema(description = "鎵�鍦ㄧ墖鍖篒D", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "鎵�鍦ㄧ墖鍖轰笉鑳戒负绌�")
- private Long blockid;
+ private Long blockId;
/**
* 鍒嗘按鎴縄D
*/
@Schema(description = "鎵�鍦ㄥ垎姘存埧ID", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "鎵�鍦ㄥ垎姘存埧涓嶈兘涓虹┖")
- private Long divideid;
+ private Long divideId;
/**
* 鍐滄埛濮撳悕
@@ -64,7 +70,7 @@
@Schema(description = "鍐滄埛韬唤璇佸彿", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "鍐滄埛韬唤璇佸彿涓嶈兘涓虹┖") //涓嶈兘涓虹┖涔熶笉鑳戒负null
@Length(message = "鍐滄埛韬唤璇佸彿蹇呴』{max}浣嶆暟鎹�", min = 18, max = 18)
- private String idcard;
+ private String idCard;
/**
* 绉嶆闈㈢Н
@@ -73,6 +79,12 @@
private Double area;
/**
+ * 鐢ㄦ按鏂瑰紡
+ */
+ @Schema(description = "鐢ㄦ按鏂瑰紡", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ private Long typeId;
+
+ /**
* 琛楅亾鍙婇棬鐗屽彿
*/
@Schema(description = "琛楅亾+闂ㄧ墝鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
--
Gitblit v1.8.0