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/pojoRm/RmCommandHistory.java |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmCommandHistory.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmCommandHistory.java
index 83b2a95..163416d 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmCommandHistory.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmCommandHistory.java
@@ -1,5 +1,4 @@
 package com.dy.pipIrrGlobal.pojoRm;
-
 /**
  * @author ZhuBaoMin
  * @date 2024-05-24 10:46
@@ -24,8 +23,8 @@
 import java.util.Date;
 
 /**
-    * 鍛戒护鏃ュ織琛�
-    */
+ * 鍛戒护鏃ュ織琛�
+ */
 @TableName(value = "rm_command_history", autoResultMap = true)
 @Data
 @Builder
@@ -40,7 +39,7 @@
      */
     @JSONField(serializeUsing = ObjectWriterImplToString.class)
     @TableId(type = IdType.INPUT)
-    private Long id;
+    private Long comId;
 
     /**
      * 鍔熻兘鐮�
@@ -107,7 +106,6 @@
     /**
      * 鍛戒护缁撴灉鍐呭
      */
-    @TableField(typeHandler = JacksonTypeHandler.class)
-    private JSONObject resultText;
+    private String resultText;
 
 }
\ No newline at end of file

--
Gitblit v1.8.0