diff --git a/suimangCApi/src/main/java/com/iformall/controller/PhotoSpeakVideoController.java b/suimangCApi/src/main/java/com/iformall/controller/PhotoSpeakVideoController.java index dbbef45..a7de038 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/PhotoSpeakVideoController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/PhotoSpeakVideoController.java @@ -6,15 +6,13 @@ import com.iformall.annotation.AuthIgnore; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.sm.MusicInfo; import com.iformall.domain.po.sm.PhotoSpeakVideo; import com.iformall.domain.po.sm.UserMouldVideo; import com.iformall.domain.po.sm.VoiceInfo; import com.iformall.enums.EnumVideoStatus; import com.iformall.exception.MallinkException; -import com.iformall.service.sm.MouldPatchService; -import com.iformall.service.sm.PhotoSpeakVideoService; -import com.iformall.service.sm.UserMouldVideoService; -import com.iformall.service.sm.VoiceInfoService; +import com.iformall.service.sm.*; import com.iformall.video.VideoFactory; import com.iformall.video.entity.VideUploadResult; import io.swagger.annotations.Api; @@ -23,6 +21,7 @@ import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.SneakyThrows; import org.apache.commons.lang3.StringUtils; +import org.checkerframework.checker.units.qual.A; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -38,6 +37,7 @@ import java.net.URL; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; import java.util.Date; +import java.util.List; @RestController @@ -61,6 +61,9 @@ public class PhotoSpeakVideoController extends BaseController { @Autowired String videoType; + @Autowired + private MusicInfoService musicInfoService; + @ApiOperation("分页列表接口") @GetMapping("list") @ApiImplicitParams({ @@ -296,5 +299,11 @@ public class PhotoSpeakVideoController extends BaseController { } } + @GetMapping(value = "/music") + @ApiOperation("获取默认音乐") + public ResultData music() { + List music = musicInfoService.music(); + return new ResultData(music); + } } diff --git a/suimangService/src/main/java/com/iformall/domain/po/sm/MusicInfo.java b/suimangService/src/main/java/com/iformall/domain/po/sm/MusicInfo.java new file mode 100644 index 0000000..63cd9d1 --- /dev/null +++ b/suimangService/src/main/java/com/iformall/domain/po/sm/MusicInfo.java @@ -0,0 +1,62 @@ +package com.iformall.domain.po.sm; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.util.Date; +import java.io.Serializable; +import lombok.Data; + + +/** + * @Description + * @Author LRH + * @Date 2023-06-13 + */ +@Data +@TableName("music_info" ) +public class MusicInfo implements Serializable { + + private static final long serialVersionUID = 6934358084213154592L; + + /** + * 主键ID + */ + @TableId + private Integer id; + + /** + * 音乐名称 + */ + private String name; + + /** + * 音乐链接 + */ + private String url; + + /** + * 音乐大小 + */ + private Integer size; + + /** + * 音乐时长(s) + */ + private Integer time; + + /** + * 创建时间 + */ + private Date createDate; + + /** + * 更新时间 + */ + private Date updateDate; + + /** + * 是否删除1是0否 + */ + private Integer isDel; + +} diff --git a/suimangService/src/main/java/com/iformall/mapper/MusicInfoServiceMapper.java b/suimangService/src/main/java/com/iformall/mapper/MusicInfoServiceMapper.java new file mode 100644 index 0000000..f409cff --- /dev/null +++ b/suimangService/src/main/java/com/iformall/mapper/MusicInfoServiceMapper.java @@ -0,0 +1,8 @@ +package com.iformall.mapper; + +import com.iformall.common.CommonMapper; +import com.iformall.domain.po.MallPermission; +import com.iformall.domain.po.sm.MusicInfo; + +public interface MusicInfoServiceMapper extends CommonMapper { +} diff --git a/suimangService/src/main/java/com/iformall/service/sm/MusicInfoService.java b/suimangService/src/main/java/com/iformall/service/sm/MusicInfoService.java new file mode 100644 index 0000000..ec79e67 --- /dev/null +++ b/suimangService/src/main/java/com/iformall/service/sm/MusicInfoService.java @@ -0,0 +1,11 @@ +package com.iformall.service.sm; + +import com.iformall.domain.po.sm.MusicInfo; + +import java.util.List; + +public interface MusicInfoService { + + List music(); + +} diff --git a/suimangService/src/main/java/com/iformall/service/sm/impl/MusicInfoServiceImpl.java b/suimangService/src/main/java/com/iformall/service/sm/impl/MusicInfoServiceImpl.java new file mode 100644 index 0000000..723ca61 --- /dev/null +++ b/suimangService/src/main/java/com/iformall/service/sm/impl/MusicInfoServiceImpl.java @@ -0,0 +1,25 @@ +package com.iformall.service.sm.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.iformall.domain.po.sm.MusicInfo; +import com.iformall.mapper.MusicInfoServiceMapper; +import com.iformall.service.sm.MusicInfoService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class MusicInfoServiceImpl implements MusicInfoService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired + private MusicInfoServiceMapper musicInfoServiceMapper; + + @Override + public List music() { + return musicInfoServiceMapper.selectList(new LambdaQueryWrapper().eq(MusicInfo::getIsDel,0)); + } +}