Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb_21

jinpengyong

2023-08-23 8c741905bff160816524a54df00a4acca684b770

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

@@ -18,6 +18,7 @@
import org.springframework.web.multipart.MultipartHttpServletRequest;

import java.text.ParseException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -98,29 +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();
        Map<Integer,HistorySecondCruiserResultDTO> map = new HashMap<>();

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


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

    }