山西直流电源系统
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
whyclxw
6 天以前 3470b33466cfd9ce423a46220ff81f734fae9fb7 
 src/main/java/com/whyc/service/BattRealdataIdService.java


@@ -9,6 +9,8 @@


import com.whyc.mapper.CommonMapper;




import com.whyc.pojo.db_data_history.BattRealdataId;


import com.whyc.pojo.db_param.AlmAnalysisParam;


import com.whyc.pojo.db_param.AppParam;


import com.whyc.util.ActionUtil;


import com.whyc.util.DateUtil;


import com.whyc.util.ThreadLocalUtil;


@@ -18,6 +20,8 @@




import javax.annotation.Resource;


import java.text.ParseException;


import java.time.LocalDateTime;


import java.time.format.DateTimeFormatter;


import java.util.*;


import java.util.concurrent.CountDownLatch;


import java.util.concurrent.ThreadPoolExecutor;


@@ -38,6 +42,7 @@




    @Autowired


    private BattInfService binfService;








    //获取电池组最近一季度的单体数据


@@ -164,11 +169,18 @@


    public Response getHalfHourBattDevData(Integer battgroupId,Integer granularity) {


        String dateTime = ActionUtil.sdfwithOutday.format(new Date());


        String tableName ="db_data_history.tb_batt_realdata_"+battgroupId+"_"+dateTime;


        //获取前半个小时数据


        LocalDateTime now = LocalDateTime.now();


        // 计算半小时前的时间点


        LocalDateTime halfHourAgo = now.minusMinutes(30);


        // 格式化输出


        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");


        String halfHourAgoTime=halfHourAgo.format(formatter);


        String existTableName = commonMapper.existTable("db_data_history", "tb_batt_realdata_"+battgroupId+"_"+dateTime);


        if(existTableName == null){


            return new Response().set(1,false,"当前电池组不存在前面小时数据");


        }


        List<BattHisRealDto> datalist=subTablePageInfoService.getHalfHourBattDevData(tableName,granularity);


        List<BattHisRealDto> datalist=subTablePageInfoService.getHalfHourBattDevData(tableName,granularity,halfHourAgoTime);


        return new Response().setII(1,datalist.size()>0,datalist,"获取半小时内核容设备信息");


    }


    //历史实时数据


@@ -208,6 +220,5 @@


        latch.await(10, TimeUnit.MINUTES);


        List dataListSorted = dataList.stream().sorted(Comparator.comparing(RealDateDTO::getRecordTime)).collect(Collectors.toList());


        return new Response().set(1, dataListSorted);




    }


}