jinpengyong
2023-12-13 0ac36f61bfbb42c4867afda00e8528ecec60ef74
screen-api/src/main/java/com/moral/api/controller/HistoryFiveMinutelyController.java
@@ -94,8 +94,15 @@
                                            @RequestParam @ApiParam(value = "chooseTime",name = "选取历史数据") String chooseTime,
                                            @RequestParam @ApiParam(value = "time",name = "时间") String time){
        QueryFiveDataByMacVO queryFiveDataByMacVO = historyFiveMinutelyService.queryFiveDataByMac(mac, chooseTime, time);
        return ResultMessage.ok(ObjectUtils.isEmpty(queryFiveDataByMacVO)?"0":queryFiveDataByMacVO);
        if (ObjectUtils.isEmpty(queryFiveDataByMacVO)){
            return ResultMessage.fail(ResponseCodeEnum.TARGET_IS_NULL.getCode(), ResponseCodeEnum.TARGET_IS_NULL.getMsg());
        }
        return  ResultMessage.ok(queryFiveDataByMacVO);
    }
}