Browse Source

Merge branch 'develop' of gitadmin/tuoheng_lc into release

tags/v1.2.0^2
wanjing 1 year ago
parent
commit
0d996d7c8b
2 changed files with 13 additions and 8 deletions
  1. +2
    -2
      tuoheng-admin/src/main/java/com/tuoheng/admin/service/third/airport/PointFlightService.java
  2. +11
    -6
      tuoheng-admin/src/main/java/com/tuoheng/admin/service/third/dsp/DspCallBackService.java

+ 2
- 2
tuoheng-admin/src/main/java/com/tuoheng/admin/service/third/airport/PointFlightService.java View File

@@ -70,7 +70,7 @@ public class PointFlightService {
// 巡检任务已经结束
// 再次选择原来机场进行定点飞行,
if (emergencyMission.getAirportId() == request.getAirportId()) {
log.info("新机场执行定点飞行");
log.info("原机场,重新执行定点飞行");
} else {
log.info("新机场执行定点飞行");
}
@@ -78,7 +78,7 @@ public class PointFlightService {
} else {
log.info("执行定点飞行, 原巡检任务在执行");
if (oldMission.getAirportId().equals(request.getAirportId())) {
log.info("原机场执行定点飞行");
log.info("原机场,直接执行定点飞行");
this.callOldAirpor(request);
} else {
log.info("新机场执行定点飞行");

+ 11
- 6
tuoheng-admin/src/main/java/com/tuoheng/admin/service/third/dsp/DspCallBackService.java View File

@@ -199,14 +199,19 @@ public class DspCallBackService {
warning.setLocation(gaodeAddress);
}

// 该巡检任务存在应急任务,将后面发现的预警直接设置为不展示
ThMission emergencyMission = missionMapper.selectOne(new LambdaQueryWrapper<ThMission>()
.eq(ThMission::getEmergencyDataMissionId, question.getMissionId())
.eq(ThMission::getMark, MarkEnum.VALID.getCode()));
if (ObjectUtils.isNotEmpty(emergencyMission)) {
ThMission thMission = missionMapper.selectById(question.getMissionId());
if (thMission.getType() == AccidentTaskEnum.ACCIDENT_TASK.getCode()) {
warning.setFlag(FlagEnum.ACCIDENT.getCode());
} else {
warning.setFlag(FlagEnum.INSPECTION_ACCIDENT.getCode());
// 该巡检任务存在应急任务,将后面发现的预警直接设置为不展示
ThMission emergencyMission = missionMapper.selectOne(new LambdaQueryWrapper<ThMission>()
.eq(ThMission::getEmergencyDataMissionId, question.getMissionId())
.eq(ThMission::getMark, MarkEnum.VALID.getCode()));
if (ObjectUtils.isNotEmpty(emergencyMission)) {
warning.setFlag(FlagEnum.ACCIDENT.getCode());
} else {
warning.setFlag(FlagEnum.INSPECTION_ACCIDENT.getCode());
}
}
warningList.add(warning);
}

Loading…
Cancel
Save