From f74db84df0e3797e0a2db1faa50adcb778a5150a Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 27 六月 2025 11:33:35 +0800
Subject: [PATCH] 1、完善水肥、墒情、气象相关Mapper代码; 2、解决表阀一体机远程关阀出现的订单号不一致专制不能关阀问题(王江海测试发现)。

---
 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkRtuDealCommandResponse.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkRtuDealCommandResponse.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkRtuDealCommandResponse.java
index 44566dd..852009e 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkRtuDealCommandResponse.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkRtuDealCommandResponse.java
@@ -47,14 +47,14 @@
                         log.error("鏈緱鍒板懡浠ゆ棩蹇楋紙" + d.getCommandId() + ")");
                     }
                 }catch (Exception e){
-                    log.error("淇濆瓨鎺у埗鍣ㄨ嚜鎶ユ暟鎹椂鍙戠敓寮傚父", e);
+                    log.error("淇濆瓨鎺у埗鍣ㄥ懡浠ょ粨鏋滄椂鍙戠敓寮傚父", e);
                 }
             }
         }
     }
 
     public RmCommandHistory updateCommandLogPo(RmCommandHistory po, String code, DataV1 dV1, Object obj) throws Exception{
-        po.setResultTime(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1.dt)) ;
+        po.setResultTime(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1.dt==null?DateTime.yyyy_MM_dd_HH_mm_ss():dV1.dt));
         if(obj instanceof DataCd97Vo){
             DataCd97Vo vo = (DataCd97Vo)obj ;
             po.setResult(vo.success?(byte)1:(byte)0);

--
Gitblit v1.8.0