diff --git a/admin/src/main/java/com/multictrl/common/constant/BusinessConstant.java b/admin/src/main/java/com/multictrl/common/constant/BusinessConstant.java index d95f50a..65c526a 100644 --- a/admin/src/main/java/com/multictrl/common/constant/BusinessConstant.java +++ b/admin/src/main/java/com/multictrl/common/constant/BusinessConstant.java @@ -84,4 +84,5 @@ public interface BusinessConstant { String IMAGE_PATH = "image/"; String VIDEO_PATH = "video/"; String VIDEO_COVER_SUFFIX = "_cover.jpeg"; + String DJI_SIGN = "DJI"; } diff --git a/admin/src/main/java/com/multictrl/modules/business/dto/DockDTO.java b/admin/src/main/java/com/multictrl/modules/business/dto/DockDTO.java index 500f174..7de0eee 100644 --- a/admin/src/main/java/com/multictrl/modules/business/dto/DockDTO.java +++ b/admin/src/main/java/com/multictrl/modules/business/dto/DockDTO.java @@ -2,6 +2,7 @@ package com.multictrl.modules.business.dto; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; +import com.multictrl.common.constant.BusinessConstant; import com.multictrl.common.validator.group.AddGroup; import com.multictrl.common.validator.group.UpdateGroup; import io.swagger.v3.oas.annotations.media.Schema; @@ -110,7 +111,7 @@ public class DockDTO implements Serializable { @Schema(hidden = true) @AssertTrue(message = "机库型号不能为空", groups = {AddGroup.class, UpdateGroup.class}) public boolean isDockModelValid() { - if (!"DJI".equals(dockType)) { + if (!BusinessConstant.DJI_SIGN.equals(dockType)) { return StringUtils.isNotBlank(dockModel); } else { return true; 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 b38eef6..10ce1c8 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 @@ -21,6 +21,8 @@ import com.multictrl.modules.business.entity.DockEntity; import com.multictrl.modules.business.service.DJIBaseService; import com.multictrl.modules.business.service.DockService; import com.multictrl.modules.security.service.ShiroService; +import com.multictrl.modules.sys.dao.SysDictDataDao; +import com.multictrl.modules.sys.entity.SysDictDataEntity; import com.multictrl.modules.sys.service.SysDictDataService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -42,7 +44,7 @@ public class DockServiceImpl extends CrudServiceImpl getWrapper(Map params) { @@ -101,8 +103,19 @@ public class DockServiceImpl extends CrudServiceImpl().eq("sn", dockDTO.getDockSn())); + if (dockDevice != null) { + dockDTO.setImgUrl(BusinessConstant.IMAGE_PATH + DJIImage.getImageUrlByName(dockDevice.getDeviceName())); + dockDTO.setDockModel(dockDevice.getDeviceName()); + } + } else { + String dockMode = dockDTO.getDockMode(); + List list = dictDataDao.selectList(new QueryWrapper() + .eq("dict_value", dockMode).orderByAsc("create_date")); + if (list != null) { + dockDTO.setImgUrl(BusinessConstant.IMAGE_PATH + list.get(0).getImageUrl()); + } } } return page; diff --git a/admin/src/main/java/com/multictrl/modules/sys/controller/SysDictDataController.java b/admin/src/main/java/com/multictrl/modules/sys/controller/SysDictDataController.java index 22248a5..8459b95 100644 --- a/admin/src/main/java/com/multictrl/modules/sys/controller/SysDictDataController.java +++ b/admin/src/main/java/com/multictrl/modules/sys/controller/SysDictDataController.java @@ -34,7 +34,6 @@ import java.util.Map; public class SysDictDataController { private final SysDictDataService sysDictDataService; private final static String DOCK_TYPE = "dockType"; - private final static String DOCK_MODEL = "dockModel"; @GetMapping("page") @Operation(summary = "字典数据") @@ -112,8 +111,8 @@ public class SysDictDataController { @GetMapping("/getDockModel") @Operation(summary = "获取机库型号") - public Result> getDockModel() { - List list = sysDictDataService.getDictDataByType(DOCK_MODEL); + public Result> getDockModel(@RequestParam String dockType) { + List list = sysDictDataService.getDictDataByType(dockType); return new Result>().ok(list); } 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 4726829..f63c98a 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 @@ -93,8 +93,8 @@ public class SysDictDataServiceImpl extends BaseServiceImpl implements SysDictTypeService { private final SysDictDataDao sysDictDataDao; private final static List DICT_TYPE_LIST = new ArrayList<>() {{ - add("dockTyp"); - add("dockModel"); + add("dockType"); +// add("dockModel"); }}; @Override @@ -68,6 +69,11 @@ public class SysDictTypeServiceImpl extends BaseServiceImpl list = baseDao.selectList(new QueryWrapper() + .eq("dict_type", dto.getDictType())); + if (CollectionUtil.isNotEmpty(list)) { + throw new RenException(ErrorCode.DICT_EXIST, dto.getDictType()); + } SysDictTypeEntity entity = ConvertUtils.sourceToTarget(dto, SysDictTypeEntity.class); insert(entity); @@ -80,6 +86,11 @@ public class SysDictTypeServiceImpl extends BaseServiceImpl list = baseDao.selectList(new QueryWrapper() + .eq("dict_type", dto.getDictType()).ne("id", dto.getId())); + if (CollectionUtil.isNotEmpty(list)) { + throw new RenException(ErrorCode.DICT_EXIST, dto.getDictType()); + } SysDictTypeEntity entity = ConvertUtils.sourceToTarget(dto, SysDictTypeEntity.class); updateById(entity); @@ -99,7 +110,7 @@ public class SysDictTypeServiceImpl extends BaseServiceImpl