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/inspection/update/status/UpdateWaittStatusService.java

@@ -69,7 +69,10 @@ public class UpdateWaittStatusService {
         }
 
         // 硬件停止后，停止录制
-        dspService.stopRecord(businessList.get(0).getMsgId());
+        JsonResult stopRecord = dspService.stopRecord(businessList.get(0).getMsgId());
+        if(0 != stopRecord.getCode()){
+            log.info("调用停止录制接口失败，请重试！",stopRecord.getMsg());
+        }
 
         // 硬件停止后，查询录屏信息
         JsonResult queryRecord = dspService.queryRecord(businessList.get(0).getMsgId());
@@ -84,15 +87,13 @@ public class UpdateWaittStatusService {
         if (0 != result.getCode()) {
             log.info("修改任务状态业务接口：获取天气信息失败：{}", result.getMsg());
             inspectionUpdate.setWeather("");
-            inspectionMapper.updateById(inspectionUpdate);
-            return;
         } else {
             log.info("修改任务状态业务接口：获取天气信息：{}", result.getData());
+            AirWeatherVO weather = (AirWeatherVO) result.getData();
+            String weatherStr = AirWeatherUtil.getWeather(weather);
+            log.info("修改任务状态业务接口：获取天气信息：weatherStr={}", weatherStr);
+            inspectionUpdate.setWeather(weatherStr);
         }
-        AirWeatherVO weather = (AirWeatherVO) result.getData();
-        String weatherStr = AirWeatherUtil.getWeather(weather);
-        log.info("修改任务状态业务接口：获取天气信息：weatherStr={}", weatherStr);
-        inspectionUpdate.setWeather(weatherStr);
 
         Integer flightDataCount = flightDataMapper.selectCount(new LambdaQueryWrapper<FlightData>()
                 .eq(FlightData::getInspectionId, inspection.getId())

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/third/dsp/StopRecordIService.java

@@ -42,7 +42,9 @@ public class StopRecordIService {
     private RestTemplate restTemplate;
 
     public JsonResult stopRecord(String msgId) {
-        String url = dspDomainUrl+SystemConstant.DSP_START_RECORD+"?request="+msgId;
+        String url = UriComponentsBuilder.fromHttpUrl(dspDomainUrl+SystemConstant.DSP_STOP_RECORD)
+                .queryParam("requestId", msgId)
+                .toUriString();
 
         JsonResult jsonResult;
         try {