DELL
2024-10-10 13644901831040bd4564aa1d61ac62fab0a58cd6
云南昆明电源通信程序更新
2个文件已删除
10个文件已修改
3个文件已添加
29287 ■■■■ 已修改文件
IEC61850_ForPowerSupply_ForNW/IEC61850_ForPowerSupply_logs/error-20240708-1.log.gz 补丁 | 查看 | 原始文档 | blame | 历史
IEC61850_ForPowerSupply_ForNW/IEC61850_ForPowerSupply_logs/error-20240726-1.log.gz 补丁 | 查看 | 原始文档 | blame | 历史
IEC61850_ForPowerSupply_ForNW/IEC61850_ForPowerSupply_logs/error.log 21488 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
IEC61850_ForPowerSupply_ForNW/IEC61850_ForPowerSupply_logs/info-20240708-1.log.gz 补丁 | 查看 | 原始文档 | blame | 历史
IEC61850_ForPowerSupply_ForNW/IEC61850_ForPowerSupply_logs/info-20240726-1.log.gz 补丁 | 查看 | 原始文档 | blame | 历史
IEC61850_ForPowerSupply_ForNW/IEC61850_ForPowerSupply_logs/info.log 7504 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
IEC61850_ForPowerSupply_ForNW/config.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
IEC61850_ForPowerSupply_ForNW/lastconnection.properties 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
IEC61850_ForPowerSupply_ForNW/src/com/power/alarm/Alarm_Param_SQL.java 43 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
IEC61850_ForPowerSupply_ForNW/src/com/power/alarm/PwrDeviceAlarm_Data.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
IEC61850_ForPowerSupply_ForNW/src/com/power/alarm/PwrDeviceAlarm_Thread.java 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
IEC61850_ForPowerSupply_ForNW/src/com/power/comm/Power_61850_SocketClient.java 181 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
IEC61850_ForPowerSupply_ForNW/src/com/power/mysql/Sql_Mysql.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
IEC61850_ForPowerSupply_ForNW/src/org/openmuc/openiec61850/ClientAssociation.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
IEC61850_ForPowerSupply_ForNW/src/org/openmuc/openiec61850/clientgui/ClientGui.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
IEC61850_ForPowerSupply_ForNW/IEC61850_ForPowerSupply_logs/error-20240708-1.log.gz
Binary files differ
IEC61850_ForPowerSupply_ForNW/IEC61850_ForPowerSupply_logs/error-20240726-1.log.gz
Binary files differ
IEC61850_ForPowerSupply_ForNW/IEC61850_ForPowerSupply_logs/error.log
Diff too large
IEC61850_ForPowerSupply_ForNW/IEC61850_ForPowerSupply_logs/info-20240708-1.log.gz
Binary files differ
IEC61850_ForPowerSupply_ForNW/IEC61850_ForPowerSupply_logs/info-20240726-1.log.gz
Binary files differ
IEC61850_ForPowerSupply_ForNW/IEC61850_ForPowerSupply_logs/info.log
Diff too large
IEC61850_ForPowerSupply_ForNW/config.xml
@@ -2,7 +2,7 @@
<root>
  <mysql_ramdb_recreate_en>false</mysql_ramdb_recreate_en>
  <mysql_server_ip>127.0.0.1</mysql_server_ip>
  <mysql_server_ip>192.168.10.79</mysql_server_ip>
  <!--SOURCE_BATTDATA_TYPE_FBSDEV = 0-->
  <!--SOURCE_BATTDATA_TYPE_SQLSERVER = 1-->
  <!--SOURCE_BATTDATA_TYPE_C_INTERFACE = 2-->
IEC61850_ForPowerSupply_ForNW/lastconnection.properties
New file
@@ -0,0 +1,5 @@
#Fri Jul 26 13:56:51 CST 2024
tselLocal=0,0
serverAddress=127.0.0.1
tselRemote=0,1
serverPort=102
IEC61850_ForPowerSupply_ForNW/src/com/power/alarm/Alarm_Param_SQL.java
@@ -18,12 +18,11 @@
    public static void init_alarm_param_sql(int powerdevid, MysqlConnPool conn_pool) {
        
        Sql_Mysql sql = new Sql_Mysql(conn_pool.getConn());
        try {
            sql.sqlMysqlUseDB(Sql_Mysql.DB_PWRDEV_ALARM);
            
            boolean ex = sql.sqlMysqlCheckIfTableExist(PWRDEV_ALARM_PARAM_TABLE+powerdevid);
            //System.out.println("ex:"+ex);
            //System.err.println("ex:"+ex);
            if(!ex) 
            {
                
@@ -45,6 +44,9 @@
                
                sql.sqlMysqlExecute(sql_str);
                
            }
                //通信电源
                insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_CPSS_CommErr_ID, (float)0, (float)0,0,1, 0,1,"通信电源通信故障",sql);
                
@@ -90,6 +92,24 @@
                insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module14Err_ID, (float)0, (float)0,0,3, 1,0,"模块14故障",sql);
                insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module15Err_ID, (float)0, (float)0,0,3, 1,0,"模块15故障",sql);
                insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module16Err_ID, (float)0, (float)0,0,3, 1,0,"模块16故障",sql);
            insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module1Close_ID, (float)0, (float)0,0,1, 1,0,"模块1关机",sql);
            insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module2Close_ID, (float)0, (float)0,0,1, 1,0,"模块2关机",sql);
            insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module3Close_ID, (float)0, (float)0,0,1, 1,0,"模块3关机",sql);
            insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module4Close_ID, (float)0, (float)0,0,1, 1,0,"模块4关机",sql);
            insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module5Close_ID, (float)0, (float)0,0,1, 1,0,"模块5关机",sql);
            insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module6Close_ID, (float)0, (float)0,0,1, 1,0,"模块6关机",sql);
            insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module7Close_ID, (float)0, (float)0,0,1, 1,0,"模块7关机",sql);
            insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module8Close_ID, (float)0, (float)0,0,1, 1,0,"模块8关机",sql);
            insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module9Close_ID, (float)0, (float)0,0,1, 1,0,"模块9关机",sql);
            insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module10Close_ID, (float)0, (float)0,0,1, 1,0,"模块10关机",sql);
            insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module11Close_ID, (float)0, (float)0,0,1, 1,0,"模块11关机",sql);
            insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module12Close_ID, (float)0, (float)0,0,1, 1,0,"模块12关机",sql);
            insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module13Close_ID, (float)0, (float)0,0,1, 1,0,"模块13关机",sql);
            insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module14Close_ID, (float)0, (float)0,0,1, 1,0,"模块14关机",sql);
            insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module15Close_ID, (float)0, (float)0,0,1, 1,0,"模块15关机",sql);
            insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module16Close_ID, (float)0, (float)0,0,1, 1,0,"模块16关机",sql);
                insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_TolalAlarm_ID, (float)0, (float)0,0,3, 1,0,"高频开关电源柜总告警",sql);
                insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_DCout_OverV_ID, (float)57, (float)43,1,2, 1,0,"直流输出过压",sql);
                insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_DCout_UnderV_ID, (float)57, (float)43,1,2, 1,0,"直流输出欠压",sql);
@@ -142,8 +162,6 @@
                insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_DC_MonitorErr_ID, (float)0, (float)0,0,3, 3,0,"监控单元故障",sql);                
                insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_DC_TolalAlarm_ID, (float)0, (float)0,0,3, 3,0,"直流配电柜总告警",sql);    
                
            }
        }catch (Exception e) {
            logger.error(e.toString(), e);
        } finally {
@@ -158,7 +176,8 @@
    public static  void insert_alarm_param(int powerdevid,int id,float alm_h,float alm_l,int alm_en,int level,int type,int user_en,String name,Sql_Mysql sql) throws SQLException{
        
        String sql_str = " INSERT IGNORE INTO " + Sql_Mysql.PWRDEV_ALARM_PARAM_TABLE + powerdevid+"`";
        String sql_str_sel = "SELECT * FROM "  + Sql_Mysql.PWRDEV_ALARM_PARAM_TABLE + powerdevid+ "` WHERE alarm_id = " + id;
        ResultSet res = null;
        sql_str += " (alarm_id,alarm_limitH,alarm_limitL,alarm_limitEn,alarm_level,alarm_devtype,UserAlarm_EN,alarm_name ) VALUES ("
                + id + ","
                + alm_h + ","
@@ -170,8 +189,20 @@
                + "\""+name+"\"" + ")";
        
        //logger.info(sql_str);
        try {
            res = sql.sqlMysqlQuery(sql_str_sel);
            if(!res.next()) {
        sql.sqlMysqlExecute(sql_str);
                //System.err.println(sql_str_sel);
            }
            //System.out.println(sql_str_sel);
        } catch (Exception e) {
            e.printStackTrace();
        } finally {
            if(null != res) {
                res.close();
            }
        }
    }
    
    public static Alarm_Param query_alarm_param(int powerdevid,int alm_type_id, Sql_Mysql sql) throws SQLException {
IEC61850_ForPowerSupply_ForNW/src/com/power/alarm/PwrDeviceAlarm_Data.java
@@ -212,6 +212,23 @@
    public final static int ALM_TYPE_DC_MonitorErr_ID             = 110509;        //监控单元故障
    public final static int ALM_TYPE_DC_TolalAlarm_ID             = 110510;        //直流配电柜总告警
    
    public final static int ALM_TYPE_ACDC_Module1Close_ID         = 110550;        //模块1关机告警
    public final static int ALM_TYPE_ACDC_Module2Close_ID         = 110551;        //模块2关机告警
    public final static int ALM_TYPE_ACDC_Module3Close_ID         = 110552;        //模块3关机告警
    public final static int ALM_TYPE_ACDC_Module4Close_ID         = 110553;        //模块4关机告警
    public final static int ALM_TYPE_ACDC_Module5Close_ID         = 110554;        //模块5关机告警
    public final static int ALM_TYPE_ACDC_Module6Close_ID         = 110555;        //模块6关机告警
    public final static int ALM_TYPE_ACDC_Module7Close_ID         = 110556;        //模块7关机告警
    public final static int ALM_TYPE_ACDC_Module8Close_ID         = 110557;        //模块8关机告警
    public final static int ALM_TYPE_ACDC_Module9Close_ID         = 110558;        //模块9关机告警
    public final static int ALM_TYPE_ACDC_Module10Close_ID         = 110559;        //模块10关机告警
    public final static int ALM_TYPE_ACDC_Module11Close_ID         = 110560;        //模块11关机告警
    public final static int ALM_TYPE_ACDC_Module12Close_ID         = 110561;        //模块12关机告警
    public final static int ALM_TYPE_ACDC_Module13Close_ID         = 110562;        //模块13关机告警
    public final static int ALM_TYPE_ACDC_Module14Close_ID         = 110563;        //模块14关机告警
    public final static int ALM_TYPE_ACDC_Module15Close_ID         = 110564;        //模块15关机告警
    public final static int ALM_TYPE_ACDC_Module16Close_ID         = 110565;        //模块16关机告警
    
    public final static int FIRST_ALM_LEVEL  = 1;                                    //一级告警---紧急
    public final static int SECOND_ALM_LEVEL = 2;                                    //二级告警---重大
IEC61850_ForPowerSupply_ForNW/src/com/power/alarm/PwrDeviceAlarm_Thread.java
@@ -766,6 +766,39 @@
        mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_MonitorErr_ID, sql);        
        makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_MonitorErr_ID,rtpd.m_acdcData.is_acIn_monitorerr,PwrDeviceAlarm_Data.DEFAULT_ALARM_VALUE,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);
        mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module1Close_ID, sql);
        makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module1Close_ID,rtpd.m_acdcData.is_acdcMod_off[0],PwrDeviceAlarm_Data.DEFAULT_ALARM_VALUE,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);
        mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module2Close_ID, sql);
        makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module2Close_ID,rtpd.m_acdcData.is_acdcMod_off[1],PwrDeviceAlarm_Data.DEFAULT_ALARM_VALUE,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);
        mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module3Close_ID, sql);
        makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module3Close_ID,rtpd.m_acdcData.is_acdcMod_off[2],PwrDeviceAlarm_Data.DEFAULT_ALARM_VALUE,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);
        mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module4Close_ID, sql);
        makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module4Close_ID,rtpd.m_acdcData.is_acdcMod_off[3],PwrDeviceAlarm_Data.DEFAULT_ALARM_VALUE,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);
        mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module5Close_ID, sql);
        makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module5Close_ID,rtpd.m_acdcData.is_acdcMod_off[4],PwrDeviceAlarm_Data.DEFAULT_ALARM_VALUE,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);
        mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module6Close_ID, sql);
        makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module6Close_ID,rtpd.m_acdcData.is_acdcMod_off[5],PwrDeviceAlarm_Data.DEFAULT_ALARM_VALUE,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);
        mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module7Close_ID, sql);
        makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module7Close_ID,rtpd.m_acdcData.is_acdcMod_off[6],PwrDeviceAlarm_Data.DEFAULT_ALARM_VALUE,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);
        mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module8Close_ID, sql);
        makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module8Close_ID,rtpd.m_acdcData.is_acdcMod_off[7],PwrDeviceAlarm_Data.DEFAULT_ALARM_VALUE,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);
        mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module9Close_ID, sql);
        makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module9Close_ID,rtpd.m_acdcData.is_acdcMod_off[8],PwrDeviceAlarm_Data.DEFAULT_ALARM_VALUE,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);
        mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module10Close_ID, sql);
        makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module10Close_ID,rtpd.m_acdcData.is_acdcMod_off[9],PwrDeviceAlarm_Data.DEFAULT_ALARM_VALUE,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);
        mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module11Close_ID, sql);
        makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module11Close_ID,rtpd.m_acdcData.is_acdcMod_off[10],PwrDeviceAlarm_Data.DEFAULT_ALARM_VALUE,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);
        mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module12Close_ID, sql);
        makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module12Close_ID,rtpd.m_acdcData.is_acdcMod_off[11],PwrDeviceAlarm_Data.DEFAULT_ALARM_VALUE,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);
        mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module13Close_ID, sql);
        makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module13Close_ID,rtpd.m_acdcData.is_acdcMod_off[12],PwrDeviceAlarm_Data.DEFAULT_ALARM_VALUE,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);
        mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module14Close_ID, sql);
        makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module14Close_ID,rtpd.m_acdcData.is_acdcMod_off[13],PwrDeviceAlarm_Data.DEFAULT_ALARM_VALUE,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);
        mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module15Close_ID, sql);
        makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module15Close_ID,rtpd.m_acdcData.is_acdcMod_off[14],PwrDeviceAlarm_Data.DEFAULT_ALARM_VALUE,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);
        mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module16Close_ID, sql);
        makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module16Close_ID,rtpd.m_acdcData.is_acdcMod_off[15],PwrDeviceAlarm_Data.DEFAULT_ALARM_VALUE,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);
        mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module1Err_ID, sql);
        makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module1Err_ID,rtpd.m_acdcData.is_acdcMod_err[0],PwrDeviceAlarm_Data.DEFAULT_ALARM_VALUE,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);
        mAlarm_Param = Alarm_Param_SQL.query_alarm_param(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module2Err_ID, sql);
IEC61850_ForPowerSupply_ForNW/src/com/power/comm/Power_61850_SocketClient.java
@@ -412,6 +412,54 @@
                    }else if(fc_model_str.contains("/chmGGIO16.AnIn1.mag.f")) {
                        pwrDev_rtData.m_acdcData.m_out_curr[15]  = ((BdaFloat32) fc_mode).getFloat();
                        
                    }else if(fc_model_str.contains("/chmGGIO1.AnIn2.mag.f")) {
                        pwrDev_rtData.m_acdcData.m_out_vol[0]  = ((BdaFloat32) fc_mode).getFloat();
                    }else if(fc_model_str.contains("/chmGGIO2.AnIn2.mag.f")) {
                        pwrDev_rtData.m_acdcData.m_out_vol[1]  = ((BdaFloat32) fc_mode).getFloat();
                    }else if(fc_model_str.contains("/chmGGIO3.AnIn2.mag.f")) {
                        pwrDev_rtData.m_acdcData.m_out_vol[2]  = ((BdaFloat32) fc_mode).getFloat();
                    }else if(fc_model_str.contains("/chmGGIO4.AnIn2.mag.f")) {
                        pwrDev_rtData.m_acdcData.m_out_vol[3]  = ((BdaFloat32) fc_mode).getFloat();
                    }else if(fc_model_str.contains("/chmGGIO5.AnIn2.mag.f")) {
                        pwrDev_rtData.m_acdcData.m_out_vol[4]  = ((BdaFloat32) fc_mode).getFloat();
                    }else if(fc_model_str.contains("/chmGGIO6.AnIn2.mag.f")) {
                        pwrDev_rtData.m_acdcData.m_out_vol[5]  = ((BdaFloat32) fc_mode).getFloat();
                    }else if(fc_model_str.contains("/chmGGIO7.AnIn2.mag.f")) {
                        pwrDev_rtData.m_acdcData.m_out_vol[6]  = ((BdaFloat32) fc_mode).getFloat();
                    }else if(fc_model_str.contains("/chmGGIO8.AnIn2.mag.f")) {
                        pwrDev_rtData.m_acdcData.m_out_vol[7]  = ((BdaFloat32) fc_mode).getFloat();
                    }else if(fc_model_str.contains("/chmGGIO9.AnIn2.mag.f")) {
                        pwrDev_rtData.m_acdcData.m_out_vol[8]  = ((BdaFloat32) fc_mode).getFloat();
                    }else if(fc_model_str.contains("/chmGGIO10.AnIn2.mag.f")) {
                        pwrDev_rtData.m_acdcData.m_out_vol[9]  = ((BdaFloat32) fc_mode).getFloat();
                    }else if(fc_model_str.contains("/chmGGIO11.AnIn2.mag.f")) {
                        pwrDev_rtData.m_acdcData.m_out_vol[10]  = ((BdaFloat32) fc_mode).getFloat();
                    }else if(fc_model_str.contains("/chmGGIO12.AnIn2.mag.f")) {
                        pwrDev_rtData.m_acdcData.m_out_vol[11]  = ((BdaFloat32) fc_mode).getFloat();
                    }else if(fc_model_str.contains("/chmGGIO13.AnIn2.mag.f")) {
                        pwrDev_rtData.m_acdcData.m_out_vol[12]  = ((BdaFloat32) fc_mode).getFloat();
                    }else if(fc_model_str.contains("/chmGGIO14.AnIn2.mag.f")) {
                        pwrDev_rtData.m_acdcData.m_out_vol[13]  = ((BdaFloat32) fc_mode).getFloat();
                    }else if(fc_model_str.contains("/chmGGIO15.AnIn2.mag.f")) {
                        pwrDev_rtData.m_acdcData.m_out_vol[14]  = ((BdaFloat32) fc_mode).getFloat();
                    }else if(fc_model_str.contains("/chmGGIO16.AnIn2.mag.f")) {
                        pwrDev_rtData.m_acdcData.m_out_vol[15]  = ((BdaFloat32) fc_mode).getFloat();
                    }else if(fc_model_str.contains("/aciGGIO1.AnIn7.mag.f")) {
                        pwrDev_rtData.m_acdcData.acVolH_Limit  = ((BdaFloat32) fc_mode).getFloat();
                        
@@ -427,6 +475,27 @@
                    }                
                }
            }
            /**
             *     昆明新增读取模块电压数据
             */
            pwrDev_rtData.m_acdcData.m_out_vol[0] = (float)readFloatNodeData(acdcDeviceName + "/chmGGIO1.AnIn2.mag.f", Fc.MX, pwrDev_rtData.m_acdcData.m_out_vol[0]);
            pwrDev_rtData.m_acdcData.m_out_vol[1] = (float)readFloatNodeData(acdcDeviceName + "/chmGGIO2.AnIn2.mag.f", Fc.MX, pwrDev_rtData.m_acdcData.m_out_vol[1]);
            pwrDev_rtData.m_acdcData.m_out_vol[2] = (float)readFloatNodeData(acdcDeviceName + "/chmGGIO3.AnIn2.mag.f", Fc.MX, pwrDev_rtData.m_acdcData.m_out_vol[2]);
            pwrDev_rtData.m_acdcData.m_out_vol[3] = (float)readFloatNodeData(acdcDeviceName + "/chmGGIO4.AnIn2.mag.f", Fc.MX, pwrDev_rtData.m_acdcData.m_out_vol[3]);
            pwrDev_rtData.m_acdcData.m_out_vol[4] = (float)readFloatNodeData(acdcDeviceName + "/chmGGIO5.AnIn2.mag.f", Fc.MX, pwrDev_rtData.m_acdcData.m_out_vol[4]);
            pwrDev_rtData.m_acdcData.m_out_vol[5] = (float)readFloatNodeData(acdcDeviceName + "/chmGGIO6.AnIn2.mag.f", Fc.MX, pwrDev_rtData.m_acdcData.m_out_vol[5]);
            pwrDev_rtData.m_acdcData.m_out_vol[6] = (float)readFloatNodeData(acdcDeviceName + "/chmGGIO7.AnIn2.mag.f", Fc.MX, pwrDev_rtData.m_acdcData.m_out_vol[6]);
            pwrDev_rtData.m_acdcData.m_out_vol[7] = (float)readFloatNodeData(acdcDeviceName + "/chmGGIO8.AnIn2.mag.f", Fc.MX, pwrDev_rtData.m_acdcData.m_out_vol[7]);
            pwrDev_rtData.m_acdcData.m_out_vol[8] = (float)readFloatNodeData(acdcDeviceName + "/chmGGIO9.AnIn2.mag.f", Fc.MX, pwrDev_rtData.m_acdcData.m_out_vol[8]);
            pwrDev_rtData.m_acdcData.m_out_vol[9] = (float)readFloatNodeData(acdcDeviceName + "/chmGGIO10.AnIn2.mag.f", Fc.MX, pwrDev_rtData.m_acdcData.m_out_vol[9]);
            pwrDev_rtData.m_acdcData.m_out_vol[10] = (float)readFloatNodeData(acdcDeviceName + "/chmGGIO11.AnIn2.mag.f", Fc.MX, pwrDev_rtData.m_acdcData.m_out_vol[10]);
            pwrDev_rtData.m_acdcData.m_out_vol[11] = (float)readFloatNodeData(acdcDeviceName + "/chmGGIO12.AnIn2.mag.f", Fc.MX, pwrDev_rtData.m_acdcData.m_out_vol[11]);
            pwrDev_rtData.m_acdcData.m_out_vol[12] = (float)readFloatNodeData(acdcDeviceName + "/chmGGIO13.AnIn2.mag.f", Fc.MX, pwrDev_rtData.m_acdcData.m_out_vol[12]);
            pwrDev_rtData.m_acdcData.m_out_vol[13] = (float)readFloatNodeData(acdcDeviceName + "/chmGGIO14.AnIn2.mag.f", Fc.MX, pwrDev_rtData.m_acdcData.m_out_vol[13]);
            pwrDev_rtData.m_acdcData.m_out_vol[14] = (float)readFloatNodeData(acdcDeviceName + "/chmGGIO15.AnIn2.mag.f", Fc.MX, pwrDev_rtData.m_acdcData.m_out_vol[14]);
            pwrDev_rtData.m_acdcData.m_out_vol[15] = (float)readFloatNodeData(acdcDeviceName + "/chmGGIO16.AnIn2.mag.f", Fc.MX, pwrDev_rtData.m_acdcData.m_out_vol[15]);
            pwrDev_rtData.setCommSuccessCountInc();
            pwrDev_rtData.SetPwrDeviceCommErrState(false);                //更新通信时间
            resetErrCommCount("read_ACDC_LD.dsCpssYc");
@@ -708,37 +777,149 @@
                            PowerData_RT_SQL.make_TimeOutTag(m_ConnPool, pwrDev_rtData.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_MonitorErr_ID, 0, timeout_tag,dt);
                        }
                    }else if(fc_model_str.contains("/chmGGIO1.Ind2.stVal")) {///chmGGIO1.Ind2.stVal
                        origin_val = pwrDev_rtData.m_acdcData.is_acdcMod_off[0];
                        pwrDev_rtData.m_acdcData.is_acdcMod_off[0] = ((BdaBoolean)fc_mode).getValue();    
                        if(origin_val==false && pwrDev_rtData.m_acdcData.is_acdcMod_off[0]==true) {
                            Date dt = ((BdaTimestamp)fc_mode_t).getDate();
                            timeout_tag = checkIfBoolNodeTimeOut(dt);
                            PowerData_RT_SQL.make_TimeOutTag(m_ConnPool, pwrDev_rtData.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module1Close_ID, 0, timeout_tag,dt);
                        }
                    }else if(fc_model_str.contains("/chmGGIO2.Ind2.stVal")) {///chmGGIO2.Ind2.stVal
                        origin_val = pwrDev_rtData.m_acdcData.is_acdcMod_off[1];
                        pwrDev_rtData.m_acdcData.is_acdcMod_off[1] = ((BdaBoolean)fc_mode).getValue();    
                        if(origin_val==false && pwrDev_rtData.m_acdcData.is_acdcMod_off[1]==true) {
                            Date dt = ((BdaTimestamp)fc_mode_t).getDate();
                            timeout_tag = checkIfBoolNodeTimeOut(dt);
                            PowerData_RT_SQL.make_TimeOutTag(m_ConnPool, pwrDev_rtData.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module2Close_ID, 0, timeout_tag,dt);
                        }
                    }else if(fc_model_str.contains("/chmGGIO3.Ind2.stVal")) {///chmGGIO3.Ind2.stVal
                        origin_val = pwrDev_rtData.m_acdcData.is_acdcMod_off[2];
                        pwrDev_rtData.m_acdcData.is_acdcMod_off[2] = ((BdaBoolean)fc_mode).getValue();    
                        if(origin_val==false && pwrDev_rtData.m_acdcData.is_acdcMod_off[2]==true) {
                            Date dt = ((BdaTimestamp)fc_mode_t).getDate();
                            timeout_tag = checkIfBoolNodeTimeOut(dt);
                            PowerData_RT_SQL.make_TimeOutTag(m_ConnPool, pwrDev_rtData.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module3Close_ID, 0, timeout_tag,dt);
                        }
                    }else if(fc_model_str.contains("/chmGGIO4.Ind2.stVal")) {///chmGGIO4.Ind2.stVal                        
                        origin_val = pwrDev_rtData.m_acdcData.is_acdcMod_off[3];
                        pwrDev_rtData.m_acdcData.is_acdcMod_off[3] = ((BdaBoolean)fc_mode).getValue();
                        if(origin_val==false && pwrDev_rtData.m_acdcData.is_acdcMod_off[3]==true) {
                            Date dt = ((BdaTimestamp)fc_mode_t).getDate();
                            timeout_tag = checkIfBoolNodeTimeOut(dt);
                            PowerData_RT_SQL.make_TimeOutTag(m_ConnPool, pwrDev_rtData.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module4Close_ID, 0, timeout_tag,dt);
                        }
                    }else if(fc_model_str.contains("/chmGGIO5.Ind2.stVal")) {///chmGGIO5.Ind2.stVal                    
                        origin_val = pwrDev_rtData.m_acdcData.is_acdcMod_off[4];
                        pwrDev_rtData.m_acdcData.is_acdcMod_off[4] = ((BdaBoolean)fc_mode).getValue();
                        if(origin_val==false && pwrDev_rtData.m_acdcData.is_acdcMod_off[4]==true) {
                            Date dt = ((BdaTimestamp)fc_mode_t).getDate();
                            timeout_tag = checkIfBoolNodeTimeOut(dt);
                            PowerData_RT_SQL.make_TimeOutTag(m_ConnPool, pwrDev_rtData.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module5Close_ID, 0, timeout_tag,dt);
                        }
                    }else if(fc_model_str.contains("/chmGGIO6.Ind2.stVal")) {///chmGGIO6.Ind2.stVal
                        origin_val = pwrDev_rtData.m_acdcData.is_acdcMod_off[5];
                        pwrDev_rtData.m_acdcData.is_acdcMod_off[5] = ((BdaBoolean)fc_mode).getValue();
                        if(origin_val==false && pwrDev_rtData.m_acdcData.is_acdcMod_off[5]==true) {
                            Date dt = ((BdaTimestamp)fc_mode_t).getDate();
                            timeout_tag = checkIfBoolNodeTimeOut(dt);
                            PowerData_RT_SQL.make_TimeOutTag(m_ConnPool, pwrDev_rtData.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module6Close_ID, 0, timeout_tag,dt);
                        }
                    }else if(fc_model_str.contains("/chmGGIO7.Ind2.stVal")) {///chmGGIO7.Ind2.stVal
                        origin_val = pwrDev_rtData.m_acdcData.is_acdcMod_off[6];
                        pwrDev_rtData.m_acdcData.is_acdcMod_off[6] = ((BdaBoolean)fc_mode).getValue();
                        if(origin_val==false && pwrDev_rtData.m_acdcData.is_acdcMod_off[6]==true) {
                            Date dt = ((BdaTimestamp)fc_mode_t).getDate();
                            timeout_tag = checkIfBoolNodeTimeOut(dt);
                            PowerData_RT_SQL.make_TimeOutTag(m_ConnPool, pwrDev_rtData.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module7Close_ID, 0, timeout_tag,dt);
                        }
                    }else if(fc_model_str.contains("/chmGGIO8.Ind2.stVal")) {///chmGGIO8.Ind2.stVal
                        origin_val = pwrDev_rtData.m_acdcData.is_acdcMod_off[7];
                        pwrDev_rtData.m_acdcData.is_acdcMod_off[7] = ((BdaBoolean)fc_mode).getValue();
                        if(origin_val==false && pwrDev_rtData.m_acdcData.is_acdcMod_off[7]==true) {
                            Date dt = ((BdaTimestamp)fc_mode_t).getDate();
                            timeout_tag = checkIfBoolNodeTimeOut(dt);
                            PowerData_RT_SQL.make_TimeOutTag(m_ConnPool, pwrDev_rtData.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module8Close_ID, 0, timeout_tag,dt);
                        }
                    }else if(fc_model_str.contains("/chmGGIO9.Ind2.stVal")) {///chmGGIO9.Ind2.stVal                        
                        origin_val = pwrDev_rtData.m_acdcData.is_acdcMod_off[8];
                        pwrDev_rtData.m_acdcData.is_acdcMod_off[8] = ((BdaBoolean)fc_mode).getValue();
                        if(origin_val==false && pwrDev_rtData.m_acdcData.is_acdcMod_off[8]==true) {
                            Date dt = ((BdaTimestamp)fc_mode_t).getDate();
                            timeout_tag = checkIfBoolNodeTimeOut(dt);
                            PowerData_RT_SQL.make_TimeOutTag(m_ConnPool, pwrDev_rtData.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module9Close_ID, 0, timeout_tag,dt);
                        }
                    }else if(fc_model_str.contains("/chmGGIO10.Ind2.stVal")) {///chmGGIO10.Ind2.stVal                        
                        origin_val = pwrDev_rtData.m_acdcData.is_acdcMod_off[9];
                        pwrDev_rtData.m_acdcData.is_acdcMod_off[9] = ((BdaBoolean)fc_mode).getValue();
                        if(origin_val==false && pwrDev_rtData.m_acdcData.is_acdcMod_off[9]==true) {
                            Date dt = ((BdaTimestamp)fc_mode_t).getDate();
                            timeout_tag = checkIfBoolNodeTimeOut(dt);
                            PowerData_RT_SQL.make_TimeOutTag(m_ConnPool, pwrDev_rtData.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module10Close_ID, 0, timeout_tag,dt);
                        }
                    }else if(fc_model_str.contains("/chmGGIO11.Ind2.stVal")) {///chmGGIO11.Ind2.stVal
                        origin_val = pwrDev_rtData.m_acdcData.is_acdcMod_off[10];
                        pwrDev_rtData.m_acdcData.is_acdcMod_off[10] = ((BdaBoolean)fc_mode).getValue();
                        if(origin_val==false && pwrDev_rtData.m_acdcData.is_acdcMod_off[10]==true) {
                            Date dt = ((BdaTimestamp)fc_mode_t).getDate();
                            timeout_tag = checkIfBoolNodeTimeOut(dt);
                            PowerData_RT_SQL.make_TimeOutTag(m_ConnPool, pwrDev_rtData.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module11Close_ID, 0, timeout_tag,dt);
                        }
                    }else if(fc_model_str.contains("/chmGGIO12.Ind2.stVal")) {///chmGGIO12.Ind2.stVal                        
                        origin_val = pwrDev_rtData.m_acdcData.is_acdcMod_off[11];
                        pwrDev_rtData.m_acdcData.is_acdcMod_off[11] = ((BdaBoolean)fc_mode).getValue();
                        if(origin_val==false && pwrDev_rtData.m_acdcData.is_acdcMod_off[11]==true) {
                            Date dt = ((BdaTimestamp)fc_mode_t).getDate();
                            timeout_tag = checkIfBoolNodeTimeOut(dt);
                            PowerData_RT_SQL.make_TimeOutTag(m_ConnPool, pwrDev_rtData.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module12Close_ID, 0, timeout_tag,dt);
                        }
                    }else if(fc_model_str.contains("/chmGGIO13.Ind2.stVal")) {                        
                        origin_val = pwrDev_rtData.m_acdcData.is_acdcMod_off[12];
                        pwrDev_rtData.m_acdcData.is_acdcMod_off[12] = ((BdaBoolean)fc_mode).getValue();
                        if(origin_val==false && pwrDev_rtData.m_acdcData.is_acdcMod_off[12]==true) {
                            Date dt = ((BdaTimestamp)fc_mode_t).getDate();
                            timeout_tag = checkIfBoolNodeTimeOut(dt);
                            PowerData_RT_SQL.make_TimeOutTag(m_ConnPool, pwrDev_rtData.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module13Close_ID, 0, timeout_tag,dt);
                        }
                    }else if(fc_model_str.contains("/chmGGIO14.Ind2.stVal")) {///chmGGIO14.Ind2.stVal
                        origin_val = pwrDev_rtData.m_acdcData.is_acdcMod_off[13];
                        pwrDev_rtData.m_acdcData.is_acdcMod_off[13] = ((BdaBoolean)fc_mode).getValue();
                        if(origin_val==false && pwrDev_rtData.m_acdcData.is_acdcMod_off[13]==true) {
                            Date dt = ((BdaTimestamp)fc_mode_t).getDate();
                            timeout_tag = checkIfBoolNodeTimeOut(dt);
                            PowerData_RT_SQL.make_TimeOutTag(m_ConnPool, pwrDev_rtData.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module14Close_ID, 0, timeout_tag,dt);
                        }
                    }else if(fc_model_str.contains("/chmGGIO15.Ind2.stVal")) {///chmGGIO15.Ind2.stVal                        
                        origin_val = pwrDev_rtData.m_acdcData.is_acdcMod_off[14];
                        pwrDev_rtData.m_acdcData.is_acdcMod_off[14] = ((BdaBoolean)fc_mode).getValue();
                        if(origin_val==false && pwrDev_rtData.m_acdcData.is_acdcMod_off[14]==true) {
                            Date dt = ((BdaTimestamp)fc_mode_t).getDate();
                            timeout_tag = checkIfBoolNodeTimeOut(dt);
                            PowerData_RT_SQL.make_TimeOutTag(m_ConnPool, pwrDev_rtData.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module15Close_ID, 0, timeout_tag,dt);
                        }
                    }else if(fc_model_str.contains("/chmGGIO16.Ind2.stVal")) {///chmGGIO16.Ind2.stVal                        
                        origin_val = pwrDev_rtData.m_acdcData.is_acdcMod_off[15];
                        pwrDev_rtData.m_acdcData.is_acdcMod_off[15] = ((BdaBoolean)fc_mode).getValue();
                        if(origin_val==false && pwrDev_rtData.m_acdcData.is_acdcMod_off[15]==true) {
                            Date dt = ((BdaTimestamp)fc_mode_t).getDate();
                            timeout_tag = checkIfBoolNodeTimeOut(dt);
                            PowerData_RT_SQL.make_TimeOutTag(m_ConnPool, pwrDev_rtData.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_Module16Close_ID, 0, timeout_tag,dt);
                        }
                    }else if(fc_model_str.contains("/chmGGIO1.Ind1.stVal")) {///chmGGIO1.Ind1.stVal
                        origin_val = pwrDev_rtData.m_acdcData.is_acdcMod_err[0];
                        pwrDev_rtData.m_acdcData.is_acdcMod_err[0] = ((BdaBoolean)fc_mode).getValue();
IEC61850_ForPowerSupply_ForNW/src/com/power/mysql/Sql_Mysql.java
@@ -547,6 +547,8 @@
                + "ENGINE=InnoDB DEFAULT CHARSET=utf8;";
        
        String table_12_0 = "DROP TABLE IF EXISTS " + PWRDEV_RT_INFO_TABLE;
        //清空数据库表记录,并重置自增
        String table_12_1 = "TRUNCATE TABLE " + PWRDEV_RT_INFO_TABLE;
        String table_12 = "CREATE TABLE IF NOT EXISTS " + PWRDEV_RT_INFO_TABLE
                        + "( `num`  bigint NOT NULL AUTO_INCREMENT ,"
                        + "`PowerDeviceId`  bigint NOT NULL DEFAULT 0 ,"
@@ -622,7 +624,11 @@
        //sqlMysqlExecute(table_2_0);
        //sqlMysqlExecute(table_3_0);
        //sqlMysqlExecute(table_4_0);
        sqlMysqlExecute(table_12_0);
        try {
            sqlMysqlExecute(table_12_1);
        } catch (Exception e) {
            e.printStackTrace();
        }
        sqlMysqlExecute(table_14_0);
        sqlMysqlExecute(table_15_0);
        
IEC61850_ForPowerSupply_ForNW/src/org/openmuc/openiec61850/ClientAssociation.java
@@ -706,7 +706,7 @@
        List<String> ldNames = retrieveLogicalDevices();
        List<List<String>> lnNames = new ArrayList<>(ldNames.size());
        System.out.println("List<String> ldNames = retrieveLogicalDevices();");
        //System.out.println("List<String> ldNames = retrieveLogicalDevices();");
        for (int i = 0; i < ldNames.size(); i++) {
            lnNames.add(retrieveLogicalNodeNames(ldNames.get(i)));
            //System.out.println(ldNames.get(i));
@@ -715,7 +715,7 @@
        for (int i = 0; i < ldNames.size(); i++) {
            List<LogicalNode> lns = new ArrayList<>();
            for (int j = 0; j < lnNames.get(i).size(); j++) {
                System.out.println(ldNames.get(i) + "/" + lnNames.get(i).get(j));
                //System.out.println(ldNames.get(i) + "/" + lnNames.get(i).get(j));
                lns.add(retrieveDataDefinitions(new ObjectReference(ldNames.get(i) + "/" + lnNames.get(i).get(j))));
            }
            lds.add(new LogicalDevice(new ObjectReference(ldNames.get(i)), lns));
IEC61850_ForPowerSupply_ForNW/src/org/openmuc/openiec61850/clientgui/ClientGui.java
@@ -66,7 +66,7 @@
    private static final long serialVersionUID = -1938913902977758367L;
    private final JTextField ipTextField = new JTextField("127.0.0.1");
    private final JTextField portTextField = new JTextField("10002");
    private final JTextField portTextField = new JTextField("102");
    private final JTree tree = new JTree(new DefaultMutableTreeNode("No server connected"));
    private final JPanel detailsPanel = new JPanel();
    private final GridBagLayout detailsLayout = new GridBagLayout();