diff --git a/suimangAdmin/src/main/java/com/iformall/controller/sys/UploadController.java b/suimangAdmin/src/main/java/com/iformall/controller/sys/UploadController.java index bc4b991..5c4f4c0 100644 --- a/suimangAdmin/src/main/java/com/iformall/controller/sys/UploadController.java +++ b/suimangAdmin/src/main/java/com/iformall/controller/sys/UploadController.java @@ -77,9 +77,9 @@ public class UploadController extends BaseController { TenantEntity tenantEntity = getTenantInfo(); long size = multiReq.getSize(); - final long length = 2097152; + final long length = 2097152 * 2; if (size > length) { - return new ResultData(ErrorCode.PICTURE_SIZE_EXCEED); + return new ResultData(ErrorCode.PICTURE_FOUR_SIZE_EXCEED); } String fileFormat = ""; diff --git a/suimangCApi/src/main/java/com/iformall/controller/PhotoSpeakVideoController.java b/suimangCApi/src/main/java/com/iformall/controller/PhotoSpeakVideoController.java index 6573978..cea1147 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/PhotoSpeakVideoController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/PhotoSpeakVideoController.java @@ -470,4 +470,10 @@ public class PhotoSpeakVideoController extends BaseController { return new ResultData(); } + @ApiOperation("获取视频是否生成成功") + @GetMapping("/checkVideoStatus") + public ResultData checkVideoStatus() { + photoSpeakVideoService.checkVideoStatus(getMemberId()); + return new ResultData(); + } } diff --git a/suimangService/src/main/java/com/iformall/common/ErrorCode.java b/suimangService/src/main/java/com/iformall/common/ErrorCode.java index c97abc5..83a9005 100644 --- a/suimangService/src/main/java/com/iformall/common/ErrorCode.java +++ b/suimangService/src/main/java/com/iformall/common/ErrorCode.java @@ -103,6 +103,7 @@ public enum ErrorCode{ MEMBER_IS_NOT_ACTIVE(2112, "当前会员未激活"), MEMBER_IS_ACTIVE(2113, "当前会员已激活"), MEMBER_IS_FOUND(2114, "当前会员已存在"), + VIDEO_CREATING(2115, "视频生成中"), /** * 商场/商户 diff --git a/suimangService/src/main/java/com/iformall/mapper/PhotoSpeakVideoMapper.java b/suimangService/src/main/java/com/iformall/mapper/PhotoSpeakVideoMapper.java index 193adfa..d7977af 100644 --- a/suimangService/src/main/java/com/iformall/mapper/PhotoSpeakVideoMapper.java +++ b/suimangService/src/main/java/com/iformall/mapper/PhotoSpeakVideoMapper.java @@ -23,4 +23,5 @@ public interface PhotoSpeakVideoMapper extends CommonMapper getSortList(PhotoSpeakVideo record); + Integer checkVideoStatus(@Param("userId") Long userId); } diff --git a/suimangService/src/main/java/com/iformall/service/sm/PhotoSpeakVideoService.java b/suimangService/src/main/java/com/iformall/service/sm/PhotoSpeakVideoService.java index 32f4133..4212d42 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/PhotoSpeakVideoService.java +++ b/suimangService/src/main/java/com/iformall/service/sm/PhotoSpeakVideoService.java @@ -67,4 +67,5 @@ public interface PhotoSpeakVideoService { List getNotHyUploadList(); + ResultData checkVideoStatus(Long userId); } diff --git a/suimangService/src/main/java/com/iformall/service/sm/impl/PhotoSpeakVideoServiceImpl.java b/suimangService/src/main/java/com/iformall/service/sm/impl/PhotoSpeakVideoServiceImpl.java index 8ea2d0d..9b8cb95 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/impl/PhotoSpeakVideoServiceImpl.java +++ b/suimangService/src/main/java/com/iformall/service/sm/impl/PhotoSpeakVideoServiceImpl.java @@ -9,15 +9,11 @@ import com.iformall.common.IdWorker; import com.iformall.common.ResultData; import com.iformall.domain.po.sm.*; import com.iformall.enums.*; -import com.iformall.enums.sm.EnumLogType; -import com.iformall.enums.sm.EnumPackageType; import com.iformall.mapper.PhotoSpeakVideoMapper; import com.iformall.service.sm.*; import com.iformall.sm.*; import com.iformall.utils.Base64Util; -import com.iformall.utils.DateUtils; import com.iformall.video.VideoFactory; -import com.iformall.video.aliyun.sdk.server.UploadCacheHelper; import com.iformall.video.entity.VideUploadResult; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -27,16 +23,12 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Value; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.scheduling.annotation.Async; -import org.springframework.scheduling.annotation.AsyncResult; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; -import javax.transaction.xa.XAException; import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.Objects; -import java.util.concurrent.Future; import java.util.concurrent.atomic.AtomicInteger; @@ -387,4 +379,13 @@ public class PhotoSpeakVideoServiceImpl implements PhotoSpeakVideoService { umVideoQ.setVideoStatuss(videoStatuss); return photoSpeakVideoMapper.getSortList(umVideoQ); } + + @Override + public ResultData checkVideoStatus(Long userId) { + Integer integer = photoSpeakVideoMapper.checkVideoStatus(userId); + if (integer > 0){ + return new ResultData("生成视频成功"); + } + return new ResultData(ErrorCode.VIDEO_CREATING.getCode(),"视频生成中"); + } } diff --git a/suimangService/src/main/resources/mapper/PhotoSpeakVideoMapper.xml b/suimangService/src/main/resources/mapper/PhotoSpeakVideoMapper.xml index 08fcdae..923bfee 100644 --- a/suimangService/src/main/resources/mapper/PhotoSpeakVideoMapper.xml +++ b/suimangService/src/main/resources/mapper/PhotoSpeakVideoMapper.xml @@ -156,5 +156,11 @@ + +