Merge branch 'master' of http://118.89.139.230:10101/r/powerIntelligenceSystem

DELL

3 天以前 d8475b8670b6b4cbcd1bc9e57d30a6f433d206ab

 src/main/java/com/whyc/controller/RealContoller.java

@@ -33,19 +33,19 @@

    @ApiOperation(value = "系统概览获取前一百比时间间隔数据交流输入统计")
    @GetMapping("getPwrHisAcinData100")
    public Response getPwrHisAcinData100(@RequestParam Integer powerId){
    public Response getPwrHisAcinData100(@RequestParam Integer powerId) throws ParseException, InterruptedException {
        return pwrdevHistorydataIdService.getPwrHisAcinData100(powerId);
    }

    @ApiOperation(value = "系统概览获取前一百比时间间隔数据直流输出统计")
    @GetMapping("getPwrHisDcoutData100")
    public Response getPwrHisDcoutData100(@RequestParam Integer powerId){
    public Response getPwrHisDcoutData100(@RequestParam Integer powerId) throws ParseException, InterruptedException {
        return pwrdevHistorydataIdService.getHalfHourPwrHisDcoutData(powerId);
    }

    @ApiOperation(value = "系统概览获取前一百比时间间隔数据核容设备信息")
    @GetMapping("getBattDevData100")
    public Response getBattDevData100(@RequestParam Integer powerId,@RequestParam Integer battgroupId){
    public Response getBattDevData100(@RequestParam Integer powerId,@RequestParam Integer battgroupId) throws ParseException, InterruptedException {
        return battRealdataIdService.getBattDevData100(powerId,battgroupId);
    }

@@ -62,10 +62,16 @@
        return tdataIdService.getTinfDataWithTestRecordCount(battgroupId,testRecordCount,recordNum,granularity);
    }

    @ApiOperation(value = "历史实时查询")
    @ApiOperation(value = "电池历史实时查询")
    @GetMapping("getBattRealDataHis")
    public Response getBattRealDataHis(@RequestParam Integer battgroupId,@RequestParam Integer granularity
            ,@RequestParam String startTime,@RequestParam String  endTime) throws ParseException, InterruptedException {
        return battRealdataIdService.getBattRealDataHis(battgroupId,granularity,startTime,endTime);
    }
    @ApiOperation(value = "电源历史实时查询")
    @GetMapping("getPwrRealDataHis")
    public Response getPwrRealDataHis(@RequestParam Integer powerId,@RequestParam Integer granularity
            ,@RequestParam String startTime,@RequestParam String  endTime) throws ParseException, InterruptedException {
        return pwrdevHistorydataIdService.getPwrRealDataHis(powerId,granularity,startTime,endTime);
    }
}