jinpengyong
2023-07-31 7ed9e64f4b566574d19a6be15660cba9dbe6cabe
screen-api/src/main/java/com/moral/api/controller/CruiserController.java
@@ -99,20 +99,19 @@
            @ApiImplicitParam(name = "mac", value = "设备mac", required = true, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "time1", value = "时间,2021-08-18", required = true, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "time2", value = "时间,2021-08-18", required = true, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "type", value = "采集因子", required = true, paramType = "query", dataType = "String")
            @ApiImplicitParam(name = "type", value = "采集因子", required = true, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "range", value = "范围", required = true, paramType = "query", dataType = "int")
    })
    public ResultMessage carTrajectoryNewAvg(HttpServletRequest request) {
        Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
        if (!params.containsKey("mac") || !params.containsKey("time1")|| !params.containsKey("type")|| !params.containsKey("time2")) {
        if (!params.containsKey("mac") || !params.containsKey("time1")||!params.containsKey("range")|| !params.containsKey("type")|| !params.containsKey("time2")) {
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        }
        List<HistorySecondCruiserResultDTO> response = specialDeviceService.carTrajectoryNewAvg(params);
        if(CollectionUtils.isEmpty(response)){
            return ObjectUtils.isEmpty(response) ? ResultMessage.ok() : ResultMessage.ok(response);
        }//计算执行时间
        return ResultMessage.ok(response);
        //计算执行时间
        return ObjectUtils.isEmpty(response) ? ResultMessage.ok() : ResultMessage.ok(response);
    }