whyclj
2020-09-09 491df299f66993c836743774e365dd90f64d84e2
提交
4个文件已修改
22 ■■■■ 已修改文件
bin/.gitignore 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/com/dev/base/data/Dynamicload_SocketClient_Thread.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/com/modbus/data/MyModbusFactory.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/main_MonitorServer_Dynamicload.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
bin/.gitignore
@@ -1,2 +1,2 @@
/main/
/com/
/main/
src/com/dev/base/data/Dynamicload_SocketClient_Thread.java
@@ -44,15 +44,15 @@
                    // *************************** 更新负载按钮信息******************************//*
                    // Date t1 = new Date();
                    readElectrical_button(master, dbutton);
                    //readMutilElectrical_button(master, dbutton);
                    //readElectrical_button(master, dbutton);
                    readMutilElectrical_button(master, dbutton);
                    PowerArk_Task_SQL.updateDynamicload_ButtonTable(conn_pool, dbutton);
                    // System.out.println("RT:"+(new Date().getTime() - t1.getTime()));
                    // Date t2 = new Date();
                    // **************************** 更新负载状态信息 *****************************//*
                    readElectrical_state(master, dstate);
                    //readMutilElectrical_state(master, dstate);
                    //readElectrical_state(master, dstate);
                    readMutilElectrical_state(master, dstate);
                    PowerArk_Task_SQL.updateDynamicload_StateTable(conn_pool, dstate);
                    // System.out.println("State:"+(new Date().getTime() - t2.getTime()));
                }
@@ -90,7 +90,7 @@
        BatchRead<Integer> batch = dbutton.createBatchRead(master);    
        //System.out.println("ip"+dinf.getDev_ip()+"  dbutton: "+batch.toString());
        BatchResults<Integer> res = MyModbusUtils.readMutilRegisters(batch, master);
        System.out.println("ip"+dinf.getDev_ip()+"   "+res.toString());
        //System.out.println("ip"+dinf.getDev_ip()+"   "+res.toString());
        dbutton.putBatchResult(res);
    }
    /**
src/com/modbus/data/MyModbusFactory.java
@@ -31,7 +31,7 @@
        ModbusMaster master = modbusFactory.createTcpMaster(params, true);// TCP 协议
        try {
             //设置超时时间
            master.setTimeout(100);
            master.setTimeout(2000);
            //设置重连次数
            master.setRetries(3);
            //初始化
src/main/main_MonitorServer_Dynamicload.java
@@ -77,11 +77,11 @@
        /*********************************************************************************/
        GB_DevData = PowerArk_Task_SQL.queryAllPowerArk(GB_MysqlConnPool);
        
        PowerArk_ServerSocket_Thread power_thread = new PowerArk_ServerSocket_Thread(GB_MysqlConnPool,GB_DevData);
        new Thread(power_thread).start();
        //PowerArk_ServerSocket_Thread power_thread = new PowerArk_ServerSocket_Thread(GB_MysqlConnPool,GB_DevData);
        //new Thread(power_thread).start();
        //读取每套负载系统的信息
        /*Dynamicload_ServerSocket_Thread server = new Dynamicload_ServerSocket_Thread(GB_MysqlConnPool,GB_DevData);
        new Thread(server).start();*/
        Dynamicload_ServerSocket_Thread server = new Dynamicload_ServerSocket_Thread(GB_MysqlConnPool,GB_DevData);
        new Thread(server).start();
        /*********************************************************************************/
    }