Commit beb3d443 by gdj

放行自定义设备的drc校验。

parent 37c06824
package com.dji.sample.common.constant;
import java.util.ArrayList;
import java.util.Arrays;
/**
* @author guan
*/
public class DeviceConstant {
public final static ArrayList<String> CUSTOM_DEVICE_LIST = new ArrayList<>(Arrays.asList("12345678901", "12345678902", "12345678903", "12345678904"));
public final static ArrayList<String> CUSTOM_DOCK_LIST = new ArrayList<>(Arrays.asList("12345678901", "12345678903"));
public final static ArrayList<String> CUSTOM_DRONE_LIST = new ArrayList<>(Arrays.asList("12345678902", "12345678904"));
}
......@@ -57,6 +57,7 @@ import java.util.Optional;
import java.util.stream.Collectors;
import static com.dji.sample.common.util.SecurityUtils.aboveSysAdminRole;
import static com.dji.sample.common.constant.DeviceConstant.CUSTOM_DOCK_LIST;
/**
*
......@@ -781,6 +782,11 @@ public class DeviceServiceImpl extends ServiceImpl<IDeviceMapper, DeviceEntity>
@Override
public Boolean checkDockDrcMode(String dockSn) {
if (CUSTOM_DOCK_LIST.contains(dockSn) || dockSn.contains("123456789")) {
return true;
}
return deviceRedisService.getDeviceOsd(dockSn, OsdDock.class)
.map(OsdDock::getDrcState)
.orElse(DrcStateEnum.DISCONNECTED) != DrcStateEnum.DISCONNECTED;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment