Commit 19693038 by gdj

增加自定义机型

parent 5b2ed680
...@@ -12,5 +12,6 @@ public class DeviceConstant { ...@@ -12,5 +12,6 @@ public class DeviceConstant {
public final static ArrayList<String> CUSTOM_DOCK_LIST = new ArrayList<>(Arrays.asList("12345678901", "12345678903")); 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")); public final static ArrayList<String> CUSTOM_DRONE_LIST = new ArrayList<>(Arrays.asList("12345678902", "12345678904"));
public final static String CUSTOM_DOCK_START = "616CC";
} }
...@@ -59,6 +59,8 @@ import java.util.List; ...@@ -59,6 +59,8 @@ import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static com.dji.sample.common.constant.DeviceConstant.CUSTOM_DOCK_START;
import static com.dji.sample.common.util.SecurityUtils.aboveSysAdminRole;
import static com.dji.sample.common.constant.DeviceConstant.CUSTOM_DOCK_LIST; import static com.dji.sample.common.constant.DeviceConstant.CUSTOM_DOCK_LIST;
import static com.dji.sample.common.util.SecurityUtils.*; import static com.dji.sample.common.util.SecurityUtils.*;
...@@ -901,7 +903,10 @@ public class DeviceServiceImpl extends ServiceImpl<IDeviceMapper, DeviceEntity> ...@@ -901,7 +903,10 @@ public class DeviceServiceImpl extends ServiceImpl<IDeviceMapper, DeviceEntity>
@Override @Override
public Boolean checkDockDrcMode(String dockSn) { public Boolean checkDockDrcMode(String dockSn) {
if (CUSTOM_DOCK_LIST.contains(dockSn) || dockSn.contains("123456789")) { if (CUSTOM_DOCK_LIST.contains(dockSn) || dockSn.contains("12345")) {
return true;
}
if (StringUtils.hasText(dockSn) && dockSn.startsWith(CUSTOM_DOCK_START)) {
return true; return true;
} }
......
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