负载修改

whyclj

2020-10-14 8fd586d2adbf01799f7eae9aa1e28012da11e961

负载修改

 src/com/data/PowerArk_Task_SQL.java

@@ -520,34 +520,33 @@
        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"));             //间隔时间
            }
        } catch (Exception e) {
            e.printStackTrace();

 src/com/dev/base/data/Dynamicload_SocketClient_Thread.java

@@ -47,13 +47,17 @@
                    PowerArk_Task_SQL.update_Dynamicload_Control(conn_pool, dcontrol);
                }*/
                //控制页面
                PowerArk_Task_SQL.queryDynamicload_Control(conn_pool, dcontrol);
                /*PowerArk_Task_SQL.queryDynamicload_Control(conn_pool, dcontrol);
                {
//                    if(dcontrol.dev_id == 1001) {
//                        System.out.println(dcontrol.dev_id+"=="+dcontrol.control_en);
//                    }
                    if(dcontrol.control_en) {
					
                        writeDynamicload_Control(master, dcontrol);
                        PowerArk_Task_SQL.update_Dynamicload_Control(conn_pool, dcontrol);
                    }
                }
                }*/
                
                if (runCount % 2 == 0) {
                    // *************************** 更新负载按钮信息******************************//*
@@ -176,6 +180,7 @@
            }
        }
        if(dcontrol.start_auto>0) {
            //System.out.println("启动自动加减载");
            MyModbusUtils.writeCoil(8, true, master);        
        }
        if(dcontrol.stop_auto>0) {

 src/com/dev/base/data/Dynamicload_control.java

@@ -64,6 +64,7 @@
        this.fan_button=0;
        this.set_power=0;
        this.interval_time=0;
        this.control_en = false;
    }
    
    public boolean isControl_en() {

 src/com/dev/base/data/Dynamicload_state.java

@@ -266,7 +266,7 @@
        }else {
            batch.addLocator(4,MyModbusUtils.createBaseLocator(2,DataType.TWO_BYTE_INT_SIGNED, master));    //实际设定功率4                                    
            batch.addLocator(5,MyModbusUtils.createBaseLocator(4,DataType.FOUR_BYTE_FLOAT, master));    //已输出功率                                
            batch.addLocator(6,MyModbusUtils.createBaseLocator(8,DataType.TWO_BYTE_INT_SIGNED, master));//设定功率						
            batch.addLocator(6,MyModbusUtils.createBaseLocator(8,DataType.FOUR_BYTE_FLOAT, master));//设定功率						
            batch.addLocator(7,MyModbusUtils.createBaseLocator(16,DataType.TWO_BYTE_INT_SIGNED,master));//间隔时间                        
            batch.addLocator(8,MyModbusUtils.createBaseLocator(17,DataType.TWO_BYTE_INT_SIGNED, master));//实际电流                        
            batch.addLocator(9,MyModbusUtils.createBaseLocator(18,DataType.TWO_BYTE_INT_SIGNED, master));//实际电压4
@@ -308,10 +308,11 @@
            this.actual_set_power = MyModbusUtils.readShortToFloat(res.getValue(4));                //实际设定功率    
            if(fz_button_num == 11) {
                this.output_power = MyModbusUtils.readShortToFloat(res.getValue(5));            //已输出功率
                this.set_power = MyModbusUtils.readShortToFloat(res.getValue(6));                //设定功率				
            }else {
                this.output_power = MyModbusUtils.readFloat(res.getValue(5));            //已输出功率
                this.set_power = MyModbusUtils.readFloat(res.getValue(6));                //设定功率				
            }
            this.set_power = MyModbusUtils.readShortToFloat(res.getValue(6));                //设定功率				
            this.interval_time = MyModbusUtils.readShortToFloat(res.getValue(7));            //间隔时间    
            this.actual_curr = MyModbusUtils.readShortToFloat(res.getValue(8));                //电压            
            this.actual_mov= MyModbusUtils.readShortToFloat(res.getValue(9));                //电流