From 1b82b1cf780a3d3f2ff3c9b09ce24cea30b9800e Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq,com>
Date: 星期一, 24 八月 2020 12:13:03 +0800
Subject: [PATCH] 修改水冷故障
---
WaterSystem_MonitorServer/src/com/watersystem/monitor/Water_Task_SQL.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/WaterSystem_MonitorServer/src/com/watersystem/monitor/Water_Task_SQL.java b/WaterSystem_MonitorServer/src/com/watersystem/monitor/Water_Task_SQL.java
index e21df4d..1e7708e 100644
--- a/WaterSystem_MonitorServer/src/com/watersystem/monitor/Water_Task_SQL.java
+++ b/WaterSystem_MonitorServer/src/com/watersystem/monitor/Water_Task_SQL.java
@@ -5,7 +5,7 @@
import java.sql.SQLException;
import java.util.List;
-import com.electrical.FourKW.Electric_alarm;
+import com.base.Com;
import com.sql.MysqlConnPool;
import com.sql.Sql_Mysql;
@@ -300,15 +300,14 @@
for (Water_alarm walarm : list) {
String sql_str_sel = " select * from " + Sql_Mysql.Tb_water_alarm + " where water_id = " + walarm.getWater_id()+" and alarm_id="+walarm.getAlarm_id();
String sql_str_ins = " INSERT INTO " + Sql_Mysql.Tb_water_alarm + "(water_id,alarm_id,alarm_starttime,alarm_endtime,alarm_confirm,alarm_confirmtime) "
- +" VALUES("+walarm.water_id+","+walarm.alarm_id+",'"+walarm.alarm_starttime+"','"+walarm.getAlarm_endtime()+"',"+walarm.alarm_confirm+",'"+walarm.alarm_confirmtime+"');";
+ +" VALUES("+walarm.water_id+","+walarm.alarm_id+",'"+Com.getDateTimeFormat(walarm.alarm_starttime, Com.DTF_YMDhms)+"','"+Com.getDateTimeFormat(walarm.alarm_endtime, Com.DTF_YMDhms)+"',"+walarm.alarm_confirm+",'"+Com.getDateTimeFormat(walarm.alarm_confirmtime, Com.DTF_YMDhms)+"');";
String sql_str_update= " update " + Sql_Mysql.Tb_water_alarm +
- " set alarm_starttime="+walarm.alarm_starttime+
- ",alarm_endtime="+walarm.getAlarm_endtime()+
- ",alarm_confirm="+walarm.alarm_confirm+
- ",alarm_confirmtime"+walarm.getAlarm_confirmtime()+
- " where electric_id="+walarm.water_id+
+ " set alarm_starttime='"+Com.getDateTimeFormat(walarm.alarm_starttime, Com.DTF_YMDhms)+
+ "',alarm_endtime='"+Com.getDateTimeFormat(walarm.alarm_endtime, Com.DTF_YMDhms)+
+ "',alarm_confirm="+walarm.alarm_confirm+
+ ",alarm_confirmtime='"+Com.getDateTimeFormat(walarm.alarm_confirmtime, Com.DTF_YMDhms)+
+ "' where water_id="+walarm.water_id+
" and alarm_id="+walarm.alarm_id;
-
ResultSet res = null;
Sql_Mysql sql = new Sql_Mysql(conn_pool.getConn());
try {
--
Gitblit v1.9.1