From 6f1b67b93229e9ecd387cb1b53dafc4782d1b8fe Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期四, 18 六月 2020 11:07:27 +0800
Subject: [PATCH] 修复离线养护计划
---
src/com/dec/fbs9100/FBS9100_Task_Thread_SQL.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/src/com/dec/fbs9100/FBS9100_Task_Thread_SQL.java b/src/com/dec/fbs9100/FBS9100_Task_Thread_SQL.java
index b9e560a..d58a5c9 100644
--- a/src/com/dec/fbs9100/FBS9100_Task_Thread_SQL.java
+++ b/src/com/dec/fbs9100/FBS9100_Task_Thread_SQL.java
@@ -452,7 +452,7 @@
/***********************************************************************************/
/**
- * 锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷id锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷 tb_fbs9100_state 锟斤拷锟斤拷锟斤拷
+ * 鏇存柊鏁版嵁搴撹〃 tb_fbs9100_state 鏇存柊61850璁惧宸ヤ綔鐘舵��
* @param con_pool
* @param v_data
* @param dev_id
@@ -507,7 +507,7 @@
+ "dev_61850alarms= '" +v_data.m_SysState.dev_61850alam+"'";
- //String sql_str_update = "UPDATE " + sql_str_base + " WHERE dev_id=" + dev_id;
+ String sql_str_update = "UPDATE " + sql_str_base + " WHERE dev_id=" + m_pm.dev_id;
String sql_str_replace = "REPLACE INTO " + sql_str_base;
Sql_Mysql sql = new Sql_Mysql(con_pool.getConn());
@@ -515,12 +515,16 @@
if(v_data.m_SysState.CapTestStopType>=0 && v_data.m_SysState.CapTestStopType<=256) {
//System.out.println(sql_str_replace);
+ ResultSet res = sql.sqlMysqlQuery("SELECT * FROM db_ram_db.tb_fbs9100_state WHERE dev_id = " + m_pm.dev_id);
try {
- //System.out.println(sql_str_replace);
+ if(res.next()) {
+ sql.sqlMysqlExecute(sql_str_update);
+ } else {
+ sql.sqlMysqlExecute(sql_str_replace);
+ }
+ //System.out.println(sql_str_replace);
- sql.sqlMysqlExecute(sql_str_replace);
} catch (SQLException e) {
- // TODO Auto-generated catch block
e.printStackTrace();
} finally {
sql.close_con();
@@ -528,6 +532,8 @@
}
}
/***********************************************************************************/
+
+
/*
* 鏇存柊鎸囧畾璁惧闄ょ～妯″潡鐨勫伐浣滅姸鎬�
*/
@@ -707,6 +713,10 @@
param.m_FBS_DiscParam.OffLineYH_Cycle = res.getInt("OffLineYH_Cycle");
param.m_FBS_DiscParam.OnLineVol_Low = res.getFloat("OnLineVol_Low");
+
+ param.m_FBS_DiscParam.OffLineYHstarttime = res.getTimestamp("OffLineYHstarttime");
+ param.m_FBS_DiscParam.OffLineYHTimes = res.getInt("OffLineYHTimes");
+ param.m_FBS_DiscParam.OffLineYHOnceCycle = res.getInt("OffLineYHOnceCycle");
}
}
@@ -1274,7 +1284,9 @@
+ " PowerBreakChargeCurr =" + sysparam.PowerBreakChargeCurr + ", " //鐢垫祦寮傚父闃�鍊�
+ " POF_BG_Boost_VolStop =" + sysparam.POF_BG_Boost_VolStop + ", " //鐢靛帇杩囬珮闃�鍊�
+ " POF_BG_Boost_VolStart =" + sysparam.POF_BG_Boost_VolStart + ", " //鐢靛帇杩囦綆闃�鍊�
- + " MonomerOrder =" + sysparam.MonomerOrder + " "; //涓讳粠鏈烘ā寮�
+ + " MonomerOrder =" + sysparam.MonomerOrder + ", " //涓讳粠鏈烘ā寮�
+ + " LoaderCount =" + sysparam.LoaderCount + ", " //涓讳粠鏈轰娇鑳�
+ + " DtCardCount =" + sysparam.DtCardCount + " "; //骞叉帴鐐逛娇鑳�
//+ " where dev_id = " + param.dev_id;
//String sql_str_update = "UPDATE " + sql_str_base;
String sql_str_replace = " REPLACE INTO " + sql_str_base;
--
Gitblit v1.9.1