V1.105 2024-04-18 lijun 1.因通信所存在平台端出现检测告警，当前去除平台端检测告警功能

DELL

2024-07-04 725266264d7394aad9989e20e40971f57be5ebe3

 IEC61850_ForPowerSupply_ForNW/src/com/power/alarm/PwrDeviceAlarm_Thread.java

@@ -104,13 +104,14 @@
               + " SET "

               + " alm_end_time='" + Com.getDateTimeFormat(new Date(), Com.DTF_YMDhms) + "', "

               + " alm_cleared_type=" + PwrDeviceAlarm_Data.ALM_CLEARED_TYPE_AUTO 

               + " WHERE PowerDeviceId=" + dev_id + " AND alm_type= "+ alm_type_id + " AND alm_source = "+alm_src  + " AND alm_index = "+alm_index;

            + " WHERE PowerDeviceId=" + dev_id + " AND alm_type= " + alm_type_id /* + " AND alm_source = "+alm_src */ + " AND alm_index = "+alm_index;

         

         //将当前设备实时告警表中的历史告警记录插入到设备历史告警表中

         String sql_str2 = " INSERT INTO " + Sql_Mysql.TB_PWRDEV_ALARM_HISTORY+"(record_id,PowerDeviceId,alm_type,alm_level,alm_source,alm_index,alm_start_time,alm_end_time,alm_value,alm_is_confirmed,alm_confirmed_time,alm_cleared_type)  (SELECT record_id,PowerDeviceId,alm_type,alm_level,alm_source,alm_index,alm_start_time,alm_end_time,alm_value,alm_is_confirmed,alm_confirmed_time,alm_cleared_type from "+Sql_Mysql.TB_PWRDEV_ALARM+" WHERE PowerDeviceId="+dev_id+" AND alm_cleared_type!="+PwrDeviceAlarm_Data.ALM_CLEARED_TYPE_NULL+ " AND alm_type= "+ alm_type_id+ " AND alm_source = "+alm_src  + " AND alm_index = "+alm_index+")";

         

         //将实时告警表中的非实时告警删除

         String sql_str3 = " DELETE FROM " + Sql_Mysql.TB_PWRDEV_ALARM +" WHERE PowerDeviceId = " + dev_id+" AND alm_cleared_type != "+ PwrDeviceAlarm_Data.ALM_CLEARED_TYPE_NULL+ " AND alm_type= "+ alm_type_id +" AND alm_source = "+alm_src  + " AND alm_index = "+alm_index;

      String sql_str3 = " DELETE FROM " + Sql_Mysql.TB_PWRDEV_ALARM + " WHERE PowerDeviceId = " + dev_id

            + " AND alm_cleared_type != " + PwrDeviceAlarm_Data.ALM_CLEARED_TYPE_NULL + " AND alm_type= " + alm_type_id /* +" AND alm_source = "+alm_src */ + " AND alm_index = "+alm_index;



         sql_strs.add(sql_str1);

         sql_strs.add(sql_str2);

@@ -135,7 +136,8 @@
         sql.sqlMysqlUseDB(Sql_Mysql.DB_PWRDEV_ALARM);

         String sql_str = " SELECT PowerDeviceId,record_id,alm_level,alm_cleared_type,alm_start_time "

                  + " FROM " + Sql_Mysql.TB_PWRDEV_ALARM

                  + " WHERE PowerDeviceId= "+ dev_id +" AND alm_type = "+alm_type_id +" AND alm_source = "+alm_src  + " AND alm_index = "+alm_index

            + " WHERE PowerDeviceId= " + dev_id + " AND alm_type = "

            + alm_type_id /* +" AND alm_source = "+alm_src */ + " AND alm_index = "+alm_index

                  + " ORDER BY alm_start_time DESC ";



         ResultSet rs = sql.sqlMysqlQuery(sql_str);

@@ -175,8 +177,7 @@
         

         InsertPwrDevAlarmToTable(RecId,dev_id,alm_type_id,mAlarm_Param.alarm_level,alm_src,alm_index,alm_val,sql);

         

      }

      else if((adata!=null) && (alm_st == false)) {

      } else if((adata!=null) && (alm_st == false)) {

         ChangeRT_AlarmToHistoryAlarm(dev_id,alm_type_id,alm_src,alm_index,sql);

      }

   }

@@ -185,7 +186,6 @@


   

   private void makePowerDeviceAlarm(PowerData_RT rtpd) {

			
      //----------协转通信告警-------------

      boolean commerr = false;

      if(rtpd.GetPwrDeviceCommErrState() == true) {

@@ -343,7 +343,7 @@
      if(rtpd.m_acData.acIn1_volA<mAlarm_Param.alarm_limitL && rtpd.m_acData.acIn1_volB<mAlarm_Param.alarm_limitL && rtpd.m_acData.acIn1_volC<mAlarm_Param.alarm_limitL) {

         ac1_powerdown = true;

      }

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn1_PowerDown_ID,ac1_powerdown,rtpd.m_acData.acIn1_volA,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);

//      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn1_PowerDown_ID,ac1_powerdown,rtpd.m_acData.acIn1_volA,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);

      

      mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn2_PowerDown_ID, sql);

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn2_PowerDown_ID,rtpd.m_acData.is_acIn2_powerdown,rtpd.m_acData.acIn2_volA,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);

@@ -351,12 +351,12 @@
      if(rtpd.m_acData.acIn2_volA<mAlarm_Param.alarm_limitL && rtpd.m_acData.acIn2_volB<mAlarm_Param.alarm_limitL && rtpd.m_acData.acIn2_volC<mAlarm_Param.alarm_limitL) {

         ac2_powerdown = true;

      }

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn2_PowerDown_ID,ac2_powerdown,rtpd.m_acData.acIn2_volA,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);					
//      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn2_PowerDown_ID,ac2_powerdown,rtpd.m_acData.acIn2_volA,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);					


      //-----------------------------------------------------------------------------------------------------------

      mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn1_A_OverV_ID, sql);

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn1_A_OverV_ID,rtpd.m_acData.is_acIn1_over_volA,rtpd.m_acData.acIn1_volA,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);   

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn1_A_OverV_ID,(rtpd.m_acData.acIn1_volA>mAlarm_Param.alarm_limitH),rtpd.m_acData.acIn1_volA,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
//      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn1_A_OverV_ID,(rtpd.m_acData.acIn1_volA>mAlarm_Param.alarm_limitH),rtpd.m_acData.acIn1_volA,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
      

      mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn1_A_Less_ID, sql);

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn1_A_Less_ID,rtpd.m_acData.is_acIn1_less_A,rtpd.m_acData.acIn1_volA,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);   

@@ -364,7 +364,7 @@
      if(rtpd.m_acData.acIn1_volA<mAlarm_Param.alarm_limitL && false==ac1_powerdown) { //先判断是否缺相

         err_detect = true;

      }

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn1_A_Less_ID,err_detect,rtpd.m_acData.acIn1_volA,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
//      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn1_A_Less_ID,err_detect,rtpd.m_acData.acIn1_volA,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
      

      mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn1_A_UnderV_ID, sql);

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn1_A_UnderV_ID,rtpd.m_acData.is_acIn1_under_volA,rtpd.m_acData.acIn1_volA,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);   

@@ -379,12 +379,12 @@
            err_detect = false;

         }

      }

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn1_A_UnderV_ID,err_detect,rtpd.m_acData.acIn1_volA,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
//      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn1_A_UnderV_ID,err_detect,rtpd.m_acData.acIn1_volA,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
      

      //-----------------------------------------------------------------------------------------------------------

      mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn1_B_OverV_ID, sql);

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn1_B_OverV_ID,rtpd.m_acData.is_acIn1_over_volB,rtpd.m_acData.acIn1_volB,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);   

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn1_B_OverV_ID,(rtpd.m_acData.acIn1_volB>mAlarm_Param.alarm_limitH),rtpd.m_acData.acIn1_volB,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
//      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn1_B_OverV_ID,(rtpd.m_acData.acIn1_volB>mAlarm_Param.alarm_limitH),rtpd.m_acData.acIn1_volB,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
      

      mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn1_B_Less_ID, sql);

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn1_B_Less_ID,rtpd.m_acData.is_acIn1_less_B,rtpd.m_acData.acIn1_volB,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);   

@@ -392,7 +392,7 @@
      if(rtpd.m_acData.acIn1_volB<mAlarm_Param.alarm_limitL && false==ac1_powerdown) { //先判断是否缺相

         err_detect = true;

      }

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn1_B_Less_ID,err_detect,rtpd.m_acData.acIn1_volB,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
//      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn1_B_Less_ID,err_detect,rtpd.m_acData.acIn1_volB,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
      

      mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn1_B_UnderV_ID, sql);

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn1_B_UnderV_ID,rtpd.m_acData.is_acIn1_under_volB,rtpd.m_acData.acIn1_volB,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);   

@@ -407,12 +407,12 @@
            err_detect = false;

         }

      }

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn1_B_UnderV_ID,err_detect,rtpd.m_acData.acIn1_volB,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
//      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn1_B_UnderV_ID,err_detect,rtpd.m_acData.acIn1_volB,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
      

      //-----------------------------------------------------------------------------------------------------------

      mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn1_C_OverV_ID, sql);

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn1_C_OverV_ID,rtpd.m_acData.is_acIn1_over_volC,rtpd.m_acData.acIn1_volC,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);   

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn1_C_OverV_ID,(rtpd.m_acData.acIn1_volC>mAlarm_Param.alarm_limitH),rtpd.m_acData.acIn1_volB,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
//      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn1_C_OverV_ID,(rtpd.m_acData.acIn1_volC>mAlarm_Param.alarm_limitH),rtpd.m_acData.acIn1_volB,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
      

      mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn1_C_Less_ID, sql);

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn1_C_Less_ID,rtpd.m_acData.is_acIn1_less_C,rtpd.m_acData.acIn1_volC,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);   

@@ -420,7 +420,7 @@
      if(rtpd.m_acData.acIn1_volC<mAlarm_Param.alarm_limitL && false==ac1_powerdown) { //先判断是否缺相

         err_detect = true;

      }

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn1_C_Less_ID,err_detect,rtpd.m_acData.acIn1_volC,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
//      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn1_C_Less_ID,err_detect,rtpd.m_acData.acIn1_volC,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
      

      mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn1_C_UnderV_ID, sql);

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn1_C_UnderV_ID,rtpd.m_acData.is_acIn1_under_volC,rtpd.m_acData.acIn1_volC,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);   

@@ -435,12 +435,12 @@
            err_detect = false;

         }

      }

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn1_C_UnderV_ID,err_detect,rtpd.m_acData.acIn1_volC,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
//      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn1_C_UnderV_ID,err_detect,rtpd.m_acData.acIn1_volC,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
      

      //-----------------------------------------------------------------------------------------------------------

      mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn2_A_OverV_ID, sql);

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn2_A_OverV_ID,rtpd.m_acData.is_acIn2_over_volA,rtpd.m_acData.acIn2_volA,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);   

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn2_A_OverV_ID,(rtpd.m_acData.acIn2_volA>mAlarm_Param.alarm_limitH),rtpd.m_acData.acIn2_volA,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
//      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn2_A_OverV_ID,(rtpd.m_acData.acIn2_volA>mAlarm_Param.alarm_limitH),rtpd.m_acData.acIn2_volA,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
      

      mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn2_A_Less_ID, sql);

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn2_A_Less_ID,rtpd.m_acData.is_acIn2_less_A,rtpd.m_acData.acIn2_volA,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);   

@@ -448,7 +448,7 @@
      if(rtpd.m_acData.acIn2_volA<mAlarm_Param.alarm_limitL && false==ac2_powerdown) { //先判断是否缺相

         err_detect = true;

      }

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn2_A_Less_ID,err_detect,rtpd.m_acData.acIn2_volA,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
//      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn2_A_Less_ID,err_detect,rtpd.m_acData.acIn2_volA,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
      

      mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn2_A_UnderV_ID, sql);

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn2_A_UnderV_ID,rtpd.m_acData.is_acIn2_under_volA,rtpd.m_acData.acIn2_volA,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);   

@@ -463,12 +463,12 @@
            err_detect = false;

         }

      }

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn2_A_UnderV_ID,err_detect,rtpd.m_acData.acIn2_volA,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
//      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn2_A_UnderV_ID,err_detect,rtpd.m_acData.acIn2_volA,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
      

      //-----------------------------------------------------------------------------------------------------------

      mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn2_B_OverV_ID, sql);

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn2_B_OverV_ID,rtpd.m_acData.is_acIn2_over_volB,rtpd.m_acData.acIn2_volB,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);   

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn2_B_OverV_ID,(rtpd.m_acData.acIn2_volB>mAlarm_Param.alarm_limitH),rtpd.m_acData.acIn2_volB,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
//      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn2_B_OverV_ID,(rtpd.m_acData.acIn2_volB>mAlarm_Param.alarm_limitH),rtpd.m_acData.acIn2_volB,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
      

      mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn2_B_Less_ID, sql);

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn2_B_Less_ID,rtpd.m_acData.is_acIn2_less_B,rtpd.m_acData.acIn2_volB,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);   

@@ -476,7 +476,7 @@
      if(rtpd.m_acData.acIn2_volB<mAlarm_Param.alarm_limitL && false==ac2_powerdown) { //先判断是否缺相

         err_detect = true;

      }

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn2_B_Less_ID,err_detect,rtpd.m_acData.acIn2_volB,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
//      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn2_B_Less_ID,err_detect,rtpd.m_acData.acIn2_volB,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
      

      mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn1_B_UnderV_ID, sql);

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn2_B_UnderV_ID,rtpd.m_acData.is_acIn2_under_volB,rtpd.m_acData.acIn2_volB,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);   

@@ -491,12 +491,12 @@
            err_detect = false;

         }

      }

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn2_B_UnderV_ID,err_detect,rtpd.m_acData.acIn2_volB,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
//      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn2_B_UnderV_ID,err_detect,rtpd.m_acData.acIn2_volB,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
      

      //-----------------------------------------------------------------------------------------------------------

      mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn2_C_OverV_ID, sql);

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn2_C_OverV_ID,rtpd.m_acData.is_acIn2_over_volC,rtpd.m_acData.acIn2_volC,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);   

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn2_C_OverV_ID,(rtpd.m_acData.acIn2_volC>mAlarm_Param.alarm_limitH),rtpd.m_acData.acIn2_volB,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
//      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn2_C_OverV_ID,(rtpd.m_acData.acIn2_volC>mAlarm_Param.alarm_limitH),rtpd.m_acData.acIn2_volB,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
      

      mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn2_C_Less_ID, sql);

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn2_C_Less_ID,rtpd.m_acData.is_acIn2_less_C,rtpd.m_acData.acIn2_volC,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);   

@@ -504,7 +504,7 @@
      if(rtpd.m_acData.acIn2_volC<mAlarm_Param.alarm_limitL && false==ac2_powerdown) { //先判断是否缺相

         err_detect = true;

      }

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn2_C_Less_ID,err_detect,rtpd.m_acData.acIn2_volC,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
//      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn2_C_Less_ID,err_detect,rtpd.m_acData.acIn2_volC,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
      

      mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn2_C_UnderV_ID, sql);

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn2_C_UnderV_ID,rtpd.m_acData.is_acIn2_under_volC,rtpd.m_acData.acIn2_volC,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);   

@@ -519,7 +519,7 @@
            err_detect = false;

         }

      }

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn2_C_UnderV_ID,err_detect,rtpd.m_acData.acIn2_volC,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
//      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn2_C_UnderV_ID,err_detect,rtpd.m_acData.acIn2_volC,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	


      //-----------------------------------------------------------------------------------------------------------

      mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_AcIn1_ThunderErr_ID, sql);

@@ -560,7 +560,7 @@
            

      mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_TempAlarm_ID, sql);

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_TempAlarm_ID,rtpd.m_acData.is_ac_tempAlarm,rtpd.m_acData.temprature,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_TempAlarm_ID,(rtpd.m_acData.temprature>mAlarm_Param.alarm_limitH),rtpd.m_acData.temprature,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);

//      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_AC_TempAlarm_ID,(rtpd.m_acData.temprature>mAlarm_Param.alarm_limitH),rtpd.m_acData.temprature,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);

      

   }

   

@@ -570,23 +570,24 @@
      //先判断有没有停电，停电了就不判断缺相、欠压

      mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_PowerDown_ID, sql);

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_PowerDown_ID,rtpd.m_acdcData.is_acIn1_powerdown,rtpd.m_acdcData.acIn1_volA,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);

		
      boolean ac1_powerdown = false;

      if(rtpd.m_acdcData.acIn1_volA<mAlarm_Param.alarm_limitL && rtpd.m_acdcData.acIn1_volB<mAlarm_Param.alarm_limitL && rtpd.m_acdcData.acIn1_volC<mAlarm_Param.alarm_limitL) {

         ac1_powerdown = true;

      }

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_PowerDown_ID,ac1_powerdown,rtpd.m_acdcData.acIn1_volA,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);

//      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_PowerDown_ID,ac1_powerdown,rtpd.m_acdcData.acIn1_volA,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);

      mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_PowerDown_ID, sql);

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_PowerDown_ID,rtpd.m_acdcData.is_acIn2_powerdown,rtpd.m_acdcData.acIn2_volA,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);

      boolean ac2_powerdown = false;

      if(rtpd.m_acdcData.acIn2_volA<mAlarm_Param.alarm_limitL && rtpd.m_acdcData.acIn2_volB<mAlarm_Param.alarm_limitL && rtpd.m_acdcData.acIn2_volC<mAlarm_Param.alarm_limitL) {

         ac2_powerdown = true;

      }

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_PowerDown_ID,ac2_powerdown,rtpd.m_acdcData.acIn2_volA,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);					
//      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_PowerDown_ID,ac2_powerdown,rtpd.m_acdcData.acIn2_volA,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);					


      //-----------------------------------------------------------------------------------------------------------

      mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_A_OverV_ID, sql);

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_A_OverV_ID,rtpd.m_acdcData.is_acIn1_over_volA,rtpd.m_acdcData.acIn1_volA,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);   

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_A_OverV_ID,(rtpd.m_acdcData.acIn1_volA>mAlarm_Param.alarm_limitH),rtpd.m_acdcData.acIn1_volA,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
//      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_A_OverV_ID,(rtpd.m_acdcData.acIn1_volA>mAlarm_Param.alarm_limitH),rtpd.m_acdcData.acIn1_volA,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
      

      mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_A_Less_ID, sql);

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_A_Less_ID,rtpd.m_acdcData.is_acIn1_less_A,rtpd.m_acdcData.acIn1_volA,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);   

@@ -594,7 +595,7 @@
      if(rtpd.m_acdcData.acIn1_volA<mAlarm_Param.alarm_limitL && false==ac1_powerdown) { //先判断是否缺相

         err_detect = true;

      }

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_A_Less_ID,err_detect,rtpd.m_acdcData.acIn1_volA,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
//      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_A_Less_ID,err_detect,rtpd.m_acdcData.acIn1_volA,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
      

      mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_A_UnderV_ID, sql);

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_A_UnderV_ID,rtpd.m_acdcData.is_acIn1_under_volA,rtpd.m_acdcData.acIn1_volA,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);   

@@ -609,12 +610,12 @@
            err_detect = false;

         }

      }

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_A_UnderV_ID,err_detect,rtpd.m_acdcData.acIn1_volA,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
//      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_A_UnderV_ID,err_detect,rtpd.m_acdcData.acIn1_volA,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
      

      //-----------------------------------------------------------------------------------------------------------

      mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_B_OverV_ID, sql);

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_B_OverV_ID,rtpd.m_acdcData.is_acIn1_over_volB,rtpd.m_acdcData.acIn1_volB,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);   

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_B_OverV_ID,(rtpd.m_acdcData.acIn1_volB>mAlarm_Param.alarm_limitH),rtpd.m_acdcData.acIn1_volB,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
//      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_B_OverV_ID,(rtpd.m_acdcData.acIn1_volB>mAlarm_Param.alarm_limitH),rtpd.m_acdcData.acIn1_volB,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
      

      mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_B_Less_ID, sql);

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_B_Less_ID,rtpd.m_acdcData.is_acIn1_less_B,rtpd.m_acdcData.acIn1_volB,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);   

@@ -622,7 +623,7 @@
      if(rtpd.m_acdcData.acIn1_volB<mAlarm_Param.alarm_limitL && false==ac1_powerdown) { //先判断是否缺相

         err_detect = true;

      }

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_B_Less_ID,err_detect,rtpd.m_acdcData.acIn1_volB,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
//      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_B_Less_ID,err_detect,rtpd.m_acdcData.acIn1_volB,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
      

      mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_B_UnderV_ID, sql);

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_B_UnderV_ID,rtpd.m_acdcData.is_acIn1_under_volB,rtpd.m_acdcData.acIn1_volB,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);   

@@ -637,12 +638,12 @@
            err_detect = false;

         }

      }

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_B_UnderV_ID,err_detect,rtpd.m_acdcData.acIn1_volB,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
//      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_B_UnderV_ID,err_detect,rtpd.m_acdcData.acIn1_volB,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
      

      //-----------------------------------------------------------------------------------------------------------

      mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_C_OverV_ID, sql);

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_C_OverV_ID,rtpd.m_acdcData.is_acIn1_over_volC,rtpd.m_acdcData.acIn1_volC,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);   

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_C_OverV_ID,(rtpd.m_acdcData.acIn1_volC>mAlarm_Param.alarm_limitH),rtpd.m_acdcData.acIn1_volB,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
//      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_C_OverV_ID,(rtpd.m_acdcData.acIn1_volC>mAlarm_Param.alarm_limitH),rtpd.m_acdcData.acIn1_volB,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
      

      mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_C_Less_ID, sql);

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_C_Less_ID,rtpd.m_acdcData.is_acIn1_less_C,rtpd.m_acdcData.acIn1_volC,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);   

@@ -650,7 +651,7 @@
      if(rtpd.m_acdcData.acIn1_volC<mAlarm_Param.alarm_limitL && false==ac1_powerdown) { //先判断是否缺相

         err_detect = true;

      }

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_C_Less_ID,err_detect,rtpd.m_acdcData.acIn1_volC,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
//      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_C_Less_ID,err_detect,rtpd.m_acdcData.acIn1_volC,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
      

      mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_C_UnderV_ID, sql);

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_C_UnderV_ID,rtpd.m_acdcData.is_acIn1_under_volC,rtpd.m_acdcData.acIn1_volC,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);   

@@ -665,12 +666,12 @@
            err_detect = false;

         }

      }

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_C_UnderV_ID,err_detect,rtpd.m_acdcData.acIn1_volC,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
//      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_C_UnderV_ID,err_detect,rtpd.m_acdcData.acIn1_volC,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
      

      //-----------------------------------------------------------------------------------------------------------

      mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_A_OverV_ID, sql);

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_A_OverV_ID,rtpd.m_acdcData.is_acIn2_over_volA,rtpd.m_acdcData.acIn2_volA,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);   

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_A_OverV_ID,(rtpd.m_acdcData.acIn2_volA>mAlarm_Param.alarm_limitH),rtpd.m_acdcData.acIn2_volA,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
//      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_A_OverV_ID,(rtpd.m_acdcData.acIn2_volA>mAlarm_Param.alarm_limitH),rtpd.m_acdcData.acIn2_volA,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
      

      mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_A_Less_ID, sql);

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_A_Less_ID,rtpd.m_acdcData.is_acIn2_less_A,rtpd.m_acdcData.acIn2_volA,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);   

@@ -678,7 +679,7 @@
      if(rtpd.m_acdcData.acIn2_volA<mAlarm_Param.alarm_limitL && false==ac2_powerdown) { //先判断是否缺相

         err_detect = true;

      }

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_A_Less_ID,err_detect,rtpd.m_acdcData.acIn2_volA,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
//      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_A_Less_ID,err_detect,rtpd.m_acdcData.acIn2_volA,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
      

      mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_A_UnderV_ID, sql);

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_A_UnderV_ID,rtpd.m_acdcData.is_acIn2_under_volA,rtpd.m_acdcData.acIn2_volA,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);   

@@ -693,12 +694,12 @@
            err_detect = false;

         }

      }

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_A_UnderV_ID,err_detect,rtpd.m_acdcData.acIn2_volA,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
//      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_A_UnderV_ID,err_detect,rtpd.m_acdcData.acIn2_volA,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
      

      //-----------------------------------------------------------------------------------------------------------

      mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_B_OverV_ID, sql);

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_B_OverV_ID,rtpd.m_acdcData.is_acIn2_over_volB,rtpd.m_acdcData.acIn2_volB,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);   

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_B_OverV_ID,(rtpd.m_acdcData.acIn2_volB>mAlarm_Param.alarm_limitH),rtpd.m_acdcData.acIn2_volB,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
//      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_B_OverV_ID,(rtpd.m_acdcData.acIn2_volB>mAlarm_Param.alarm_limitH),rtpd.m_acdcData.acIn2_volB,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
      

      mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_B_Less_ID, sql);

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_B_Less_ID,rtpd.m_acdcData.is_acIn2_less_B,rtpd.m_acdcData.acIn2_volB,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);   

@@ -706,7 +707,7 @@
      if(rtpd.m_acdcData.acIn2_volB<mAlarm_Param.alarm_limitL && false==ac2_powerdown) { //先判断是否缺相

         err_detect = true;

      }

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_B_Less_ID,err_detect,rtpd.m_acdcData.acIn2_volB,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
//      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_B_Less_ID,err_detect,rtpd.m_acdcData.acIn2_volB,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
      

      mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_B_UnderV_ID, sql);

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_B_UnderV_ID,rtpd.m_acdcData.is_acIn2_under_volB,rtpd.m_acdcData.acIn2_volB,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);   

@@ -721,12 +722,12 @@
            err_detect = false;

         }

      }

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_B_UnderV_ID,err_detect,rtpd.m_acdcData.acIn2_volB,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
//      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_B_UnderV_ID,err_detect,rtpd.m_acdcData.acIn2_volB,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
      

      //-----------------------------------------------------------------------------------------------------------

      mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_C_OverV_ID, sql);

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_C_OverV_ID,rtpd.m_acdcData.is_acIn2_over_volC,rtpd.m_acdcData.acIn2_volC,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);   

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_C_OverV_ID,(rtpd.m_acdcData.acIn2_volC>mAlarm_Param.alarm_limitH),rtpd.m_acdcData.acIn2_volB,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
//      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_C_OverV_ID,(rtpd.m_acdcData.acIn2_volC>mAlarm_Param.alarm_limitH),rtpd.m_acdcData.acIn2_volB,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
      

      mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_C_Less_ID, sql);

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_C_Less_ID,rtpd.m_acdcData.is_acIn2_less_C,rtpd.m_acdcData.acIn2_volC,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);   

@@ -734,7 +735,7 @@
      if(rtpd.m_acdcData.acIn2_volC<mAlarm_Param.alarm_limitL && false==ac2_powerdown) { //先判断是否缺相

         err_detect = true;

      }

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_C_Less_ID,err_detect,rtpd.m_acdcData.acIn2_volC,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
//      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_C_Less_ID,err_detect,rtpd.m_acdcData.acIn2_volC,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
      

      mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_C_UnderV_ID, sql);

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_C_UnderV_ID,rtpd.m_acdcData.is_acIn2_under_volC,rtpd.m_acdcData.acIn2_volC,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);   

@@ -749,7 +750,7 @@
            err_detect = false;

         }

      }

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_C_UnderV_ID,err_detect,rtpd.m_acdcData.acIn2_volC,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	
//      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_C_UnderV_ID,err_detect,rtpd.m_acdcData.acIn2_volC,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);	


      //-----------------------------------------------------------------------------------------------------------

      mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_ThunderErr_ID, sql);

@@ -804,10 +805,10 @@
      

      mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_DCout_OverV_ID, sql);

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_DCout_OverV_ID,rtpd.m_acdcData.is_dcOut_over_vol,rtpd.m_acdcData.dcOut_vol,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_DCout_OverV_ID,(rtpd.m_acdcData.dcOut_vol>mAlarm_Param.alarm_limitH),rtpd.m_acdcData.dcOut_vol,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);

//      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_DCout_OverV_ID,(rtpd.m_acdcData.dcOut_vol>mAlarm_Param.alarm_limitH),rtpd.m_acdcData.dcOut_vol,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);

      mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_DCout_UnderV_ID, sql);

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_DCout_UnderV_ID,rtpd.m_acdcData.is_dcOut_under_vol,rtpd.m_acdcData.dcOut_vol,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_DCout_UnderV_ID,(rtpd.m_acdcData.dcOut_vol<mAlarm_Param.alarm_limitL),rtpd.m_acdcData.dcOut_vol,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);

//      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_DCout_UnderV_ID,(rtpd.m_acdcData.dcOut_vol<mAlarm_Param.alarm_limitL),rtpd.m_acdcData.dcOut_vol,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);



      mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Batt1_Down_ID, sql);

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Batt1_Down_ID,rtpd.m_acdcData.is_battgroup1_down,rtpd.m_acdcData.battgroup1_vol,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);

@@ -826,17 +827,17 @@
      

      mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_DC_DCout1_OverV_ID, sql);

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_DC_DCout1_OverV_ID,rtpd.m_dcData.is_dc1_over_vol,rtpd.m_dcData.dcOut1_vol,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_DC_DCout1_OverV_ID,(rtpd.m_dcData.dcOut1_vol>mAlarm_Param.alarm_limitH),rtpd.m_dcData.dcOut1_vol,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);

//      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_DC_DCout1_OverV_ID,(rtpd.m_dcData.dcOut1_vol>mAlarm_Param.alarm_limitH),rtpd.m_dcData.dcOut1_vol,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);

      mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_DC_DCout1_UnderV_ID, sql);

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_DC_DCout1_UnderV_ID,rtpd.m_dcData.is_dc1_under_vol,rtpd.m_dcData.dcOut1_vol,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_DC_DCout1_UnderV_ID,(rtpd.m_dcData.dcOut1_vol<mAlarm_Param.alarm_limitL),rtpd.m_dcData.dcOut1_vol,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);

//      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_DC_DCout1_UnderV_ID,(rtpd.m_dcData.dcOut1_vol<mAlarm_Param.alarm_limitL),rtpd.m_dcData.dcOut1_vol,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);

      

      mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_DC_DCout2_OverV_ID, sql);

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_DC_DCout2_OverV_ID,rtpd.m_dcData.is_dc2_over_vol,rtpd.m_dcData.dcOut2_vol,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_DC_DCout2_OverV_ID,(rtpd.m_dcData.dcOut2_vol>mAlarm_Param.alarm_limitH),rtpd.m_dcData.dcOut2_vol,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);

//      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_DC_DCout2_OverV_ID,(rtpd.m_dcData.dcOut2_vol>mAlarm_Param.alarm_limitH),rtpd.m_dcData.dcOut2_vol,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);

      mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_DC_DCout2_UnderV_ID, sql);

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_DC_DCout2_UnderV_ID,rtpd.m_dcData.is_dc2_under_vol,rtpd.m_dcData.dcOut2_vol,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_DC_DCout2_UnderV_ID,(rtpd.m_dcData.dcOut2_vol<mAlarm_Param.alarm_limitL),rtpd.m_dcData.dcOut2_vol,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);

//      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_DC_DCout2_UnderV_ID,(rtpd.m_dcData.dcOut2_vol<mAlarm_Param.alarm_limitL),rtpd.m_dcData.dcOut2_vol,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);

            

      

      mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_DC_DcIn1_Trip_ID, sql);

@@ -856,7 +857,7 @@
      

      mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_DC_TempAlarm_ID, sql);

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_DC_TempAlarm_ID,rtpd.m_dcData.is_tempalarm,rtpd.m_dcData.temprature,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_DC_TempAlarm_ID,(rtpd.m_dcData.temprature>mAlarm_Param.alarm_limitH),rtpd.m_dcData.temprature,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);

//      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_DC_TempAlarm_ID,(rtpd.m_dcData.temprature>mAlarm_Param.alarm_limitH),rtpd.m_dcData.temprature,PwrDeviceAlarm_Data.ALM_SOURCE_DETECT,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);

      

      mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_DC_MonitorErr_ID, sql);      

      makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_DC_MonitorErr_ID,rtpd.m_dcData.is_dc_monitorerr,PwrDeviceAlarm_Data.DEFAULT_ALARM_VALUE,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);