V3.323 edit by lijun @ 2021-09-10 1. 历史实时数据检测线程中;循环删除检测统计查询占用MySQL资源大且频繁查询...

Administrator

2021-09-10 ce9ebbe26ab8d098f440243fd2c666b6dcd6262f

V3.323 edit by lijun @ 2021-09-10
	1. 历史实时数据检测线程中;循环删除检测统计查询占用MySQL资源大且频繁查询，已修改成24小时定期检测删除指定天数之前的历史实时表
	2. 均衡电压设置修改为浮点数修改

 iec_61850_forFoShanAES/src/com/dec/fbs9100/BTS_61850_SocketClient.java

@@ -158,14 +158,15 @@


            try {

                m_ServerModel = m_Association.retrieveModel();



                /************************* read m_DevVersion first *************************/

                m_StatAndParam.m_DevVersion = readVersionStringNodeData(FBSDeviceName + "/ncdGGIO1.DevVersion.d", Fc.DC);

                /***************************************************************************/

                logger.debug("IP:" + FBSDeviceIp + " - BTS_IEC61850_VersionInf: " + m_StatAndParam.m_DevVersion);

            } catch (ServiceError | IOException e) {

                logger.error(e.toString(), e);

                continue;

            }

            /************************* read m_DevVersion first *************************/

            m_StatAndParam.m_DevVersion = readVersionStringNodeData(FBSDeviceName + "/ncdGGIO1.DevVersion.d", Fc.DC);

            /***************************************************************************/

            logger.debug("IP:" + FBSDeviceIp + " - BTS_IEC61850_VersionInf: " + m_StatAndParam.m_DevVersion);

            

            //m_FBS_VCData.m_SysState.resetErrCommCount();

            FBS9100_Task_Thread_SQL.inseartOrUpdateFBS9100SFODParam(m_ConnPool, m_StatAndParam.clParam, m_StatAndParam);

@@ -437,7 +438,7 @@
                    // 只有设备在在线监测状态才能启动离线养护任务

                    // 启动离线养护

                    boolean flag = BTS_IEC61850_Write_CO_Node(FBSDeviceName + "/ncdGGIO1.SPCSO13.Oper", true);

                    //flag = checkMakeSuccess(5);

                    flag = checkMakeSuccess(5);

                    if(flag) {

                        logger.warn("启动离线养护计划成功");

                    }

@@ -1108,28 +1109,28 @@
                } else if (m_FBS_VCData.m_SysState.WorkState == 5) {

                    count = 8;

                }

                //comm_res = checkMakeSuccess(count);

                comm_res = checkMakeSuccess(count);

                //---------------------------------Log Level.WARN-------------------------------------//

                logger.printf(Level.WARN, "DevIp:%s operate FBS9100_ComBase.CMD_Stop, res:%b", FBSDeviceIp, comm_res);

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

            } else if (FBS9100_ComBase.CMD_StartDischarge == cmd) {

                if(!setBTSPublicKeyY("BTSE/ncdGGIO1.SPCSO1")) return false;

                comm_res = BTS_IEC61850_Write_CO_Node(FBSDeviceName + "/ncdGGIO1.SPCSO1.Oper", true);

                //comm_res = checkMakeSuccess(0);

                comm_res = checkMakeSuccess(0);

                //---------------------------------Log Level.WARN-------------------------------------//

                logger.printf(Level.WARN, "DevIp:%s operate FBS9100_ComBase.CMD_StartDischarge, res:%b", FBSDeviceIp, comm_res);

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

            } else if (FBS9100_ComBase.CMD_StartResDischarge == cmd) {

                if(!setBTSPublicKeyY("BTSE/ncdGGIO1.SPCSO2")) return false;

                comm_res = BTS_IEC61850_Write_CO_Node(FBSDeviceName + "/ncdGGIO1.SPCSO2.Oper", true);

                //comm_res = checkMakeSuccess(2);

                comm_res = checkMakeSuccess(2);

                //---------------------------------Log Level.WARN-------------------------------------//

                logger.printf(Level.WARN, "DevIp:%s operate FBS9100_ComBase.CMD_StartResDischarge, res:%b", FBSDeviceIp, comm_res);

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

            } else if (FBS9100_ComBase.CMD_StartKIDI == cmd) {

                if(!setBTSPublicKeyY("BTSE/ncdGGIO1.SPCSO3")) return false;

                comm_res = BTS_IEC61850_Write_CO_Node(FBSDeviceName + "/ncdGGIO1.SPCSO3.Oper", true);

                //comm_res = checkMakeSuccess(1);

                comm_res = checkMakeSuccess(1);

                //---------------------------------Log Level.WARN-------------------------------------//

                logger.printf(Level.WARN, "DevIp:%s operate FBS9100_ComBase.CMD_StartKIDI, res:%b", FBSDeviceIp, comm_res);

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

@@ -1389,7 +1390,7 @@
                    comm_res = BTS_IEC61850_Write_CO_Node(FBSDeviceName + "/ncdGGIO1.SPCSO9.Oper", true); // 模块41除硫

                }break;

                }

                //comm_res = checkMakeSuccess(3);

                comm_res = checkMakeSuccess(3);

                //---------------------------------Log Level.WARN-------------------------------------//

                logger.printf(Level.WARN, "DevIp:%s operate FBS9100_ComBase.CMD_Start_FODCL_test, "

                                + "battgroup_num:%d, res:%b", FBSDeviceIp, m_StatAndParam.clParam.GroupNum, comm_res);

@@ -1422,7 +1423,7 @@
                        comm_res = BTS_IEC61850_Write_CO_Node(FBSDeviceName + "/ncdGGIO1.SPCSO13.Oper", false);

                    }break;

                }

                //comm_res = checkMakeSuccess(9);

                comm_res = checkMakeSuccess(9);

                //---------------------------------Log Level.WARN-------------------------------------//

                logger.printf(Level.WARN, "DevIp:%s operate FBS9100_ComBase.CMD_Stop_FOD_test, "

                                + "battgroup_num:%d, res:%b", FBSDeviceIp, m_StatAndParam.clParam.GroupNum, comm_res);

@@ -1446,7 +1447,7 @@
                    comm_res = BTS_IEC61850_Write_CO_Node(FBSDeviceName + "/ncdGGIO1.SPCSO13.Oper", true);

                }break;

                }

                //comm_res = checkMakeSuccess(4);

                comm_res = checkMakeSuccess(4);

                //---------------------------------Log Level.WARN-------------------------------------//

                logger.printf(Level.WARN, "DevIp:%s operate FBS9100_ComBase.CMD_Start_FODYH_test, "

                                + "battgroup_num:%d, res:%b", FBSDeviceIp, m_StatAndParam.clParam.GroupNum, comm_res);

@@ -1504,14 +1505,14 @@
            } else if (FBS9100_ComBase.CMD_StartOffLineYH == cmd) {

                if(!setBTSPublicKeyY("BTSE/ncdGGIO1.SPCSO14")) return false;

                comm_res = BTS_IEC61850_Write_CO_Node(FBSDeviceName + "/ncdGGIO1.SPCSO14.Oper", true);

                //comm_res = checkMakeSuccess(5);

                comm_res = checkMakeSuccess(5);

                //---------------------------------Log Level.WARN-------------------------------------//

                logger.printf(Level.WARN, "DevIp:%s operate FBS9100_ComBase.CMD_StartOffLineYH, res:%b", FBSDeviceIp, comm_res);

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

            } else if (FBS9100_ComBase.CMD_StopOffLineYH == cmd) {

                if(!setBTSPublicKeyY("BTSE/ncdGGIO1.SPCSO14")) return false;

                comm_res = BTS_IEC61850_Write_CO_Node(FBSDeviceName + "/ncdGGIO1.SPCSO14.Oper", false);

                //comm_res = checkMakeSuccess(10);

                comm_res = checkMakeSuccess(10);

                //---------------------------------Log Level.WARN-------------------------------------//

                logger.printf(Level.WARN, "DevIp:%s operate FBS9100_ComBase.CMD_StopOffLineYH, res:%b", FBSDeviceIp, comm_res);

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

@@ -1589,7 +1590,7 @@
                /**

                 * 2021-08-30 edit @lijun 佛山二期新增点位用户判断均衡功能启用状态以及对应阀值 

                 */

                m_FBS_SysParam.JunHeng_Enabled = (int) (readFloatNodeData(FBSDeviceName + "/btgGGIO1.AnIn31.mag.f",Fc.MX)); //均衡启用状态

                m_FBS_SysParam.JunHeng_Enabled = readFloatNodeData(FBSDeviceName + "/btgGGIO1.AnIn31.mag.f",Fc.MX);         //均衡启用状态

                m_FBS_SysParam.JunHeng_StVol = readFloatNodeData(FBSDeviceName + "/btgGGIO1.AnIn32.mag.f",Fc.MX);             //均衡停止电压阀值

                m_FBS_SysParam.JunHeng_StCurr = readFloatNodeData(FBSDeviceName + "/btgGGIO1.AnIn33.mag.f",Fc.MX);             //均衡停止电流阀值

            }else if(FBS9100_ComBase.CMD_SetJuHengParam == cmd) {


 iec_61850_forFoShanAES/src/com/dec/fbs9100/BattRealDataPro_Thread.java

@@ -41,6 +41,7 @@
        logger.info("BattRealDataPro_Thread Started ...");

        

        Date lastTime = new Date();

        Date lastdelTime = new Date();            //上一次监测需要删除数据库指定

        //线程启动前休眠60秒                            //用于甄别还未通讯上的设备

        for(int i =0; i<60; i++) {

            try {

@@ -62,12 +63,20 @@
            /**********************************************************/

            nowTime = new Date();

            long timelong =(nowTime.getTime()-lastTime.getTime())/1000;

            long deltimelong =(nowTime.getTime()-lastdelTime.getTime())/1000;

            try {

                /**************** lijun add @ 20200906 ***************/

                //获取指定天数之前的时间

                Date critical = getDateBefore(nowTime, MaxRecordTimeLong);

                //删除修改时间超时的数据表

                BTS61850_Task_Thread_SQL.deleteHistoryData(con_pool, critical);

                //BTS61850_Task_Thread_SQL.deleteHistoryData(con_pool, critical);

                if(deltimelong > 60*60*24) {

                    /**

                     * 2021-08-25 @lijun 24小时定期检测删除指定天数之前的历史实时表,该查询占用SQL资源较大，减轻SQL查询负担

                     */

                    BTS61850_Task_Thread_SQL.deleteHistoryData(con_pool, critical);

                    lastdelTime = nowTime;

                }

                /**********************************************************/

                if(timelong < MinRecordTimeLong) {

                    continue;


 iec_61850_forFoShanAES/src/com/dec/fbs9100/FBS9100_SysParam.java

@@ -28,7 +28,7 @@
    public float POF_BG_Boost_VolStop;                //电压过高阀值

    public float POF_BG_Boost_VolStart;                //电压过低阀值

    

    public int JunHeng_Enabled;                        //均衡启用状态

    public float JunHeng_Enabled;                    //均衡电压 0:不启用均衡

    public float JunHeng_StVol;                        //均衡停止电压阀值

    public float JunHeng_StCurr;                    //均衡停止电流阀值

    


 iec_61850_forFoShanAES/src/com/dec/fbs9100/FBS9100_Task_Thread_SQL.java

@@ -1271,7 +1271,7 @@
                    param.m_FBS_SysParam.POF_BG_Boost_VolStop = res.getFloat("POF_BG_Boost_VolStop");

                    param.m_FBS_SysParam.POF_BG_Boost_VolStart = res.getFloat("POF_BG_Boost_VolStart");



                    param.m_FBS_SysParam.JunHeng_Enabled = res.getInt("JunHeng_Enabled");

                    param.m_FBS_SysParam.JunHeng_Enabled = res.getFloat("JunHeng_Enabled");

                    param.m_FBS_SysParam.JunHeng_StVol = res.getFloat("JunHeng_StVol");

                    param.m_FBS_SysParam.JunHeng_StCurr = res.getFloat("JunHeng_StCurr");

                    


 iec_61850_forFoShanAES/src/com/version_inf/version_inf.txt

@@ -69,4 +69,8 @@


V3.322 edit by lijun @ 2021-09-01

    1.佛山二期版本新增均衡参数读取和设置命令

    2.之前读取集合方式修改为单个点位数据读取
    2.之前读取集合方式修改为单个点位数据读取

	
V3.323 edit by lijun @ 2021-09-10

    1. 历史实时数据检测线程中;循环删除检测统计查询占用MySQL资源大且频繁查询，已修改成24小时定期检测删除指定天数之前的历史实时表

    2. 均衡电压设置修改为浮点数修改