sdy
/
Dock-MultiCtrl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

字典图片、机库图片优化

This commit is contained in:
sdy 2026-06-05 14:35:47 +08:00
parent 6d9bd5a7ca
commit 4f4a110765
8 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/src/main/java/com/multictrl/common/constant/DJIImage.java
View File

@ -7,7 +7,7 @@ import lombok.Getter;
@Getter @Getter
public enum DJIImage { public enum DJIImage {
DJI("DJI", "source-material/dji.png"), 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"), DOCK2("DJI Dock2", "source-material/dock2.png"),
DOCK3("DJI Dock3", "source-material/dock3.png"); DOCK3("DJI Dock3", "source-material/dock3.png");

2
admin/src/main/java/com/multictrl/modules/business/q20/controller/Q20CommandController.java
View File

@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.*;
@RestController @RestController
@RequestMapping("business/q20/cmd") @RequestMapping("business/q20/cmd")
@Tag(name = "Q20控制指令") @Tag(name = "Q20控制指令")
@ApiOrder(12) @ApiOrder(102)
@RequiredArgsConstructor @RequiredArgsConstructor
public class Q20CommandController { public class Q20CommandController {

2
admin/src/main/java/com/multictrl/modules/business/q20/controller/Q20Controller.java
View File

@ -21,7 +21,7 @@ import java.util.List;
@RestController @RestController
@RequestMapping("business/q20") @RequestMapping("business/q20")
@Tag(name = "Q20飞机管理") @Tag(name = "Q20飞机管理")
@ApiOrder(10) @ApiOrder(100)
@RequiredArgsConstructor @RequiredArgsConstructor
public class Q20Controller { public class Q20Controller {

2
admin/src/main/java/com/multictrl/modules/business/q20/controller/Q20MockController.java
View File

@ -2,6 +2,7 @@ package com.multictrl.modules.business.q20.controller;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import cn.hutool.json.JSONObject; import cn.hutool.json.JSONObject;
import com.multictrl.common.annotation.ApiOrder;
import com.multictrl.common.exception.RenException; import com.multictrl.common.exception.RenException;
import com.multictrl.common.utils.Result; import com.multictrl.common.utils.Result;
import com.multictrl.modules.business.service.DJIBaseService; import com.multictrl.modules.business.service.DJIBaseService;
@ -19,6 +20,7 @@ import org.springframework.web.bind.annotation.*;
@RestController @RestController
@RequestMapping("business/q20/mock") @RequestMapping("business/q20/mock")
@Tag(name = "Q20 MQTT模拟(测试)") @Tag(name = "Q20 MQTT模拟(测试)")
@ApiOrder(104)
@RequiredArgsConstructor @RequiredArgsConstructor
public class Q20MockController { public class Q20MockController {

2
admin/src/main/java/com/multictrl/modules/business/q20/controller/Q20ParamController.java
View File

@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.*;
@RestController @RestController
@RequestMapping("business/q20/param") @RequestMapping("business/q20/param")
@Tag(name = "Q20参数指令") @Tag(name = "Q20参数指令")
@ApiOrder(11) @ApiOrder(101)
@RequiredArgsConstructor @RequiredArgsConstructor
public class Q20ParamController { public class Q20ParamController {

2
admin/src/main/java/com/multictrl/modules/business/q20/controller/Q20RouteController.java
View File

@ -27,7 +27,7 @@ import java.util.Map;
@RestController @RestController
@RequestMapping("business/q20/route") @RequestMapping("business/q20/route")
@Tag(name = "Q20航线任务") @Tag(name = "Q20航线任务")
@ApiOrder(13) @ApiOrder(103)
@RequiredArgsConstructor @RequiredArgsConstructor
public class Q20RouteController { public class Q20RouteController {

6
admin/src/main/java/com/multictrl/modules/business/service/impl/DockServiceImpl.java
View File

@ -110,10 +110,10 @@ public class DockServiceImpl extends CrudServiceImpl<DockDao, DockEntity, DockDT
dockDTO.setDockModel(dockDevice.getDeviceName()); dockDTO.setDockModel(dockDevice.getDeviceName());
} }
} else { } else {
String dockMode = dockDTO.getDockMode(); String dockModel = dockDTO.getDockModel();
List<SysDictDataEntity> list = dictDataDao.selectList(new QueryWrapper<SysDictDataEntity>() List<SysDictDataEntity> list = dictDataDao.selectList(new QueryWrapper<SysDictDataEntity>()
.eq("dict_value", dockMode).orderByAsc("create_date")); .eq("dict_value", dockModel).orderByAsc("create_date"));
if (list != null) { if (CollUtil.isNotEmpty(list)) {
dockDTO.setImgUrl(BusinessConstant.IMAGE_PATH + list.get(0).getImageUrl()); dockDTO.setImgUrl(BusinessConstant.IMAGE_PATH + list.get(0).getImageUrl());
} }
} }

10
admin/src/main/java/com/multictrl/modules/sys/service/impl/SysDictDataServiceImpl.java
View File

@ -38,6 +38,12 @@ public class SysDictDataServiceImpl extends BaseServiceImpl<SysDictDataDao, SysD
getPage(params, "sort", true), getPage(params, "sort", true),
getWrapper(params) getWrapper(params)
); );
for (SysDictDataEntity record : page.getRecords()) {
String imageUrl = record.getImageUrl();
if (StrUtil.isNotBlank(imageUrl)) {
record.setImageUrl(BusinessConstant.IMAGE_PATH + imageUrl);
}
}
return getPageData(page, SysDictDataDTO.class); return getPageData(page, SysDictDataDTO.class);
} }
@ -58,6 +64,10 @@ public class SysDictDataServiceImpl extends BaseServiceImpl<SysDictDataDao, SysD
@Override @Override
public SysDictDataDTO get(Long id) { public SysDictDataDTO get(Long id) {
SysDictDataEntity entity = baseDao.selectById(id); SysDictDataEntity entity = baseDao.selectById(id);
String imageUrl = entity.getImageUrl();
if (StrUtil.isNotBlank(imageUrl)) {
entity.setImageUrl(BusinessConstant.IMAGE_PATH + imageUrl);
}
return ConvertUtils.sourceToTarget(entity, SysDictDataDTO.class); return ConvertUtils.sourceToTarget(entity, SysDictDataDTO.class);
} }