whyclxw
2020-11-10 79c8199c667289f5c1a6542f3aada6ca499aaa80
修改
8个文件已修改
221 ■■■■■ 已修改文件
DyEnvir_system/src/com/fgkj/actions/dynamicload/Dynamicload_controlAction.java 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DyEnvir_system/src/com/fgkj/dynamicload/dto/Dynamicload_control.java 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DyEnvir_system/src/com/fgkj/electric2mwsystem/Impl/Electric_Control_Single_2kwImpl.java 52 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DyEnvir_system/src/com/fgkj/electric2mwsystem/dto/Electric_Control_Single_2kw.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DyEnvir_system/src/com/fgkj/electricsystem/Impl/Electric_control_connImpl.java 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DyEnvir_system/src/com/fgkj/electricsystem/Impl/Electric_control_singleImpl.java 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DyEnvir_system/src/com/fgkj/electricsystem/dto/Electric_control_conn.java 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DyEnvir_system/src/com/fgkj/electricsystem/dto/Electric_control_single.java 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DyEnvir_system/src/com/fgkj/actions/dynamicload/Dynamicload_controlAction.java
@@ -22,7 +22,7 @@
        //ServiceModel model=service.update(dtrol);
        ServiceModel model=service.updatePLC(dtrol);
        {
            String msg="启动"+dtrol.getDev_id()+"负载系统手动加载开关";
            String msg="启动"+dtrol.getDev_name()+"负载系统手动加载开关";
            User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Start_up,UinfDaoFactory.dynamicload, msg);
            User_logService uservice=new User_logService();
            uservice.add(ulog);//将用户的操作记录下来
@@ -36,7 +36,7 @@
        //ServiceModel model=service.updateAll_open(dtrol);
        ServiceModel model=service.updateAll_openPLC(dtrol);
        {
            String msg="启动"+dtrol.getDev_id()+"负载系统全部分闸";
            String msg="启动"+dtrol.getDev_name()+"负载系统全部分闸";
            User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Start_up,UinfDaoFactory.dynamicload, msg);
            User_logService uservice=new User_logService();
            uservice.add(ulog);//将用户的操作记录下来
@@ -50,7 +50,7 @@
        //ServiceModel model=service.updateStart_auto(dtrol);
        ServiceModel model=service.updateStart_autoPLC(dtrol);
        {
            String msg="启动"+dtrol.getDev_id()+"加减载";
            String msg="启动"+dtrol.getDev_name()+"加减载";
            User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Start_up,UinfDaoFactory.dynamicload, msg);
            User_logService uservice=new User_logService();
            uservice.add(ulog);//将用户的操作记录下来
@@ -64,7 +64,7 @@
        //ServiceModel model=service.updateStop_auto(dtrol);
        ServiceModel model=service.updateStop_autoPLC(dtrol);
        {
            String msg="停止"+dtrol.getDev_id()+"加减载";
            String msg="停止"+dtrol.getDev_name()+"加减载";
            User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Start_up,UinfDaoFactory.dynamicload, msg);
            User_logService uservice=new User_logService();
            uservice.add(ulog);//将用户的操作记录下来
@@ -78,7 +78,7 @@
        //ServiceModel model=service.updateSudden_crease(dtrol);
        ServiceModel model=service.updateSudden_creasePLC(dtrol);
        {
            String msg="启动"+dtrol.getDev_id()+"突加突卸";
            String msg="启动"+dtrol.getDev_name()+"突加突卸";
            User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Start_up,UinfDaoFactory.dynamicload, msg);
            User_logService uservice=new User_logService();
            uservice.add(ulog);//将用户的操作记录下来
@@ -122,7 +122,7 @@
        //ServiceModel model=service.updateSet_power(dtrol);
        ServiceModel model=service.updateSet_powerPLC(dtrol);
        {
            String msg="设置"+dtrol.getDev_id()+"功率";
            String msg="设置"+dtrol.getDev_name()+"功率";
            User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Set_up,UinfDaoFactory.dynamicload, msg);
            User_logService uservice=new User_logService();
            uservice.add(ulog);//将用户的操作记录下来
@@ -137,7 +137,7 @@
        //ServiceModel model=service.updateInterval_time(dtrol);
        ServiceModel model=service.updateInterval_timePLC(dtrol);
        {
            String msg="修改"+dtrol.getDev_id()+"时间间隔";
            String msg="修改"+dtrol.getDev_name()+"时间间隔";
            User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Alter,UinfDaoFactory.dynamicload, msg);
            User_logService uservice=new User_logService();
            uservice.add(ulog);//将用户的操作记录下来
DyEnvir_system/src/com/fgkj/dynamicload/dto/Dynamicload_control.java
@@ -9,6 +9,7 @@
public class Dynamicload_control implements Serializable{
    private int num;
    private int dev_id; 
    private String dev_name;
    private String dev_ip;
    
    private int FZ_b1;
@@ -230,14 +231,20 @@
    public void setDev_ip(String dev_ip) {
        this.dev_ip = dev_ip;
    }
    public String getDev_name() {
        return dev_name;
    }
    public void setDev_name(String dev_name) {
        this.dev_name = dev_name;
    }
    @Override
    public String toString() {
        return "Dynamicload_control [num=" + num + ", dev_id=" + dev_id
                + ", dev_ip=" + dev_ip + ", FZ_b1=" + FZ_b1 + ", FZ_b2="
                + FZ_b2 + ", FZ_b3=" + FZ_b3 + ", FZ_b4=" + FZ_b4 + ", FZ_b5="
                + FZ_b5 + ", FZ_b6=" + FZ_b6 + ", FZ_b7=" + FZ_b7 + ", FZ_b8="
                + FZ_b8 + ", FZ_b9=" + FZ_b9 + ", FZ_b10=" + FZ_b10
                + ", FZ_b11=" + FZ_b11 + ", start_auto=" + start_auto
                + ", dev_name=" + dev_name + ", dev_ip=" + dev_ip + ", FZ_b1="
                + FZ_b1 + ", FZ_b2=" + FZ_b2 + ", FZ_b3=" + FZ_b3 + ", FZ_b4="
                + FZ_b4 + ", FZ_b5=" + FZ_b5 + ", FZ_b6=" + FZ_b6 + ", FZ_b7="
                + FZ_b7 + ", FZ_b8=" + FZ_b8 + ", FZ_b9=" + FZ_b9 + ", FZ_b10="
                + FZ_b10 + ", FZ_b11=" + FZ_b11 + ", start_auto=" + start_auto
                + ", stop_auto=" + stop_auto + ", sudden_crease="
                + sudden_crease + ", all_open=" + all_open + ", set_power="
                + set_power + ", interval_time=" + interval_time
@@ -252,4 +259,5 @@
    
    
    
}
DyEnvir_system/src/com/fgkj/electric2mwsystem/Impl/Electric_Control_Single_2kwImpl.java
@@ -38,34 +38,34 @@
        String msg="";
        int opreat=0;
        switch (econ.getNum()) {
        case 1:updateSql=" upper_pulse_block=? ";updateVaule=(float)econ.getUpper_pulse_block();opreat=UinfDaoFactory.Alter;msg="修改上位机脉冲封锁";break;//上位机脉冲封锁
        case 2:updateSql=" remote_start=? ";updateVaule=(float)econ.getRemote_start();opreat=UinfDaoFactory.Start_up;msg="远程启动";break;//远程启动
        case 3:updateSql=" fault_reset=? ";updateVaule=(float)econ.getFault_reset();opreat=UinfDaoFactory.Alter;msg="故障复位";break;//故障复位
        case 4:updateSql=" conscurrswitch=? ";updateVaule=(float)econ.getConscurrswitch();opreat=UinfDaoFactory.Alter;msg="恒流切换";break;//恒流切换
        case 5:updateSql=" constantvol=? ";updateVaule=(float)econ.getConstantvol();opreat=UinfDaoFactory.Alter;msg="4并或2串2并恒压";break;//4并或2串2并恒压
        case 6:updateSql=" volset_confirm =? ";updateVaule=(float)econ.getVolset_confirm();opreat=UinfDaoFactory.Alter;msg="电压给定确认";break;//电压给定确认
        case 7:updateSql=" currset_confirm =? ";updateVaule=(float)econ.getCurrset_confirm();opreat=UinfDaoFactory.Alter;msg="电流给定确认";break;//电流给定确认
        case 8:updateSql=" remote_stop =? ";updateVaule=(float)econ.getRemote_stop();opreat=UinfDaoFactory.End;msg="远程停止";break;//远程停止
        case 9:updateSql=" start_screen_set =? ";updateVaule=(float)econ.getStart_screen_set();opreat=UinfDaoFactory.Start_up;msg="启动触摸屏给定";break;//启动触摸屏给定
        case 10:updateSql=" start_upper_set=? ";updateVaule=(float)econ.getStart_upper_set();opreat=UinfDaoFactory.Start_up;msg="启动上位机给定";break;//启动上位机给定
        case 11:updateSql=" consvolswitch =? ";updateVaule=(float)econ.getConsvolswitch();opreat=UinfDaoFactory.Alter;msg="恒压切换";break;//恒压切换
        case 12:updateSql=" othermode =? ";updateVaule=(float)econ.getOthermode();opreat=UinfDaoFactory.Alter;msg="4并或2串2并以外模式";break;//4并或2串2并以外模式
        case 13:updateSql=" consvol_distribution =? ";updateVaule=(float)econ.getConsvol_distribution();opreat=UinfDaoFactory.Alter;msg="四串恒压电压分配";break;//四串恒压电压分配位
        case 1:updateSql=" upper_pulse_block=? ";updateVaule=(float)econ.getUpper_pulse_block();opreat=UinfDaoFactory.Alter;msg=econ.getDev_name()+"上位机脉冲封锁";break;//上位机脉冲封锁
        case 2:updateSql=" remote_start=? ";updateVaule=(float)econ.getRemote_start();opreat=UinfDaoFactory.Start_up;msg=econ.getDev_name()+"远程启动";break;//远程启动
        case 3:updateSql=" fault_reset=? ";updateVaule=(float)econ.getFault_reset();opreat=UinfDaoFactory.Alter;msg=econ.getDev_name()+"故障复位";break;//故障复位
        case 4:updateSql=" conscurrswitch=? ";updateVaule=(float)econ.getConscurrswitch();opreat=UinfDaoFactory.Alter;msg=econ.getDev_name()+"恒流切换";break;//恒流切换
        case 5:updateSql=" constantvol=? ";updateVaule=(float)econ.getConstantvol();opreat=UinfDaoFactory.Alter;msg=econ.getDev_name()+"4并或2串2并恒压";break;//4并或2串2并恒压
        case 6:updateSql=" volset_confirm =? ";updateVaule=(float)econ.getVolset_confirm();opreat=UinfDaoFactory.Alter;msg=econ.getDev_name()+"电压给定确认";break;//电压给定确认
        case 7:updateSql=" currset_confirm =? ";updateVaule=(float)econ.getCurrset_confirm();opreat=UinfDaoFactory.Alter;msg=econ.getDev_name()+"电流给定确认";break;//电流给定确认
        case 8:updateSql=" remote_stop =? ";updateVaule=(float)econ.getRemote_stop();opreat=UinfDaoFactory.End;msg=econ.getDev_name()+"远程停止";break;//远程停止
        case 9:updateSql=" start_screen_set =? ";updateVaule=(float)econ.getStart_screen_set();opreat=UinfDaoFactory.Start_up;msg=econ.getDev_name()+"启动触摸屏给定";break;//启动触摸屏给定
        case 10:updateSql=" start_upper_set=? ";updateVaule=(float)econ.getStart_upper_set();opreat=UinfDaoFactory.Start_up;msg=econ.getDev_name()+"启动上位机给定";break;//启动上位机给定
        case 11:updateSql=" consvolswitch =? ";updateVaule=(float)econ.getConsvolswitch();opreat=UinfDaoFactory.Alter;msg=econ.getDev_name()+"恒压切换";break;//恒压切换
        case 12:updateSql=" othermode =? ";updateVaule=(float)econ.getOthermode();opreat=UinfDaoFactory.Alter;msg=econ.getDev_name()+"4并或2串2并以外模式";break;//4并或2串2并以外模式
        case 13:updateSql=" consvol_distribution =? ";updateVaule=(float)econ.getConsvol_distribution();opreat=UinfDaoFactory.Alter;msg=econ.getDev_name()+"四串恒压电压分配";break;//四串恒压电压分配位
    
        case 14:updateSql=" consvolmode_chargecurr =? ";updateVaule=econ.getConsvolmode_chargecurr();opreat=UinfDaoFactory.Alter;msg="转为恒压模式充电电压值";break;//'转为恒压模式充电电压值'
        case 15:updateSql=" chargecurr_one =? ";updateVaule=econ.getChargecurr_one();opreat=UinfDaoFactory.Alter;msg="第1阶段充电电流值";break;//第1阶段充电电流值',
        case 16:updateSql=" chargecurr_two =? ";updateVaule=econ.getChargecurr_two();opreat=UinfDaoFactory.Alter;msg="恒流切换";break;//第2阶段充电电流值',、
        case 17:updateSql=" chargecurr_three=? ";updateVaule=econ.getChargecurr_three();opreat=UinfDaoFactory.Alter;msg="第2阶段充电电流值";break;//第3阶段充电电流值',
        case 18:updateSql=" chargecurr_four=? ";updateVaule=econ.getChargecurr_four();opreat=UinfDaoFactory.Alter;msg="第4阶段充电电流值";break;//第4阶段充电电流值',
        case 19:updateSql=" chargecurr_five=? ";updateVaule=econ.getChargecurr_five();opreat=UinfDaoFactory.Alter;msg="第5阶段充电电流值";break;//第5阶段充电电流值',
        case 20:updateSql=" currset=? ";updateVaule=econ.getCurrset();opreat=UinfDaoFactory.Alter;msg="电流设定";break;//'电流设定值',
        case 14:updateSql=" consvolmode_chargecurr =? ";updateVaule=econ.getConsvolmode_chargecurr();opreat=UinfDaoFactory.Alter;msg=econ.getDev_name()+"转为恒压模式充电电压值";break;//'转为恒压模式充电电压值'
        case 15:updateSql=" chargecurr_one =? ";updateVaule=econ.getChargecurr_one();opreat=UinfDaoFactory.Alter;msg=econ.getDev_name()+"第1阶段充电电流值";break;//第1阶段充电电流值',
        case 16:updateSql=" chargecurr_two =? ";updateVaule=econ.getChargecurr_two();opreat=UinfDaoFactory.Alter;msg=econ.getDev_name()+"恒流切换";break;//第2阶段充电电流值',、
        case 17:updateSql=" chargecurr_three=? ";updateVaule=econ.getChargecurr_three();opreat=UinfDaoFactory.Alter;msg=econ.getDev_name()+"第2阶段充电电流值";break;//第3阶段充电电流值',
        case 18:updateSql=" chargecurr_four=? ";updateVaule=econ.getChargecurr_four();opreat=UinfDaoFactory.Alter;msg=econ.getDev_name()+"第4阶段充电电流值";break;//第4阶段充电电流值',
        case 19:updateSql=" chargecurr_five=? ";updateVaule=econ.getChargecurr_five();opreat=UinfDaoFactory.Alter;msg=econ.getDev_name()+"第5阶段充电电流值";break;//第5阶段充电电流值',
        case 20:updateSql=" currset=? ";updateVaule=econ.getCurrset();opreat=UinfDaoFactory.Alter;msg=econ.getDev_name()+"电流设定";break;//'电流设定值',
        
        case 21:updateSql=" volset =? ";updateVaule=econ.getVolset();opreat=UinfDaoFactory.Alter;msg="电压设定";break;//'电压设定值',
        case 22:updateSql=" stopchargevol_one =? ";updateVaule=econ.getStopchargevol_one();opreat=UinfDaoFactory.Alter;msg="第1阶段充电终止电压";break;//'第1阶段充电终止电压',
        case 23:updateSql=" stopchargevol_two =? ";updateVaule=econ.getStopchargevol_two();opreat=UinfDaoFactory.Alter;msg="第2阶段充电终止电压";break;//'第2阶段充电终止电压',
        case 24:updateSql=" stopchargevol_three =? ";updateVaule=econ.getStopchargevol_three();opreat=UinfDaoFactory.Alter;msg="第3阶段充电终止电压";break;//'第3阶段充电终止电压',
        case 25:updateSql=" stopchargevol_four=? ";updateVaule=econ.getStopchargevol_four();opreat=UinfDaoFactory.Alter;msg="第4阶段充电终止电压";break;//'第4阶段充电终止电压',
        case 26:updateSql=" stopchargevol_five=? ";updateVaule=econ.getStopchargevol_five();opreat=UinfDaoFactory.Alter;msg="第5阶段充电终止电压";break;//'第5阶段充电终止电压',
        case 21:updateSql=" volset =? ";updateVaule=econ.getVolset();opreat=UinfDaoFactory.Alter;msg=econ.getDev_name()+"电压设定";break;//'电压设定值',
        case 22:updateSql=" stopchargevol_one =? ";updateVaule=econ.getStopchargevol_one();opreat=UinfDaoFactory.Alter;msg=econ.getDev_name()+"第1阶段充电终止电压";break;//'第1阶段充电终止电压',
        case 23:updateSql=" stopchargevol_two =? ";updateVaule=econ.getStopchargevol_two();opreat=UinfDaoFactory.Alter;msg=econ.getDev_name()+"第2阶段充电终止电压";break;//'第2阶段充电终止电压',
        case 24:updateSql=" stopchargevol_three =? ";updateVaule=econ.getStopchargevol_three();opreat=UinfDaoFactory.Alter;msg=econ.getDev_name()+"第3阶段充电终止电压";break;//'第3阶段充电终止电压',
        case 25:updateSql=" stopchargevol_four=? ";updateVaule=econ.getStopchargevol_four();opreat=UinfDaoFactory.Alter;msg=econ.getDev_name()+"第4阶段充电终止电压";break;//'第4阶段充电终止电压',
        case 26:updateSql=" stopchargevol_five=? ";updateVaule=econ.getStopchargevol_five();opreat=UinfDaoFactory.Alter;msg=econ.getDev_name()+"第5阶段充电终止电压";break;//'第5阶段充电终止电压',
        
        
        default:break;
DyEnvir_system/src/com/fgkj/electric2mwsystem/dto/Electric_Control_Single_2kw.java
@@ -5,6 +5,7 @@
public class Electric_Control_Single_2kw implements Serializable{
      public int num ;                            //'主键',
      public int electric2KW_id ;                //'电源id',
      public String dev_name;
      
      public int upper_pulse_block;                //上位机脉冲封锁
      public int remote_start;                    //远程启动
@@ -202,10 +203,18 @@
    public void setStopchargevol_five(float stopchargevol_five) {
        this.stopchargevol_five = stopchargevol_five;
    }
    public String getDev_name() {
        return dev_name;
    }
    public void setDev_name(String dev_name) {
        this.dev_name = dev_name;
    }
    @Override
    public String toString() {
        return "Electric_Control_Single_2kw [num=" + num + ", electric2KW_id="
                + electric2KW_id + ", upper_pulse_block=" + upper_pulse_block
                + electric2KW_id + ", dev_name=" + dev_name
                + ", upper_pulse_block=" + upper_pulse_block
                + ", remote_start=" + remote_start + ", fault_reset="
                + fault_reset + ", conscurrswitch=" + conscurrswitch
                + ", constantvol=" + constantvol + ", volset_confirm="
@@ -225,7 +234,6 @@
                + ", stopchargevol_four=" + stopchargevol_four
                + ", stopchargevol_five=" + stopchargevol_five + "]";
    }
      
      
      
DyEnvir_system/src/com/fgkj/electricsystem/Impl/Electric_control_connImpl.java
@@ -37,20 +37,20 @@
        String msg="";
        int opreat=0;
        switch (econn.getNum()) {
        case 1:updateSql=" convolcontrol=? ";updateVaule=econn.getConvolcontrol();opreat=UinfDaoFactory.Alter;msg="恒压控制";break;//恒压控制
        case 2:updateSql=" concurrcontrol=? ";updateVaule=econn.getConcurrcontrol();opreat=UinfDaoFactory.Alter;msg="恒流控制";break;//恒流控制
        case 3:updateSql=" conn_flag=? ";updateVaule=econn.getConn_flag();opreat=UinfDaoFactory.Alter;msg="并联模式";break;// '并联模式',
        case 4:updateSql=" divide_flag=? ";updateVaule=econn.getDivide_flag();opreat=UinfDaoFactory.Alter;msg="串联模式";break;// '串联模式',
        case 1:updateSql=" convolcontrol=? ";updateVaule=econn.getConvolcontrol();opreat=UinfDaoFactory.Alter;msg=econn.getDev_name()+"恒压控制";break;//恒压控制
        case 2:updateSql=" concurrcontrol=? ";updateVaule=econn.getConcurrcontrol();opreat=UinfDaoFactory.Alter;msg=econn.getDev_name()+"恒流控制";break;//恒流控制
        case 3:updateSql=" conn_flag=? ";updateVaule=econn.getConn_flag();opreat=UinfDaoFactory.Alter;msg=econn.getDev_name()+"并联模式";break;// '并联模式',
        case 4:updateSql=" divide_flag=? ";updateVaule=econn.getDivide_flag();opreat=UinfDaoFactory.Alter;msg=econn.getDev_name()+"串联模式";break;// '串联模式',
        
        case 5:updateSql=" volset=? ";updateVaule=econn.getVolset();opreat=UinfDaoFactory.Alter;msg="电压给定";break;// '电压给定',
        case 6:updateSql=" currset =? ";updateVaule=econn.getCurrset();opreat=UinfDaoFactory.Alter;msg="电流给定";break;// '电流给定',
        case 5:updateSql=" volset=? ";updateVaule=econn.getVolset();opreat=UinfDaoFactory.Alter;msg=econn.getDev_name()+"电压给定";break;// '电压给定',
        case 6:updateSql=" currset =? ";updateVaule=econn.getCurrset();opreat=UinfDaoFactory.Alter;msg=econn.getDev_name()+"电流给定";break;// '电流给定',
            
        case 7:updateSql=" switchon1 =? ";updateVaule=econn.getSwitchon1();opreat=UinfDaoFactory.Alter;msg="输出合闸1";break;// '输出合闸1',
        case 8:updateSql=" switchon2 =? ";updateVaule=econn.getSwitchon2();opreat=UinfDaoFactory.Alter;msg="输出合闸2";break;// '输出合闸2',
        case 9:updateSql=" switchoff1 =? ";updateVaule=econn.getSwitchoff1();opreat=UinfDaoFactory.Alter;msg="输出分闸1";break;// '输出分闸1 ',
        case 10:updateSql=" switchoff2=? ";updateVaule=econn.getSwitchoff2();opreat=UinfDaoFactory.Alter;msg="输出分闸2";break;// '输出分闸2',
        case 11:updateSql=" conn_start =? ";updateVaule=econn.getConn_start();opreat=UinfDaoFactory.Alter;msg="并联运行启动";break;// '并联运行启动',
        case 12:updateSql=" conn_stop =? ";updateVaule=econn.getConn_stop();opreat=UinfDaoFactory.Alter;msg="并联运行停止";break;// '并联运行停止',
        case 7:updateSql=" switchon1 =? ";updateVaule=econn.getSwitchon1();opreat=UinfDaoFactory.Alter;msg=econn.getDev_name()+"输出合闸1";break;// '输出合闸1',
        case 8:updateSql=" switchon2 =? ";updateVaule=econn.getSwitchon2();opreat=UinfDaoFactory.Alter;msg=econn.getDev_name()+"输出合闸2";break;// '输出合闸2',
        case 9:updateSql=" switchoff1 =? ";updateVaule=econn.getSwitchoff1();opreat=UinfDaoFactory.Alter;msg=econn.getDev_name()+"输出分闸1";break;// '输出分闸1 ',
        case 10:updateSql=" switchoff2=? ";updateVaule=econn.getSwitchoff2();opreat=UinfDaoFactory.Alter;msg=econn.getDev_name()+"输出分闸2";break;// '输出分闸2',
        case 11:updateSql=" conn_start =? ";updateVaule=econn.getConn_start();opreat=UinfDaoFactory.Alter;msg=econn.getDev_name()+"并联运行启动";break;// '并联运行启动',
        case 12:updateSql=" conn_stop =? ";updateVaule=econn.getConn_stop();opreat=UinfDaoFactory.Alter;msg=econn.getDev_name()+"并联运行停止";break;// '并联运行停止',
        
        default:break;
        }
@@ -73,8 +73,8 @@
        String msg="";
        int opreat=0;
        switch (econn.getNum()) {
        case 13:updateSql=" givevol=? ";updateVaule=econn.getGivevol();opreat=UinfDaoFactory.Alter;msg="电压设定";break;//电压设定
        case 14:updateSql=" givecurr=? ";updateVaule=econn.getGivecurr();opreat=UinfDaoFactory.Alter;msg="电流设定    ";break;//电流设定
        case 13:updateSql=" givevol=? ";updateVaule=econn.getGivevol();opreat=UinfDaoFactory.Alter;msg=econn.getDev_name()+"电压设定";break;//电压设定
        case 14:updateSql=" givecurr=? ";updateVaule=econn.getGivecurr();opreat=UinfDaoFactory.Alter;msg=econn.getDev_name()+"电流设定    ";break;//电流设定
        default:break;
        }
        String sql=" update db_electricsystem.tb_electric_control_conn set "+updateSql+" where electric_id=?  ";
DyEnvir_system/src/com/fgkj/electricsystem/Impl/Electric_control_singleImpl.java
@@ -6,8 +6,11 @@
import com.fgkj.dao.BaseDAO;
import com.fgkj.dao.CallBack;
import com.fgkj.dao.DAOHelper;
import com.fgkj.dao.UinfDaoFactory;
import com.fgkj.db.DBUtil;
import com.fgkj.dto.User_log;
import com.fgkj.electricsystem.dto.Electric_control_single;
import com.fgkj.services.User_logService;
public class Electric_control_singleImpl implements BaseDAO,CallBack{
@@ -28,28 +31,35 @@
        Electric_control_single ecs=(Electric_control_single) obj;
        String updateSql="";
        float updateVaule=0f;
        String msg="";
        int opreat=0;
        switch (ecs.getNum()) {
        case 1:updateSql=" upsetcurr=? ";updateVaule=ecs.getUpsetcurr();break;//上位机设定电流
        case 2:updateSql=" upsetvol=? ";updateVaule=ecs.getUpsetvol();break;//上位机设定电压
        case 3:updateSql=" convolcontrol=? ";updateVaule=ecs.getConvolcontrol();break;//恒压控制
        case 4:updateSql=" concurrcontrol=? ";updateVaule=ecs.getConcurrcontrol();break;//恒流控制
        case 5:updateSql=" othermodes=? ";updateVaule=ecs.getOthermodes();break;//其他模式运行
        case 6:updateSql=" parallelmodes =? ";updateVaule=ecs.getParallelmodes();break;//并联稳压运行
        case 7:updateSql=" startposition =? ";updateVaule=ecs.getStartposition();break;//启动位
        case 8:updateSql=" stopposition =? ";updateVaule=ecs.getStopposition();break;//停止位
        case 9:updateSql=" resetposition =? ";updateVaule=ecs.getResetposition();break;//复位
        case 10:updateSql=" fanstart=? ";updateVaule=ecs.getFanstart();break;//风机启动
        case 11:updateSql=" fanstop =? ";updateVaule=ecs.getFanstop();break;//风机停止
        case 12:updateSql=" dcvol =? ";updateVaule=ecs.getDcvol();break;//直流电压
        case 13:updateSql=" dccurr =? ";updateVaule=ecs.getDccurr();break;//直流电流
        case 14:updateSql=" controlangle =? ";updateVaule=ecs.getControlangle();break;//控制角
        case 15:updateSql=" switchon =? ";updateVaule=ecs.getSwitchon();break;//开关合闸
        case 16:updateSql=" switchoff =? ";updateVaule=ecs.getSwitchoff();break;//开关分闸
        case 1:updateSql=" upsetcurr=? ";updateVaule=ecs.getUpsetcurr();opreat=UinfDaoFactory.Alter;msg=ecs.getDev_name()+"上位机设定电流";break;//上位机设定电流
        case 2:updateSql=" upsetvol=? ";updateVaule=ecs.getUpsetvol();opreat=UinfDaoFactory.Alter;msg=ecs.getDev_name()+"上位机设定电压";break;//上位机设定电压
        case 3:updateSql=" convolcontrol=? ";updateVaule=ecs.getConvolcontrol();opreat=UinfDaoFactory.Alter;msg=ecs.getDev_name()+"恒压控制";break;//恒压控制
        case 4:updateSql=" concurrcontrol=? ";updateVaule=ecs.getConcurrcontrol();opreat=UinfDaoFactory.Alter;msg=ecs.getDev_name()+"电压设定";break;//恒流控制
        case 5:updateSql=" othermodes=? ";updateVaule=ecs.getOthermodes();opreat=UinfDaoFactory.Alter;msg=ecs.getDev_name()+"恒流控制";break;//其他模式运行
        case 6:updateSql=" parallelmodes =? ";updateVaule=ecs.getParallelmodes();opreat=UinfDaoFactory.Alter;msg=ecs.getDev_name()+"并联稳压运行";break;//并联稳压运行
        case 7:updateSql=" startposition =? ";updateVaule=ecs.getStartposition();opreat=UinfDaoFactory.Alter;msg=ecs.getDev_name()+"启动位";break;//启动位
        case 8:updateSql=" stopposition =? ";updateVaule=ecs.getStopposition();opreat=UinfDaoFactory.Alter;msg=ecs.getDev_name()+"停止位";break;//停止位
        case 9:updateSql=" resetposition =? ";updateVaule=ecs.getResetposition();opreat=UinfDaoFactory.Alter;msg=ecs.getDev_name()+"复位";break;//复位
        case 10:updateSql=" fanstart=? ";updateVaule=ecs.getFanstart();opreat=UinfDaoFactory.Alter;msg=ecs.getDev_name()+"风机启动";break;//风机启动
        case 11:updateSql=" fanstop =? ";updateVaule=ecs.getFanstop();opreat=UinfDaoFactory.Alter;msg=ecs.getDev_name()+"风机停止";break;//风机停止
        case 12:updateSql=" dcvol =? ";updateVaule=ecs.getDcvol();opreat=UinfDaoFactory.Alter;msg=ecs.getDev_name()+"直流电压";break;//直流电压
        case 13:updateSql=" dccurr =? ";updateVaule=ecs.getDccurr();opreat=UinfDaoFactory.Alter;msg=ecs.getDev_name()+"直流电流";break;//直流电流
        case 14:updateSql=" controlangle =? ";updateVaule=ecs.getControlangle();opreat=UinfDaoFactory.Alter;msg=ecs.getDev_name()+"控制角";break;//控制角
        case 15:updateSql=" switchon =? ";updateVaule=ecs.getSwitchon();opreat=UinfDaoFactory.Alter;msg=ecs.getDev_name()+"开关合闸";break;//开关合闸
        case 16:updateSql=" switchoff =? ";updateVaule=ecs.getSwitchoff();opreat=UinfDaoFactory.Alter;msg=ecs.getDev_name()+"开关分闸";break;//开关分闸
        
        default:break;
        }
        String sql=" update db_electricsystem.tb_electric_control_single set "+updateSql+" where electric_id=?  ";
        boolean bl=DAOHelper.executeUpdate(DBUtil.getConn(), sql, new Object[]{updateVaule,ecs.getElectric_id()});
        {
            User_log ulog=UinfDaoFactory.CreateULog(opreat,UinfDaoFactory.electricsystem, msg);
            User_logService uservice=new User_logService();
            uservice.add(ulog);//将用户的操作记录下来
        }
        return bl;
    }
DyEnvir_system/src/com/fgkj/electricsystem/dto/Electric_control_conn.java
@@ -5,6 +5,7 @@
public class Electric_control_conn implements Serializable{
      public int num ;//'主键',
      public int electric_id  ;// '组合界面主要id',
      public String dev_name;
      public String conn_name   ;// '组合名称',
      public int convolcontrol   ;// '恒压控制',
      public int concurrcontrol   ;// '恒流控制',
@@ -130,21 +131,29 @@
    public void setElectric_ip(String electric_ip) {
        this.electric_ip = electric_ip;
    }
    public String getDev_name() {
        return dev_name;
    }
    public void setDev_name(String dev_name) {
        this.dev_name = dev_name;
    }
    @Override
    public String toString() {
        return "Electric_control_conn [num=" + num + ", electric_id="
                + electric_id + ", conn_name=" + conn_name + ", convolcontrol="
                + convolcontrol + ", concurrcontrol=" + concurrcontrol
                + ", conn_flag=" + conn_flag + ", divide_flag=" + divide_flag
                + ", volset=" + volset + ", currset=" + currset + ", givevol="
                + givevol + ", givecurr=" + givecurr + ", switchon1="
                + switchon1 + ", switchon2=" + switchon2 + ", switchoff1="
                + switchoff1 + ", switchoff2=" + switchoff2 + ", conn_start="
                + conn_start + ", conn_stop=" + conn_stop + ", electric_ip="
                + electric_ip + "]";
                + electric_id + ", dev_name=" + dev_name + ", conn_name="
                + conn_name + ", convolcontrol=" + convolcontrol
                + ", concurrcontrol=" + concurrcontrol + ", conn_flag="
                + conn_flag + ", divide_flag=" + divide_flag + ", volset="
                + volset + ", currset=" + currset + ", givevol=" + givevol
                + ", givecurr=" + givecurr + ", switchon1=" + switchon1
                + ", switchon2=" + switchon2 + ", switchoff1=" + switchoff1
                + ", switchoff2=" + switchoff2 + ", conn_start=" + conn_start
                + ", conn_stop=" + conn_stop + ", electric_ip=" + electric_ip
                + "]";
    }
    
      
     
      
}
DyEnvir_system/src/com/fgkj/electricsystem/dto/Electric_control_single.java
@@ -5,6 +5,7 @@
public class Electric_control_single implements Serializable{
      private int num; // '主键',
      private int electric_id;// '电源id',
      private String dev_name;
      private int upsetcurr ;// '上位机设定电流',
      private int upsetvol ;// '上位机设定电压',
      private int convolcontrol  ;// '恒压控制',
@@ -143,19 +144,26 @@
    public void setElectric_ip(String electric_ip) {
        this.electric_ip = electric_ip;
    }
    public String getDev_name() {
        return dev_name;
    }
    public void setDev_name(String dev_name) {
        this.dev_name = dev_name;
    }
    @Override
    public String toString() {
        return "Electric_control_single [num=" + num + ", electric_id="
                + electric_id + ", upsetcurr=" + upsetcurr + ", upsetvol="
                + upsetvol + ", convolcontrol=" + convolcontrol
                + ", concurrcontrol=" + concurrcontrol + ", othermodes="
                + othermodes + ", parallelmodes=" + parallelmodes
                + ", startposition=" + startposition + ", stopposition="
                + stopposition + ", resetposition=" + resetposition
                + ", fanstart=" + fanstart + ", fanstop=" + fanstop
                + ", dcvol=" + dcvol + ", dccurr=" + dccurr + ", controlangle="
                + controlangle + ", switchon=" + switchon + ", switchoff="
                + switchoff + ", electric_ip=" + electric_ip + "]";
                + electric_id + ", dev_name=" + dev_name + ", upsetcurr="
                + upsetcurr + ", upsetvol=" + upsetvol + ", convolcontrol="
                + convolcontrol + ", concurrcontrol=" + concurrcontrol
                + ", othermodes=" + othermodes + ", parallelmodes="
                + parallelmodes + ", startposition=" + startposition
                + ", stopposition=" + stopposition + ", resetposition="
                + resetposition + ", fanstart=" + fanstart + ", fanstop="
                + fanstop + ", dcvol=" + dcvol + ", dccurr=" + dccurr
                + ", controlangle=" + controlangle + ", switchon=" + switchon
                + ", switchoff=" + switchoff + ", electric_ip=" + electric_ip
                + "]";
    }
    
}