chore:补充提交

jinpengyong

2023-10-25 ac6261ea96f8b32cd6f1ae52d6dc77700af77ce9

chore:补充提交

 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);
    }



}




 screen-api/src/main/java/com/moral/api/pojo/vo/historyFiveMinutely/QueryFiveDataByMacVO.java

@@ -44,4 +44,7 @@

    @ApiModelProperty(value = "风速")
    private String a01007;

    @ApiModelProperty(value = "tvos")
    private String a99054;
}

 screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java

@@ -303,6 +303,7 @@
        queryFiveDataByMacVO.setA05024(result.get("a05024").toString());
        queryFiveDataByMacVO.setA01008(result.get("a01008").toString());
        queryFiveDataByMacVO.setA01007(result.get("a01007").toString());
        queryFiveDataByMacVO.setA99054(result.get("a99054").toString());

        return queryFiveDataByMacVO;
    }