|
|
@@ -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<MusicInfo> music = musicInfoService.music(); |
|
|
|
return new ResultData(music); |
|
|
|
} |
|
|
|
|
|
|
|
} |