chore:测试提交

jinpengyong

2023-08-31 2b5a2bb0525cc70d7f44d18b8bcf44f46db8a35e

 screen-api/src/main/java/com/moral/api/controller/CruiserController.java

@@ -99,31 +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) {
        long stime = System.currentTimeMillis();
        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);
        }
        long etime = System.currentTimeMillis();
       /*List<Map<Integer,HistorySecondCruiserResultDTO>> mapList = new ArrayList<>();

        for(int i = 0 ;i<response.size();i++){
            Map<Integer,HistorySecondCruiserResultDTO> map = new HashMap<>();
            map.put(i,response.get(i));
            mapList.add(map);
        }*/
        //计算执行时间
        System.out.printf("执行时长：%d 毫秒.", (etime - stime));
        return ResultMessage.ok(response);


        return ObjectUtils.isEmpty(response) ? ResultMessage.ok() : ResultMessage.ok(response);

    }

@@ -229,6 +217,27 @@
        return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(),ResponseCodeEnum.SUCCESS.getMsg(),map);
    }


    /**
     * 下载尘负荷报告
     * @return
     */
    @PostMapping("dailyDustlds")
    public ResultMessage  dailyDustlds(HttpServletRequest request){
//        List<MultipartFile> files = ((MultipartHttpServletRequest) request).getFiles("files");
        Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);


        Map<String, Object> map = dustldService.dailyDustlds(null,params);
        if (ObjectUtils.isEmpty(map)){
            return ResultMessage.fail(ResponseCodeEnum.TARGET_IS_NULL.getCode(), ResponseCodeEnum.TARGET_IS_NULL.getMsg());
        }
        return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(),ResponseCodeEnum.SUCCESS.getMsg(),map);
    }




    /**
     * 查看路段高值
     * @param id