Merge branch 'develop' into release

tuoheng-admin/src/main/java/com/tuoheng/admin/entity/request/MissionStatusRequest.java

@@ -39,4 +39,7 @@ public class MissionStatusRequest  implements Serializable {
 
     @ApiModelProperty(value = "直播原视频外网地址")
     private String playUrl;
+
+    @ApiModelProperty(value = "请求ID")
+    private String requestId;
 }

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

@@ -100,8 +100,10 @@ public class IndexServiceImpl implements IndexService {
                     .setWdir(parmJson.getString("WDIR") + "度");
             //用角度表示风向，是把圆周分成360度，北风(N)是0度(即360度)，东风(E)是90度，南风(S)是180度，西风(W)是270度
             BigDecimal hpa = parmJson.getBigDecimal("Hpa");
-            BigDecimal mpa = hpa.divide(new BigDecimal(100000), 1, BigDecimal.ROUND_HALF_UP);
-            airportDetailDto.setHpa(mpa + "Mpa");
+            if(hpa != null){
+                BigDecimal mpa = hpa.divide(new BigDecimal(100000), 1, BigDecimal.ROUND_HALF_UP);
+                airportDetailDto.setHpa(mpa + "Mpa");
+            }
         }
         JSONObject tahJson = dataObject.getJSONObject("TAH");
         if(Objects.nonNull(tahJson)){

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

@@ -248,6 +248,7 @@ public class MissionServiceImpl extends BaseServiceImpl<ThMissionMapper, ThMissi
         LambdaQueryWrapper<ThMission> lambdaQueryWrapper=new LambdaQueryWrapper<>();
         lambdaQueryWrapper.orderByAsc(ThMission::getExecutionStartTime);
         lambdaQueryWrapper.eq(ThMission::getInspectionLine, missionStatusRequest.getId());
+        lambdaQueryWrapper.eq(ThMission::getId,missionStatusRequest.getRequestId());
         lambdaQueryWrapper.eq(ThMission::getStatus,status);
         //lambdaQueryWrapper.eq(ThMission::getTenantId,ShiroUtils.getTenantId());
         List<ThMission> thMissions = thMissionMapper.selectList(lambdaQueryWrapper);