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-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/DtoActiveCard.java | 17 +++++++----------
1 files changed, 7 insertions(+), 10 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 d5e63c4..e6cbdae 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,33 +21,30 @@
public static final long serialVersionUID = 20231191728001L;
/**
- * 姘村崱鍦板潃
+ * 姘村崱鍦板潃锛屼粎淇濆瓨锛屾棤涓氬姟
*/
@Schema(description = "姘村崱鍦板潃", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@NotBlank(message = "姘村崱鍦板潃涓嶈兘涓虹┖")
private String cardAddr;
/**
- * 鍐滄埛缂栧彿
- * 寮�鍗℃椂浣跨敤
+ * 鍐滄埛缂栧彿锛屽紑鍗′娇鐢�
*/
@Schema(description = "鍐滄埛缂栧彿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private String clientNum;
/**
- * 鍐滄埛ID锛堜富閿級
- * 搴熷純锛屾敼鐢╟lientNum
+ * 鍐滄埛ID锛堜富閿級锛屼笉鏄紑鍗℃帴鍙d紶鍏ワ紝鐢卞啘鎴风紪鍙疯幏寰楋紝淇濆瓨寮�鍗¤褰曞拰鍏呭�艰褰曢兘闇�瑕�
*/
- //@Schema(description = "鍐滄埛ID", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- //@Positive(message = "鍐滄埛ID蹇呴』涓哄ぇ浜�0鐨勬暣鏁�")
- //private Long clientId;
+ @Schema(description = "鍐滄埛ID", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ private Long clientId;
/**
* 姘村崱缂栧彿
* 琛ュ崱鏃朵娇鐢�
*/
@Schema(description = "姘村崱缂栧彿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- private String cardNum;
+ private Long cardNum;
/**
* 鍗$墖璐圭敤
@@ -68,7 +65,7 @@
*/
@Schema(description = "琛ュ崱閲戦", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@Min(value = 0, message="琛ュ崱閲戦涓嶈兘灏忎簬0")
- private Double reissueAmount;
+ private Float reissueAmount;
/**
* 鏀粯鏂瑰紡缂栧彿
--
Gitblit v1.8.0