~whyclj/IEC61850_ForPowerSupply_ForNW.git

parent: 37d91802 | 补丁 | 提交 | ignore whitespace

DELL

2024-10-24 4fe3fff3b52219cb5ec7a3aa906b07cc6f96dedc

新增电源告警-协转与电源通信故障

9个文件已修改

2个文件已添加

	IEC61850_ForPowerSupply_ForNW/IEC61850_ForPowerSupply_logs/error-20241019-1.log.gz	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	IEC61850_ForPowerSupply_ForNW/IEC61850_ForPowerSupply_logs/error.log	19004 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	IEC61850_ForPowerSupply_ForNW/IEC61850_ForPowerSupply_logs/info-20241019-1.log.gz	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	IEC61850_ForPowerSupply_ForNW/IEC61850_ForPowerSupply_logs/info.log	6122 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	IEC61850_ForPowerSupply_ForNW/src/com/base/Com.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	IEC61850_ForPowerSupply_ForNW/src/com/power/alarm/Alarm_Param_SQL.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	IEC61850_ForPowerSupply_ForNW/src/com/power/alarm/PwrDeviceAlarm_Data.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	IEC61850_ForPowerSupply_ForNW/src/com/power/alarm/PwrDeviceAlarm_Thread.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	IEC61850_ForPowerSupply_ForNW/src/com/power/comm/Power_61850_SocketClient.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	IEC61850_ForPowerSupply_ForNW/src/com/power/datasave/PowerRealDataSave_Thread.java	21 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	IEC61850_ForPowerSupply_ForNW/src/com/version_inf/version_inf.txt	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 IEC61850_ForPowerSupply_ForNW/IEC61850_ForPowerSupply_logs/error-20241019-1.log.gz

Binary files differ

 IEC61850_ForPowerSupply_ForNW/IEC61850_ForPowerSupply_logs/error.log

Diff too large

 IEC61850_ForPowerSupply_ForNW/IEC61850_ForPowerSupply_logs/info-20241019-1.log.gz

Binary files differ

 IEC61850_ForPowerSupply_ForNW/IEC61850_ForPowerSupply_logs/info.log

Diff too large

 IEC61850_ForPowerSupply_ForNW/src/com/base/Com.java

@@ -179,4 +179,9 @@
        return calendar.getTimeInMillis();

    

    }



    public static String get_DTF(Date dt, String format){

        DateFormat dtf = new SimpleDateFormat(format);

        return dtf.format(dt);

    }

}


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

@@ -49,6 +49,8 @@
            }

            //通信电源

            insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_CPSS_CommErr_ID, (float)0, (float)0,0,1, 0,1,"通信电源通信故障",sql);



            insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_PWRDEV_CommErr_ID, (float)0, (float)0,0,1, 0,1,"协转与电源通信故障",sql);

            

            //ACDC

            insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_PowerDown_ID, (float)264.0, (float)110.0,1,1, 1,0,"交流输入1停电",sql);        //交流输入1停电


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

@@ -137,7 +137,7 @@
    public final static int ALM_TYPE_ACDC_CPSS_CommErr_ID         = 110119; //通信电源通信故障

    

    //1+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

    public final static int ALM_TYPE_PWRDEV_CommErr_ID             = 110120;

    public final static int ALM_TYPE_PWRDEV_CommErr_ID             = 110120;  //协转与电源通信故障

    

    public final static int ALM_TYPE_User_AcIn1_PowerDown_ID     = 110121;

    public final static int ALM_TYPE_User_AcIn2_PowerDown_ID     = 110122;


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

@@ -755,8 +755,12 @@
//        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_PWRDEV_CommErr_ID, sql);

        makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_PWRDEV_CommErr_ID,rtpd.m_acdcData.is_comm_err,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_AcIn1_ThunderErr_ID, sql);

        makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_ThunderErr_ID,rtpd.m_acdcData.is_acIn1_thunder_err,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_AcIn2_ThunderErr_ID, sql);

        makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_ThunderErr_ID,rtpd.m_acdcData.is_acIn2_thunder_err,PwrDeviceAlarm_Data.DEFAULT_ALARM_VALUE,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);    

                


 IEC61850_ForPowerSupply_ForNW/src/com/power/comm/Power_61850_SocketClient.java

@@ -1142,8 +1142,16 @@
                        pwrDev_rtData.m_acdcData.is_jun_charge = ((BdaBoolean)fc_mode).getValue();

                    }else if(fc_model_str.contains("/acbGGIO1.Ind3.stVal")) {

                        //协转与高频开关柜通信故障

                        origin_val = pwrDev_rtData.m_acdcData.is_comm_err;

                        pwrDev_rtData.m_acdcData.is_comm_err = ((BdaBoolean)fc_mode).getValue();

                        //System.out.println("is_comm_err:"+pwrDev_rtData.m_acdcData.is_comm_err);

                        if(origin_val==false && pwrDev_rtData.m_acdcData.is_battgroup1_fuse==true) {

                            Date dt = ((BdaTimestamp)fc_mode_t).getDate();

                            //Date dt = readNodeTimeStamp(acdcDeviceName + "/gswGGIO4.Alm.t", Fc.ST);

                            timeout_tag = checkIfBoolNodeTimeOut(dt);

							
                            PowerData_RT_SQL.make_TimeOutTag(m_ConnPool, pwrDev_rtData.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_PWRDEV_CommErr_ID, 0, timeout_tag,dt);

                        }

                    } if(fc_model_str.contains("/gdsGGIO1.IntIn.stVal")) {

                        if(fc_mode instanceof BdaBoolean) {

                            pwrDev_rtData.m_acdcData.acInUseCount = ((BdaBoolean)fc_mode).getValue()?1:0;        


 IEC61850_ForPowerSupply_ForNW/src/com/power/datasave/PowerRealDataSave_Thread.java

@@ -6,6 +6,7 @@
import java.util.Date;



import com.power.mysql.MysqlConnPool;

import com.base.Com;

import com.power.data.PowerData_RT;

import com.power.data.PowerData_RT_Array;



@@ -16,7 +17,8 @@
    Logger logger = null;

    

    public static int MinRecordTimeLong = 60;            //每次记录的最短时间间隔--60S

    public static int MaxRecordTimeLong = 366*3;        //最大记录历史数据时间--3年

//    public static int MaxRecordTimeLong = 366*3;        //最大记录历史数据时间--3年

    public static int MaxRecordTimeLong = 366;            //最大记录历史数据时间--1年

    

    

    public PowerRealDataSave_Thread(MysqlConnPool pool,PowerData_RT_Array data) {

@@ -30,7 +32,7 @@
    public void run() {

        

        logger.info("PowerRealDataSave_Thread: Started ...");

		
        Date lastdelTime = new Date(0);

        Date lastTime = new Date();

        //线程启动前休眠60秒

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

@@ -54,12 +56,21 @@
            /**********************************************************/

            nowTime = new Date();

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

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

            try {

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

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

                Date critical = PowerDataSave_SQL.getDateBefore(nowTime, MaxRecordTimeLong);

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

                PowerDataSave_SQL.deleteHistoryData(m_ConnPool, critical);

                if(deltimelong > 60*60*24) {

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

                    Date critical = PowerDataSave_SQL.getDateBefore(nowTime, MaxRecordTimeLong);

                    logger.info("开始循环删除"+Com.get_DTF(critical, Com.DTF_YMDhms)+"之前创建的电源历史实时数据库表");

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

                    PowerDataSave_SQL.deleteHistoryData(m_ConnPool, critical);

					
                    lastdelTime = nowTime;

                }

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

                if(timelong < MinRecordTimeLong) {

                    continue;


 IEC61850_ForPowerSupply_ForNW/src/com/version_inf/version_inf.txt

@@ -9,10 +9,15 @@
        

        

        高频开关柜



V1.108  2024-10-23 lijun

    1.添加"协转与电源通信故障告警",方便排查现场问题

    2.调整电源历史实时记录表，缩短最大记录时间  3年->1年	
        

V1.107  2024-10-17 lijun        

    1.插入默认告警参数-模块告警    

    2.根据告警参数中的配置，进行电源告警触发，参数表中的紧急告警主动赋予通用逻辑

	
        

V1.106  2024-07-23 lijun

    1.兼容修复紫晶电源设备，在直读设备无法读取到时加载icd文件连接

			@@ -179,4 +179,9 @@
			return calendar.getTimeInMillis();

			}

			public static String get_DTF(Date dt, String format){
			DateFormat dtf = new SimpleDateFormat(format);
			return dtf.format(dt);
			}
			}

			@@ -49,6 +49,8 @@
			}
			//通信电源
			insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_CPSS_CommErr_ID, (float)0, (float)0,0,1, 0,1,"通信电源通信故障",sql);

			insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_PWRDEV_CommErr_ID, (float)0, (float)0,0,1, 0,1,"协转与电源通信故障",sql);

			//ACDC
			insert_alarm_param(powerdevid,PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_PowerDown_ID, (float)264.0, (float)110.0,1,1, 1,0,"交流输入1停电",sql); //交流输入1停电

			@@ -137,7 +137,7 @@
			public final static int ALM_TYPE_ACDC_CPSS_CommErr_ID = 110119; //通信电源通信故障

			//1+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
			public final static int ALM_TYPE_PWRDEV_CommErr_ID = 110120;
			public final static int ALM_TYPE_PWRDEV_CommErr_ID = 110120; //协转与电源通信故障

			public final static int ALM_TYPE_User_AcIn1_PowerDown_ID = 110121;
			public final static int ALM_TYPE_User_AcIn2_PowerDown_ID = 110122;

			@@ -755,8 +755,12 @@
			// 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_PWRDEV_CommErr_ID, sql);
			makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_PWRDEV_CommErr_ID,rtpd.m_acdcData.is_comm_err,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_AcIn1_ThunderErr_ID, sql);
			makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn1_ThunderErr_ID,rtpd.m_acdcData.is_acIn1_thunder_err,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_AcIn2_ThunderErr_ID, sql);
			makeAlarmWork(rtpd.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_ACDC_AcIn2_ThunderErr_ID,rtpd.m_acdcData.is_acIn2_thunder_err,PwrDeviceAlarm_Data.DEFAULT_ALARM_VALUE,PwrDeviceAlarm_Data.ALM_SOURCE_READ,PwrDeviceAlarm_Data.DEFAULT_ALARM_INDEX,sql);

			@@ -1142,8 +1142,16 @@
			pwrDev_rtData.m_acdcData.is_jun_charge = ((BdaBoolean)fc_mode).getValue();
			}else if(fc_model_str.contains("/acbGGIO1.Ind3.stVal")) {
			//协转与高频开关柜通信故障
			origin_val = pwrDev_rtData.m_acdcData.is_comm_err;
			pwrDev_rtData.m_acdcData.is_comm_err = ((BdaBoolean)fc_mode).getValue();
			//System.out.println("is_comm_err:"+pwrDev_rtData.m_acdcData.is_comm_err);
			if(origin_val==false && pwrDev_rtData.m_acdcData.is_battgroup1_fuse==true) {
			Date dt = ((BdaTimestamp)fc_mode_t).getDate();
			//Date dt = readNodeTimeStamp(acdcDeviceName + "/gswGGIO4.Alm.t", Fc.ST);
			timeout_tag = checkIfBoolNodeTimeOut(dt);

			PowerData_RT_SQL.make_TimeOutTag(m_ConnPool, pwrDev_rtData.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_PWRDEV_CommErr_ID, 0, timeout_tag,dt);
			}
			} if(fc_model_str.contains("/gdsGGIO1.IntIn.stVal")) {
			if(fc_mode instanceof BdaBoolean) {
			pwrDev_rtData.m_acdcData.acInUseCount = ((BdaBoolean)fc_mode).getValue()?1:0;

			@@ -6,6 +6,7 @@
			import java.util.Date;

			import com.power.mysql.MysqlConnPool;
			import com.base.Com;
			import com.power.data.PowerData_RT;
			import com.power.data.PowerData_RT_Array;

			@@ -16,7 +17,8 @@
			Logger logger = null;

			public static int MinRecordTimeLong = 60; //每次记录的最短时间间隔--60S
			public static int MaxRecordTimeLong = 366*3; //最大记录历史数据时间--3年
			// public static int MaxRecordTimeLong = 366*3; //最大记录历史数据时间--3年
			public static int MaxRecordTimeLong = 366; //最大记录历史数据时间--1年


			public PowerRealDataSave_Thread(MysqlConnPool pool,PowerData_RT_Array data) {
			@@ -30,7 +32,7 @@
			public void run() {

			logger.info("PowerRealDataSave_Thread: Started ...");

			Date lastdelTime = new Date(0);
			Date lastTime = new Date();
			//线程启动前休眠60秒
			for(int i =0; i<60; i++) {
			@@ -54,12 +56,21 @@
			/**********************************************************/
			nowTime = new Date();
			long timelong =(nowTime.getTime()-lastTime.getTime())/1000;
			long deltimelong = (nowTime.getTime()-lastdelTime.getTime())/1000;
			try {
			/************** lijun add @ 20200906 *************/
			//获取指定天数之前的时间
			Date critical = PowerDataSave_SQL.getDateBefore(nowTime, MaxRecordTimeLong);
			//删除修改时间超时的数据表
			PowerDataSave_SQL.deleteHistoryData(m_ConnPool, critical);
			if(deltimelong > 606024) {

			//获取指定天数之前的时间
			Date critical = PowerDataSave_SQL.getDateBefore(nowTime, MaxRecordTimeLong);
			logger.info("开始循环删除"+Com.get_DTF(critical, Com.DTF_YMDhms)+"之前创建的电源历史实时数据库表");
			//删除修改时间超时的数据表
			PowerDataSave_SQL.deleteHistoryData(m_ConnPool, critical);

			lastdelTime = nowTime;
			}

			/**********************************************************/
			if(timelong < MinRecordTimeLong) {
			continue;

			@@ -9,10 +9,15 @@


			高频开关柜

			V1.108 2024-10-23 lijun
			1.添加"协转与电源通信故障告警",方便排查现场问题
			2.调整电源历史实时记录表，缩短最大记录时间 3年->1年

			V1.107 2024-10-17 lijun
			1.插入默认告警参数-模块告警
			2.根据告警参数中的配置，进行电源告警触发，参数表中的紧急告警主动赋予通用逻辑


			V1.106 2024-07-23 lijun
			1.兼容修复紫晶电源设备，在直读设备无法读取到时加载icd文件连接