diff --git a/admin/src/main/java/com/multictrl/common/constant/DJIImage.java b/admin/src/main/java/com/multictrl/common/constant/DJIImage.java index 91833ab..7a1a654 100644 --- a/admin/src/main/java/com/multictrl/common/constant/DJIImage.java +++ b/admin/src/main/java/com/multictrl/common/constant/DJIImage.java @@ -7,7 +7,7 @@ import lombok.Getter; @Getter public enum DJIImage { DJI("DJI", "source-material/dji.png"), - DOCK1("DJI Dock1", "source-material/dock1.png"), + DOCK1("DJI Dock", "source-material/dock1.png"), DOCK2("DJI Dock2", "source-material/dock2.png"), DOCK3("DJI Dock3", "source-material/dock3.png"); diff --git a/admin/src/main/java/com/multictrl/modules/business/q20/controller/Q20CommandController.java b/admin/src/main/java/com/multictrl/modules/business/q20/controller/Q20CommandController.java index 7899adf..f1cae70 100644 --- a/admin/src/main/java/com/multictrl/modules/business/q20/controller/Q20CommandController.java +++ b/admin/src/main/java/com/multictrl/modules/business/q20/controller/Q20CommandController.java @@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("business/q20/cmd") @Tag(name = "Q20控制指令") -@ApiOrder(12) +@ApiOrder(102) @RequiredArgsConstructor public class Q20CommandController { diff --git a/admin/src/main/java/com/multictrl/modules/business/q20/controller/Q20Controller.java b/admin/src/main/java/com/multictrl/modules/business/q20/controller/Q20Controller.java index 04a7bbf..d749f83 100644 --- a/admin/src/main/java/com/multictrl/modules/business/q20/controller/Q20Controller.java +++ b/admin/src/main/java/com/multictrl/modules/business/q20/controller/Q20Controller.java @@ -21,7 +21,7 @@ import java.util.List; @RestController @RequestMapping("business/q20") @Tag(name = "Q20飞机管理") -@ApiOrder(10) +@ApiOrder(100) @RequiredArgsConstructor public class Q20Controller { diff --git a/admin/src/main/java/com/multictrl/modules/business/q20/controller/Q20MockController.java b/admin/src/main/java/com/multictrl/modules/business/q20/controller/Q20MockController.java index 8f3a65c..d15509f 100644 --- a/admin/src/main/java/com/multictrl/modules/business/q20/controller/Q20MockController.java +++ b/admin/src/main/java/com/multictrl/modules/business/q20/controller/Q20MockController.java @@ -2,6 +2,7 @@ package com.multictrl.modules.business.q20.controller; import cn.hutool.core.util.IdUtil; import cn.hutool.json.JSONObject; +import com.multictrl.common.annotation.ApiOrder; import com.multictrl.common.exception.RenException; import com.multictrl.common.utils.Result; import com.multictrl.modules.business.service.DJIBaseService; @@ -19,6 +20,7 @@ import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("business/q20/mock") @Tag(name = "Q20 MQTT模拟(测试)") +@ApiOrder(104) @RequiredArgsConstructor public class Q20MockController { diff --git a/admin/src/main/java/com/multictrl/modules/business/q20/controller/Q20ParamController.java b/admin/src/main/java/com/multictrl/modules/business/q20/controller/Q20ParamController.java index 9f93b09..eee96d7 100644 --- a/admin/src/main/java/com/multictrl/modules/business/q20/controller/Q20ParamController.java +++ b/admin/src/main/java/com/multictrl/modules/business/q20/controller/Q20ParamController.java @@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("business/q20/param") @Tag(name = "Q20参数指令") -@ApiOrder(11) +@ApiOrder(101) @RequiredArgsConstructor public class Q20ParamController { diff --git a/admin/src/main/java/com/multictrl/modules/business/q20/controller/Q20RouteController.java b/admin/src/main/java/com/multictrl/modules/business/q20/controller/Q20RouteController.java index fe532db..34e488b 100644 --- a/admin/src/main/java/com/multictrl/modules/business/q20/controller/Q20RouteController.java +++ b/admin/src/main/java/com/multictrl/modules/business/q20/controller/Q20RouteController.java @@ -27,7 +27,7 @@ import java.util.Map; @RestController @RequestMapping("business/q20/route") @Tag(name = "Q20航线任务") -@ApiOrder(13) +@ApiOrder(103) @RequiredArgsConstructor public class Q20RouteController { diff --git a/admin/src/main/java/com/multictrl/modules/business/service/impl/DockServiceImpl.java b/admin/src/main/java/com/multictrl/modules/business/service/impl/DockServiceImpl.java index 10ce1c8..07f698c 100644 --- a/admin/src/main/java/com/multictrl/modules/business/service/impl/DockServiceImpl.java +++ b/admin/src/main/java/com/multictrl/modules/business/service/impl/DockServiceImpl.java @@ -110,10 +110,10 @@ public class DockServiceImpl extends CrudServiceImpl list = dictDataDao.selectList(new QueryWrapper() - .eq("dict_value", dockMode).orderByAsc("create_date")); - if (list != null) { + .eq("dict_value", dockModel).orderByAsc("create_date")); + if (CollUtil.isNotEmpty(list)) { dockDTO.setImgUrl(BusinessConstant.IMAGE_PATH + list.get(0).getImageUrl()); } } diff --git a/admin/src/main/java/com/multictrl/modules/sys/service/impl/SysDictDataServiceImpl.java b/admin/src/main/java/com/multictrl/modules/sys/service/impl/SysDictDataServiceImpl.java index f63c98a..5b1a91d 100644 --- a/admin/src/main/java/com/multictrl/modules/sys/service/impl/SysDictDataServiceImpl.java +++ b/admin/src/main/java/com/multictrl/modules/sys/service/impl/SysDictDataServiceImpl.java @@ -38,6 +38,12 @@ public class SysDictDataServiceImpl extends BaseServiceImpl