From 9a332594f1efa890997f9ba8d3a4d964f1b68b72 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 30 六月 2025 08:57:39 +0800
Subject: [PATCH] 1、中间件设备日志文件针对FBox设备优化；2、表阀一体机功能码92返回结果判断bug修改；3、remote模块中实现表阀一体机协议的功能码9D(正常远程关阀)。
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/resource/rtuLog/RtuLogManager.java | 45 ++++++++++++++++++++++++---------------------
1 files changed, 24 insertions(+), 21 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 313c8b7b..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
@@ -128,14 +128,14 @@
/**
* 璁板綍Rtu鏃ュ織
* @param rtuAddr 鎺у埗鍣ㄥ湴鍧�
- * @param conent 鏃ュ織鍐呭
+ * @param content 鏃ュ織鍐呭
*/
- private void log(String rtuAddr , String conent){
- File f = getFileForWrite(ResourceUnit.confVo.rtuLogDir , rtuAddr.trim()) ;
- if(f != null){
- writeLog(f , DateTime.yyyy_MM_dd_HH_mm_ss() + " " + conent) ;
+ private void log(String rtuAddr , String content){
+ Object[] res = getFileForWrite(ResourceUnit.confVo.rtuLogDir , rtuAddr.trim()) ;
+ if(res[0] != null){
+ writeLog((File)res[0] , DateTime.yyyy_MM_dd_HH_mm_ss() + " " + content) ;
}else{
- log.error("涓嶈兘寰楀埌鍦板潃涓�:" + rtuAddr + "鐨凴tu鏃ュ織鏂囦欢锛�") ;
+ log.error("涓嶈兘寰楀埌鍦板潃涓�:" + rtuAddr + "鐨凴tu鏃ュ織鏂囦欢锛侊紙淇℃伅缂栫爜" + res[1] + "锛�") ;
}
}
@@ -145,11 +145,11 @@
* @param rtuAddr 鎺у埗鍣ㄥ湴鍧�
* @return 鏃ュ織鏂囦欢
*/
- private File getFileForWrite(String path , String rtuAddr) {
+ private Object[] getFileForWrite(String path , String rtuAddr) {
File dir = new File(path) ;
if(!dir.exists()){
if(!dir.mkdirs()){
- return null ;
+ return new Object[]{null, 1} ;
}
}
File f = new File(path + rtuAddr + ".log");
@@ -162,43 +162,46 @@
File oldestLog = new File(path + rtuAddr + ".log." + (ResourceUnit.confVo.rtuLogFileMaxCount - 1)) ;
if(oldestLog.exists()){
if(!oldestLog.delete()){
- return null ;
+ return new Object[]{null, 2} ;
}
}
for(int i = (ResourceUnit.confVo.rtuLogFileMaxCount - 2) ; i > 0 ; i--){
File oldLog = new File(path + rtuAddr + ".log." + i) ;
if(oldLog.exists()){
if(!oldLog.renameTo(new File(path + rtuAddr + ".log." + (i + 1)))){
- return null ;
+ return new Object[]{null, 3} ;
}
if(!oldLog.delete()){
- return null ;
+ //2025-06-28 瀵逛簬姘磋偉鏈篎Box涓婃姤鏁版嵁姣旇緝棰戠箒锛屽疄娴嬭�佹枃浠跺父鏈夊垹闄や笉浜嗙殑鎯呭喌鍙戠敓锛�
+ //涓�娆″垹闄や笉浜嗭紝涓嬫鍐嶅彲鍒犻櫎锛屾墍浠ヤ笅闈eturn鍘婚櫎
+ //return new Object[]{null, 4} ;
}
}
}
if(!f.renameTo(new File(path + rtuAddr + ".log." + 1))){
- return null ;
+ return new Object[]{null, 5} ;
}
- if(!f.delete()){
- return null ;
- }
+ //2024-10-11 涓婇潰rename浜嗭紝搴旇涓嶇敤delete浜�
+ //if(!f.delete()){
+ // return new Object[]{null, 6} ;
+ //}
f = new File(path + rtuAddr + ".log");
if(!f.exists()){
if(f.createNewFile()){
- return f ;
+ return new Object[]{f, 7} ;
}else{
- return null ;
+ return new Object[]{null, 8} ;
}
}
}else{
- return f ;
+ return new Object[]{f, 9} ;
}
}else{
if(f.createNewFile()){
- return f ;
+ return new Object[]{f, 10} ;
}else{
- return null ;
+ return new Object[]{null, 11} ;
}
}
} catch (Exception e) {
@@ -212,7 +215,7 @@
log.error("鍏抽棴Rtu鏃ュ織鏂囦欢(" + f.getName() + ")璇诲叆娴佹椂鍑洪敊" , e) ;
}
}
- return null;
+ return new Object[]{null, 12} ;
}
/**
--
Gitblit v1.8.0