Browse Source

修改视频创建逻辑、新增图片检查接口、新增百度API接口、修改上传阿里云检查、新增回调接口

private_deployment
lrh 1 year ago
parent
commit
8d570e6819
7 changed files with 26 additions and 10 deletions
  1. +2
    -2
      suimangAdmin/src/main/java/com/iformall/controller/sys/UploadController.java
  2. +6
    -0
      suimangCApi/src/main/java/com/iformall/controller/PhotoSpeakVideoController.java
  3. +1
    -0
      suimangService/src/main/java/com/iformall/common/ErrorCode.java
  4. +1
    -0
      suimangService/src/main/java/com/iformall/mapper/PhotoSpeakVideoMapper.java
  5. +1
    -0
      suimangService/src/main/java/com/iformall/service/sm/PhotoSpeakVideoService.java
  6. +9
    -8
      suimangService/src/main/java/com/iformall/service/sm/impl/PhotoSpeakVideoServiceImpl.java
  7. +6
    -0
      suimangService/src/main/resources/mapper/PhotoSpeakVideoMapper.xml

+ 2
- 2
suimangAdmin/src/main/java/com/iformall/controller/sys/UploadController.java View File

@@ -77,9 +77,9 @@ public class UploadController extends BaseController {
TenantEntity tenantEntity = getTenantInfo(); TenantEntity tenantEntity = getTenantInfo();


long size = multiReq.getSize(); long size = multiReq.getSize();
final long length = 2097152;
final long length = 2097152 * 2;
if (size > length) { if (size > length) {
return new ResultData(ErrorCode.PICTURE_SIZE_EXCEED);
return new ResultData(ErrorCode.PICTURE_FOUR_SIZE_EXCEED);
} }


String fileFormat = ""; String fileFormat = "";


+ 6
- 0
suimangCApi/src/main/java/com/iformall/controller/PhotoSpeakVideoController.java View File

@@ -470,4 +470,10 @@ public class PhotoSpeakVideoController extends BaseController {
return new ResultData(); return new ResultData();
} }


@ApiOperation("获取视频是否生成成功")
@GetMapping("/checkVideoStatus")
public ResultData checkVideoStatus() {
photoSpeakVideoService.checkVideoStatus(getMemberId());
return new ResultData();
}
} }

+ 1
- 0
suimangService/src/main/java/com/iformall/common/ErrorCode.java View File

@@ -103,6 +103,7 @@ public enum ErrorCode{
MEMBER_IS_NOT_ACTIVE(2112, "当前会员未激活"), MEMBER_IS_NOT_ACTIVE(2112, "当前会员未激活"),
MEMBER_IS_ACTIVE(2113, "当前会员已激活"), MEMBER_IS_ACTIVE(2113, "当前会员已激活"),
MEMBER_IS_FOUND(2114, "当前会员已存在"), MEMBER_IS_FOUND(2114, "当前会员已存在"),
VIDEO_CREATING(2115, "视频生成中"),


/** /**
* 商场/商户 * 商场/商户


+ 1
- 0
suimangService/src/main/java/com/iformall/mapper/PhotoSpeakVideoMapper.java View File

@@ -23,4 +23,5 @@ public interface PhotoSpeakVideoMapper extends CommonMapper<PhotoSpeakVideo, Lon


List<PhotoSpeakVideo> getSortList(PhotoSpeakVideo record); List<PhotoSpeakVideo> getSortList(PhotoSpeakVideo record);


Integer checkVideoStatus(@Param("userId") Long userId);
} }

+ 1
- 0
suimangService/src/main/java/com/iformall/service/sm/PhotoSpeakVideoService.java View File

@@ -67,4 +67,5 @@ public interface PhotoSpeakVideoService {


List<PhotoSpeakVideo> getNotHyUploadList(); List<PhotoSpeakVideo> getNotHyUploadList();


ResultData checkVideoStatus(Long userId);
} }

+ 9
- 8
suimangService/src/main/java/com/iformall/service/sm/impl/PhotoSpeakVideoServiceImpl.java View File

@@ -9,15 +9,11 @@ import com.iformall.common.IdWorker;
import com.iformall.common.ResultData; import com.iformall.common.ResultData;
import com.iformall.domain.po.sm.*; import com.iformall.domain.po.sm.*;
import com.iformall.enums.*; import com.iformall.enums.*;
import com.iformall.enums.sm.EnumLogType;
import com.iformall.enums.sm.EnumPackageType;
import com.iformall.mapper.PhotoSpeakVideoMapper; import com.iformall.mapper.PhotoSpeakVideoMapper;
import com.iformall.service.sm.*; import com.iformall.service.sm.*;
import com.iformall.sm.*; import com.iformall.sm.*;
import com.iformall.utils.Base64Util; import com.iformall.utils.Base64Util;
import com.iformall.utils.DateUtils;
import com.iformall.video.VideoFactory; import com.iformall.video.VideoFactory;
import com.iformall.video.aliyun.sdk.server.UploadCacheHelper;
import com.iformall.video.entity.VideUploadResult; import com.iformall.video.entity.VideUploadResult;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; 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.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.AsyncResult;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;


import javax.transaction.xa.XAException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Objects;
import java.util.concurrent.Future;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;




@@ -387,4 +379,13 @@ public class PhotoSpeakVideoServiceImpl implements PhotoSpeakVideoService {
umVideoQ.setVideoStatuss(videoStatuss); umVideoQ.setVideoStatuss(videoStatuss);
return photoSpeakVideoMapper.getSortList(umVideoQ); 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(),"视频生成中");
}
} }

+ 6
- 0
suimangService/src/main/resources/mapper/PhotoSpeakVideoMapper.xml View File

@@ -156,5 +156,11 @@
<include refid="dynamicWhereConditions"/> <include refid="dynamicWhereConditions"/>
</select> </select>


<select id="checkVideoStatus" resultType="java.lang.Integer">
select count(1)
from photo_speak_video
where video_status = 5 and create_video_date &gt;= now() and user_id = #{userId}
</select>



</mapper> </mapper>

Loading…
Cancel
Save