修复历史实时数据循环删除，屏蔽版本号bug，修改log4j使用的的xml配置文件名

Administrator

2023-09-20 656faebfb6a3f546f4e22f70f1594ac64cff010f

修复历史实时数据循环删除，屏蔽版本号bug，修改log4j使用的的xml配置文件名

 iec_61850_forFoShanAES/log4j2_batt_61850_dev_x64.xml

New file
@@ -0,0 +1,63 @@
<?xml version="1.0" encoding="UTF-8"?>

<Configuration status="WARN" monitorInterval="30">

    <properties>

        <Property name="PATTERN_LAYOUT">%d{yyyy-MM-dd HH:mm:ss.SSS} [%t] [%level] %logger{36} - %msg%n</Property>

        <property name="LOG_HOME">batt_61850_dev_x64_logs</property>

    </properties>

    <Appenders>

        <Console name="Console" target="SYSTEM_OUT">

            <PatternLayout pattern="${PATTERN_LAYOUT}" />

        </Console>

        
        <!--warn及以下日志-->

        <RollingFile name="INFO" fileName="${LOG_HOME}/info.log" filePattern="${LOG_HOME}/info-%d{yyyyMMdd}-%i.log.gz">

            <PatternLayout pattern="${PATTERN_LAYOUT}"/>

            <Filters>

                <!--如果是error级别拒绝-->

                <ThresholdFilter level="error" onMatch="DENY" onMismatch="NEUTRAL"/>

                <!--如果是info\warn输出-->

                <ThresholdFilter level="trace" onMatch="ACCEPT" onMismatch="DENY"/>

            </Filters>

            <Policies>

                <TimeBasedTriggeringPolicy />

                <!--单个文件大小-->

                <SizeBasedTriggeringPolicy size="20MB"/>

            </Policies>

            <!--保存日志文件个数-->

            <DefaultRolloverStrategy max="9"/>

        </RollingFile>



        <!--error级别日志输出-->

        <RollingFile name="ERROR" fileName="${LOG_HOME}/error.log" filePattern="${LOG_HOME}/error-%d{yyyyMMdd}-%i.log.gz">

            <PatternLayout pattern="${PATTERN_LAYOUT}"/>

            <Filters>

                <ThresholdFilter level="error" onMatch="ACCEPT" onMismatch="DENY"/>

            </Filters>

            <Policies>

                <TimeBasedTriggeringPolicy />

                <SizeBasedTriggeringPolicy size="20MB"/>

            </Policies>

            <DefaultRolloverStrategy max="15">

                <Delete basePath="${LOG_HOME}/" maxDepth="2">

                    <IfFileName glob="*.log.gz" >

                        <IfAny>

                          <IfAccumulatedFileCount exceeds="14" />

                        </IfAny>

                    </IfFileName>

                    <!--!Note: 这里的age必须和filePattern协调, 后者是精确到dd, 这里就要写成xd, xD就不起作用,另外, 数字最好>2, 否则可能造成删除的时候, 最近的文件还处于被占用状态,导致删除不成功!-->

                    <!--30天-->

                </Delete>

            </DefaultRolloverStrategy>

        </RollingFile>

        
    </Appenders>



    <Loggers>

        <Root level="trace">

            <AppenderRef ref="Console" />

            <appenderRef ref="INFO" />

            <appenderRef ref="ERROR" />

        </Root>

    </Loggers>



</Configuration>

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

@@ -85,7 +85,7 @@
        Sql_Mysql sql = new Sql_Mysql(conn_pool);

        ResultSet res = null;

        int count = 0;

        res = sql.sqlMysqlQuery(sql_select_strs);

        res = sql.sqlMysqlTotalQuery(sql_select_strs);

        try {

            while(res.next()) {

                if(count > 0) {

@@ -97,7 +97,7 @@
                count++;

            }

            if(count >0) {

                sql.sqlMysqlExecute(sql_delete_strs);

                sql.sqlMysqlTotalExecute(sql_delete_strs);

            }

            res.close();

        } catch (SQLException e) {


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

@@ -685,21 +685,29 @@
            return null;

        }

        //System.out.println("Successfully read data.");

        ModelNode fc_mode = fcModelNode;

        String a[]= null;

        a = new String[5];

        a = (fc_mode.toString()).split(":");

        res_val = a[2];

        //System.out.println(a[3]);

        String split[]= null;

        split = new String[5];

        split = (res_val.toString()).split(", ");

        String result[]= null;

        result = new String[2];

        result[0] = split[0];

        result[1] = a[3];

        String resul = null;

        resul = String.format("%s,%s", result);

        String resul = fcModelNode.toString();

        try {

            ModelNode fc_mode = fcModelNode;

            String a[]= null;

            a = new String[5];

            a = (fc_mode.toString().trim()).split(":");

            if(null != a && a.length > 2) {				
                res_val = a[2];

                //System.out.println(a[3]);

                String split[]= null;

                split = new String[5];

                split = (res_val.toString()).split(", ");

                String result[]= null;

                result = new String[2];

                result[0] = split[0];

                result[1] = a[3];

                resul = null;

                resul = String.format("%s,%s", result);

            }

        } catch (Exception e) {

            // TODO Auto-generated catch block

            e.printStackTrace();

        }

        //System.out.println(resul);

        return resul;  //控制节点TRUE FALSE 

    }

@@ -1125,7 +1133,7 @@
//                    }

//                }

                m_FBS_DiscParamFromDev.DisCurr = readFloatNodeData(FBSDeviceName + "/ncdGGIO1.TestCurr.mag.f", Fc.MX);

                System.out.println(ZJDYCPSS + "/cheGGIO1.HiTestTmhour.mag.f");

				
                m_FBS_DiscParamFromDev.DisTime = (int)(readFloatNodeData(ZJDYCPSS + "/cheGGIO1.HiTestTmhour.mag.f", Fc.MX)*60);

                m_FBS_DiscParamFromDev.DisCap = readFloatNodeData(FBSDeviceName + "/ncdGGIO1.HiTestBatAh.mag.f", Fc.MX);

                m_FBS_DiscParamFromDev.MonomerTmp_High = readFloatNodeData(FBSDeviceName + "/ncdGGIO1.HiCelTemp.mag.f", Fc.MX);

@@ -1777,8 +1785,8 @@
        String str = "";

        BufferedReader stdout = null;

        try {

            //Process proc=Runtime.getRuntime().exec("sign_test.exe "+BTSID+" "+UkeyID);

            Process proc=Runtime.getRuntime().exec("sign_calukey_x64.exe "+BTSID+" "+UkeyID);

            Process proc=Runtime.getRuntime().exec("sign_test.exe "+BTSID+" "+UkeyID);

            //Process proc=Runtime.getRuntime().exec("sign_calukey_x64.exe "+BTSID+" "+UkeyID);

             stdout = new BufferedReader(new InputStreamReader(proc.getInputStream()));

             str = stdout.readLine();

        } catch (Exception e) {


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

@@ -172,6 +172,13 @@
        sql.execute(sql_str);
    }
    
    public void sqlMysqlTotalExecute(String sql_str) throws SQLException
    {
        Statement sql = mysql_con.createStatement();
        sql.setQueryTimeout(60*5);
        sql.execute(sql_str);
    }
	
    //锟斤拷锟斤拷锟斤拷db锟斤拷锟斤拷锟斤拷锟斤拷锟�
    public void sqlMysqlUseDB(String db) throws SQLException
    {
@@ -225,6 +232,20 @@
        }
        return res;
    }
	
    public ResultSet sqlMysqlTotalQuery(String sql_str)
    {
        ResultSet res = null;
        try {
            Statement sql = mysql_con.createStatement();
            sql.setQueryTimeout(60*5);
            String query = sql_str;
            res =  sql.executeQuery(query);			
        } catch(SQLException ex) {
            logger.error(ex.toString(), ex);
        }
        return res;
    }

    //锟斤拷锟斤拷锟斤拷sql锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷sql锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷
    public void sqlMysqlUpdate(String sql_str)

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

@@ -78,7 +78,7 @@
    /*********************************************************************************************/

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

    static {

        System.setProperty("log4j.configurationFile", "log4j2.xml");

        System.setProperty("log4j.configurationFile", "log4j2_batt_61850_dev_x64.xml");

    //    System.setProperty("contextSelector", "org.apache.logging.log4j.core.async.AsyncLoggerContextSelector");

    }

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


 iec_61850_forFoShanAES/src/com/version_inf/version_inf.txt

@@ -9,6 +9,10 @@
    均衡电流



V3.330 edit lijun at 2023-02-23

    1.修复历史实时数据循环删除功能

    2.修复无版本号时报错



V3.330 edit lijun at 2023-02-23

    1.屏蔽输出打印以及提交代码

            

1.109 edit lijun at 2019-11-19