Browse Source

Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release

tags/V1.0.1
chengwang 1 year ago
parent
commit
2ed818e87b
1 changed files with 4 additions and 2 deletions
  1. +4
    -2
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/airData/syncdata/SyncAirDataService.java

+ 4
- 2
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/airData/syncdata/SyncAirDataService.java View File

if (CollectionUtil.isNotEmpty(inspectionList) || inspectionList.size() != 0) { if (CollectionUtil.isNotEmpty(inspectionList) || inspectionList.size() != 0) {
inspection = inspectionList.get(0); inspection = inspectionList.get(0);
log.info("正在飞行的飞手任务,inspection={}", inspection); log.info("正在飞行的飞手任务,inspection={}", inspection);
} else if (inspection == null) {
} else if (CollectionUtil.isEmpty(inspectionList) || inspectionList.size() == 0) {
//再查询最新的一条任务 //再查询最新的一条任务
inspectionList = inspectionMapper.selectList(Wrappers.<Inspection>lambdaQuery() inspectionList = inspectionMapper.selectList(Wrappers.<Inspection>lambdaQuery()
.eq(Inspection::getMark, 1) .eq(Inspection::getMark, 1)
if (CollectionUtil.isNotEmpty(inspectionList) || inspectionList.size() != 0) { if (CollectionUtil.isNotEmpty(inspectionList) || inspectionList.size() != 0) {
inspection = inspectionList.get(0); inspection = inspectionList.get(0);
log.info("正在飞行的巡检任务,inspection={}", inspection); log.info("正在飞行的巡检任务,inspection={}", inspection);
} else {
} else if(inspection == null){
log.info("没有正在飞行的任务,无法关联推送的灵嗅数据,serial={}", response.getSerial()); log.info("没有正在飞行的任务,无法关联推送的灵嗅数据,serial={}", response.getSerial());
return JsonResult.error("没有正在飞行的任务"); return JsonResult.error("没有正在飞行的任务");
}else {
log.info("查询出的任务数据不存在");
} }


} }

Loading…
Cancel
Save