修复机队bug

sample/src/main/java/com/dji/sample/manage/model/dto/FleetDTO.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Builder;
 import lombok.Data;
 import lombok.Data;
@@ -39,8 +40,10 @@ public class FleetDTO implements Serializable {
 
 
     private String nickname;
     private String nickname;
 
 
+    @JsonProperty(value = "user_list")
     private List<FleetUserDTO> userList;
     private List<FleetUserDTO> userList;
 
 
+    @JsonProperty(value = "device_list")
     private List<FleetDeviceDTO> deviceList;
     private List<FleetDeviceDTO> deviceList;
 
 
 }
 }

sample/src/main/java/com/dji/sample/manage/service/impl/FleetDeviceServiceImpl.java

@@ -12,6 +12,7 @@ import com.dji.sdk.cloudapi.device.DeviceEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
@@ -63,10 +64,12 @@ public class FleetDeviceServiceImpl extends ServiceImpl<IFleetDeviceMapper, Flee
         LambdaQueryWrapper<DeviceEntity> deviceQueryWrapper = new LambdaQueryWrapper<>();
         LambdaQueryWrapper<DeviceEntity> deviceQueryWrapper = new LambdaQueryWrapper<>();
         deviceQueryWrapper.eq(DeviceEntity::getId, fleetDeviceDTO.getDeviceId());
         deviceQueryWrapper.eq(DeviceEntity::getId, fleetDeviceDTO.getDeviceId());
         DeviceEntity device = deviceService.getOne(deviceQueryWrapper);
         DeviceEntity device = deviceService.getOne(deviceQueryWrapper);
-        fleetDeviceDTO.setDeviceNickname(device.getNickname());
-        // 型号
-        DeviceEnum deviceEnum = DeviceEnum.find(device.getDomain(), device.getDeviceType(), device.getSubType());
-        fleetDeviceDTO.setDeviceEnumName(deviceEnum.name());
+        if (!ObjectUtils.isEmpty(device)) {
+            fleetDeviceDTO.setDeviceNickname(device.getNickname());
+            // 型号
+            DeviceEnum deviceEnum = DeviceEnum.find(device.getDomain(), device.getDeviceType(), device.getSubType());
+            fleetDeviceDTO.setDeviceEnumName(deviceEnum.name());
+        }
 
 
         return fleetDeviceDTO;
         return fleetDeviceDTO;
     }
     }

sample/src/main/java/com/dji/sample/manage/service/impl/FleetUserServiceImpl.java

@@ -12,6 +12,7 @@ import com.dji.sample.manage.service.IUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
@@ -66,8 +67,10 @@ public class FleetUserServiceImpl extends ServiceImpl<IFleetUserMapper, FleetUse
         userQueryWrapper.eq(UserEntity::getId, fleetUserDTO.getUserId());
         userQueryWrapper.eq(UserEntity::getId, fleetUserDTO.getUserId());
         UserEntity user = userService.getOne(userQueryWrapper);
         UserEntity user = userService.getOne(userQueryWrapper);
 
 
-        fleetUserDTO.setUsername(user.getUsername());
-        fleetUserDTO.setUserTypeName(UserTypeEnum.find(user.getUserType()).name());
+        if (!ObjectUtils.isEmpty(user)) {
+            fleetUserDTO.setUsername(user.getUsername());
+            fleetUserDTO.setUserTypeName(UserTypeEnum.find(user.getUserType()).name());
+        }
 
 
         return fleetUserDTO;
         return fleetUserDTO;
     }
     }