From 0f2f2cfaeb23fc8f84ce13202bbc94fbc5644531 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 14 七月 2025 11:44:02 +0800
Subject: [PATCH] 修改用水户年用水量统计查询中的bug

---
 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/resource/rtuLog/RtuLogManager.java |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/resource/rtuLog/RtuLogManager.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/resource/rtuLog/RtuLogManager.java
index 304171d..d0dff48 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/resource/rtuLog/RtuLogManager.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/resource/rtuLog/RtuLogManager.java
@@ -172,16 +172,19 @@
 								return new Object[]{null, 3} ;
 							}
 							if(!oldLog.delete()){
-								return new Object[]{null, 4} ;
+								//2025-06-28 瀵逛簬姘磋偉鏈篎Box涓婃姤鏁版嵁姣旇緝棰戠箒锛屽疄娴嬭�佹枃浠跺父鏈夊垹闄や笉浜嗙殑鎯呭喌鍙戠敓锛�
+								//涓�娆″垹闄や笉浜嗭紝涓嬫鍐嶅彲鍒犻櫎锛屾墍浠ヤ笅闈eturn鍘婚櫎
+								//return new Object[]{null, 4} ;
 							}
 						}
 					}
 					if(!f.renameTo(new File(path + rtuAddr + ".log." + 1))){
 						return new Object[]{null, 5} ;
 					}
-					if(!f.delete()){
-						return new Object[]{null, 6} ;
-					}
+					//2024-10-11 涓婇潰rename浜嗭紝搴旇涓嶇敤delete浜�
+					//if(!f.delete()){
+					//	return new Object[]{null, 6} ;
+					//}
 
 					f = new File(path + rtuAddr + ".log");
 					if(!f.exists()){

--
Gitblit v1.8.0