Merge branch 'develop' of gitadmin/tuoheng_lc into release

tuoheng-admin/src/main/java/com/tuoheng/admin/service/impl/QuestionServiceImpl.java

@@ -426,7 +426,8 @@ public class QuestionServiceImpl extends BaseServiceImpl<QuestionMapper, Questio
         lambdaQueryWrapper
                 .eq(ThMission::getMark, MarkTypeEnum.VALID.getCode())
                 .eq(ThMission::getRequestId, requestId)
-                .eq(ThMission::getStatus, TaskStatusEnum.FLIGHT.getCode()).orderByDesc(ThMission::getExecutionStartTime);
+                .eq(ThMission::getStatus, TaskStatusEnum.COMPLETE.getCode())
+                .orderByDesc(ThMission::getExecutionStartTime);
         List<ThMission> thMissions = missionMapper.selectList(lambdaQueryWrapper);
         if (ObjectUtil.isEmpty(thMissions) || thMissions.size() == 0) {
             throw new ServiceException(HttpStatus.BAD_REQUEST.value(), "正在执行的任务不存在！");

tuoheng-admin/src/main/java/com/tuoheng/admin/service/third/airport/PointFlightService.java

@@ -11,7 +11,6 @@ import com.tuoheng.admin.entity.domain.WarningRecord;
 import com.tuoheng.admin.entity.request.airport.PointFlightRequest;
 import com.tuoheng.admin.enums.AirportFlyTypeEnum;
 import com.tuoheng.admin.enums.InspectionTypeEnum;
-import com.tuoheng.admin.enums.TaskStatusEnum;
 import com.tuoheng.admin.enums.UpdateOrCreateEnum;
 import com.tuoheng.admin.mapper.TenantMapper;
 import com.tuoheng.admin.mapper.ThMissionMapper;
@@ -63,10 +62,10 @@ public class PointFlightService {
         ThMission oldMission = (ThMission) result.getData();
         if (oldMission.getAirportId().equals(request.getAirportId())) {
             log.info("原机场执行定点飞行");
-//            this.callOldAirpor(tenant, request);
+            this.callOldAirpor(tenant, request);
         } else {
             log.info("新机场执行定点飞行");
-//            this.callNewAirpor(tenant, request, mission.getId());
+            this.callNewAirpor(tenant, request, mission.getId());
         }
 
         // 创建预警记录
@@ -104,8 +103,8 @@ public class PointFlightService {
             throw new ServiceException("纬度为空");
         }
         Warning warning = warningMapper.selectOne(new LambdaQueryWrapper<Warning>()
-                        .eq(Warning::getId, request.getWarningId())
-                        .eq(Warning::getMark, 1));
+                .eq(Warning::getId, request.getWarningId())
+                .eq(Warning::getMark, 1));
         if (ObjectUtil.isNull(warning)) {
             throw new ServiceException("该预警信息不存在");
         }

tuoheng-admin/src/main/java/com/tuoheng/admin/service/warningrecord/query/QueryWarningRecordListByWarningIdService.java

@@ -3,10 +3,19 @@ package com.tuoheng.admin.service.warningrecord.query;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.tuoheng.admin.conver.WarningConverMapper;
+import com.tuoheng.admin.conver.WarningRecordConverMapper;
+import com.tuoheng.admin.entity.domain.Question;
+import com.tuoheng.admin.entity.domain.ThMission;
 import com.tuoheng.admin.entity.domain.Warning;
 import com.tuoheng.admin.entity.domain.WarningRecord;
 import com.tuoheng.admin.entity.request.warningrecord.QueryWarningRecordListByWarningIdRequest;
+import com.tuoheng.admin.entity.vo.warning.WarningListVo;
+import com.tuoheng.admin.entity.vo.warning.WarningRecordVo;
 import com.tuoheng.admin.enums.MarkEnum;
+import com.tuoheng.admin.enums.TaskStatusEnum;
+import com.tuoheng.admin.enums.UpdateOrCreateEnum;
+import com.tuoheng.admin.mapper.ThMissionMapper;
 import com.tuoheng.admin.mapper.WarningMapper;
 import com.tuoheng.admin.mapper.WarningRecordMapper;
 import com.tuoheng.common.exception.ServiceException;
@@ -18,6 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 查询预警记录业务层处理
@@ -36,9 +46,11 @@ public class QueryWarningRecordListByWarningIdService {
     @Autowired
     private WarningRecordMapper warningRecordMapper;
 
+    @Autowired
+    private ThMissionMapper missionMapper;
+
     public JsonResult getListByWarningId(QueryWarningRecordListByWarningIdRequest request) {
 //        log.info("进入根据预警ID查询预警记录列表业务");
-
         User user = ShiroUtils.getUserInfo();
         Integer tenantId = user.getTenantId();
         request.setTenantId(tenantId);
@@ -52,7 +64,11 @@ public class QueryWarningRecordListByWarningIdService {
         if (CollectionUtil.isEmpty(warningRecordList)) {
             log.info("预警记录列表数据为空");
         }
-        return JsonResult.success(warningRecordList);
+
+        // 构造返回结果对象
+        List<WarningRecordVo> warningRecordVoList = this.buildWarningRecordVoList(warningRecordList);
+
+        return JsonResult.success(warningRecordVoList);
     }
 
     /**
@@ -64,7 +80,7 @@ public class QueryWarningRecordListByWarningIdService {
      */
     private JsonResult check(Integer tenantId, QueryWarningRecordListByWarningIdRequest request) {
         // 判断预警id是否为空
-        if (ObjectUtil.isNotNull(request.getWarningId())) {
+        if (ObjectUtil.isNull(request.getWarningId())) {
             throw new ServiceException("预警ID为空");
         }
         Warning warning = warningMapper.selectOne(new LambdaQueryWrapper<Warning>()
@@ -77,4 +93,24 @@ public class QueryWarningRecordListByWarningIdService {
         return JsonResult.success();
     }
 
+    private List<WarningRecordVo> buildWarningRecordVoList(List<WarningRecord> warningRecordList) {
+        List<WarningRecordVo> warningRecordVoList = WarningRecordConverMapper.INSTANCE.fromWarningRecordListToWarningRecordListVoList(warningRecordList);
+        ThMission oldMission;
+        ThMission newMission;
+        for (WarningRecordVo warningRecordVo : warningRecordVoList) {
+            oldMission = missionMapper.selectOne(new LambdaQueryWrapper<ThMission>()
+                    .eq(ThMission::getId, warningRecordVo.getMissionId())
+                    .eq(ThMission::getMark, 1));
+            newMission = missionMapper.selectOne(new LambdaQueryWrapper<ThMission>()
+                    .eq(ThMission::getId, warningRecordVo.getEmergencyMissionId())
+                    .eq(ThMission::getMark, 1));
+            if (oldMission.getAirportId().equals(newMission.getAirportId())) {
+                warningRecordVo.setStatus(oldMission.getStatus());
+            } else {
+                warningRecordVo.setStatus(newMission.getStatus());
+            }
+        }
+        return warningRecordVoList;
+    }
+
 }