From 823cbaa8e120a6fc2e72a4e62c06d375cc821562 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 15 一月 2024 17:24:02 +0800
Subject: [PATCH] 1、增加流浪控制器实体（和数据库表）； 2、修改部分通信协议实现； 3、增加部分通信协议实现； 4、增加通信中间件RTU上行数据处理任务树部分节点。
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/DtoActiveCard.java | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/DtoActiveCard.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/DtoActiveCard.java
index 75b6535..b8b4e05 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/DtoActiveCard.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/DtoActiveCard.java
@@ -21,18 +21,30 @@
public static final long serialVersionUID = 20231191728001L;
/**
- * 姘村崱鍦板潃
+ * 姘村崱鍦板潃锛屼粎淇濆瓨锛屾棤涓氬姟
*/
@Schema(description = "姘村崱鍦板潃", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @NotBlank
+ @NotBlank(message = "姘村崱鍦板潃涓嶈兘涓虹┖")
private String cardAddr;
/**
- * 鍐滄埛ID
+ * 鍐滄埛缂栧彿锛屽紑鍗′娇鐢�
+ */
+ @Schema(description = "鍐滄埛缂栧彿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ private String clientNum;
+
+ /**
+ * 鍐滄埛ID锛堜富閿級锛屼笉鏄紑鍗℃帴鍙ｄ紶鍏ワ紝鐢卞啘鎴风紪鍙疯幏寰楋紝淇濆瓨寮�鍗¤褰曞拰鍏呭�艰褰曢兘闇�瑕�
*/
@Schema(description = "鍐滄埛ID", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @Positive(message = "鍐滄埛ID蹇呴』涓哄ぇ浜�0鐨勬暣鏁�")
private Long clientId;
+
+ /**
+ * 姘村崱缂栧彿
+ * 琛ュ崱鏃朵娇鐢�
+ */
+ @Schema(description = "姘村崱缂栧彿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ private String cardNum;
/**
* 鍗＄墖璐圭敤
@@ -42,6 +54,13 @@
private Integer cardCost;
/**
+ * 鍏呭�奸噾棰�
+ */
+ @Schema(description = "鍏呭�奸噾棰�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @Min(value = 0, message="鍏呭�奸噾棰濅笉鑳藉皬浜�0")
+ private Float amount;
+
+ /**
* 琛ュ崱閲戦
*/
@Schema(description = "琛ュ崱閲戦", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
--
Gitblit v1.8.0