Merge branch 'master' of http://118.89.139.230:10101/r/powerIntelligenceSys...

whycxzp

2025-06-11 02ccfc21d5d4f767bbd92ecda89cdfcc3283728c

 src/main/java/com/whyc/service/SubTablePageInfoService.java

@@ -560,11 +560,11 @@
        return list;
    }
    //系统概览获取半小时核容设备信息(组端信息取一个单体信息即可)
    public List<BattHisRealDto> getHalfHourBattDevData(String tableName,Integer granularity) {
        String sql="select  distinct mon_num,record_time,group_vol,online_vol,group_curr,group_tmp " +
    public List<BattHisRealDto> getHalfHourBattDevData(String tableName,Integer granularity,String halfHourAgoTime) {
        String sql="select  distinct mon_num,record_time,group_vol,online_vol,group_curr,group_tmp,load_curr " +
                "from (select a.*, (@i:= @i+1) as number " +
                "     from (select * from "+tableName+" "+
                "                    where record_time>date_sub(now(),interval 0.5 hour) and mon_num=1) a, " +
                "                    where record_time>='"+halfHourAgoTime+"' and mon_num=1) a, " +
                "                   (select @i:=0) b) c "+
                " where c.number%"+granularity+"=0 or c.number=1 ";
        sql+=" order by record_time asc";
@@ -579,6 +579,7 @@
                    data.setOnlineVol(rs.getFloat("online_vol"));
                    data.setGroupCurr(rs.getFloat("group_curr"));
                    data.setGroupTmp(rs.getFloat("group_tmp"));
                    data.setLoadCurr(rs.getFloat("load_curr"));
                    list.add(data);
                }
                return list;
@@ -587,12 +588,12 @@
        return list;
    }
    //系统概览获取半小时交流输入统计
    public List<PwrHisRealAcInDto> getHalfHourPwrHisAcinData(String tableName,Integer granularity) {
    public List<PwrHisRealAcInDto> getHalfHourPwrHisAcinData(String tableName,Integer granularity,String halfHourAgoTime) {
        String sql="select  distinct record_datetime,acin1_vola,acin1_volb,acin1_volc,acin2_vola,acin2_volb,acin2_volc " +
                ",acin1_curra,acin1_currb,acin1_currc,acin2_curra,acin2_currb,acin2_currc  " +
                "from (select a.*, (@i:= @i+1) as number " +
                "     from (select * from "+tableName+" "+
                "                    where record_datetime>date_sub(now(),interval 0.5 hour)) a, " +
                "                    where record_datetime>='"+halfHourAgoTime+"') a, " +
                "                   (select @i:=0) b) c "+
                " where c.number%"+granularity+"=0 or c.number=1 ";
        sql+=" order by record_datetime asc";
@@ -623,11 +624,11 @@
        return list;
    }

    public List<PwrHisRealDcoutInDto> getHalfHourPwrHisDcoutData(String tableName,Integer granularity) {
    public List<PwrHisRealDcoutInDto> getHalfHourPwrHisDcoutData(String tableName,Integer granularity,String halfHourAgoTime) {
        String sql="select  distinct * " +
                "from (select a.*, (@i:= @i+1) as number " +
                "     from (select * from "+tableName+" "+
                "                    where record_datetime>date_sub(now(),interval 0.5 hour)) a, " +
                "                    where record_datetime>='"+halfHourAgoTime+"') a, " +
                "                   (select @i:=0) b) c "+
                " where c.number%"+granularity+"=0 or c.number=1 ";
        sql+=" order by record_datetime asc";
@@ -655,22 +656,22 @@
                    data.setM14Outcurr(rs.getFloat("m14_outcurr"));
                    data.setM15Outcurr(rs.getFloat("m15_outcurr"));
                    data.setM16Outcurr(rs.getFloat("m16_outcurr"));
                    data.setM1OutVol(rs.getFloat("m1_outvol"));
                    data.setM2OutVol(rs.getFloat("m2_outvol"));
                    data.setM3OutVol(rs.getFloat("m3_outvol"));
                    data.setM4OutVol(rs.getFloat("m4_outvol"));
                    data.setM5OutVol(rs.getFloat("m5_outvol"));
                    data.setM6OutVol(rs.getFloat("m6_outvol"));
                    data.setM7OutVol(rs.getFloat("m7_outvol"));
                    data.setM8OutVol(rs.getFloat("m8_outvol"));
                    data.setM9OutVol(rs.getFloat("m9_outvol"));
                    data.setM10OutVol(rs.getFloat("m10_outvol"));
                    data.setM11OutVol(rs.getFloat("m11_outvol"));
                    data.setM12OutVol(rs.getFloat("m12_outvol"));
                    data.setM13OutVol(rs.getFloat("m13_outvol"));
                    data.setM14OutVol(rs.getFloat("m14_outvol"));
                    data.setM15OutVol(rs.getFloat("m15_outvol"));
                    data.setM16OutVol(rs.getFloat("m16_outvol"));
                    data.setM1OutVol(rs.getFloat("m1_out_vol"));
                    data.setM2OutVol(rs.getFloat("m2_out_vol"));
                    data.setM3OutVol(rs.getFloat("m3_out_vol"));
                    data.setM4OutVol(rs.getFloat("m4_out_vol"));
                    data.setM5OutVol(rs.getFloat("m5_out_vol"));
                    data.setM6OutVol(rs.getFloat("m6_out_vol"));
                    data.setM7OutVol(rs.getFloat("m7_out_vol"));
                    data.setM8OutVol(rs.getFloat("m8_out_vol"));
                    data.setM9OutVol(rs.getFloat("m9_out_vol"));
                    data.setM10OutVol(rs.getFloat("m10_out_vol"));
                    data.setM11OutVol(rs.getFloat("m11_out_vol"));
                    data.setM12OutVol(rs.getFloat("m12_out_vol"));
                    data.setM13OutVol(rs.getFloat("m13_out_vol"));
                    data.setM14OutVol(rs.getFloat("m14_out_vol"));
                    data.setM15OutVol(rs.getFloat("m15_out_vol"));
                    data.setM16OutVol(rs.getFloat("m16_out_vol"));
                    list.add(data);
                }
                return list;