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

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/airData/query/QueryAirDataListService.java

@@ -61,7 +61,8 @@ public class QueryAirDataListService {
     public JsonResult list(String id) {
         List<AirData> airDataList = airDataMapper.selectList(Wrappers.<AirData>lambdaQuery()
                 .eq(AirData::getMark, MarkEnum.VALID.getCode())
-                .eq(AirData::getInspectionId, id));
+                .eq(AirData::getInspectionId, id)
+                .orderByDesc(AirData::getCreateTime));
 
         return JsonResult.success(airDataList);
     }

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/airData/report/ExportReportService.java

@@ -27,10 +27,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
+import java.io.*;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
 import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -85,6 +84,11 @@ public class ExportReportService {
             this.handle(request, airDataType, airDataList);
         }
         String filename = inspection.getName() + "-" + inspection.getCode() + "-" + airDataType.getDataType() + ".doc";
+        try {
+            filename   = URLEncoder.encode(filename,"utf-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
         String filePath = UploadFileConfig.uploadFolder + "/report/" + filename;
         File fd = new File(UploadFileConfig.uploadFolder + "/report");
         if (!fd.exists()) {

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/update/flyer/UpdateFlyerService.java

@@ -137,7 +137,7 @@ public class UpdateFlyerService {
     }
 
     private void updateInflight(UpdateTaskByCodeRequest request, Inspection inspection) {
-        log.info("开始飞行，修改任务状态和信息");
+        log.info("开始飞行，修改任务状态和信息,request={}",request);
         //直播填充盒子设备
         if (1 == inspection.getIsLive()) {
             inspection.setCloudBoxId(request.getCloudBoxId());