Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_lc into develop

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

@@ -291,7 +291,6 @@ public class QuestionServiceImpl extends BaseServiceImpl<QuestionMapper, Questio
     }
 
     @Override
-    @Transactional(propagation = Propagation.REQUIRED)
     public JsonResult process(String requestId, CallbackRequest callbackRequest) throws ServiceException {
 
         ThMission mission = getThMission(requestId);
@@ -342,13 +341,15 @@ public class QuestionServiceImpl extends BaseServiceImpl<QuestionMapper, Questio
         //获取当前飞行坐标，存问题的经纬度
         List<ThInspection> flightDataList = getThInspections(mission);
         List<Question> questionList = getQuestionList(mission, questionFiles, flightDataList);
-        //保存问题数据时调用saveWarningData方法保存预警数据入库
-        Boolean aBoolean = saveWarningData(mission, questionFiles, flightDataList);
-        log.info("预警表数据入库结束, {}", aBoolean);
         if (questionList.size() == 0) {
             return true;
         }
-        return saveBatch(questionList);
+        boolean flag =  this.saveBatch(questionList);
+        log.info("已检查出来的问题列表,{}",questionFiles);
+        //保存问题数据时调用saveWarningData方法保存预警数据入库
+        flag = this.saveWarningData(mission, questionFiles, flightDataList);
+        log.info("预警表数据入库结束, {}", flag);
+        return flag;
     }
 
     private List<ThInspection> getThInspections(ThMission mission) {