whyclxw
2020-11-06 5a846245f81e4d6b790af04f81f3057799821bac
文件导出修改
8个文件已修改
359 ■■■■■ 已修改文件
DyEnvir_system/src/com/fgkj/dao/DAOHelper.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DyEnvir_system/src/com/fgkj/partinsystem/impl/Ac230v_upsImpl.java 50 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DyEnvir_system/src/com/fgkj/partinsystem/impl/Cabin_boardImpl.java 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DyEnvir_system/src/com/fgkj/partinsystem/impl/Dc230v_battImpl.java 53 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DyEnvir_system/src/com/fgkj/partinsystem/impl/Dc25v_battImpl.java 50 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DyEnvir_system/src/com/fgkj/partinsystem/impl/Electrical_monitor_stationImpl.java 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DyEnvir_system/src/com/fgkj/partinsystem/impl/Inverter_eleImpl.java 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DyEnvir_system/src/com/fgkj/partinsystem/impl/Reliable_boardImpl.java 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DyEnvir_system/src/com/fgkj/dao/DAOHelper.java
@@ -338,6 +338,28 @@
        return exe_res;
    }
    
    //检测数据库表是否存在
    public static int serchTable(String table){
        String sql=" select table_name  from information_schema.tables "
                + " where table_schema='db_partinsystem_history'  and table_name like ?  limit 1";
        List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{"%"+table}, new CallBack() {
            @Override
            public List getResults(ResultSet rs) {
                List list=new ArrayList();
                try {
                    while(rs.next()){
                        list.add(rs.getString("table_name"));
                    }
                } catch (SQLException e) {
                    // TODO Auto-generated catch block
                    e.printStackTrace();
                }
                return list;
            }
        });
        return list.size();
    }
    public static void main(String[] args) {
        //System.out.println(getSdf(null));
        float f=1.2546f;
DyEnvir_system/src/com/fgkj/partinsystem/impl/Ac230v_upsImpl.java
@@ -185,11 +185,53 @@
    //文件导出时的历史查询
    public List serchCSV(Object obj) {
        final Ac230v_ups ac=(Ac230v_ups) obj;
        String table=DAOHelper.sdf_withOut.format(ac.getRecord_time());
        String tablists=ac.getNote()+",record_time";
        String sql=" select "+tablists+" from db_partinsystem_history.ac230v_ups_"+ac.getDev_id()+"_"+table+" "
                + "  where dev_id=?  and record_time >= ? and record_time <= ?  order by record_time asc ";
        List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{ac.getDev_id(),ac.getRecord_time(),ac.getRecord_time1()}, new CallBack() {
        String table=DAOHelper.sdf_withOut.format(ac.getRecord_time());
        String table1=DAOHelper.sdf_withOut.format(ac.getRecord_time1());
        String SqlAll="";
        String sql=" (select "+tablists+" from db_partinsystem_history.ac230v_ups_"+ac.getDev_id()+"_"+table+" "
                + "  where record_time >= ? and record_time <= ?  order by record_time asc )";
        String sql_union=" union all ";
        String sql1= " (select "+tablists+" from db_partinsystem_history.ac230v_ups_"+ac.getDev_id()+"_"+table1+" "
                + "  where record_time >= ? and record_time <= ?  order by record_time asc )";
        Object[] strarr=null;
        List list=new ArrayList();
        String st=ac.getDev_id()+"_"+table;
        String st1=ac.getDev_id()+"_"+table1;
        int size=DAOHelper.serchTable(st);
        int size1=DAOHelper.serchTable(st1);
        //表都存在
        if(size>0&&size1>0){
            if(table.equals(table1)){
                SqlAll=sql;
                strarr=new Object[]{DAOHelper.sdf.format(ac.getRecord_time()),DAOHelper.sdf.format(ac.getRecord_time1())};
            }else{
                SqlAll=sql+sql_union+sql1;
                strarr=new Object[]{DAOHelper.sdf.format(ac.getRecord_time()),DAOHelper.sdfwithOut.format(ac.getRecord_time())+" 23:59:59",DAOHelper.sdfwithOut.format(ac.getRecord_time())+" 00:00:00",DAOHelper.sdf.format(ac.getRecord_time1())};
            }
        }
        //存在一个表
        if(size>0&&size1<=0){
            SqlAll=sql;
            strarr=new Object[]{DAOHelper.sdf.format(ac.getRecord_time()),DAOHelper.sdfwithOut.format(ac.getRecord_time())+" 23:59:59"};
        }
        if(size<=0&&size1>0){
            SqlAll=sql1;
            strarr=new Object[]{DAOHelper.sdfwithOut.format(ac.getRecord_time1())+" 00:00:00",DAOHelper.sdf.format(ac.getRecord_time1())};
        }
        //表都不存在
        if(size<=0&&size1<=0){
            return  list;
        }
        list=DAOHelper.executeQuery(SqlAll, DBUtil.getConn(), strarr, new CallBack() {
            
            @Override
            public List getResults(ResultSet rs) {
DyEnvir_system/src/com/fgkj/partinsystem/impl/Cabin_boardImpl.java
@@ -534,8 +534,50 @@
        final Cabin_board cb=(Cabin_board) obj;
        String tablists=cb.getNote()+",record_time";
        String table=DAOHelper.sdf_withOut.format(cb.getRecord_time());
        String sql=" select "+tablists+" from db_partinsystem_history.cabin_board_"+cb.getDev_id()+"_"+table+" where dev_id=? and record_time >= ? and record_time <= ?  order by record_time asc ";
        List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{cb.getDev_id(),cb.getRecord_time(),cb.getRecord_time1()}, new CallBack() {
        String table1=DAOHelper.sdf_withOut.format(cb.getRecord_time1());
        String SqlAll="";
        String sql=" (select "+tablists+" from db_partinsystem_history.cabin_board_"+cb.getDev_id()+"_"+table+" where   record_time >= ? and record_time <= ?  order by record_time asc  )";
        String sql_union=" union all ";
        String sql1= " (select "+tablists+" from db_partinsystem_history.cabin_board_"+cb.getDev_id()+"_"+table1+" where  record_time >= ? and record_time <= ?  order by record_time asc  )";
        Object[] strarr=null;
        List list=new ArrayList();
        String st=cb.getDev_id()+"_"+table;
        String st1=cb.getDev_id()+"_"+table1;
        int size=DAOHelper.serchTable(st);
        int size1=DAOHelper.serchTable(st1);
        //表都存在
        if(size>0&&size1>0){
            if(table.equals(table1)){
                SqlAll=sql;
                strarr=new Object[]{DAOHelper.sdf.format(cb.getRecord_time()),DAOHelper.sdf.format(cb.getRecord_time1())};
            }else{
                SqlAll=sql+sql_union+sql1;
                strarr=new Object[]{DAOHelper.sdf.format(cb.getRecord_time()),DAOHelper.sdfwithOut.format(cb.getRecord_time())+" 23:59:59",DAOHelper.sdfwithOut.format(cb.getRecord_time())+" 00:00:00",DAOHelper.sdf.format(cb.getRecord_time1())};
            }
        }
        //存在一个表
        if(size>0&&size1<=0){
            SqlAll=sql;
            strarr=new Object[]{DAOHelper.sdf.format(cb.getRecord_time()),DAOHelper.sdfwithOut.format(cb.getRecord_time())+" 23:59:59"};
        }
        if(size<=0&&size1>0){
            SqlAll=sql1;
            strarr=new Object[]{DAOHelper.sdfwithOut.format(cb.getRecord_time1())+" 00:00:00",DAOHelper.sdf.format(cb.getRecord_time1())};
        }
        //表都不存在
        if(size<=0&&size1<=0){
            return  list;
        }
        //String sql=" select "+tablists+" from db_partinsystem_history.cabin_board_"+cb.getDev_id()+"_"+table+" where dev_id=? and record_time >= ? and record_time <= ?  order by record_time asc ";
        list=DAOHelper.executeQuery(SqlAll, DBUtil.getConn(), strarr, new CallBack() {
            
            @Override
            public List getResults(ResultSet rs) {
DyEnvir_system/src/com/fgkj/partinsystem/impl/Dc230v_battImpl.java
@@ -168,10 +168,55 @@
    public List serchCSV(Object obj) {
        final Dc230v_batt dc=(Dc230v_batt) obj;
        String table=DAOHelper.sdf_withOut.format(dc.getRecord_time());
        String tablists=dc.getNote()+",record_time";
        String sql=" select "+tablists+" from db_partinsystem_history.dc230v_batt_"+dc.getDev_id()+"_"+table+" "
                + "  where dev_id=? and record_time >= ? and record_time <= ?  order by record_time asc";
        List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{dc.getDev_id(),dc.getRecord_time(),dc.getRecord_time1()}, new CallBack() {
        String table1=DAOHelper.sdf_withOut.format(dc.getRecord_time1());
        String tablists=dc.getNote()+",record_time";
        String SqlAll="";
        String sql=" (select "+tablists+" from db_partinsystem_history.dc230v_batt_"+dc.getDev_id()+"_"+table+" "
                + "  where  record_time >= ? and record_time <= ?  order by record_time asc )";
        String sql_union=" union all ";
        String sql1= " (select "+tablists+" from db_partinsystem_history.dc230v_batt_"+dc.getDev_id()+"_"+table1+" "
                + "  where  record_time >= ? and record_time <= ?  order by record_time asc )";
        Object[] strarr=null;
        List list=new ArrayList();
        String st=dc.getDev_id()+"_"+table;
        String st1=dc.getDev_id()+"_"+table1;
        int size=DAOHelper.serchTable(st);
        int size1=DAOHelper.serchTable(st1);
        //表都存在
        if(size>0&&size1>0){
            if(table.equals(table1)){
                SqlAll=sql;
                strarr=new Object[]{DAOHelper.sdf.format(dc.getRecord_time()),DAOHelper.sdf.format(dc.getRecord_time1())};
            }else{
                SqlAll=sql+sql_union+sql1;
                strarr=new Object[]{DAOHelper.sdf.format(dc.getRecord_time()),DAOHelper.sdfwithOut.format(dc.getRecord_time())+" 23:59:59",DAOHelper.sdfwithOut.format(dc.getRecord_time())+" 00:00:00",DAOHelper.sdf.format(dc.getRecord_time1())};
            }
        }
        //存在一个表
        if(size>0&&size1<=0){
            SqlAll=sql;
            strarr=new Object[]{DAOHelper.sdf.format(dc.getRecord_time()),DAOHelper.sdfwithOut.format(dc.getRecord_time())+" 23:59:59"};
        }
        if(size<=0&&size1>0){
            SqlAll=sql1;
            strarr=new Object[]{DAOHelper.sdfwithOut.format(dc.getRecord_time1())+" 00:00:00",DAOHelper.sdf.format(dc.getRecord_time1())};
        }
        //表都不存在
        if(size<=0&&size1<=0){
            return  list;
        }
        //String sql=" select "+tablists+" from db_partinsystem_history.dc230v_batt_"+dc.getDev_id()+"_"+table+" "
        //        + "  where dev_id=? and record_time >= ? and record_time <= ?  order by record_time asc";
        list=DAOHelper.executeQuery(SqlAll, DBUtil.getConn(), strarr, new CallBack() {
            
            @Override
            public List getResults(ResultSet rs) {
DyEnvir_system/src/com/fgkj/partinsystem/impl/Dc25v_battImpl.java
@@ -168,9 +168,53 @@
        final Dc25v_batt dc=(Dc25v_batt) obj;
        String table=DAOHelper.sdf_withOut.format(dc.getRecord_time());
        String tablists=dc.getNote()+",record_time";
        String sql=" select "+tablists+" from db_partinsystem_history.dc25v_batt_"+dc.getDev_id()+"_"+table+" "
                + "  where dev_id=?  and record_time >= ? and record_time <= ?  order by record_time asc ";
        List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{dc.getDev_id(),dc.getRecord_time(),dc.getRecord_time1()}, new CallBack() {
        String table1=DAOHelper.sdf_withOut.format(dc.getRecord_time1());
        String SqlAll="";
        String sql=" (select "+tablists+" from db_partinsystem_history.dc25v_batt_"+dc.getDev_id()+"_"+table+" "
                + "  where record_time >= ? and record_time <= ?  order by record_time asc )";
        String sql_union=" union all ";
        String sql1= " (select "+tablists+" from db_partinsystem_history.dc25v_batt_"+dc.getDev_id()+"_"+table1+" "
                + "  where record_time >= ? and record_time <= ?  order by record_time asc )";
        Object[] strarr=null;
        List list=new ArrayList();
        String st=dc.getDev_id()+"_"+table;
        String st1=dc.getDev_id()+"_"+table1;
        int size=DAOHelper.serchTable(st);
        int size1=DAOHelper.serchTable(st1);
        //表都存在
        if(size>0&&size1>0){
            if(table.equals(table1)){
                SqlAll=sql;
                strarr=new Object[]{DAOHelper.sdf.format(dc.getRecord_time()),DAOHelper.sdf.format(dc.getRecord_time1())};
            }else{
                SqlAll=sql+sql_union+sql1;
                strarr=new Object[]{DAOHelper.sdf.format(dc.getRecord_time()),DAOHelper.sdfwithOut.format(dc.getRecord_time())+" 23:59:59",DAOHelper.sdfwithOut.format(dc.getRecord_time())+" 00:00:00",DAOHelper.sdf.format(dc.getRecord_time1())};
            }
        }
        //存在一个表
        if(size>0&&size1<=0){
            SqlAll=sql;
            strarr=new Object[]{DAOHelper.sdf.format(dc.getRecord_time()),DAOHelper.sdfwithOut.format(dc.getRecord_time())+" 23:59:59"};
        }
        if(size<=0&&size1>0){
            SqlAll=sql1;
            strarr=new Object[]{DAOHelper.sdfwithOut.format(dc.getRecord_time1())+" 00:00:00",DAOHelper.sdf.format(dc.getRecord_time1())};
        }
        //表都不存在
        if(size<=0&&size1<=0){
            return  list;
        }
        //String sql=" select "+tablists+" from db_partinsystem_history.dc25v_batt_"+dc.getDev_id()+"_"+table+" "
        //        + "  where dev_id=?  and record_time >= ? and record_time <= ?  order by record_time asc ";
        list=DAOHelper.executeQuery(SqlAll, DBUtil.getConn(), strarr, new CallBack() {
            
            @Override
            public List getResults(ResultSet rs) {
DyEnvir_system/src/com/fgkj/partinsystem/impl/Electrical_monitor_stationImpl.java
@@ -207,8 +207,50 @@
        final Electrical_monitor_station ems=(Electrical_monitor_station) obj;
        String table=DAOHelper.sdf_withOut.format(ems.getRecord_time());
        String tablists=ems.getNote()+",record_time";
        String sql=" select "+tablists+" from db_partinsystem_history.electrical_monitor_station_"+ems.getDev_id()+"_"+table+"  where dev_id=? and record_time >= ? and record_time <= ?  order by record_time asc";
        List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{ems.getDev_id(),ems.getRecord_time(),ems.getRecord_time1()}, new CallBack() {
        String table1=DAOHelper.sdf_withOut.format(ems.getRecord_time1());
        String SqlAll="";
        String sql=" (select "+tablists+" from db_partinsystem_history.electrical_monitor_station_"+ems.getDev_id()+"_"+table+"  where  record_time >= ? and record_time <= ?  order by record_time asc)";
        String sql_union=" union all ";
        String sql1= " (select "+tablists+" from db_partinsystem_history.electrical_monitor_station_"+ems.getDev_id()+"_"+table1+"  where record_time >= ? and record_time <= ?  order by record_time asc)";
        Object[] strarr=null;
        List list=new ArrayList();
        String st=ems.getDev_id()+"_"+table;
        String st1=ems.getDev_id()+"_"+table1;
        int size=DAOHelper.serchTable(st);
        int size1=DAOHelper.serchTable(st1);
        //表都存在
        if(size>0&&size1>0){
            if(table.equals(table1)){
                SqlAll=sql;
                strarr=new Object[]{DAOHelper.sdf.format(ems.getRecord_time()),DAOHelper.sdf.format(ems.getRecord_time1())};
            }else{
                SqlAll=sql+sql_union+sql1;
                strarr=new Object[]{DAOHelper.sdf.format(ems.getRecord_time()),DAOHelper.sdfwithOut.format(ems.getRecord_time())+" 23:59:59",DAOHelper.sdfwithOut.format(ems.getRecord_time())+" 00:00:00",DAOHelper.sdf.format(ems.getRecord_time1())};
            }
        }
        //存在一个表
        if(size>0&&size1<=0){
            SqlAll=sql;
            strarr=new Object[]{DAOHelper.sdf.format(ems.getRecord_time()),DAOHelper.sdfwithOut.format(ems.getRecord_time())+" 23:59:59"};
        }
        if(size<=0&&size1>0){
            SqlAll=sql1;
            strarr=new Object[]{DAOHelper.sdfwithOut.format(ems.getRecord_time1())+" 00:00:00",DAOHelper.sdf.format(ems.getRecord_time1())};
        }
        //表都不存在
        if(size<=0&&size1<=0){
            return  list;
        }
        //String sql=" select "+tablists+" from db_partinsystem_history.electrical_monitor_station_"+ems.getDev_id()+"_"+table+"  where dev_id=? and record_time >= ? and record_time <= ?  order by record_time asc";
        list=DAOHelper.executeQuery(SqlAll, DBUtil.getConn(), strarr, new CallBack() {
            
            @Override
            public List getResults(ResultSet rs) {
DyEnvir_system/src/com/fgkj/partinsystem/impl/Inverter_eleImpl.java
@@ -303,8 +303,50 @@
        final Inverter_ele ie=(Inverter_ele) obj;
        String table=DAOHelper.sdf_withOut.format(ie.getRecord_time());
        String tablists=ie.getNote()+",record_time";
        String sql=" select "+tablists+" from db_partinsystem_history.inverter_ele_"+ie.getDev_id()+"_"+table+" where dev_id=?  and record_time >= ? and record_time <= ?  order by record_time asc ";
        List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{ie.getDev_id(),ie.getRecord_time(),ie.getRecord_time1()}, new CallBack() {
        String table1=DAOHelper.sdf_withOut.format(ie.getRecord_time1());
        String SqlAll="";
        String sql=" (select "+tablists+" from db_partinsystem_history.inverter_ele_"+ie.getDev_id()+"_"+table+" where  record_time >= ? and record_time <= ?  order by record_time asc)";
        String sql_union=" union all ";
        String sql1= " (select "+tablists+" from db_partinsystem_history.inverter_ele_"+ie.getDev_id()+"_"+table1+" where  record_time >= ? and record_time <= ?  order by record_time asc)";
        Object[] strarr=null;
        List list=new ArrayList();
        String st=ie.getDev_id()+"_"+table;
        String st1=ie.getDev_id()+"_"+table1;
        int size=DAOHelper.serchTable(st);
        int size1=DAOHelper.serchTable(st1);
        //表都存在
        if(size>0&&size1>0){
            if(table.equals(table1)){
                SqlAll=sql;
                strarr=new Object[]{DAOHelper.sdf.format(ie.getRecord_time()),DAOHelper.sdf.format(ie.getRecord_time1())};
            }else{
                SqlAll=sql+sql_union+sql1;
                strarr=new Object[]{DAOHelper.sdf.format(ie.getRecord_time()),DAOHelper.sdfwithOut.format(ie.getRecord_time())+" 23:59:59",DAOHelper.sdfwithOut.format(ie.getRecord_time())+" 00:00:00",DAOHelper.sdf.format(ie.getRecord_time1())};
            }
        }
        //存在一个表
        if(size>0&&size1<=0){
            SqlAll=sql;
            strarr=new Object[]{DAOHelper.sdf.format(ie.getRecord_time()),DAOHelper.sdfwithOut.format(ie.getRecord_time())+" 23:59:59"};
        }
        if(size<=0&&size1>0){
            SqlAll=sql1;
            strarr=new Object[]{DAOHelper.sdfwithOut.format(ie.getRecord_time1())+" 00:00:00",DAOHelper.sdf.format(ie.getRecord_time1())};
        }
        //表都不存在
        if(size<=0&&size1<=0){
            return  list;
        }
        //String sql=" select "+tablists+" from db_partinsystem_history.inverter_ele_"+ie.getDev_id()+"_"+table+" where dev_id=?  and record_time >= ? and record_time <= ?  order by record_time asc ";
        list=DAOHelper.executeQuery(SqlAll, DBUtil.getConn(), strarr, new CallBack() {
            
            @Override
            public List getResults(ResultSet rs) {
DyEnvir_system/src/com/fgkj/partinsystem/impl/Reliable_boardImpl.java
@@ -540,8 +540,50 @@
        final Reliable_board rb=(Reliable_board) obj;
        String tablists=rb.getNote()+",record_time";
        String table=DAOHelper.sdf_withOut.format(rb.getRecord_time());
        String sql="select "+tablists+" from db_partinsystem_history.reliable_board_"+rb.getDev_id()+"_"+table+"  where dev_id=?  and record_time >= ? and record_time <= ?  order by record_time asc ";
        List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{rb.getDev_id(),rb.getRecord_time(),rb.getRecord_time1()}, new CallBack() {
        String table1=DAOHelper.sdf_withOut.format(rb.getRecord_time1());
        String SqlAll="";
        String sql=" (select "+tablists+" from db_partinsystem_history.reliable_board_"+rb.getDev_id()+"_"+table+"  where record_time >= ? and record_time <= ?  order by record_time asc)";
        String sql_union=" union all ";
        String sql1= " (select "+tablists+" from db_partinsystem_history.reliable_board_"+rb.getDev_id()+"_"+table1+"  where  record_time >= ? and record_time <= ?  order by record_time asc)";
        Object[] strarr=null;
        List list=new ArrayList();
        String st=rb.getDev_id()+"_"+table;
        String st1=rb.getDev_id()+"_"+table1;
        int size=DAOHelper.serchTable(st);
        int size1=DAOHelper.serchTable(st1);
        //表都存在
        if(size>0&&size1>0){
            if(table.equals(table1)){
                SqlAll=sql;
                strarr=new Object[]{DAOHelper.sdf.format(rb.getRecord_time()),DAOHelper.sdf.format(rb.getRecord_time1())};
            }else{
                SqlAll=sql+sql_union+sql1;
                strarr=new Object[]{DAOHelper.sdf.format(rb.getRecord_time()),DAOHelper.sdfwithOut.format(rb.getRecord_time())+" 23:59:59",DAOHelper.sdfwithOut.format(rb.getRecord_time())+" 00:00:00",DAOHelper.sdf.format(rb.getRecord_time1())};
            }
        }
        //存在一个表
        if(size>0&&size1<=0){
            SqlAll=sql;
            strarr=new Object[]{DAOHelper.sdf.format(rb.getRecord_time()),DAOHelper.sdfwithOut.format(rb.getRecord_time())+" 23:59:59"};
        }
        if(size<=0&&size1>0){
            SqlAll=sql1;
            strarr=new Object[]{DAOHelper.sdfwithOut.format(rb.getRecord_time1())+" 00:00:00",DAOHelper.sdf.format(rb.getRecord_time1())};
        }
        //表都不存在
        if(size<=0&&size1<=0){
            return  list;
        }
        //String sql="select "+tablists+" from db_partinsystem_history.reliable_board_"+rb.getDev_id()+"_"+table+"  where dev_id=?  and record_time >= ? and record_time <= ?  order by record_time asc ";
        list=DAOHelper.executeQuery(SqlAll, DBUtil.getConn(), strarr, new CallBack() {
            
            @Override
            public List getResults(ResultSet rs) {