From b215735f76f8dca514b1befd68ff183757f4dd12 Mon Sep 17 00:00:00 2001
From: DELL <1525436766@qq.com>
Date: 星期二, 24 六月 2025 17:49:26 +0800
Subject: [PATCH] V6.110 edit by lijun 	@  2025-06-24 	1.新增单体漏液信息读取 	2.同步window或linux系统超时配置

---
 iec61850_forFoShanAES_Model/src/com/battdata_rt/BattData_RT_SQL.java |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/iec61850_forFoShanAES_Model/src/com/battdata_rt/BattData_RT_SQL.java b/iec61850_forFoShanAES_Model/src/com/battdata_rt/BattData_RT_SQL.java
index f03f7d5..5154331 100644
--- a/iec61850_forFoShanAES_Model/src/com/battdata_rt/BattData_RT_SQL.java
+++ b/iec61850_forFoShanAES_Model/src/com/battdata_rt/BattData_RT_SQL.java
@@ -257,6 +257,7 @@
 			if(sql_str_JH.trim().length() > 1) {
 				sql_str_JH = ", mon_JH_curr = CASE mon_num " + sql_str_JH + " ELSE mon_JH_curr END ";
 			}
+			
 			String sql_str_rest_cap = " ";
 			for(int n=0; n<bd_rt.MonCount; n++) {
 				tmp_dt = bd_rt.al_MonVol.get(n).mon_rest_cap;
@@ -269,7 +270,19 @@
 				sql_str_rest_cap = ", mon_rest_cap = CASE mon_num " + sql_str_rest_cap + " ELSE mon_rest_cap END ";
 			}
 			
-			String sql_str_2 = sql_str_vol + sql_str_tmp + sql_str_res + sql_str_ser + sql_str_JH + sql_str_rest_cap;
+			String sql_str_ly = " ";
+			for(int n=0; n<bd_rt.MonCount; n++) {
+				tmp_dt = bd_rt.al_MonVol.get(n).mon_LY_vol;
+				//if(bd_rt.al_MonVol_RtOld.get(n).mon_rest_cap != tmp_dt) {
+				bd_rt.al_MonVol_RtOld.get(n).mon_LY_vol = tmp_dt;
+				sql_str_ly += " WHEN " + (n+1) + " THEN " + String.format("%1.3f", tmp_dt);
+				//}
+			}
+			if(sql_str_ly.trim().length() > 1) {
+				sql_str_ly = ", mon_LY_vol = CASE mon_num " + sql_str_ly + " ELSE mon_LY_vol END ";
+			}
+			
+			String sql_str_2 = sql_str_vol + sql_str_tmp + sql_str_res + sql_str_ser + sql_str_JH + sql_str_rest_cap + sql_str_ly;
 			if(sql_str_2.trim().length() > 1) {
 				sql_str_2 += " WHERE BattGroupId=" + bd_rt.BattGroupId;
 				/*

--
Gitblit v1.9.1