Administrator
2023-02-11 4987a6ee2b8e90fc4acd86765bc8b009fe44e403
修复放电参数未记录bug
4个文件已修改
1个文件已添加
22 ■■■■ 已修改文件
iec_61850_forFoShanAES/.gitignore 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iec_61850_forFoShanAES/config.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
iec_61850_forFoShanAES/src/com/dec/fbs9100/BTS_61850_SocketClient.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iec_61850_forFoShanAES/src/com/dec/fbs9100/MysqlConnPool.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
iec_61850_forFoShanAES/src/com/version_inf/version_inf.txt 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iec_61850_forFoShanAES/.gitignore
New file
@@ -0,0 +1,2 @@
/bin/
/batt_61850_dev_x64_logs/
iec_61850_forFoShanAES/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-->
iec_61850_forFoShanAES/src/com/dec/fbs9100/BTS_61850_SocketClient.java
@@ -75,6 +75,11 @@
    private List<BTS61850_EventRecord> events; // 事件记录表
    
    private String ZJDYCPSS = "ZJDYCPSS";
    /**
     * 设备通信上后默认读取一次放电参数并记录当前参数
     */
    private boolean isReadParam = true;
    /*********************************************************************************************/
    /**********************
@@ -233,10 +238,18 @@
                            if (true == BTS_IEC61850_SocketComm(FBS9100_ComBase.CMD_Stop)) {
                                m_StatAndParam.op_cmd = FBS9100_ComBase.CMD_StopAck;
                            }
                        } else if (FBS9100_ComBase.CMD_GetDischargeParm == m_FBS_DiscParam.op_cmd) {
                        } else if (FBS9100_ComBase.CMD_GetDischargeParm == m_FBS_DiscParam.op_cmd || isReadParam) {
                            isReadParam = false;
                            if (true == BTS_IEC61850_SocketComm(FBS9100_ComBase.CMD_GetDischargeParm)) {
                                m_StatAndParam.op_cmd = FBS9100_ComBase.CMD_GetDischargeParmAck;
                                //保留当前读取的参数
                                test_Param.copyBTS61850Param(m_FBS_DiscParamFromDev);
                                FBS9100_Task_Thread_SQL.updateFbs9100SetParamBydev_id(m_ConnPool, m_StatAndParam);
                                //读取一次ukey
                                m_StatAndParam.keyID = readStringNodeData(FBSDeviceName+"/btgGGIO1.ukeyID.d",Fc.DC);
                                m_StatAndParam.serialNumber = readStringNodeData(FBSDeviceName+"/btgGGIO1.Bts_ID.d",Fc.DC);                //唯一序列号
                            }
                        } else if (FBS9100_ComBase.CMD_SetIp == m_FBS_DiscParam.op_cmd) {
                            if (true == BTS_IEC61850_SocketComm(FBS9100_ComBase.CMD_SetIp)) {
iec_61850_forFoShanAES/src/com/dec/fbs9100/MysqlConnPool.java
@@ -40,7 +40,7 @@
        mysql_ds.setAcquireIncrement(4);
        mysql_ds.setMaxIdleTime(120);
        mysql_ds.setNumHelperThreads(4);
        mysql_ds.setBreakAfterAcquireFailure(true);
        mysql_ds.setBreakAfterAcquireFailure(false);
        mysql_ds.setIdleConnectionTestPeriod(60);
    }
    public Connection getConn()
iec_61850_forFoShanAES/src/com/version_inf/version_inf.txt
@@ -95,5 +95,6 @@
    2.适配各种版本协议的61850设备通信
    3.修复均衡供电信息小数位数过多bug--精度转换bug
    4.修复解析版本号前有的包含空格,有的不包含导致报错
    5.修复记录放电参数若设备未设置放电参数现场[现场启动的]参数记录的都是0