From 7d55b601b8ec846e9d48ce31de1c5c6930d6dee0 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 19 八月 2025 17:24:35 +0800
Subject: [PATCH] 1、修改等待中间件返回结果超时时间为10秒； 2、修改向水肥机下发命令相关逻辑； 3、修改水肥机回复命令结果处理逻辑； 4、去除前端webSocket关闭产生异常日志记录。
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeClientCard.java | 28 +++++++---------------------
1 files changed, 7 insertions(+), 21 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeClientCard.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeClientCard.java
index 075c426..6c891aa 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeClientCard.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeClientCard.java
@@ -18,9 +18,9 @@
/**
* @author ZhuBaoMin
- * @date 2023/12/7 9:06
- * @LastEditTime 2023/12/18 10:14
- * @Description 娣诲姞姘村崱缂栧彿锛坈ardnum锛夊瓧娈�
+ * @date 2025-06-06 10:21
+ * @LastEditTime 2025-06-06 10:21
+ * @Description
*/
/**
@@ -33,7 +33,6 @@
@ToString
@NoArgsConstructor
@AllArgsConstructor
-@Schema(name = "鍐滄埛姘村崱瀹炰綋")
public class SeClientCard implements BaseEntity {
public static final long serialVersionUID = 202401151518004L;
@@ -42,7 +41,6 @@
*/
@JSONField(serializeUsing= ObjectWriterImplToString.class)
@TableId(type = IdType.INPUT)
- @Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private Long id;
@NotBlank(message = "閫氳鍗忚涓嶈兘涓虹┖")
@@ -51,35 +49,30 @@
/**
* 姘村崱鍦板潃
*/
- @Schema(description = "姘村崱鍦板潃", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@NotBlank(message = "姘村崱鍦板潃涓嶈兘涓虹┖")
private String cardaddr;
/**
* 姘村崱缂栧彿
*/
- @Schema(description = "姘村崱缂栧彿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@NotBlank(message = "姘村崱缂栧彿涓嶈兘涓虹┖")
private String cardnum;
/**
* 鍐滄埛ID
*/
- @Schema(description = "鍐滄埛ID", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@NotBlank(message = "鍐滄埛ID涓嶈兘涓虹┖")
private Long clientid;
/**
* 浣欓
*/
- @Schema(description = "浣欓", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Float money;
/**
* 鍗＄墖鐘舵��;1-姝ｅ父锛�2-宸叉敞閿�锛�3-宸叉寕澶�
*/
- @Schema(description = "鍗＄墖鐘舵��", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@Positive(message = "鍗＄墖鐘舵�佸繀椤讳负1鎴�2鎴�3")
@Size(min = 1, max = 3)
private Byte state;
@@ -87,32 +80,27 @@
/**
* 鍘熸寕澶卞崱ID
*/
- @Schema(description = "鍗＄墖鐘舵��", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@Positive(message = "鍘熸寕澶卞崱ID蹇呴』涓烘鏁�")
private Long originalCardId;
/**
* 寮�鍗℃椂闂�
*/
- @Schema(description = "寮�鍗℃椂闂�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private Date createdt;
/**
* 琛ュ崱鏃堕棿
*/
- @Schema(description = "琛ュ崱鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private Date replacedt;
/**
* 鍏呭�兼椂闂�
*/
- @Schema(description = "鍏呭�兼椂闂�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private Date rechargedt;
/**
* 鎸傚け鏃堕棿
*/
- @Schema(description = "鎸傚け鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private Date lossdtdt;
/**
@@ -124,31 +112,26 @@
/**
* 瑙ｉ攣鏃堕棿
*/
- @Schema(description = "瑙ｉ攣鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private Date unlockdt;
/**
* 鍐叉鏃堕棿
*/
- @Schema(description = "鍐叉鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private Date reversaldt;
/**
* 琛ユ墸鏃堕棿
*/
- @Schema(description = "琛ユ墸鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private Date refunddt;
/**
* 娑堣垂鏃堕棿
*/
- @Schema(description = "娑堣垂鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private Date consumedt;
/**
* 鏈�鍚庢搷浣滅被鍨�;1-寮�鍗★紝2-琛ュ崱锛�3-鍏呭�硷紝4-鎸傚け锛�5-娉ㄩ攢锛�6-瑙ｉ攣锛�7-鍐叉锛�8-娑堣垂
*/
- @Schema(description = "鏈�鍚庢搷浣滅被鍨�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@Positive(message = "鍗＄墖鐘舵�佸繀椤讳负1鍒�8鐨勬鏁存暟")
@Size(min = 1, max = 8)
private Byte lastoper;
@@ -156,8 +139,11 @@
/**
* 澶囨敞淇℃伅
*/
- @Schema(description = "澶囨敞", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@Length(message = "澶囨敞闀垮害灏忎簬{max}瀛�", min = 1, max = 200)
private String remarks;
+ /**
+ * 璁㈠崟鍙�
+ */
+ private String orderNo;
}
\ No newline at end of file
--
Gitblit v1.8.0