whyclxw
2020-11-07 352dfb611fee785a40cc0847eef9315e2c5775b0
修改
8个文件已修改
68 ■■■■ 已修改文件
DyEnvir_system/src/com/fgkj/dao/impl/BattInfImpl.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DyEnvir_system/src/com/fgkj/dao/impl/User_battgroup_baojigroup_battgroupImpl.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DyEnvir_system/src/com/fgkj/dao/impl/User_battgroup_baojigroup_usrImpl.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DyEnvir_system/src/com/fgkj/dao/impl/User_permitImpl.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DyEnvir_system/src/com/fgkj/dao/impl/User_permitgroupImpl.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DyEnvir_system/src/com/fgkj/dao/impl/User_permitgroup_dataImpl.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DyEnvir_system/src/com/fgkj/dao/impl/User_permitgroup_usrImpl.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DyEnvir_system/src/com/fgkj/electric2mwsystem/Impl/Electric_Control_Single_2kwImpl.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DyEnvir_system/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -78,11 +78,11 @@
                String baoji_sql="REPLACE into db_user.tb_user_battgroup_baojigroup_battgroup(baoji_group_id,StationId,BattGroupId) " + 
                         " SELECT baoji_group_id,'"+binf.getStationId()+"',"+binf.getBattGroupId()+" from  db_user.tb_user_battgroup_baojigroup_usr where uid="+((User_inf)ActionUtil.getUser()).getUId();
                sql_str.add(baoji_sql);
                {
                /*{
                    String msg="添加"+binf.getStationName()+"机房"+binf.getBattGroupId()+"电池组的信息";
                    User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Increase, msg);
                    listU.add(ulog);
                 }
                 }*/
            }
        }
        boolean bl=DAOHelper.makeManualCommit(DBUtil.getConn(), sql_str);
@@ -106,11 +106,11 @@
                         + ",DeviceIdentityCode='"+binf.getDeviceIdentityCode()+"',ProjectType='"+binf.getProjectType()+"',BatteryApplicationType='"+binf.getBatteryApplicationType()+"',SingleRatedVoltage="+binf.getSingleRatedVoltage()+",RemoteMonitor='"+binf.getRemoteMonitor()+"',BatttIndependentPlaced='"+binf.getBatttIndependentPlaced()+"',JunChargeVoltageValue="+binf.getJunChargeVoltageValue()+"   "
                         +"  where battgroupId="+binf.getBattGroupId();
                sql_str.add(sql);
                {
                /*{
                    String msg="修改"+binf.getStationName()+"机房"+binf.getBattGroupId()+"电池组的信息";
                    User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Alter, msg);
                    listU.add(ulog);
                 }
                 }*/
            }
        }
        (new User_logService()).addPro(listU);//将用户的操作记录下来
@@ -128,11 +128,11 @@
                BattInf binf=list.get(i);
                String sql = "delete from db_battinf.tb_battinf where battgroupid="+binf.getBattGroupId();
                sql_str.add(sql);
                {
                /*{
                    String msg="删除"+binf.getStationName()+"机房"+binf.getBattGroupId()+"电池组的信息";
                    User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Delete, msg);
                    listU.add(ulog);
                 }
                 }*/
            }
        }
        (new User_logService()).addPro(listU);//将用户的操作记录下来
DyEnvir_system/src/com/fgkj/dao/impl/User_battgroup_baojigroup_battgroupImpl.java
@@ -33,11 +33,11 @@
            for (User_battgroup_baojigroup_battgroup ugroup : list) {
                String sql="insert into db_equip_user.tb_user_battgroup_baojigroup_battgroup(baoji_group_id,dev_id) values("+ugroup.getBaoji_group_id()+","+ugroup.getDev_id()+")";
                sql_strs.add(sql);
                {
               /* {
                    String msg="添加"+ugroup.getDev_name()+"至"+ugroup.getBaoji_group_name()+"包机组中";
                    User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Increase, msg);
                    listU.add(ulog);
                 }
                 }*/
            }
        }
        boolean bl=DAOHelper.makeManualCommit(DBUtil.getConn(), sql_strs);
@@ -61,11 +61,11 @@
            for (User_battgroup_baojigroup_battgroup ugroup : list) {
                String sql="delete from db_equip_user.tb_user_battgroup_baojigroup_battgroup where baoji_group_id="+ugroup.getBaoji_group_id()+" and dev_id="+ugroup.getDev_id();
                sql_strs.add(sql);
                {
                /*{
                    String msg="删除"+ugroup.getBaoji_group_name()+"包机组中"+ugroup.getDev_name()+"设备";
                    User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Delete, msg);
                    listU.add(ulog);
                 }
                 }*/
            }
        }
        boolean bl=DAOHelper.makeManualCommit(DBUtil.getConn(), sql_strs);
DyEnvir_system/src/com/fgkj/dao/impl/User_battgroup_baojigroup_usrImpl.java
@@ -30,11 +30,11 @@
            for (User_battgroup_baojigroup_usr uusr : list) {
                String sql = "insert into  db_equip_user.tb_user_battgroup_baojigroup_usr(baoji_group_id,Uid) values("+uusr.getBaoji_group_id()+","+uusr.getuId()+")";
                sql_strs.add(sql);
                {
                /*{
                    String msg="添加"+uusr.getUname()+"用户至"+uusr.getBaoji_group_name()+"包机组中";
                    User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Increase, msg);
                    listU.add(ulog);
                 }
                 }*/
            }
        }
        boolean bl=DAOHelper.makeManualCommit(DBUtil.getConn(), sql_strs);
@@ -57,11 +57,11 @@
            for (User_battgroup_baojigroup_usr uusr : list) {
                String sql = "delete from  db_equip_user.tb_user_battgroup_baojigroup_usr where baoji_group_id="+uusr.getBaoji_group_id()+",Uid="+uusr.getuId();
                sql_strs.add(sql);
                {
                /*{
                    String msg="删除"+uusr.getBaoji_group_name()+"包机组中的"+uusr.getUname()+"用户";
                    User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Delete, msg);
                    listU.add(ulog);
                 }
                 }*/
            }
        }
        boolean bl=DAOHelper.makeManualCommit(DBUtil.getConn(), sql_strs);
DyEnvir_system/src/com/fgkj/dao/impl/User_permitImpl.java
@@ -33,11 +33,11 @@
                for (User_permit up : list) {
                    String sql= "insert into db_equip_user.tb_user_permit(permit_pid,permit_name,permit_pname,permit_enable,permit_sibie) values('"+up.getPermit_pid().toString()+"','"+up.getPermit_name().toString()+"','"+up.getPermit_pname().toString()+"',"+up.getPermit_enable()+",'"+up.getPermit_sibie().toString()+"')";
                    sql_strs.add(sql);
                    {
                    /*{
                        String msg="添加"+up.getPermit_name();
                        User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Increase, msg);
                        listU.add(ulog);
                     }
                     }*/
                }
            }
        } catch (Exception e) {
@@ -63,11 +63,11 @@
            for (User_permit up : list) {
                String sql="delete from db_equip_user.tb_user_permit where permit_id="+up.getPermit_id();
                sql_strs.add(sql);
                {
                /*{
                    String msg="删除"+up.getPermit_name();
                    User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Delete, msg);
                    listU.add(ulog);
                 }
                 }*/
            }
        }
        boolean bl=DAOHelper.makeManualCommit(DBUtil.getConn(), sql_strs);
DyEnvir_system/src/com/fgkj/dao/impl/User_permitgroupImpl.java
@@ -42,11 +42,11 @@
            for (User_permitgroup ugroup : list) {
                String sql="insert into db_equip_user.tb_user_permitgroup(permit_group_name) values('"+ugroup.getPermit_group_name()+"')";
                sql_strs.add(sql);
                {
                /*{
                    String msg="添加"+ugroup.getPermit_group_name();
                    User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Increase, msg);
                    listU.add(ulog);
                 }
                 }*/
            }
        }
        boolean bl=DAOHelper.makeManualCommit(DBUtil.getConn(), sql_strs);
@@ -72,11 +72,11 @@
            for (User_permitgroup ugroup : list) {
                String sql="delete from db_equip_user.tb_user_permitgroup where permit_group_id="+ugroup.getPermit_group_id();
                sql_strs.add(sql);
                {
                /*{
                    String msg="删除"+ugroup.getPermit_group_name();
                    User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Delete, msg);
                    listU.add(ulog);
                 }
                 }*/
            }
        }
        boolean bl=DAOHelper.makeManualCommit(DBUtil.getConn(), sql_strs);
DyEnvir_system/src/com/fgkj/dao/impl/User_permitgroup_dataImpl.java
@@ -32,11 +32,11 @@
            for (User_permitgroup_data udata : list) {
                String sql="insert into  db_equip_user.tb_user_permitgroup_data(permit_group_id,permit_id) values("+udata.getPermit_group_id()+","+udata.getPermit_id()+")";
                sql_strs.add(sql);
                {
                /*{
                    String msg="添加"+udata.getPermit_name()+"权限至"+udata.getPermit_group_name()+"权限组中";
                    User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Increase, msg);
                    listU.add(ulog);
                 }
                 }*/
            }
        }
        boolean bl=DAOHelper.makeManualCommit(DBUtil.getConn(), sql_strs);
@@ -57,11 +57,11 @@
            for (User_permitgroup_data udata : list) {
                String sql="delete from  db_equip_user.tb_user_permitgroup_data where permit_group_id="+udata.getPermit_group_id()+" and permit_id="+udata.getPermit_id();
                sql_strs.add(sql);
                {
                /*{
                    String msg="删除"+udata.getPermit_group_name()+"的"+udata.getPermit_name()+"权限";
                    User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Delete, msg);
                    listU.add(ulog);
                 }
                 }*/
            }
        }
        boolean bl=DAOHelper.makeManualCommit(DBUtil.getConn(), sql_strs);
DyEnvir_system/src/com/fgkj/dao/impl/User_permitgroup_usrImpl.java
@@ -32,11 +32,11 @@
            for (User_permitgroup_usr us : list) {
                String sql="insert into  db_equip_user.tb_user_permitgroup_usr(permit_group_id,uid) values("+us.getPermit_group_id()+","+us.getUid()+")";
                sql_strs.add(sql);
                {
                /*{
                    String msg="添加"+us.getUname()+"用户至"+us.getPermit_group_name()+"权限组中";
                    User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Increase, msg);
                    listU.add(ulog);
                 }
                 }*/
            }
        }
        boolean bl=DAOHelper.makeManualCommit(DBUtil.getConn(), sql_strs);
@@ -59,11 +59,11 @@
            for (User_permitgroup_usr us : list) {
                String sql="delete from  db_equip_user.tb_user_permitgroup_usr where permit_group_id="+us.getPermit_group_id()+" and uid="+us.getUid();
                sql_strs.add(sql);
                {
               /* {
                    String msg="删除"+us.getPermit_group_name()+"的"+us.getUname()+"用户";
                    User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Delete, msg);
                    listU.add(ulog);
                 }
                 }*/
            }
        }
        boolean bl=DAOHelper.makeManualCommit(DBUtil.getConn(), sql_strs);
DyEnvir_system/src/com/fgkj/electric2mwsystem/Impl/Electric_Control_Single_2kwImpl.java
@@ -42,10 +42,10 @@
        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="恒流切换";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.Alter;msg="恒流切换";break;//远程停止
        case 5:updateSql=" constantvol=? ";updateVaule=(float)econ.getConstantvol();opreat=UinfDaoFactory.Alter;msg="恒压切换";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.Alter;msg="恒流切换";break;//启动触摸屏给定
        case 10:updateSql=" start_upper_set=? ";updateVaule=(float)econ.getStart_upper_set();opreat=UinfDaoFactory.Alter;msg="恒流切换";break;//启动上位机给定
        case 11:updateSql=" consvolswitch =? ";updateVaule=(float)econ.getConsvolswitch();opreat=UinfDaoFactory.Alter;msg="恒流切换";break;//恒压切换