whyclxw
2025-06-07 19839488d6bd2b65e9253c0a478b6555f46d6416
src/main/java/com/whyc/service/SubTablePageInfoService.java
@@ -624,7 +624,7 @@
    }
    public List<PwrHisRealDcoutInDto> getHalfHourPwrHisDcoutData(String tableName,Integer granularity) {
        String sql="select  distinct record_datetime,dcout_vol,dcout_curr,battgroup1_vol,battgroup1_curr,battgroup2_vol,battgroup2_curr " +
        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, " +
@@ -638,12 +638,39 @@
                while (rs.next()){
                    PwrHisRealDcoutInDto data=new PwrHisRealDcoutInDto();
                    data.setRecordDatetime(rs.getTimestamp("record_datetime"));
                    data.setDcoutVol(rs.getFloat("dcout_vol"));
                    data.setDcoutCurr(rs.getFloat("dcout_curr"));
                    data.setBattgroup1Vol(rs.getFloat("battgroup1_vol"));
                    data.setBattgroup1Curr(rs.getFloat("battgroup1_curr"));
                    data.setBattgroup2Vol(rs.getFloat("battgroup2_vol"));
                    data.setBattgroup2Curr(rs.getFloat("battgroup2_curr"));
                    data.setMOutputvol(rs.getFloat("m_outputvol"));
                    data.setM1Outcurr(rs.getFloat("m1_outcurr"));
                    data.setM2Outcurr(rs.getFloat("m2_outcurr"));
                    data.setM3Outcurr(rs.getFloat("m3_outcurr"));
                    data.setM4Outcurr(rs.getFloat("m4_outcurr"));
                    data.setM5Outcurr(rs.getFloat("m5_outcurr"));
                    data.setM6Outcurr(rs.getFloat("m6_outcurr"));
                    data.setM7Outcurr(rs.getFloat("m7_outcurr"));
                    data.setM8Outcurr(rs.getFloat("m8_outcurr"));
                    data.setM9Outcurr(rs.getFloat("m9_outcurr"));
                    data.setM10Outcurr(rs.getFloat("m10_outcurr"));
                    data.setM11Outcurr(rs.getFloat("m11_outcurr"));
                    data.setM12Outcurr(rs.getFloat("m12_outcurr"));
                    data.setM13Outcurr(rs.getFloat("m13_outcurr"));
                    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"));
                    list.add(data);
                }
                return list;