V6.110 edit by lijun 	@  2025-06-24
1.新增单体漏液信息读取
2.同步window或linux系统超时配置
17个文件已修改
2个文件已添加
119172 ■■■■■ 已修改文件
iec61850_forFoShanAES_Model/2CPSS2BTSE-2025-06-23.icd 24138 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iec61850_forFoShanAES_Model/2CPSS2BTSE.icd 35426 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iec61850_forFoShanAES_Model/bin/2CPSS2BTSE-2025-06-23.icd 24138 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iec61850_forFoShanAES_Model/bin/2CPSS2BTSE.icd 35426 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iec61850_forFoShanAES_Model/bin/com/battdata_rt/BattData_RT_RamDB_Thread_SQL.class 补丁 | 查看 | 原始文档 | blame | 历史
iec61850_forFoShanAES_Model/bin/com/battdata_rt/BattData_RT_SQL.class 补丁 | 查看 | 原始文档 | blame | 历史
iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS_61850_SocketClient.class 补丁 | 查看 | 原始文档 | blame | 历史
iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/main_BTS_APP_IEC61850.class 补丁 | 查看 | 原始文档 | blame | 历史
iec61850_forFoShanAES_Model/bin/com/version_inf/version_inf.txt 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iec61850_forFoShanAES_Model/bin/log4j2_batt_61850_dev_x64.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
iec61850_forFoShanAES_Model/bin/org/openmuc/jositransport/TConnection.class 补丁 | 查看 | 原始文档 | blame | 历史
iec61850_forFoShanAES_Model/bin/org/openmuc/openiec61850/ClientAssociation.class 补丁 | 查看 | 原始文档 | blame | 历史
iec61850_forFoShanAES_Model/log4j2_batt_61850_dev_x64.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
iec61850_forFoShanAES_Model/src/com/battdata_rt/BattData_RT_SQL.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS_61850_SocketClient.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iec61850_forFoShanAES_Model/src/com/dec/fbs9100/main_BTS_APP_IEC61850.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
iec61850_forFoShanAES_Model/src/com/version_inf/version_inf.txt 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iec61850_forFoShanAES_Model/src/org/openmuc/jositransport/TConnection.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iec61850_forFoShanAES_Model/src/org/openmuc/openiec61850/ClientAssociation.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iec61850_forFoShanAES_Model/2CPSS2BTSE-2025-06-23.icd
New file
Diff too large
iec61850_forFoShanAES_Model/2CPSS2BTSE.icd
Diff too large
iec61850_forFoShanAES_Model/bin/2CPSS2BTSE-2025-06-23.icd
New file
Diff too large
iec61850_forFoShanAES_Model/bin/2CPSS2BTSE.icd
Diff too large
iec61850_forFoShanAES_Model/bin/com/battdata_rt/BattData_RT_RamDB_Thread_SQL.class
Binary files differ
iec61850_forFoShanAES_Model/bin/com/battdata_rt/BattData_RT_SQL.class
Binary files differ
iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS_61850_SocketClient.class
Binary files differ
iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/main_BTS_APP_IEC61850.class
Binary files differ
iec61850_forFoShanAES_Model/bin/com/version_inf/version_inf.txt
@@ -16,6 +16,11 @@
        ② 若测试过程中设备工作状态为充电测,记录在核容充电里面。否则为监测充电。
        ③ 数据结束逻辑为:当前电池电流<(浮充电流阈值+2)
V6.110 edit by lijun     @  2025-06-24
    1.新增单体漏液信息读取
    2.同步window或linux系统超时配置
V6.109 edit by lijun     @  2025-01-15
    1.设备遥调遥控需要先绑定设备Ukey上的UkeyID[可通过网页工具,或者ukey调试工具读取]
iec61850_forFoShanAES_Model/bin/log4j2_batt_61850_dev_x64.xml
@@ -53,7 +53,7 @@
    </Appenders>
    <Loggers>
        <Root level="info">
        <Root level="trace">
            <AppenderRef ref="Console" />
            <appenderRef ref="INFO" />
            <appenderRef ref="ERROR" />
iec61850_forFoShanAES_Model/bin/org/openmuc/jositransport/TConnection.class
Binary files differ
iec61850_forFoShanAES_Model/bin/org/openmuc/openiec61850/ClientAssociation.class
Binary files differ
iec61850_forFoShanAES_Model/log4j2_batt_61850_dev_x64.xml
@@ -53,7 +53,7 @@
    </Appenders>
    <Loggers>
        <Root level="info">
        <Root level="trace">
            <AppenderRef ref="Console" />
            <appenderRef ref="INFO" />
            <appenderRef ref="ERROR" />
iec61850_forFoShanAES_Model/src/com/battdata_rt/BattData_RT_SQL.java
@@ -257,6 +257,7 @@
            if(sql_str_JH.trim().length() > 1) {
                sql_str_JH = ", mon_JH_curr = CASE mon_num " + sql_str_JH + " ELSE mon_JH_curr END ";
            }
            String sql_str_rest_cap = " ";
            for(int n=0; n<bd_rt.MonCount; n++) {
                tmp_dt = bd_rt.al_MonVol.get(n).mon_rest_cap;
@@ -269,7 +270,19 @@
                sql_str_rest_cap = ", mon_rest_cap = CASE mon_num " + sql_str_rest_cap + " ELSE mon_rest_cap END ";
            }
            
            String sql_str_2 = sql_str_vol + sql_str_tmp + sql_str_res + sql_str_ser + sql_str_JH + sql_str_rest_cap;
            String sql_str_ly = " ";
            for(int n=0; n<bd_rt.MonCount; n++) {
                tmp_dt = bd_rt.al_MonVol.get(n).mon_LY_vol;
                //if(bd_rt.al_MonVol_RtOld.get(n).mon_rest_cap != tmp_dt) {
                bd_rt.al_MonVol_RtOld.get(n).mon_LY_vol = tmp_dt;
                sql_str_ly += " WHEN " + (n+1) + " THEN " + String.format("%1.3f", tmp_dt);
                //}
            }
            if(sql_str_ly.trim().length() > 1) {
                sql_str_ly = ", mon_LY_vol = CASE mon_num " + sql_str_ly + " ELSE mon_LY_vol END ";
            }
            String sql_str_2 = sql_str_vol + sql_str_tmp + sql_str_res + sql_str_ser + sql_str_JH + sql_str_rest_cap + sql_str_ly;
            if(sql_str_2.trim().length() > 1) {
                sql_str_2 += " WHERE BattGroupId=" + bd_rt.BattGroupId;
                /*
iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS_61850_SocketClient.java
@@ -1059,6 +1059,10 @@
                                else if ((n >= (m + 24 * 4)) && (n < (m + 24 * 5))) {
                                    m_FBS_VCData.mon_JH[n - (m + 24 * 4)] = ((BdaFloat32) fc_mode).getFloat();
                                }
                                else if ((n >= (m + 24 * 5)) && (n < (m + 24 * 6))) {
                                    m_FBS_VCData.mon_LY[n - (m + 24 * 5)] = ((BdaFloat32) fc_mode).getFloat()/1000;
                                }
                            }
                            
                            /*for(int i=0;i<24;i++) {
@@ -2294,6 +2298,7 @@
                        m_RTData[n].al_MonVol.get(index).monTmp = (float) vc_data.tmp[mon_index];
                        m_RTData[n].al_MonVol.get(index).mon_JH_curr = (float) vc_data.mon_JH[mon_index];
                        m_RTData[n].al_MonVol.get(index).mon_rest_cap = (float) vc_data.mon_rest_cap[mon_index];
                        m_RTData[n].al_MonVol.get(index).mon_LY_vol = (float) vc_data.mon_LY[mon_index];
                        mon_index++;
                    }
iec61850_forFoShanAES_Model/src/com/dec/fbs9100/main_BTS_APP_IEC61850.java
@@ -29,7 +29,7 @@
    /**************************************************************************/
    /**************************************************************************/
    public final static boolean app_debug = false;
    public final static double m_VersionNum = 6.109;
    public final static double m_VersionNum = 6.110;
    public final static String m_Version = "Welcome To Use BattMonitor_BTS_IEC61850 V" 
                                            + m_VersionNum + " RC_20201003";
    /**************************************************************************/
iec61850_forFoShanAES_Model/src/com/version_inf/version_inf.txt
@@ -16,6 +16,11 @@
        ② 若测试过程中设备工作状态为充电测,记录在核容充电里面。否则为监测充电。
        ③ 数据结束逻辑为:当前电池电流<(浮充电流阈值+2)
V6.110 edit by lijun     @  2025-06-24
    1.新增单体漏液信息读取
    2.同步window或linux系统超时配置
V6.109 edit by lijun     @  2025-01-15
    1.设备遥调遥控需要先绑定设备Ukey上的UkeyID[可通过网页工具,或者ukey调试工具读取]
iec61850_forFoShanAES_Model/src/org/openmuc/jositransport/TConnection.java
@@ -591,6 +591,11 @@
        int li = 0;
        int tPduCode;
//        System.err.println("超时时间:"+messageTimeout);
        //修复Linux环境下不超时,通信故障延迟严重问题
        //socket.setSoTimeout(messageTimeout);
        messageFragmentTimeout     = 60000;
        messageTimeout             = 60000;
        socket.setSoTimeout(messageTimeout);
        byte version;
        try {
iec61850_forFoShanAES_Model/src/org/openmuc/openiec61850/ClientAssociation.java
@@ -709,10 +709,11 @@
        //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));
            System.out.println(ldNames.get(i));
        }
        List<LogicalDevice> lds = new ArrayList<>();
        for (int i = 0; i < ldNames.size(); i++) {
            System.out.println(ldNames.get(i));
            List<LogicalNode> lns = new ArrayList<>();
            for (int j = 0; j < lnNames.get(i).size(); j++) {
                lns.add(retrieveDataDefinitions(new ObjectReference(ldNames.get(i) + "/" + lnNames.get(i).get(j))));