|
|
@@ -94,7 +94,8 @@ public class QueryAirDataListService { |
|
|
|
//获取当前任务id下的大气数据 |
|
|
|
List<AirData> airDataList = airDataMapper.selectList(Wrappers.<AirData>lambdaQuery() |
|
|
|
.eq(AirData::getMark, MarkEnum.VALID.getCode()) |
|
|
|
.eq(AirData::getInspectionId, id)); |
|
|
|
.eq(AirData::getInspectionId, id) |
|
|
|
.orderByAsc(AirData::getCUtcTime)); |
|
|
|
if(CollectionUtils.isEmpty(airDataList) || airDataList.size() == 0){ |
|
|
|
return JsonResult.error(AirDataEnum.AIR_DATA_IS_NOT_EXIST.getCode(),AirDataEnum.AIR_DATA_IS_NOT_EXIST.getMsg()); |
|
|
|
} |
|
|
@@ -113,7 +114,7 @@ public class QueryAirDataListService { |
|
|
|
airDataExcelVoList.add(vo); |
|
|
|
}); |
|
|
|
//对列表进行排序 |
|
|
|
airDataExcelVoList.stream().sorted(Comparator.comparing(AirDataExcelVo::getSequence)).collect(Collectors.toList()); |
|
|
|
//airDataExcelVoList.stream().sorted(Comparator.comparing(AirDataExcelVo::getCUtcTime)).collect(Collectors.toList()); |
|
|
|
|
|
|
|
String fileName = inspection.getName()+"+"+inspection.getCode()+".xlsx"; |
|
|
|
String filePath = UploadFileConfig.uploadFolder + "/data/" + fileName; |