Browse Source

报错信息修改 in_the_sky修改

S0025136190 1 year ago
parent
commit
3fbc048bac

+ 12 - 2
Backend/sample/src/main/java/com/dji/sample/manage/service/impl/DeviceHmsServiceImpl.java

@@ -194,8 +194,18 @@ public class DeviceHmsServiceImpl extends AbstractHmsService implements IDeviceH
      */
     private void fillMessage(DeviceHmsEntity dto, DeviceHmsArgs args) {
         HmsMessage hmsMessage = HmsJsonUtil.get(dto.getHmsKey());
-        String zh = StringUtils.hasText(hmsMessage.getZh()) ? hmsMessage.getZh() : String.format("未知错误(%s)", dto.getHmsKey());
-        String en = StringUtils.hasText(hmsMessage.getEn()) ? hmsMessage.getEn() : String.format("Unknown(%s)", dto.getHmsKey());//
+        String zh;
+        String en;
+        if (null != hmsMessage) {
+            zh = StringUtils.hasText(hmsMessage.getZh()) ? hmsMessage.getZh() : String.format("未知错误(%s)", dto.getHmsKey());
+            en = StringUtils.hasText(hmsMessage.getEn()) ? hmsMessage.getEn() : String.format("Unknown(%s)", dto.getHmsKey());//
+        } else {
+            String hmsKey = dto.getHmsKey().replace(HmsInTheSkyEnum.IN_THE_SKY.getText(),"");
+            hmsMessage = HmsJsonUtil.get(hmsKey);
+            zh = StringUtils.hasText(hmsMessage.getZh()) ? hmsMessage.getZh() : String.format("未知错误(%s)", dto.getHmsKey());
+            en = StringUtils.hasText(hmsMessage.getEn()) ? hmsMessage.getEn() : String.format("Unknown(%s)", dto.getHmsKey());//
+        }
+
 
         dto.setMessageZh(format(Locale.CHINESE.getLanguage(), zh, args));
         dto.setMessageEn(format(Locale.ENGLISH.getLanguage(), en, args));

+ 1 - 1
Backend/sample/src/main/java/com/dji/sample/wayline/service/impl/FlightTaskServiceImpl.java

@@ -412,7 +412,7 @@ public class FlightTaskServiceImpl extends AbstractWaylineService implements IFl
         // Check if the task status is correct.
         boolean isErr = !jobIds.removeAll(waylineJobIds) || !jobIds.isEmpty() ;
         if (isErr) {
-            throw new IllegalArgumentException("任务的状态不正确,无法删除。 " + Arrays.toString(jobIds.toArray()));
+            throw new IllegalArgumentException("任务的状态不正确,无法删除。 " );
         }
 
         // Group job id by dock sn.