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/SeManagerCard.java | 48 ++++++++++++++++++++++++++----------------------
1 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeManagerCard.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeManagerCard.java
index 932ba30..e22b5e9 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeManagerCard.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeManagerCard.java
@@ -10,18 +10,13 @@
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.*;
-import org.hibernate.validator.constraints.Length;
-
import java.util.Date;
/**
* @author ZhuBaoMin
- * @date 2024-07-24 10:36
- * @LastEditTime 2024-07-24 10:36
- * @Description
- */
-/**
- * 绠＄悊鍛樻按鍗¤〃
+ * @date 2025-06-11 10:34
+ * @LastEditTime 2025-06-11 10:34
+ * @Description 绠＄悊鍛樻按鍗¤〃
*/
@TableName(value = "se_manager_card", autoResultMap = true)
@@ -31,42 +26,51 @@
@NoArgsConstructor
@AllArgsConstructor
public class SeManagerCard implements BaseEntity {
- public static final long serialVersionUID = 202407241040001L;
+ public static final long serialVersionUID = 202506111039001L;
/**
- * 涓婚敭
- */
+ * 涓婚敭
+ */
@JSONField(serializeUsing= ObjectWriterImplToString.class)
@TableId(type = IdType.INPUT)
private Long id;
/**
- * 鍗＄墖鍦板潃
- */
+ * 閫氳鍗忚
+ */
+ private String protocol;
+
+ /**
+ * 鍗＄墖鍦板潃
+ */
@NotBlank(message = "鍗＄墖鍦板潃涓嶈兘涓虹┖")
private String cardAddr;
/**
- * 鍗＄墖缂栧彿
- */
+ * 鍗＄墖缂栧彿
+ */
@NotBlank(message = "鍗＄墖缂栧彿涓嶈兘涓虹┖")
private String cardNum;
/**
- * 鍗＄墖绫诲瀷;2-绠＄悊绉戯紝4-宸℃鍗★紝5娓呯┖鍗�
- */
+ * 鍗＄墖绫诲瀷;2-绠＄悊绉戯紝4-宸℃鍗★紝5娓呯┖鍗�
+ */
@NotNull(message = "鍗＄墖绫诲瀷涓嶈兘涓虹┖")
private Byte cardType;
/**
- * 寮�鍗℃椂闂�
- */
+ * 寮�鍗℃椂闂�
+ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
- * 澶囨敞淇℃伅
- */
- @Length(max = 200)
+ * 澶囨敞淇℃伅
+ */
private String remarks;
+
+ /**
+ * 璁㈠崟鍙�
+ */
+ private String orderNo;
}
\ No newline at end of file
--
Gitblit v1.8.0