修改

whyclxw

2020-09-21 7b7e6fcb9f54efa98487222a54fb2c681ae79b78

修改

 ElectricalSystem_MonitorServer_4KW/src/com/electrical/FourKW/Electrical_4KW_SocketClient_Thread.java

@@ -492,6 +492,7 @@
                alarm.setAlarm_starttime(new Date());
                alarm.setAlarm_endtime(new Date());
                alarm.setAlarm_confirm(0);
                alarm.setAlarm_confirmtime(new Date());
                listAlarm.add(alarm);
            }
            
@@ -501,6 +502,7 @@
                alarm.setAlarm_starttime(new Date());
                alarm.setAlarm_endtime(new Date());
                alarm.setAlarm_confirm(0);
                alarm.setAlarm_confirmtime(new Date());
                listAlarm.add(alarm);
            }
            
@@ -510,6 +512,7 @@
                alarm.setAlarm_starttime(new Date());
                alarm.setAlarm_endtime(new Date());
                alarm.setAlarm_confirm(0);
                alarm.setAlarm_confirmtime(new Date());
                listAlarm.add(alarm);
            }
            if(eAlarm.case_pulse_block>0) {
@@ -518,6 +521,7 @@
                alarm.setAlarm_starttime(new Date());
                alarm.setAlarm_endtime(new Date());
                alarm.setAlarm_confirm(0);
                alarm.setAlarm_confirmtime(new Date());
                listAlarm.add(alarm);
            }
            if(eAlarm.case_transA_overcurr>0) {
@@ -526,6 +530,7 @@
                alarm.setAlarm_starttime(new Date());
                alarm.setAlarm_endtime(new Date());
                alarm.setAlarm_confirm(0);
                alarm.setAlarm_confirmtime(new Date());
                listAlarm.add(alarm);
            }
            if(eAlarm.case_transB_overcurr>0) {
@@ -534,6 +539,7 @@
                alarm.setAlarm_starttime(new Date());
                alarm.setAlarm_endtime(new Date());
                alarm.setAlarm_confirm(0);
                alarm.setAlarm_confirmtime(new Date());
                listAlarm.add(alarm);
            }
            if(eAlarm.case_transC_overcurr>0) {
@@ -542,6 +548,7 @@
                alarm.setAlarm_starttime(new Date());
                alarm.setAlarm_endtime(new Date());
                alarm.setAlarm_confirm(0);
                alarm.setAlarm_confirmtime(new Date());
                listAlarm.add(alarm);
            }
            if(eAlarm.case_cuurfeedback_lose>0) {
@@ -550,6 +557,7 @@
                alarm.setAlarm_starttime(new Date());
                alarm.setAlarm_endtime(new Date());
                alarm.setAlarm_confirm(0);
                alarm.setAlarm_confirmtime(new Date());
                listAlarm.add(alarm);
            }
            if(eAlarm.case_synchro_cycle_fault>0) {
@@ -558,6 +566,7 @@
                alarm.setAlarm_starttime(new Date());
                alarm.setAlarm_endtime(new Date());
                alarm.setAlarm_confirm(0);
                alarm.setAlarm_confirmtime(new Date());
                listAlarm.add(alarm);
            }
            if(eAlarm.main_cabinet_fault_one>0) {
@@ -566,6 +575,7 @@
                alarm.setAlarm_starttime(new Date());
                alarm.setAlarm_endtime(new Date());
                alarm.setAlarm_confirm(0);
                alarm.setAlarm_confirmtime(new Date());
                listAlarm.add(alarm);
            }
            if(eAlarm.main_cabinet_fault_two>0) {
@@ -574,6 +584,7 @@
                alarm.setAlarm_starttime(new Date());
                alarm.setAlarm_endtime(new Date());
                alarm.setAlarm_confirm(0);
                alarm.setAlarm_confirmtime(new Date());
                listAlarm.add(alarm);
            }    
        }

 ElectricalSystem_MonitorServer_4KW/src/com/electrical/FourKW/Electrical_Task_SQL.java

@@ -721,12 +721,12 @@
            for (Electric_alarm ealarm : list) {
                String sql_str_sel = " select * from " + Sql_Mysql.Tb_Electric_alarm + " where electric_id = " + ealarm.getElectric_id()+" and alarm_id="+ealarm.getAlarm_id();
                String sql_str_ins = " INSERT INTO " + Sql_Mysql.Tb_Electric_alarm + "(electric_id,alarm_id,alarm_starttime,alarm_endtime,alarm_confirm,alarm_confirmtime) "
                                    +" VALUES("+ealarm.electric_id+","+ealarm.alarm_id+",'"+ealarm.alarm_starttime+"','"+ealarm.getAlarm_endtime()+"',"+ealarm.alarm_confirm+",'"+ealarm.alarm_confirmtime+"');";
                                    +" VALUES("+ealarm.electric_id+","+ealarm.alarm_id+",'"+Com.getDateTimeFormat(ealarm.alarm_starttime, Com.DTF_YMDhms)+"','"+Com.getDateTimeFormat(ealarm.getAlarm_endtime(), Com.DTF_YMDhms)+"',"+ealarm.alarm_confirm+",'"+Com.getDateTimeFormat(ealarm.alarm_confirmtime, Com.DTF_YMDhms)+"');";
                String sql_str_update= " update " + Sql_Mysql.Tb_Electric_alarm + 
                                       " set alarm_starttime="+ealarm.alarm_starttime+
                                       ",alarm_endtime="+ealarm.getAlarm_endtime()+
                                       ",alarm_confirm="+ealarm.alarm_confirm+
                                       ",alarm_confirmtime"+ealarm.getAlarm_confirmtime()+
                                       " set alarm_starttime='"+Com.getDateTimeFormat(ealarm.alarm_starttime, Com.DTF_YMDhms)+
                                       "',alarm_endtime='"+Com.getDateTimeFormat(ealarm.getAlarm_endtime(), Com.DTF_YMDhms)+
                                       "',alarm_confirm="+ealarm.alarm_confirm+
                                       //",alarm_confirmtime"+ealarm.getAlarm_confirmtime()+
                                       "  where electric_id="+ealarm.electric_id+
                                       "  and alarm_id="+ealarm.alarm_id;