Merge branch 'develop' of gitadmin/tuoheng_lc into release

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

@@ -345,12 +345,25 @@ public class QuestionServiceImpl extends BaseServiceImpl<QuestionMapper, Questio
             return true;
         }
         boolean flag =  this.saveBatch(questionList);
-        log.info("已检查出来的问题列表,{}",questionFiles);
+        log.info("已检查出来的问题列表, questionList size={}", questionList.size());
+        for (Question question : questionList) {
+            log.info("保存问题，question id={}", question.getId());
+        }
         //保存问题数据时调用saveWarningData方法保存预警数据入库
         flag = this.saveWarningData(mission, questionFiles, flightDataList);
         log.info("预警表数据入库结束, {}", flag);
         return flag;
     }
+//    //保存预警数据
+//    private Boolean saveWarning(CallbackRequest callbackRequest, ThMission mission) {
+//        List<CallbackRequest.QuestionFilesDTO> questionFiles = callbackRequest.getQuestionFiles();
+//        //获取当前飞行坐标，存问题的经纬度
+//        List<ThInspection> flightDataList = getThInspections(mission);
+//        List<Warning> warnings = saveWarningData(mission, questionFiles, flightDataList);
+//        boolean result = iWarningService.saveBatch(warnings);
+//
+//        return result;
+//    }
 
     private List<ThInspection> getThInspections(ThMission mission) {
         return inspectionMapper.selectList(new LambdaQueryWrapper<ThInspection>()