From 2521bca9ae494f602bebcb2fe069807e8335c4c6 Mon Sep 17 00:00:00 2001 From: gyb Date: Wed, 4 Feb 2026 11:17:21 +0800 Subject: [PATCH] =?UTF-8?q?fit=EF=BC=9A=E8=B0=83=E6=95=B4=E7=B1=BB?= =?UTF-8?q?=E5=90=8D=E5=8F=8A=E7=B1=BB=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/domain/AirTypeVendorGroupVO.java | 35 ---------- .../DeviceAirTypeGeneralEnumController.java | 14 ++-- .../DeviceAirTypeGeneralEnumVOConvert.java | 14 ++-- ...a => IDeviceAirTypeGeneralEnumDomain.java} | 12 ++-- .../convert/AirTypeGeneralEnumConvert.java | 57 ---------------- .../DeviceAirTypeGeneralEnumConvert.java | 57 ++++++++++++++++ .../impl/AirTypeGeneralEnumDomainImpl.java | 65 ------------------- .../DeviceAirTypeGeneralEnumDomainImpl.java | 65 +++++++++++++++++++ ...num.java => DeviceAirTypeGeneralEnum.java} | 2 +- ...va => DeviceAirTypeGeneralEnumMapper.java} | 12 ++-- .../DeviceAirTypeGeneralEnumEntity.java | 64 ++++++++++++++++++ ... => IDeviceAirTypeGeneralEnumService.java} | 12 ++-- .../convert/AirTypeGeneralEnumDTOConvert.java | 57 ---------------- .../DeviceAirTypeGeneralEnumDTOConvert.java | 57 ++++++++++++++++ ....java => DeviceAirTypeGeneralEnumDTO.java} | 2 +- .../impl/AirTypeGeneralEnumServiceImpl.java | 65 ------------------- .../DeviceAirTypeGeneralEnumServiceImpl.java | 65 +++++++++++++++++++ ...xml => DeviceAirTypeGeneralEnumMapper.xml} | 10 +-- 18 files changed, 347 insertions(+), 318 deletions(-) delete mode 100644 src/main/java/com/ruoyi/device/api/domain/AirTypeVendorGroupVO.java rename src/main/java/com/ruoyi/device/domain/api/{IAirTypeGeneralEnumDomain.java => IDeviceAirTypeGeneralEnumDomain.java} (71%) delete mode 100644 src/main/java/com/ruoyi/device/domain/convert/AirTypeGeneralEnumConvert.java create mode 100644 src/main/java/com/ruoyi/device/domain/convert/DeviceAirTypeGeneralEnumConvert.java delete mode 100644 src/main/java/com/ruoyi/device/domain/impl/AirTypeGeneralEnumDomainImpl.java create mode 100644 src/main/java/com/ruoyi/device/domain/impl/DeviceAirTypeGeneralEnumDomainImpl.java rename src/main/java/com/ruoyi/device/domain/model/{AirTypeGeneralEnum.java => DeviceAirTypeGeneralEnum.java} (92%) rename src/main/java/com/ruoyi/device/mapper/{AirTypeGeneralEnumMapper.java => DeviceAirTypeGeneralEnumMapper.java} (70%) create mode 100644 src/main/java/com/ruoyi/device/mapper/entity/DeviceAirTypeGeneralEnumEntity.java rename src/main/java/com/ruoyi/device/service/api/{IAirTypeGeneralEnumService.java => IDeviceAirTypeGeneralEnumService.java} (70%) delete mode 100644 src/main/java/com/ruoyi/device/service/convert/AirTypeGeneralEnumDTOConvert.java create mode 100644 src/main/java/com/ruoyi/device/service/convert/DeviceAirTypeGeneralEnumDTOConvert.java rename src/main/java/com/ruoyi/device/service/dto/{AirTypeGeneralEnumDTO.java => DeviceAirTypeGeneralEnumDTO.java} (92%) delete mode 100644 src/main/java/com/ruoyi/device/service/impl/AirTypeGeneralEnumServiceImpl.java create mode 100644 src/main/java/com/ruoyi/device/service/impl/DeviceAirTypeGeneralEnumServiceImpl.java rename src/main/resources/mapper/device/{AirTypeGeneralEnumMapper.xml => DeviceAirTypeGeneralEnumMapper.xml} (90%) diff --git a/src/main/java/com/ruoyi/device/api/domain/AirTypeVendorGroupVO.java b/src/main/java/com/ruoyi/device/api/domain/AirTypeVendorGroupVO.java deleted file mode 100644 index c395a58..0000000 --- a/src/main/java/com/ruoyi/device/api/domain/AirTypeVendorGroupVO.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.ruoyi.device.api.domain; - -import com.ruoyi.common.core.web.domain.BaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.List; - -/** - * 无人机厂商分组VO - * - * @author ruoyi - * @date 2026-01-29 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class AirTypeVendorGroupVO extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** - * 厂商标签 - */ - private String label; - - /** - * 厂商值 - */ - private String value; - - /** - * 无人机类型列表 - */ - private List airTypeList; - -} diff --git a/src/main/java/com/ruoyi/device/controller/DeviceAirTypeGeneralEnumController.java b/src/main/java/com/ruoyi/device/controller/DeviceAirTypeGeneralEnumController.java index 9a1545d..8e40576 100644 --- a/src/main/java/com/ruoyi/device/controller/DeviceAirTypeGeneralEnumController.java +++ b/src/main/java/com/ruoyi/device/controller/DeviceAirTypeGeneralEnumController.java @@ -6,8 +6,8 @@ import com.ruoyi.common.core.web.controller.BaseController; import com.ruoyi.device.api.domain.AirTypeGeneralEnumVO; import com.ruoyi.device.api.domain.AirTypeVendorGroupVO; import com.ruoyi.device.controller.convert.DeviceAirTypeGeneralEnumVOConvert; -import com.ruoyi.device.service.api.IAirTypeGeneralEnumService; -import com.ruoyi.device.service.dto.AirTypeGeneralEnumDTO; +import com.ruoyi.device.service.api.IDeviceAirTypeGeneralEnumService; +import com.ruoyi.device.service.dto.DeviceAirTypeGeneralEnumDTO; import com.ruoyi.system.api.RemoteDictService; import com.ruoyi.system.api.domain.SysDictData; import org.springframework.beans.factory.annotation.Autowired; @@ -29,7 +29,7 @@ import java.util.List; public class DeviceAirTypeGeneralEnumController extends BaseController { @Autowired - private IAirTypeGeneralEnumService airTypeGeneralEnumService; + private IDeviceAirTypeGeneralEnumService airTypeGeneralEnumService; @Autowired private RemoteDictService remoteDictService; @@ -43,8 +43,8 @@ public class DeviceAirTypeGeneralEnumController extends BaseController @GetMapping("/list") public R> selectAirTypeGeneralEnumList(AirTypeGeneralEnumVO vo) { - AirTypeGeneralEnumDTO dto = DeviceAirTypeGeneralEnumVOConvert.to(vo); - List list = airTypeGeneralEnumService.selectAirTypeGeneralEnumList(dto); + DeviceAirTypeGeneralEnumDTO dto = DeviceAirTypeGeneralEnumVOConvert.to(vo); + List list = airTypeGeneralEnumService.selectAirTypeGeneralEnumList(dto); List voList = DeviceAirTypeGeneralEnumVOConvert.fromList(list); return R.ok(voList); } @@ -64,8 +64,8 @@ public class DeviceAirTypeGeneralEnumController extends BaseController if (dictResult.getData() != null) { // 获取所有无人机类型数据 - List allList = airTypeGeneralEnumService.selectAirTypeGeneralEnumList(new AirTypeGeneralEnumDTO()); - List allVoList = DeviceAirTypeGeneralEnumVOConvert.fromList(allList); + List allList = airTypeGeneralEnumService.selectAirTypeGeneralEnumList(new DeviceAirTypeGeneralEnumDTO()); + List allVoList = DeviceAirTypeGeneralEnumVOConvert.fromList(allList); // 为每个字典项创建分组 for (SysDictData dictData : dictResult.getData()) diff --git a/src/main/java/com/ruoyi/device/controller/convert/DeviceAirTypeGeneralEnumVOConvert.java b/src/main/java/com/ruoyi/device/controller/convert/DeviceAirTypeGeneralEnumVOConvert.java index 2eb17b4..6ae1bc1 100644 --- a/src/main/java/com/ruoyi/device/controller/convert/DeviceAirTypeGeneralEnumVOConvert.java +++ b/src/main/java/com/ruoyi/device/controller/convert/DeviceAirTypeGeneralEnumVOConvert.java @@ -2,7 +2,7 @@ package com.ruoyi.device.controller.convert; import com.ruoyi.common.core.utils.BaseConvert; import com.ruoyi.device.api.domain.AirTypeGeneralEnumVO; -import com.ruoyi.device.service.dto.AirTypeGeneralEnumDTO; +import com.ruoyi.device.service.dto.DeviceAirTypeGeneralEnumDTO; import java.util.List; @@ -12,31 +12,31 @@ import java.util.List; * @author 拓恒 * @date 2026-01-20 */ -public class DeviceAirTypeGeneralEnumVOConvert extends BaseConvert +public class DeviceAirTypeGeneralEnumVOConvert extends BaseConvert { private static final DeviceAirTypeGeneralEnumVOConvert INSTANCE = new DeviceAirTypeGeneralEnumVOConvert(); private DeviceAirTypeGeneralEnumVOConvert() { - super(AirTypeGeneralEnumDTO.class, AirTypeGeneralEnumVO.class); + super(DeviceAirTypeGeneralEnumDTO.class, AirTypeGeneralEnumVO.class); } - public static AirTypeGeneralEnumVO from(AirTypeGeneralEnumDTO dto) + public static AirTypeGeneralEnumVO from(DeviceAirTypeGeneralEnumDTO dto) { return INSTANCE.innerFrom(dto); } - public static AirTypeGeneralEnumDTO to(AirTypeGeneralEnumVO vo) + public static DeviceAirTypeGeneralEnumDTO to(AirTypeGeneralEnumVO vo) { return INSTANCE.innerTo(vo); } - public static List fromList(List dtoList) + public static List fromList(List dtoList) { return INSTANCE.innerFromList(dtoList); } - public static List toList(List voList) + public static List toList(List voList) { return INSTANCE.innerToList(voList); } diff --git a/src/main/java/com/ruoyi/device/domain/api/IAirTypeGeneralEnumDomain.java b/src/main/java/com/ruoyi/device/domain/api/IDeviceAirTypeGeneralEnumDomain.java similarity index 71% rename from src/main/java/com/ruoyi/device/domain/api/IAirTypeGeneralEnumDomain.java rename to src/main/java/com/ruoyi/device/domain/api/IDeviceAirTypeGeneralEnumDomain.java index 40bd1d9..4c3bfb6 100644 --- a/src/main/java/com/ruoyi/device/domain/api/IAirTypeGeneralEnumDomain.java +++ b/src/main/java/com/ruoyi/device/domain/api/IDeviceAirTypeGeneralEnumDomain.java @@ -1,6 +1,6 @@ package com.ruoyi.device.domain.api; -import com.ruoyi.device.domain.model.AirTypeGeneralEnum; +import com.ruoyi.device.domain.model.DeviceAirTypeGeneralEnum; import java.util.List; /** @@ -9,7 +9,7 @@ import java.util.List; * @author ruoyi * @date 2026-01-28 */ -public interface IAirTypeGeneralEnumDomain +public interface IDeviceAirTypeGeneralEnumDomain { /** * 查询无人机类型通用枚举列表 @@ -17,7 +17,7 @@ public interface IAirTypeGeneralEnumDomain * @param airTypeGeneralEnum 无人机类型通用枚举 * @return 无人机类型通用枚举集合 */ - List selectAirTypeGeneralEnumList(AirTypeGeneralEnum airTypeGeneralEnum); + List selectAirTypeGeneralEnumList(DeviceAirTypeGeneralEnum airTypeGeneralEnum); /** * 根据主键查询无人机类型通用枚举 @@ -25,7 +25,7 @@ public interface IAirTypeGeneralEnumDomain * @param id 主键 * @return 无人机类型通用枚举 */ - AirTypeGeneralEnum selectAirTypeGeneralEnumById(Long id); + DeviceAirTypeGeneralEnum selectAirTypeGeneralEnumById(Long id); /** * 新增无人机类型通用枚举 @@ -33,7 +33,7 @@ public interface IAirTypeGeneralEnumDomain * @param airTypeGeneralEnum 无人机类型通用枚举 * @return 结果 */ - int insertAirTypeGeneralEnum(AirTypeGeneralEnum airTypeGeneralEnum); + int insertAirTypeGeneralEnum(DeviceAirTypeGeneralEnum airTypeGeneralEnum); /** * 修改无人机类型通用枚举 @@ -41,7 +41,7 @@ public interface IAirTypeGeneralEnumDomain * @param airTypeGeneralEnum 无人机类型通用枚举 * @return 结果 */ - int updateAirTypeGeneralEnum(AirTypeGeneralEnum airTypeGeneralEnum); + int updateAirTypeGeneralEnum(DeviceAirTypeGeneralEnum airTypeGeneralEnum); /** * 删除无人机类型通用枚举 diff --git a/src/main/java/com/ruoyi/device/domain/convert/AirTypeGeneralEnumConvert.java b/src/main/java/com/ruoyi/device/domain/convert/AirTypeGeneralEnumConvert.java deleted file mode 100644 index b45d572..0000000 --- a/src/main/java/com/ruoyi/device/domain/convert/AirTypeGeneralEnumConvert.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.ruoyi.device.domain.convert; - -import com.ruoyi.common.core.utils.BaseConvert; -import com.ruoyi.device.domain.model.AirTypeGeneralEnum; -import com.ruoyi.device.mapper.entity.AirTypeGeneralEnumEntity; - -import java.util.List; - -/** - * 无人机类型通用枚举领域层转换器 - * Domain Model ↔ Mapper Entity - * - * @author ruoyi - * @date 2026-01-28 - */ -public class AirTypeGeneralEnumConvert extends BaseConvert -{ - - private static final AirTypeGeneralEnumConvert INSTANCE = new AirTypeGeneralEnumConvert(); - - private AirTypeGeneralEnumConvert() { - super(AirTypeGeneralEnum.class, AirTypeGeneralEnumEntity.class); - } - - /** - * Model 转 Entity - */ - public static AirTypeGeneralEnumEntity from(AirTypeGeneralEnum model) - { - return INSTANCE.innerFrom(model); - } - - /** - * Entity 转 Model - */ - public static AirTypeGeneralEnum to(AirTypeGeneralEnumEntity entity) - { - return INSTANCE.innerTo(entity); - } - - /** - * Model List 转 Entity List - */ - public static List fromList(List modelList) - { - return INSTANCE.innerFromList(modelList); - } - - /** - * Entity List 转 Model List - */ - public static List toList(List entityList) - { - return INSTANCE.innerToList(entityList); - } - -} diff --git a/src/main/java/com/ruoyi/device/domain/convert/DeviceAirTypeGeneralEnumConvert.java b/src/main/java/com/ruoyi/device/domain/convert/DeviceAirTypeGeneralEnumConvert.java new file mode 100644 index 0000000..d72206e --- /dev/null +++ b/src/main/java/com/ruoyi/device/domain/convert/DeviceAirTypeGeneralEnumConvert.java @@ -0,0 +1,57 @@ +package com.ruoyi.device.domain.convert; + +import com.ruoyi.common.core.utils.BaseConvert; +import com.ruoyi.device.domain.model.DeviceAirTypeGeneralEnum; +import com.ruoyi.device.mapper.entity.DeviceAirTypeGeneralEnumEntity; + +import java.util.List; + +/** + * 无人机类型通用枚举领域层转换器 + * Domain Model ↔ Mapper Entity + * + * @author ruoyi + * @date 2026-01-28 + */ +public class DeviceAirTypeGeneralEnumConvert extends BaseConvert +{ + + private static final DeviceAirTypeGeneralEnumConvert INSTANCE = new DeviceAirTypeGeneralEnumConvert(); + + private DeviceAirTypeGeneralEnumConvert() { + super(DeviceAirTypeGeneralEnum.class, DeviceAirTypeGeneralEnumEntity.class); + } + + /** + * Model 转 Entity + */ + public static DeviceAirTypeGeneralEnumEntity from(DeviceAirTypeGeneralEnum model) + { + return INSTANCE.innerFrom(model); + } + + /** + * Entity 转 Model + */ + public static DeviceAirTypeGeneralEnum to(DeviceAirTypeGeneralEnumEntity entity) + { + return INSTANCE.innerTo(entity); + } + + /** + * Model List 转 Entity List + */ + public static List fromList(List modelList) + { + return INSTANCE.innerFromList(modelList); + } + + /** + * Entity List 转 Model List + */ + public static List toList(List entityList) + { + return INSTANCE.innerToList(entityList); + } + +} diff --git a/src/main/java/com/ruoyi/device/domain/impl/AirTypeGeneralEnumDomainImpl.java b/src/main/java/com/ruoyi/device/domain/impl/AirTypeGeneralEnumDomainImpl.java deleted file mode 100644 index 466354f..0000000 --- a/src/main/java/com/ruoyi/device/domain/impl/AirTypeGeneralEnumDomainImpl.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.ruoyi.device.domain.impl; - -import com.ruoyi.device.domain.api.IAirTypeGeneralEnumDomain; -import com.ruoyi.device.domain.convert.AirTypeGeneralEnumConvert; -import com.ruoyi.device.domain.model.AirTypeGeneralEnum; -import com.ruoyi.device.mapper.AirTypeGeneralEnumMapper; -import com.ruoyi.device.mapper.entity.AirTypeGeneralEnumEntity; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Repository; - -import java.util.List; - -/** - * 无人机类型通用枚举Domain实现类 - * - * @author ruoyi - * @date 2026-01-28 - */ -@Repository -public class AirTypeGeneralEnumDomainImpl implements IAirTypeGeneralEnumDomain -{ - @Autowired - private AirTypeGeneralEnumMapper airTypeGeneralEnumMapper; - - @Override - public List selectAirTypeGeneralEnumList(AirTypeGeneralEnum airTypeGeneralEnum) - { - AirTypeGeneralEnumEntity entity = AirTypeGeneralEnumConvert.from(airTypeGeneralEnum); - List entityList = airTypeGeneralEnumMapper.selectAirTypeGeneralEnumList(entity); - return AirTypeGeneralEnumConvert.toList(entityList); - } - - @Override - public AirTypeGeneralEnum selectAirTypeGeneralEnumById(Long id) - { - AirTypeGeneralEnumEntity entity = airTypeGeneralEnumMapper.selectAirTypeGeneralEnumById(id); - return AirTypeGeneralEnumConvert.to(entity); - } - - @Override - public int insertAirTypeGeneralEnum(AirTypeGeneralEnum airTypeGeneralEnum) - { - AirTypeGeneralEnumEntity entity = AirTypeGeneralEnumConvert.from(airTypeGeneralEnum); - return airTypeGeneralEnumMapper.insertAirTypeGeneralEnum(entity); - } - - @Override - public int updateAirTypeGeneralEnum(AirTypeGeneralEnum airTypeGeneralEnum) - { - AirTypeGeneralEnumEntity entity = AirTypeGeneralEnumConvert.from(airTypeGeneralEnum); - return airTypeGeneralEnumMapper.updateAirTypeGeneralEnum(entity); - } - - @Override - public int deleteAirTypeGeneralEnumById(Long id) - { - return airTypeGeneralEnumMapper.deleteAirTypeGeneralEnumById(id); - } - - @Override - public int deleteAirTypeGeneralEnumByIds(Long[] ids) - { - return airTypeGeneralEnumMapper.deleteAirTypeGeneralEnumByIds(ids); - } -} diff --git a/src/main/java/com/ruoyi/device/domain/impl/DeviceAirTypeGeneralEnumDomainImpl.java b/src/main/java/com/ruoyi/device/domain/impl/DeviceAirTypeGeneralEnumDomainImpl.java new file mode 100644 index 0000000..baf029c --- /dev/null +++ b/src/main/java/com/ruoyi/device/domain/impl/DeviceAirTypeGeneralEnumDomainImpl.java @@ -0,0 +1,65 @@ +package com.ruoyi.device.domain.impl; + +import com.ruoyi.device.domain.api.IDeviceAirTypeGeneralEnumDomain; +import com.ruoyi.device.domain.convert.DeviceAirTypeGeneralEnumConvert; +import com.ruoyi.device.domain.model.DeviceAirTypeGeneralEnum; +import com.ruoyi.device.mapper.DeviceAirTypeGeneralEnumMapper; +import com.ruoyi.device.mapper.entity.DeviceAirTypeGeneralEnumEntity; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + * 无人机类型通用枚举Domain实现类 + * + * @author ruoyi + * @date 2026-01-28 + */ +@Repository +public class DeviceAirTypeGeneralEnumDomainImpl implements IDeviceAirTypeGeneralEnumDomain +{ + @Autowired + private DeviceAirTypeGeneralEnumMapper airTypeGeneralEnumMapper; + + @Override + public List selectAirTypeGeneralEnumList(DeviceAirTypeGeneralEnum airTypeGeneralEnum) + { + DeviceAirTypeGeneralEnumEntity entity = DeviceAirTypeGeneralEnumConvert.from(airTypeGeneralEnum); + List entityList = airTypeGeneralEnumMapper.selectAirTypeGeneralEnumList(entity); + return DeviceAirTypeGeneralEnumConvert.toList(entityList); + } + + @Override + public DeviceAirTypeGeneralEnum selectAirTypeGeneralEnumById(Long id) + { + DeviceAirTypeGeneralEnumEntity entity = airTypeGeneralEnumMapper.selectAirTypeGeneralEnumById(id); + return DeviceAirTypeGeneralEnumConvert.to(entity); + } + + @Override + public int insertAirTypeGeneralEnum(DeviceAirTypeGeneralEnum airTypeGeneralEnum) + { + DeviceAirTypeGeneralEnumEntity entity = DeviceAirTypeGeneralEnumConvert.from(airTypeGeneralEnum); + return airTypeGeneralEnumMapper.insertAirTypeGeneralEnum(entity); + } + + @Override + public int updateAirTypeGeneralEnum(DeviceAirTypeGeneralEnum airTypeGeneralEnum) + { + DeviceAirTypeGeneralEnumEntity entity = DeviceAirTypeGeneralEnumConvert.from(airTypeGeneralEnum); + return airTypeGeneralEnumMapper.updateAirTypeGeneralEnum(entity); + } + + @Override + public int deleteAirTypeGeneralEnumById(Long id) + { + return airTypeGeneralEnumMapper.deleteAirTypeGeneralEnumById(id); + } + + @Override + public int deleteAirTypeGeneralEnumByIds(Long[] ids) + { + return airTypeGeneralEnumMapper.deleteAirTypeGeneralEnumByIds(ids); + } +} diff --git a/src/main/java/com/ruoyi/device/domain/model/AirTypeGeneralEnum.java b/src/main/java/com/ruoyi/device/domain/model/DeviceAirTypeGeneralEnum.java similarity index 92% rename from src/main/java/com/ruoyi/device/domain/model/AirTypeGeneralEnum.java rename to src/main/java/com/ruoyi/device/domain/model/DeviceAirTypeGeneralEnum.java index a6ab484..b92eba1 100644 --- a/src/main/java/com/ruoyi/device/domain/model/AirTypeGeneralEnum.java +++ b/src/main/java/com/ruoyi/device/domain/model/DeviceAirTypeGeneralEnum.java @@ -16,7 +16,7 @@ import java.util.Date; */ @EqualsAndHashCode(callSuper = true) @Data -public class AirTypeGeneralEnum extends BaseEntity +public class DeviceAirTypeGeneralEnum extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/ruoyi/device/mapper/AirTypeGeneralEnumMapper.java b/src/main/java/com/ruoyi/device/mapper/DeviceAirTypeGeneralEnumMapper.java similarity index 70% rename from src/main/java/com/ruoyi/device/mapper/AirTypeGeneralEnumMapper.java rename to src/main/java/com/ruoyi/device/mapper/DeviceAirTypeGeneralEnumMapper.java index 69850bf..2448063 100644 --- a/src/main/java/com/ruoyi/device/mapper/AirTypeGeneralEnumMapper.java +++ b/src/main/java/com/ruoyi/device/mapper/DeviceAirTypeGeneralEnumMapper.java @@ -1,6 +1,6 @@ package com.ruoyi.device.mapper; -import com.ruoyi.device.mapper.entity.AirTypeGeneralEnumEntity; +import com.ruoyi.device.mapper.entity.DeviceAirTypeGeneralEnumEntity; import java.util.List; /** @@ -9,7 +9,7 @@ import java.util.List; * @author ruoyi * @date 2026-01-28 */ -public interface AirTypeGeneralEnumMapper +public interface DeviceAirTypeGeneralEnumMapper { /** * 查询无人机类型通用枚举列表 @@ -17,7 +17,7 @@ public interface AirTypeGeneralEnumMapper * @param airTypeGeneralEnum 无人机类型通用枚举信息 * @return 无人机类型通用枚举集合 */ - List selectAirTypeGeneralEnumList(AirTypeGeneralEnumEntity airTypeGeneralEnum); + List selectAirTypeGeneralEnumList(DeviceAirTypeGeneralEnumEntity airTypeGeneralEnum); /** * 根据主键查询无人机类型通用枚举 @@ -25,7 +25,7 @@ public interface AirTypeGeneralEnumMapper * @param id 主键 * @return 无人机类型通用枚举信息 */ - AirTypeGeneralEnumEntity selectAirTypeGeneralEnumById(Long id); + DeviceAirTypeGeneralEnumEntity selectAirTypeGeneralEnumById(Long id); /** * 新增无人机类型通用枚举 @@ -33,7 +33,7 @@ public interface AirTypeGeneralEnumMapper * @param airTypeGeneralEnum 无人机类型通用枚举信息 * @return 影响行数 */ - int insertAirTypeGeneralEnum(AirTypeGeneralEnumEntity airTypeGeneralEnum); + int insertAirTypeGeneralEnum(DeviceAirTypeGeneralEnumEntity airTypeGeneralEnum); /** * 修改无人机类型通用枚举 @@ -41,7 +41,7 @@ public interface AirTypeGeneralEnumMapper * @param airTypeGeneralEnum 无人机类型通用枚举信息 * @return 影响行数 */ - int updateAirTypeGeneralEnum(AirTypeGeneralEnumEntity airTypeGeneralEnum); + int updateAirTypeGeneralEnum(DeviceAirTypeGeneralEnumEntity airTypeGeneralEnum); /** * 删除无人机类型通用枚举 diff --git a/src/main/java/com/ruoyi/device/mapper/entity/DeviceAirTypeGeneralEnumEntity.java b/src/main/java/com/ruoyi/device/mapper/entity/DeviceAirTypeGeneralEnumEntity.java new file mode 100644 index 0000000..1356608 --- /dev/null +++ b/src/main/java/com/ruoyi/device/mapper/entity/DeviceAirTypeGeneralEnumEntity.java @@ -0,0 +1,64 @@ +package com.ruoyi.device.mapper.entity; + +import com.ruoyi.common.core.web.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 无人机类型通用枚举表实体对象 air_type_general_enum + * Mapper 层实体，对应数据库表 + * + * @author ruoyi + * @date 2026-01-16 + */ +@EqualsAndHashCode(callSuper = true) +@Data +public class DeviceAirTypeGeneralEnumEntity extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private Long id; + + /** + * 名称 + */ + private String name; + + /** + * 厂商ID + */ + private Long vendorId; + + /** + * 领域 + */ + private Long domain; + /** + * 主类型 + */ + private Long type; + /** + * 子类型 + */ + private Long subType; + /** + * 图标 + */ + private String icon; + + + @Override + public String toString() { + return "DeviceAirTypeGeneralEnumEntity{" + + "id=" + id + + ", name='" + name + "'" + + ", vendorId=" + vendorId + + ", domain=" + domain + + ", type=" + type + + ", icon='" + icon + "'" + + ", subType=" + subType + + '}'; + } +} diff --git a/src/main/java/com/ruoyi/device/service/api/IAirTypeGeneralEnumService.java b/src/main/java/com/ruoyi/device/service/api/IDeviceAirTypeGeneralEnumService.java similarity index 70% rename from src/main/java/com/ruoyi/device/service/api/IAirTypeGeneralEnumService.java rename to src/main/java/com/ruoyi/device/service/api/IDeviceAirTypeGeneralEnumService.java index cb9fbaf..e98bc68 100644 --- a/src/main/java/com/ruoyi/device/service/api/IAirTypeGeneralEnumService.java +++ b/src/main/java/com/ruoyi/device/service/api/IDeviceAirTypeGeneralEnumService.java @@ -1,6 +1,6 @@ package com.ruoyi.device.service.api; -import com.ruoyi.device.service.dto.AirTypeGeneralEnumDTO; +import com.ruoyi.device.service.dto.DeviceAirTypeGeneralEnumDTO; import java.util.List; /** @@ -9,7 +9,7 @@ import java.util.List; * @author ruoyi * @date 2026-01-28 */ -public interface IAirTypeGeneralEnumService +public interface IDeviceAirTypeGeneralEnumService { /** * 查询无人机类型通用枚举列表 @@ -17,7 +17,7 @@ public interface IAirTypeGeneralEnumService * @param airTypeGeneralEnumDTO 无人机类型通用枚举 * @return 无人机类型通用枚举集合 */ - List selectAirTypeGeneralEnumList(AirTypeGeneralEnumDTO airTypeGeneralEnumDTO); + List selectAirTypeGeneralEnumList(DeviceAirTypeGeneralEnumDTO airTypeGeneralEnumDTO); /** * 根据主键查询无人机类型通用枚举 @@ -25,7 +25,7 @@ public interface IAirTypeGeneralEnumService * @param id 主键 * @return 无人机类型通用枚举 */ - AirTypeGeneralEnumDTO selectAirTypeGeneralEnumById(Long id); + DeviceAirTypeGeneralEnumDTO selectAirTypeGeneralEnumById(Long id); /** * 新增无人机类型通用枚举 @@ -33,7 +33,7 @@ public interface IAirTypeGeneralEnumService * @param airTypeGeneralEnumDTO 无人机类型通用枚举 * @return 结果 */ - int insertAirTypeGeneralEnum(AirTypeGeneralEnumDTO airTypeGeneralEnumDTO); + int insertAirTypeGeneralEnum(DeviceAirTypeGeneralEnumDTO airTypeGeneralEnumDTO); /** * 修改无人机类型通用枚举 @@ -41,7 +41,7 @@ public interface IAirTypeGeneralEnumService * @param airTypeGeneralEnumDTO 无人机类型通用枚举 * @return 结果 */ - int updateAirTypeGeneralEnum(AirTypeGeneralEnumDTO airTypeGeneralEnumDTO); + int updateAirTypeGeneralEnum(DeviceAirTypeGeneralEnumDTO airTypeGeneralEnumDTO); /** * 删除无人机类型通用枚举 diff --git a/src/main/java/com/ruoyi/device/service/convert/AirTypeGeneralEnumDTOConvert.java b/src/main/java/com/ruoyi/device/service/convert/AirTypeGeneralEnumDTOConvert.java deleted file mode 100644 index e0261dc..0000000 --- a/src/main/java/com/ruoyi/device/service/convert/AirTypeGeneralEnumDTOConvert.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.ruoyi.device.service.convert; - -import com.ruoyi.common.core.utils.BaseConvert; -import com.ruoyi.device.domain.model.AirTypeGeneralEnum; -import com.ruoyi.device.service.dto.AirTypeGeneralEnumDTO; - -import java.util.List; - -/** - * 无人机类型通用枚举Service层转换器 - * Service DTO ↔ Domain Model - * - * @author ruoyi - * @date 2026-01-28 - */ -public class AirTypeGeneralEnumDTOConvert extends BaseConvert -{ - - private static final AirTypeGeneralEnumDTOConvert INSTANCE = new AirTypeGeneralEnumDTOConvert(); - - private AirTypeGeneralEnumDTOConvert() { - super(AirTypeGeneralEnum.class, AirTypeGeneralEnumDTO.class); - } - - /** - * Model 转 DTO - */ - public static AirTypeGeneralEnumDTO from(AirTypeGeneralEnum model) - { - return INSTANCE.innerFrom(model); - } - - /** - * DTO 转 Model - */ - public static AirTypeGeneralEnum to(AirTypeGeneralEnumDTO dto) - { - return INSTANCE.innerTo(dto); - } - - /** - * Model List 转 DTO List - */ - public static List fromList(List modelList) - { - return INSTANCE.innerFromList(modelList); - } - - /** - * DTO List 转 Model List - */ - public static List toList(List dtoList) - { - return INSTANCE.innerToList(dtoList); - } - -} diff --git a/src/main/java/com/ruoyi/device/service/convert/DeviceAirTypeGeneralEnumDTOConvert.java b/src/main/java/com/ruoyi/device/service/convert/DeviceAirTypeGeneralEnumDTOConvert.java new file mode 100644 index 0000000..1225c3d --- /dev/null +++ b/src/main/java/com/ruoyi/device/service/convert/DeviceAirTypeGeneralEnumDTOConvert.java @@ -0,0 +1,57 @@ +package com.ruoyi.device.service.convert; + +import com.ruoyi.common.core.utils.BaseConvert; +import com.ruoyi.device.domain.model.DeviceAirTypeGeneralEnum; +import com.ruoyi.device.service.dto.DeviceAirTypeGeneralEnumDTO; + +import java.util.List; + +/** + * 无人机类型通用枚举Service层转换器 + * Service DTO ↔ Domain Model + * + * @author ruoyi + * @date 2026-01-28 + */ +public class DeviceAirTypeGeneralEnumDTOConvert extends BaseConvert +{ + + private static final DeviceAirTypeGeneralEnumDTOConvert INSTANCE = new DeviceAirTypeGeneralEnumDTOConvert(); + + private DeviceAirTypeGeneralEnumDTOConvert() { + super(DeviceAirTypeGeneralEnum.class, DeviceAirTypeGeneralEnumDTO.class); + } + + /** + * Model 转 DTO + */ + public static DeviceAirTypeGeneralEnumDTO from(DeviceAirTypeGeneralEnum model) + { + return INSTANCE.innerFrom(model); + } + + /** + * DTO 转 Model + */ + public static DeviceAirTypeGeneralEnum to(DeviceAirTypeGeneralEnumDTO dto) + { + return INSTANCE.innerTo(dto); + } + + /** + * Model List 转 DTO List + */ + public static List fromList(List modelList) + { + return INSTANCE.innerFromList(modelList); + } + + /** + * DTO List 转 Model List + */ + public static List toList(List dtoList) + { + return INSTANCE.innerToList(dtoList); + } + +} diff --git a/src/main/java/com/ruoyi/device/service/dto/AirTypeGeneralEnumDTO.java b/src/main/java/com/ruoyi/device/service/dto/DeviceAirTypeGeneralEnumDTO.java similarity index 92% rename from src/main/java/com/ruoyi/device/service/dto/AirTypeGeneralEnumDTO.java rename to src/main/java/com/ruoyi/device/service/dto/DeviceAirTypeGeneralEnumDTO.java index 3c39c3b..77dcffd 100644 --- a/src/main/java/com/ruoyi/device/service/dto/AirTypeGeneralEnumDTO.java +++ b/src/main/java/com/ruoyi/device/service/dto/DeviceAirTypeGeneralEnumDTO.java @@ -16,7 +16,7 @@ import java.util.Date; */ @EqualsAndHashCode(callSuper = true) @Data -public class AirTypeGeneralEnumDTO extends BaseEntity +public class DeviceAirTypeGeneralEnumDTO extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/ruoyi/device/service/impl/AirTypeGeneralEnumServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/AirTypeGeneralEnumServiceImpl.java deleted file mode 100644 index 18d3c4e..0000000 --- a/src/main/java/com/ruoyi/device/service/impl/AirTypeGeneralEnumServiceImpl.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.ruoyi.device.service.impl; - -import com.ruoyi.device.domain.api.IAirTypeGeneralEnumDomain; -import com.ruoyi.device.domain.model.AirTypeGeneralEnum; -import com.ruoyi.device.service.api.IAirTypeGeneralEnumService; -import com.ruoyi.device.service.convert.AirTypeGeneralEnumDTOConvert; -import com.ruoyi.device.service.dto.AirTypeGeneralEnumDTO; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 无人机类型通用枚举Service业务层处理 - * - * @author ruoyi - * @date 2026-01-28 - */ -@Service -public class AirTypeGeneralEnumServiceImpl implements IAirTypeGeneralEnumService -{ - @Autowired - private IAirTypeGeneralEnumDomain airTypeGeneralEnumDomain; - - @Override - public List selectAirTypeGeneralEnumList(AirTypeGeneralEnumDTO airTypeGeneralEnumDTO) - { - AirTypeGeneralEnum model = AirTypeGeneralEnumDTOConvert.to(airTypeGeneralEnumDTO); - List modelList = airTypeGeneralEnumDomain.selectAirTypeGeneralEnumList(model); - return AirTypeGeneralEnumDTOConvert.fromList(modelList); - } - - @Override - public AirTypeGeneralEnumDTO selectAirTypeGeneralEnumById(Long id) - { - AirTypeGeneralEnum model = airTypeGeneralEnumDomain.selectAirTypeGeneralEnumById(id); - return AirTypeGeneralEnumDTOConvert.from(model); - } - - @Override - public int insertAirTypeGeneralEnum(AirTypeGeneralEnumDTO airTypeGeneralEnumDTO) - { - AirTypeGeneralEnum model = AirTypeGeneralEnumDTOConvert.to(airTypeGeneralEnumDTO); - return airTypeGeneralEnumDomain.insertAirTypeGeneralEnum(model); - } - - @Override - public int updateAirTypeGeneralEnum(AirTypeGeneralEnumDTO airTypeGeneralEnumDTO) - { - AirTypeGeneralEnum model = AirTypeGeneralEnumDTOConvert.to(airTypeGeneralEnumDTO); - return airTypeGeneralEnumDomain.updateAirTypeGeneralEnum(model); - } - - @Override - public int deleteAirTypeGeneralEnumById(Long id) - { - return airTypeGeneralEnumDomain.deleteAirTypeGeneralEnumById(id); - } - - @Override - public int deleteAirTypeGeneralEnumByIds(Long[] ids) - { - return airTypeGeneralEnumDomain.deleteAirTypeGeneralEnumByIds(ids); - } -} diff --git a/src/main/java/com/ruoyi/device/service/impl/DeviceAirTypeGeneralEnumServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/DeviceAirTypeGeneralEnumServiceImpl.java new file mode 100644 index 0000000..77f1a05 --- /dev/null +++ b/src/main/java/com/ruoyi/device/service/impl/DeviceAirTypeGeneralEnumServiceImpl.java @@ -0,0 +1,65 @@ +package com.ruoyi.device.service.impl; + +import com.ruoyi.device.domain.api.IDeviceAirTypeGeneralEnumDomain; +import com.ruoyi.device.domain.model.DeviceAirTypeGeneralEnum; +import com.ruoyi.device.service.api.IDeviceAirTypeGeneralEnumService; +import com.ruoyi.device.service.convert.DeviceAirTypeGeneralEnumDTOConvert; +import com.ruoyi.device.service.dto.DeviceAirTypeGeneralEnumDTO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 无人机类型通用枚举Service业务层处理 + * + * @author ruoyi + * @date 2026-01-28 + */ +@Service +public class DeviceAirTypeGeneralEnumServiceImpl implements IDeviceAirTypeGeneralEnumService +{ + @Autowired + private IDeviceAirTypeGeneralEnumDomain airTypeGeneralEnumDomain; + + @Override + public List selectAirTypeGeneralEnumList(DeviceAirTypeGeneralEnumDTO airTypeGeneralEnumDTO) + { + DeviceAirTypeGeneralEnum model = DeviceAirTypeGeneralEnumDTOConvert.to(airTypeGeneralEnumDTO); + List modelList = airTypeGeneralEnumDomain.selectAirTypeGeneralEnumList(model); + return DeviceAirTypeGeneralEnumDTOConvert.fromList(modelList); + } + + @Override + public DeviceAirTypeGeneralEnumDTO selectAirTypeGeneralEnumById(Long id) + { + DeviceAirTypeGeneralEnum model = airTypeGeneralEnumDomain.selectAirTypeGeneralEnumById(id); + return DeviceAirTypeGeneralEnumDTOConvert.from(model); + } + + @Override + public int insertAirTypeGeneralEnum(DeviceAirTypeGeneralEnumDTO airTypeGeneralEnumDTO) + { + DeviceAirTypeGeneralEnum model = DeviceAirTypeGeneralEnumDTOConvert.to(airTypeGeneralEnumDTO); + return airTypeGeneralEnumDomain.insertAirTypeGeneralEnum(model); + } + + @Override + public int updateAirTypeGeneralEnum(DeviceAirTypeGeneralEnumDTO airTypeGeneralEnumDTO) + { + DeviceAirTypeGeneralEnum model = DeviceAirTypeGeneralEnumDTOConvert.to(airTypeGeneralEnumDTO); + return airTypeGeneralEnumDomain.updateAirTypeGeneralEnum(model); + } + + @Override + public int deleteAirTypeGeneralEnumById(Long id) + { + return airTypeGeneralEnumDomain.deleteAirTypeGeneralEnumById(id); + } + + @Override + public int deleteAirTypeGeneralEnumByIds(Long[] ids) + { + return airTypeGeneralEnumDomain.deleteAirTypeGeneralEnumByIds(ids); + } +} diff --git a/src/main/resources/mapper/device/AirTypeGeneralEnumMapper.xml b/src/main/resources/mapper/device/DeviceAirTypeGeneralEnumMapper.xml similarity index 90% rename from src/main/resources/mapper/device/AirTypeGeneralEnumMapper.xml rename to src/main/resources/mapper/device/DeviceAirTypeGeneralEnumMapper.xml index a19bd03..22b59ea 100644 --- a/src/main/resources/mapper/device/AirTypeGeneralEnumMapper.xml +++ b/src/main/resources/mapper/device/DeviceAirTypeGeneralEnumMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - @@ -51,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + insert into device_air_type_general_enum name, @@ -77,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update device_air_type_general_enum name = #{name},