whyclj
2020-09-24 06eea2578a9f80002a87c90e389231e703fd2d4d
水冷将replace改成update
2个文件已修改
128 ■■■■■ 已修改文件
WaterSystem_MonitorServer/src/com/watersystem/monitor/Water_Task_SQL.java 122 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WaterSystem_MonitorServer/src/com/watersystem/monitor/Watersystem_SocketClient_Thread.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WaterSystem_MonitorServer/src/com/watersystem/monitor/Water_Task_SQL.java
@@ -262,6 +262,40 @@
            sql.close_con();
        }
    }
    /**
     *     更新water_rt表
     * @param pool
     * @param wrt
     */
    public static void update_water_rt(MysqlConnPool pool,Water_rt wrt) {
        String sql_str = " update " + Sql_Mysql.Tb_water_rt +" set "
                + "water_id=" + wrt.water_id
                + ",cooling_flow=" +wrt.cooling_flow
                + ",supply_tmp=" + wrt.supply_tmp
                + ",Supply_pre=" + wrt.Supply_pre
                + ",back_tem=" + wrt.back_tem
                + ",back_pre=" + wrt.back_pre
                + ",Cooling_ser=" + wrt.Cooling_ser
                + ",Buffer_tank_level=" + wrt.Buffer_tank_level
                + ",Buffer_tank_pre=" + wrt.Buffer_tank_pre
                + ",Humidity_chamber=" + wrt.Humidity_chamber
                + ",Tem_chamber=" + wrt.Tem_chamber
                + ",External_tmp=" + wrt.External_tmp
                + ",External_pre=" + wrt.External_pre
                + " where water_id= " + wrt.water_id;
        Sql_Mysql sql = new Sql_Mysql(pool.getConn());
        try {
            sql.sqlMysqlExecute(sql_str);
        } catch (SQLException e) {
            e.printStackTrace();
        } finally {
            sql.close_con();
        }
    }
    //插入或更新水冷系统实时分支信息表
    public static void replace_water_brach(MysqlConnPool pool,Water_brach wbrach) {
        String sql_str = " replace into "+ Sql_Mysql.Tb_water_brach+"(water_id,Branch_flow_1,Branch_flow_2,Branch_flow_3,Branch_flow_4,Branch_flow_5,Branch_flow_6,Branch_flow_7,Branch_flow_8,Branch_flow_9,Branch_tmp_1,Branch_tmp_2,Branch_tmp_3,Branch_tmp_4,Branch_tmp_5,Branch_tmp_6,Branch_tmp_7,Branch_tmp_8,Branch_tmp_9,Branch_pre_1,Branch_pre_2,Branch_pre_3,Branch_pre_4,Branch_pre_5,Branch_pre_6,Branch_pre_7,Branch_pre_8,Branch_pre_9)  "
@@ -277,6 +311,57 @@
            sql.close_con();
        }
    }
    /**
     *     更新水冷系统实时分支信息表
     * @param pool
     * @param wbrach
     */
    public static void update_water_brach(MysqlConnPool pool,Water_brach wbrach) {
        String sql_str = " update  "+Sql_Mysql.Tb_water_brach +" "
                + " Set water_id=" + wbrach.water_id
                + ",Branch_flow_1=" + wbrach.Branch_flow_1
                + ",Branch_flow_2=" + wbrach.Branch_flow_2
                + ",Branch_flow_3=" + wbrach.Branch_flow_3
                + ",Branch_flow_4=" + wbrach.Branch_flow_4
                + ",Branch_flow_5=" + wbrach.Branch_flow_5
                + ",Branch_flow_6=" + wbrach.Branch_flow_6
                + ",Branch_flow_7=" + wbrach.Branch_flow_7
                + ",Branch_flow_8=" + wbrach.Branch_flow_8
                + ",Branch_flow_9=" + wbrach.Branch_flow_9
                + ",Branch_tmp_1=" + wbrach.Branch_tmp_1
                + ",Branch_tmp_2=" + wbrach.Branch_tmp_2
                + ",Branch_tmp_3=" + wbrach.Branch_tmp_3
                + ",Branch_tmp_4=" + wbrach.Branch_tmp_4
                + ",Branch_tmp_5=" + wbrach.Branch_tmp_5
                + ",Branch_tmp_6=" + wbrach.Branch_tmp_6
                + ",Branch_tmp_7=" + wbrach.Branch_tmp_7
                + ",Branch_tmp_8=" + wbrach.Branch_tmp_8
                + ",Branch_tmp_9=" + wbrach.Branch_tmp_9
                + ",Branch_pre_1=" + wbrach.Branch_pre_1
                + ",Branch_pre_2=" + wbrach.Branch_pre_2
                + ",Branch_pre_3=" + wbrach.Branch_pre_3
                + ",Branch_pre_4=" + wbrach.Branch_pre_4
                + ",Branch_pre_5=" + wbrach.Branch_pre_5
                + ",Branch_pre_6=" + wbrach.Branch_pre_6
                + ",Branch_pre_7=" + wbrach.Branch_pre_7
                + ",Branch_pre_8=" + wbrach.Branch_pre_8
                + ",Branch_pre_9=" + wbrach.Branch_pre_9
                + " Where water_id = " + wbrach.water_id;
        Sql_Mysql sql = new Sql_Mysql(pool.getConn());
        try {
            //System.out.println(sql_str);
            sql.sqlMysqlExecute(sql_str);
        } catch (SQLException e) {
            e.printStackTrace();
        } finally {
            sql.close_con();
        }
    }
    //插入或更新水冷系统实时信息表
    public static void replace_water_state(MysqlConnPool pool,Water_state wstate) {
        String sql_str = " replace into "+ Sql_Mysql.Tb_water_state+"(water_id,P01_main_pump,P11_replenish_pump,P12_pretest_pump,P13_replenish_pump,H01_electric_heater,H02_electric_heater,Solenoid_openflag,Solenoid_shutflag,valve_start,Exhaust_start,remote_start,remote_stop,Operation_ooled_devices,Auto_control_state,Manual_control_state,remote_control_state,Water_system_function)  "
@@ -293,6 +378,43 @@
    }
    
    /**
     *     插入或更新水冷系统实时信息表
     * @param pool
     * @param wstate
     */
    public static void update_water_state(MysqlConnPool pool,Water_state wstate) {
        String sql_str = " update " + Sql_Mysql.Tb_water_state + " "
                + " Set  water_id=" + wstate.water_id
                + ",P01_main_pump=" + wstate.P01_main_pump
                + ",P11_replenish_pump=" + wstate.P11_replenish_pump
                + ",P12_pretest_pump=" + wstate.P12_pretest_pump
                + ",P13_replenish_pump=" + wstate.P13_replenish_pump
                + ",H01_electric_heater=" + wstate.H01_electric_heater
                + ",H02_electric_heater=" + wstate.H02_electric_heater
                + ",Solenoid_openflag=" + wstate.Solenoid_openflag
                + ",Solenoid_shutflag=" + wstate.Solenoid_shutflag
                + ",valve_start=" + wstate.valve_start
                + ",Exhaust_start=" + wstate.Exhaust_start
                + ",remote_start=" + wstate.remote_start
                + ",remote_stop=" + wstate.remote_stop
                + ",Operation_ooled_devices=" + wstate.Operation_ooled_devices
                + ",Auto_control_state=" + wstate.Auto_control_state
                + ",Manual_control_state=" + wstate.Manual_control_state
                + ",remote_control_state=" + wstate.remote_control_state
                + ",Water_system_function=" + wstate.Water_system_function
                + " Where water_id = "  + wstate.water_id;
        Sql_Mysql sql = new Sql_Mysql(pool.getConn());
        try {
            //System.out.println(sql_str);
            sql.sqlMysqlExecute(sql_str);
        } catch (SQLException e) {
            e.printStackTrace();
        } finally {
            sql.close_con();
        }
    }
    /**
     * 插入或更新电源故障
     * @param conn_pool
     * @param control
WaterSystem_MonitorServer/src/com/watersystem/monitor/Watersystem_SocketClient_Thread.java
@@ -53,17 +53,17 @@
                    //*************************** 更新水冷系统实时信息******************************//*
                    //readWater_rt(master,wrt);
                    readMutilWater_rt(master, wrt);
                    Water_Task_SQL.replace_water_rt(conn_pool, wrt);
                    Water_Task_SQL.update_water_rt(conn_pool, wrt);
                    
                    //**************************** 更新水冷系统分支实时信息 *****************************//*
                    //readWater_brach(master,wbrach);
                    readMutilWater_brach(master, wbrach);
                    Water_Task_SQL.replace_water_brach(conn_pool, wbrach);
                    Water_Task_SQL.update_water_brach(conn_pool, wbrach);
                    
                    //**************************** 更新水冷系统状态信息 *****************************//*
                    //readWater_state(master,wstate);
                    readMutilWater_state(master, wstate);
                    Water_Task_SQL.replace_water_state(conn_pool, wstate);
                    Water_Task_SQL.update_water_state(conn_pool, wstate);
                }
                
                if(runCount %4 == 0) {