diff --git a/src/main/java/com/corewing/app/dto/publicFirmware/PublicFirmwareVersionListRequest.java b/src/main/java/com/corewing/app/dto/publicFirmware/PublicFirmwareVersionListRequest.java new file mode 100644 index 0000000..5bdb2ae --- /dev/null +++ b/src/main/java/com/corewing/app/dto/publicFirmware/PublicFirmwareVersionListRequest.java @@ -0,0 +1,12 @@ +package com.corewing.app.dto.publicFirmware; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class PublicFirmwareVersionListRequest { + + @ApiModelProperty(value = "固件类型") + public String firmwareType; + +} diff --git a/src/main/java/com/corewing/app/entity/AppPublicFirmwarePlane.java b/src/main/java/com/corewing/app/entity/AppPublicFirmwarePlane.java new file mode 100644 index 0000000..13add47 --- /dev/null +++ b/src/main/java/com/corewing/app/entity/AppPublicFirmwarePlane.java @@ -0,0 +1,86 @@ +package com.corewing.app.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.corewing.app.common.base.CommonEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 固件详情表 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@TableName("app_public_firmware_plane") +public class AppPublicFirmwarePlane extends CommonEntity { + + /** + * 主键 + */ + @TableId + private String id; + + /** + * 版本号Id + */ + private String versionId; + + /** + * 板载类型 + */ + private String boardType; + + /** + * 固件类型 + */ + private String type; + + /** + * 固件下载地址 + */ + private String downloadUrl; + + /** + * 固件名称 + */ + private String firmwareName; + + /** + * 固件大小 + */ + private Long fileSize; + + /** + * 固件发布时间 + */ + private Date releaseTime; + + /** + * 固件同步时间 + */ + private Date crawlTime; + + /** + * 是否有效 + */ + private int isValid; + + /** + * 排序 + */ + private int sortCode; + + /** + * 备注 + */ + private String remark; + + /** + * 扩展字段 + */ + private String extJson; + + +} diff --git a/src/main/java/com/corewing/app/entity/AppPublicFirmwareVersion.java b/src/main/java/com/corewing/app/entity/AppPublicFirmwareVersion.java new file mode 100644 index 0000000..a3a5f18 --- /dev/null +++ b/src/main/java/com/corewing/app/entity/AppPublicFirmwareVersion.java @@ -0,0 +1,65 @@ +package com.corewing.app.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.corewing.app.common.base.CommonEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 公共固件版本表 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@TableName("app_public_firmware_version") +public class AppPublicFirmwareVersion extends CommonEntity { + + /** + * 主键 + */ + @TableId + public String id; + + /** + * 固件版本类型 + */ + private String type; + + /** + * 版本类型 + */ + private String versionType; + + /** + * 版本号 + */ + private String versionNumber; + + /** + * 数字版本号 + */ + private int versionCode; + + /** + * 发布时间 + */ + private Date releaseDate; + + /** + * 排序 + */ + private int sortCode; + + /** + * 备注 + */ + private String remark; + + /** + * 扩展字段 + */ + private String extJson; + +} diff --git a/src/main/java/com/corewing/app/mapper/AppPublicFirmwarePlaneMapper.java b/src/main/java/com/corewing/app/mapper/AppPublicFirmwarePlaneMapper.java new file mode 100644 index 0000000..5277d21 --- /dev/null +++ b/src/main/java/com/corewing/app/mapper/AppPublicFirmwarePlaneMapper.java @@ -0,0 +1,9 @@ +package com.corewing.app.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.corewing.app.entity.AppPublicFirmwarePlane; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface AppPublicFirmwarePlaneMapper extends BaseMapper { +} diff --git a/src/main/java/com/corewing/app/mapper/AppPublicFirmwareVersionMapper.java b/src/main/java/com/corewing/app/mapper/AppPublicFirmwareVersionMapper.java new file mode 100644 index 0000000..ca47f90 --- /dev/null +++ b/src/main/java/com/corewing/app/mapper/AppPublicFirmwareVersionMapper.java @@ -0,0 +1,9 @@ +package com.corewing.app.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.corewing.app.entity.AppPublicFirmwareVersion; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface AppPublicFirmwareVersionMapper extends BaseMapper { +} diff --git a/src/main/java/com/corewing/app/modules/app/AppPublicFirmwareController.java b/src/main/java/com/corewing/app/modules/app/AppPublicFirmwareController.java index 4b67e7e..9b68e34 100644 --- a/src/main/java/com/corewing/app/modules/app/AppPublicFirmwareController.java +++ b/src/main/java/com/corewing/app/modules/app/AppPublicFirmwareController.java @@ -1,7 +1,10 @@ package com.corewing.app.modules.app; import com.corewing.app.common.Result; +import com.corewing.app.dto.publicFirmware.PublicFirmwareVersionListRequest; +import com.corewing.app.entity.AppPublicFirmwareVersion; import com.corewing.app.entity.BizDict; +import com.corewing.app.service.AppPublicFirmwareVersionService; import com.corewing.app.service.BizDictService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -20,16 +23,23 @@ public class AppPublicFirmwareController { @Resource private BizDictService bizDictService; - /** - * 获取固件类型 - * @return - */ + @Resource + private AppPublicFirmwareVersionService appPublicFirmwareVersionService; + + @ApiOperation("获取固件类型集合") @GetMapping("/getFirmwareTypeAll") public Result> getFirmwareTypeAll() { return Result.success(bizDictService.getDataListByKey()); } + @ApiOperation("根据固件类型获取版本集合") + @GetMapping("/getVersionList") + public Result> getVersionList(PublicFirmwareVersionListRequest publicFirmwareVersionListRequest) { + return Result.success(appPublicFirmwareVersionService.getVersionList(publicFirmwareVersionListRequest)); + } + + diff --git a/src/main/java/com/corewing/app/service/AppPublicFirmwarePlaneService.java b/src/main/java/com/corewing/app/service/AppPublicFirmwarePlaneService.java new file mode 100644 index 0000000..604d7ec --- /dev/null +++ b/src/main/java/com/corewing/app/service/AppPublicFirmwarePlaneService.java @@ -0,0 +1,7 @@ +package com.corewing.app.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.corewing.app.entity.AppPublicFirmwarePlane; + +public interface AppPublicFirmwarePlaneService extends IService { +} diff --git a/src/main/java/com/corewing/app/service/AppPublicFirmwareVersionService.java b/src/main/java/com/corewing/app/service/AppPublicFirmwareVersionService.java new file mode 100644 index 0000000..6b815d5 --- /dev/null +++ b/src/main/java/com/corewing/app/service/AppPublicFirmwareVersionService.java @@ -0,0 +1,11 @@ +package com.corewing.app.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.corewing.app.dto.publicFirmware.PublicFirmwareVersionListRequest; +import com.corewing.app.entity.AppPublicFirmwareVersion; + +import java.util.List; + +public interface AppPublicFirmwareVersionService extends IService { + List getVersionList(PublicFirmwareVersionListRequest publicFirmwareVersionListRequest); +} diff --git a/src/main/java/com/corewing/app/service/impl/AppPublicFirmwarePlaneServiceImpl.java b/src/main/java/com/corewing/app/service/impl/AppPublicFirmwarePlaneServiceImpl.java new file mode 100644 index 0000000..72d198e --- /dev/null +++ b/src/main/java/com/corewing/app/service/impl/AppPublicFirmwarePlaneServiceImpl.java @@ -0,0 +1,11 @@ +package com.corewing.app.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.corewing.app.entity.AppPublicFirmwarePlane; +import com.corewing.app.mapper.AppPublicFirmwarePlaneMapper; +import com.corewing.app.service.AppPublicFirmwarePlaneService; +import org.springframework.stereotype.Service; + +@Service +public class AppPublicFirmwarePlaneServiceImpl extends ServiceImpl implements AppPublicFirmwarePlaneService { +} diff --git a/src/main/java/com/corewing/app/service/impl/AppPublicFirmwareVersionServiceImpl.java b/src/main/java/com/corewing/app/service/impl/AppPublicFirmwareVersionServiceImpl.java new file mode 100644 index 0000000..d44c1f1 --- /dev/null +++ b/src/main/java/com/corewing/app/service/impl/AppPublicFirmwareVersionServiceImpl.java @@ -0,0 +1,23 @@ +package com.corewing.app.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.corewing.app.dto.publicFirmware.PublicFirmwareVersionListRequest; +import com.corewing.app.entity.AppPublicFirmwareVersion; +import com.corewing.app.mapper.AppPublicFirmwareVersionMapper; +import com.corewing.app.service.AppPublicFirmwareVersionService; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class AppPublicFirmwareVersionServiceImpl extends ServiceImpl implements AppPublicFirmwareVersionService { + + @Override + public List getVersionList(PublicFirmwareVersionListRequest publicFirmwareVersionListRequest) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(AppPublicFirmwareVersion::getType, publicFirmwareVersionListRequest.getFirmwareType()); + wrapper.orderByAsc(AppPublicFirmwareVersion::getSortCode); + return list(wrapper); + } +}