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/RmOpenCloseValveHistory.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveHistory.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveHistory.java
index d47352a..c90f0a0 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveHistory.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveHistory.java
@@ -458,6 +458,9 @@
         this.opIcCardNo = dataCd84Vo.icCardNo;
         this.opIcCardAddr = dataCd84Vo.icCardAddr;
         this.opRemainMoney = dataCd84Vo.moneyRemainUser;
+        this.opOrderNo = dataCd84Vo.orderNo; //姹熸捣鍗忚鐗规湁
+        this.opEleTotalAmount = dataCd84Vo.eleTotalAmount; //姹熸捣鍗忚鐗规湁
+        this.opWaterRemainUser = dataCd84Vo.waterRemainUser; //姹熸捣鍗忚鐗规湁
         this.openDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd84Vo.openDt);
         if (clearCloseValve != null && clearCloseValve.booleanValue()) {
             this.clDt = null;

--
Gitblit v1.8.0