whyclj
2020-10-11 7cae5c39af2a75c5fa6788d3bdb46b1c8766a11a
修改
3个文件已修改
158 ■■■■ 已修改文件
src/com/data/PowerArk_SocketClient_Thread_SQL.java 56 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/com/data/PowerArk_Task_SQL.java 97 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/com/dev/base/data/Dynamicload_SocketClient_Thread.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/com/data/PowerArk_SocketClient_Thread_SQL.java
@@ -23,34 +23,34 @@
        try {
            res = sql.sqlMysqlQuery(sql_str);
            if(res.next()) {
                control.FZ_b1 = res.getInt("FZ_b1");                            //FZ按钮1
                control.FZ_b2 = res.getInt("FZ_b2");                            //FZ按钮2
                control.FZ_b3 = res.getInt("FZ_b3");                            //FZ按钮3
                control.FZ_b4 = res.getInt("FZ_b4");                            //FZ按钮4
                control.FZ_b5 = res.getInt("FZ_b5");                            //FZ按钮5
                control.FZ_b6 = res.getInt("FZ_b6");                            //FZ按钮6
                control.FZ_b7 = res.getInt("FZ_b7");                            //FZ按钮7
                control.FZ_b8 = res.getInt("FZ_b8");                            //FZ按钮8
                control.FZ_b9 = res.getInt("FZ_b9");                            //FZ按钮9
                control.FZ_b10 = res.getInt("FZ_b10");                             //FZ按钮10
                control.FZ_b11 = res.getInt("FZ_b11");                            //FZ按钮11
                control.start_auto = res.getInt("start_auto");                    //启动自动加载
                control.stop_auto = res.getInt("stop_auto");                    //停止自动加载
                control.sudden_crease = res.getInt("sudden_crease");            //突加突卸
                control.all_open = res.getInt("all_open");                        //全部分闸
                control.FZ_autostate1 = res.getInt("FZ_autostate1");            //FZ自动状态1
                control.FZ_autostate2 = res.getInt("FZ_autostate2");            //FZ自动状态2
                control.FZ_autostate3 = res.getInt("FZ_autostate3");            //FZ自动状态3
                control.FZ_autostate4 = res.getInt("FZ_autostate4");            //FZ自动状态4
                control.FZ_autostate5 = res.getInt("FZ_autostate5");            //FZ自动状态5
                control.local_control = res.getInt("local_control");            //就地控制
                control.back_control = res.getInt("back_control");                //后台控制
                control.central_control = res.getInt("central_control");        //中间控制
                control.inter_volume_M200 = res.getInt("inter_volume_M200");    //中间量M200
                control.fan_button = res.getInt("fan_button");                    //风机按钮
                //control.fan_output = res.getInt("fan_output");                    //风机输出
                control.set_power = res.getFloat("set_power");                    //设定功率
                control.interval_time = res.getInt("interval_time");            //间隔时间
                control.setFZ_b1(res.getInt("fZ_b1"));                        //FZ按钮1
                control.setFZ_b2(res.getInt("fZ_b2"));                           //FZ按钮2
                control.setFZ_b3(res.getInt("FZ_b3"));                            //FZ按钮3
                control.setFZ_b4(res.getInt("FZ_b4"));                            //FZ按钮4
                control.setFZ_b5(res.getInt("FZ_b5"));                            //FZ按钮5
                control.setFZ_b6(res.getInt("FZ_b6"));                            //FZ按钮6
                control.setFZ_b7(res.getInt("FZ_b7"));                            //FZ按钮7
                control.setFZ_b8(res.getInt("FZ_b8"));                            //FZ按钮8
                control.setFZ_b9(res.getInt("FZ_b9"));                            //FZ按钮9
                control.setFZ_b10(res.getInt("FZ_b10"));                        //FZ按钮10
                control.setFZ_b11(res.getInt("FZ_b11"));                        //FZ按钮11
                control.setStart_auto(res.getInt("start_auto"));                 //启动自动加载
                control.setStop_auto(res.getInt("stop_auto"));                      //停止自动加载
                control.setSudden_crease(res.getInt("sudden_crease"));          //突加突卸
                control.setAll_open(res.getInt("all_open"));                    //全部分闸
                control.setFZ_autostate1(res.getInt("fZ_autostate1"));          //FZ自动状态1
                control.setFZ_autostate2(res.getInt("fZ_autostate2"));          //FZ自动状态2
                control.setFZ_autostate3(res.getInt("fZ_autostate3"));          //FZ自动状态3
                control.setFZ_autostate4(res.getInt("fZ_autostate4"));            //FZ自动状态4
                control.setFZ_autostate5(res.getInt("fZ_autostate5"));          //FZ自动状态5
                control.setLocal_control(res.getInt("local_control"));             //就地控制
                control.setBack_control(res.getInt("back_control"));            //后台控制
                control.setCentral_control(res.getInt("central_control"));      //中间控制
                control.setInter_volume_M200(res.getInt("inter_volume_M200"));    //中间量M200
                control.setFan_button(res.getInt("fan_button"));                //风机按钮
                control.setSet_power(res.getFloat("set_power"));                 //设定功率
                control.setInterval_time(res.getInt("interval_time"));          //间隔时间
                //control.fan_output = res.getInt("fan_output");                //风机输出
            }
        } catch (Exception e) {
            e.printStackTrace();
src/com/data/PowerArk_Task_SQL.java
@@ -513,8 +513,99 @@
            }
        }
    }
    public static void queryDynamicload_Control(MysqlConnPool conn_pool, Dynamicload_control dcontrol) {
    public static void queryDynamicload_Control(MysqlConnPool conn_pool, Dynamicload_control control) {
        String sql_str = " SELECT * FROM " + Sql_Mysql.Tb_Dynamicload_Control + " WHERE dev_id = " + control.dev_id;
        Sql_Mysql sql = new Sql_Mysql(conn_pool.getConn());
        ResultSet res = null;
        try {
            res = sql.sqlMysqlQuery(sql_str);
            if(res.next()) {
                control.FZ_b1 = res.getInt("FZ_b1");                            //FZ按钮1
                control.FZ_b2 = res.getInt("FZ_b2");                            //FZ按钮2
                control.FZ_b3 = res.getInt("FZ_b3");                            //FZ按钮3
                control.FZ_b4 = res.getInt("FZ_b4");                            //FZ按钮4
                control.FZ_b5 = res.getInt("FZ_b5");                            //FZ按钮5
                control.FZ_b6 = res.getInt("FZ_b6");                            //FZ按钮6
                control.FZ_b7 = res.getInt("FZ_b7");                            //FZ按钮7
                control.FZ_b8 = res.getInt("FZ_b8");                            //FZ按钮8
                control.FZ_b9 = res.getInt("FZ_b9");                            //FZ按钮9
                control.FZ_b10 = res.getInt("FZ_b10");                             //FZ按钮10
                control.FZ_b11 = res.getInt("FZ_b11");                            //FZ按钮11
                control.start_auto = res.getInt("start_auto");                    //启动自动加载
                control.stop_auto = res.getInt("stop_auto");                    //停止自动加载
                control.sudden_crease = res.getInt("sudden_crease");            //突加突卸
                control.all_open = res.getInt("all_open");                        //全部分闸
                control.FZ_autostate1 = res.getInt("FZ_autostate1");            //FZ自动状态1
                control.FZ_autostate2 = res.getInt("FZ_autostate2");            //FZ自动状态2
                control.FZ_autostate3 = res.getInt("FZ_autostate3");            //FZ自动状态3
                control.FZ_autostate4 = res.getInt("FZ_autostate4");            //FZ自动状态4
                control.FZ_autostate5 = res.getInt("FZ_autostate5");            //FZ自动状态5
                control.local_control = res.getInt("local_control");            //就地控制
                control.back_control = res.getInt("back_control");                //后台控制
                control.central_control = res.getInt("central_control");        //中间控制
                control.inter_volume_M200 = res.getInt("inter_volume_M200");    //中间量M200
                control.fan_button = res.getInt("fan_button");                    //风机按钮
                //control.fan_output = res.getInt("fan_output");                    //风机输出
                control.set_power = res.getFloat("set_power");                    //设定功率
                control.interval_time = res.getInt("interval_time");            //间隔时间
            }
        } catch (Exception e) {
            e.printStackTrace();
        } finally {
            if(res != null) {
                try {
                    res.close();
                } catch (SQLException e) {
                    e.printStackTrace();
                }
            }
            sql.close_con();
        }
    }
    /**
     *    更新控制状态
     * @param conn_pool
     * @param control
     */
    public static void update_Dynamicload_Control(MysqlConnPool conn_pool, Dynamicload_control control) {
        String sql_str = " UPDATE " + Sql_Mysql.Tb_Dynamicload_Control
                + " SET FZ_b1= " + control.getFZ_b1()
                + ",FZ_b2 = " + control.getFZ_b2()
                + ",FZ_b3 = " + control.getFZ_b3()
                + ",FZ_b4 = " + control.getFZ_b4()
                + ",FZ_b5 = " + control.getFZ_b5()
                + ",FZ_b6 = " + control.getFZ_b6()
                + ",FZ_b7 = " + control.getFZ_b7()
                + ",FZ_b8 = " + control.getFZ_b8()
                + ",FZ_b9 = " + control.getFZ_b9()
                + ",FZ_b10 = " + control.getFZ_b10()
                + ",FZ_b11 = " + control.getFZ_b11()
                + ",start_auto = " + control.getStart_auto()
                + ",stop_auto = " + control.getStop_auto()
                + ",sudden_crease = " + control.getSudden_crease()
                + ",all_open = " + control.getAll_open()
                + ",FZ_autostate1 = " + control.getFZ_autostate1()
                + ",FZ_autostate2 = " + control.getFZ_autostate2()
                + ",FZ_autostate3 = " + control.getFZ_autostate3()
                + ",FZ_autostate4 = " + control.getFZ_autostate4()
                + ",FZ_autostate5 = " + control.getFZ_autostate5()
                + ",local_control = " + control.getLocal_control()
                + ",back_control = " + control.getBack_control()
                + ",central_control = " + control.getCentral_control()
                + ",inter_volume_M200 = " + control.getInter_volume_M200()
                + ",fan_button = " + control.getFan_button()
                + ",interval_time = " + control.interval_time
                + ",set_power = " + control.set_power
                + " WHERE dev_id = " + control.dev_id;
        Sql_Mysql sql = new Sql_Mysql(conn_pool.getConn());
        try {
            //System.out.println(sql_str);
            sql.sqlMysqlExecute(sql_str);
        } catch (SQLException e) {
            e.printStackTrace();
        } finally {
            sql.close_con();
        }
    }
}
src/com/dev/base/data/Dynamicload_SocketClient_Thread.java
@@ -49,7 +49,10 @@
                //控制页面
                PowerArk_Task_SQL.queryDynamicload_Control(conn_pool, dcontrol);
                {
                    if(dcontrol.control_en) {
                        writeDynamicload_Control(master, dcontrol);
                        PowerArk_Task_SQL.update_Dynamicload_Control(conn_pool, dcontrol);
                    }
                }
                
                if (runCount % 2 == 0) {