whyclj
2020-08-20 e529063f57d712afd69a648e1327e69d07d03cb4
4个电源添加通讯状态,触摸屏复位,风机控制,控制柜紧急跳闸
4个文件已修改
99 ■■■■■ 已修改文件
ElectricalSystem_MonitorServer_4KW/src/com/electrical/FourKW/Electric_4KW_ModbusAddress.java 41 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ElectricalSystem_MonitorServer_4KW/src/com/electrical/FourKW/Electric_Rt.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ElectricalSystem_MonitorServer_4KW/src/com/electrical/FourKW/Electrical_4KW_SocketClient_Thread.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ElectricalSystem_MonitorServer_4KW/src/com/electrical/FourKW/Electrical_Task_SQL.java 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ElectricalSystem_MonitorServer_4KW/src/com/electrical/FourKW/Electric_4KW_ModbusAddress.java
@@ -333,6 +333,47 @@
            default:break;
            }
        }
        //ͨѶ״̬
        if(addressName.equals("comm_state")) {//ͨѶ״̬
            switch (electric_id) {
            case 4001:address=280;break;
            case 4002:address=280;break;
            case 4003:address=280;break;
            case 4004:address=280;break;
            default:break;
            }
        }
        //触摸屏复位
        if(addressName.equals("screen_reset")) {//触摸屏复位
            switch (electric_id) {
            case 4001:address=281;break;
            case 4002:address=281;break;
            case 4003:address=281;break;
            case 4004:address=281;break;
            default:break;
            }
        }
        //风机控制
        if(addressName.equals("fan_control")) {//风机控制
            switch (electric_id) {
            case 4001:address=282;break;
            case 4002:address=282;break;
            case 4003:address=282;break;
            case 4004:address=282;break;
            default:break;
            }
        }
        //紧急跳闸
        if(addressName.equals("emergency_trip")) {//紧急跳闸
            switch (electric_id) {
            case 4001:address=283;break;
            case 4002:address=283;break;
            case 4003:address=283;break;
            case 4004:address=283;break;
            default:break;
            }
        }
        return address;
    }
    //获取总开关地址和总状态地址
ElectricalSystem_MonitorServer_4KW/src/com/electrical/FourKW/Electric_Rt.java
@@ -26,6 +26,12 @@
    public int switchoff_1;                //开关1
    public int switchon_2;                //开关2
    public int switchoff_2;                //开关2
    public int comm_state;                //ͨѶ״̬
    public int screen_reset;            //触摸屏复位
    public int fan_control;                //风机控制
    public int emergency_trip;            //紧急跳闸
    public String note;                    //备用字段
    
    public Electric_Rt() {
ElectricalSystem_MonitorServer_4KW/src/com/electrical/FourKW/Electrical_4KW_SocketClient_Thread.java
@@ -254,6 +254,12 @@
        ert.switchoff_1=(int)master.checkNullData(MyModbusUtils.readCoilStatus(Electric_4KW_ModbusAddress.getAddress(ert.getElectric_id(), "switchoff_1"), master), ert.switchoff_1); //1号开关    
        ert.switchoff_2=(int)master.checkNullData(MyModbusUtils.readCoilStatus(Electric_4KW_ModbusAddress.getAddress(ert.getElectric_id(), "switchoff_2"), master), ert.switchoff_2); //2号开关    
        
        ert.comm_state=(int)master.checkNullData(MyModbusUtils.readCoilStatus(Electric_4KW_ModbusAddress.getAddress(ert.getElectric_id(), "comm_state"), master), ert.comm_state); //ͨѶ״̬
        ert.screen_reset=(int)master.checkNullData(MyModbusUtils.readCoilStatus(Electric_4KW_ModbusAddress.getAddress(ert.getElectric_id(), "screen_reset"), master), ert.screen_reset); //触摸屏状态
        ert.fan_control=(int)master.checkNullData(MyModbusUtils.readCoilStatus(Electric_4KW_ModbusAddress.getAddress(ert.getElectric_id(), "fan_control"), master), ert.fan_control); //风机控制
        ert.emergency_trip=(int)master.checkNullData(MyModbusUtils.readCoilStatus(Electric_4KW_ModbusAddress.getAddress(ert.getElectric_id(), "emergency_trip"), master), ert.emergency_trip); //总控柜紧急跳闸
        //System.out.println(ert.electric_id+"&&&&&&&&&&&&&&"+ert.getDcvol());
    }
    /**
ElectricalSystem_MonitorServer_4KW/src/com/electrical/FourKW/Electrical_Task_SQL.java
@@ -234,6 +234,11 @@
                "  switchon_2 int(11) NOT NULL DEFAULT '0' COMMENT '2号开关开 '," + 
                "  switchoff_2 int(11) NOT NULL DEFAULT '0' COMMENT '2号开关关'," + 
                
                "  comm_state int(11) NOT NULL DEFAULT '0' COMMENT 'ͨѶ״̬'," +
                "  screen_reset int(11) NOT NULL DEFAULT '0' COMMENT '触摸屏复位'," +
                "  fan_control int(11) NOT NULL DEFAULT '0' COMMENT '风机控制'," +
                "  emergency_trip int(11) NOT NULL DEFAULT '0' COMMENT '总控柜紧急跳闸'," +
                "  note varchar(255) NOT NULL DEFAULT ''," + 
                "  PRIMARY KEY (num)," + 
                "  UNIQUE KEY electric_id_key (electric_id) USING BTREE " + 
@@ -241,6 +246,43 @@
        Sql_Mysql sql = new Sql_Mysql(pool.getConn());
        try {
            sql.sqlMysqlExecute(sql_str);
            //添加    comm_state  通讯状态字段
            ResultSet res = sql.sqlMysqlQuery("SELECT * FROM information_schema.columns"
                    + " WHERE table_schema='db_electricsystem'"
                    + " AND table_name='tb_electric_rt'"
                    + " AND column_name='comm_state'");
            if(false == res.next()) {
                sql.sqlMysqlExecute("ALTER TABLE " + Sql_Mysql.Tb_Electric_Rt
                        + " ADD COLUMN comm_state int(11) NOT NULL DEFAULT '0' COMMENT 'ͨѶ״̬'  after workmodelflag;");
            }
            //添加    screen_reset  触摸屏复位
            res = sql.sqlMysqlQuery("SELECT * FROM information_schema.columns"
                    + " WHERE table_schema='db_electricsystem'"
                    + " AND table_name='tb_electric_rt'"
                    + " AND column_name='screen_reset'");
            if(false == res.next()) {
                sql.sqlMysqlExecute("ALTER TABLE " + Sql_Mysql.Tb_Electric_Rt
                        + " ADD COLUMN screen_reset int(11) NOT NULL DEFAULT '0' COMMENT 'ͨѶ״̬'  after comm_state;");
            }
            //添加    fan_control  风机控制
            res = sql.sqlMysqlQuery("SELECT * FROM information_schema.columns"
                    + " WHERE table_schema='db_electricsystem'"
                    + " AND table_name='tb_electric_rt'"
                    + " AND column_name='fan_control'");
            if(false == res.next()) {
                sql.sqlMysqlExecute("ALTER TABLE " + Sql_Mysql.Tb_Electric_Rt
                        + " ADD COLUMN fan_control int(11) NOT NULL DEFAULT '0' COMMENT 'ͨѶ״̬'  after screen_reset;");
            }
            //添加    emergency_trip  总控柜紧急跳闸
            res = sql.sqlMysqlQuery("SELECT * FROM information_schema.columns"
                    + " WHERE table_schema='db_electricsystem'"
                    + " AND table_name='tb_electric_rt'"
                    + " AND column_name='emergency_trip'");
            if(false == res.next()) {
                sql.sqlMysqlExecute("ALTER TABLE " + Sql_Mysql.Tb_Electric_Rt
                        + " ADD COLUMN emergency_trip int(11) NOT NULL DEFAULT '0' COMMENT 'ͨѶ״̬'  after fan_control;");
            }
        } catch (SQLException e) {
            e.printStackTrace();
        } finally {
@@ -433,8 +475,8 @@
    }
    //插入或更新电源实时信息表
    public static void replace_Electric_Rt(MysqlConnPool pool,Electric_Rt ert) {
        String sql_str = " replace into "+ Sql_Mysql.Tb_Electric_Rt  +"(electric_id,upsetcurr,upsetvol,convolcontrol,concurrcontrol,othermodes,parallelmodes,startposition,stopposition,resetposition,fanstart,fanstop,dcvol,dccurr,controlangle,loopflag,remoteflag,orderflag,consvolcurrflag,powerstartflag,workmodelflag,switchon_1,switchoff_1,switchon_2,switchoff_2)  "
                + "  values("+ert.electric_id+","+ert.upsetcurr+","+ert.upsetvol+","+ert.convolcontrol+","+ert.concurrcontrol+","+ert.othermodes+","+ert.parallelmodes+","+ert.startposition+","+ert.stopposition+","+ert.resetposition+","+ert.fanstart+","+ert.fanstop+","+ert.dcvol+","+ert.dccurr+","+ert.controlangle+","+ert.loopflag+","+ert.remoteflag+","+ert.orderflag+","+ert.consvolcurrflag+","+ert.powerstartflag+","+ert.workmodelflag+","+ert.switchon_1+","+ert.switchoff_1+","+ert.switchon_2+","+ert.switchoff_2+")";
        String sql_str = " replace into "+ Sql_Mysql.Tb_Electric_Rt  +"(electric_id,upsetcurr,upsetvol,convolcontrol,concurrcontrol,othermodes,parallelmodes,startposition,stopposition,resetposition,fanstart,fanstop,dcvol,dccurr,controlangle,loopflag,remoteflag,orderflag,consvolcurrflag,powerstartflag,workmodelflag,switchon_1,switchoff_1,switchon_2,switchoff_2,comm_state,screen_reset,fan_control,emergency_trip)  "
                + "  values("+ert.electric_id+","+ert.upsetcurr+","+ert.upsetvol+","+ert.convolcontrol+","+ert.concurrcontrol+","+ert.othermodes+","+ert.parallelmodes+","+ert.startposition+","+ert.stopposition+","+ert.resetposition+","+ert.fanstart+","+ert.fanstop+","+ert.dcvol+","+ert.dccurr+","+ert.controlangle+","+ert.loopflag+","+ert.remoteflag+","+ert.orderflag+","+ert.consvolcurrflag+","+ert.powerstartflag+","+ert.workmodelflag+","+ert.switchon_1+","+ert.switchoff_1+","+ert.switchon_2+","+ert.switchoff_2+","+ert.comm_state+","+ert.screen_reset+","+ert.fan_control+","+ert.emergency_trip+")";
        Sql_Mysql sql = new Sql_Mysql(pool.getConn());
        try {
            sql.sqlMysqlExecute(sql_str);