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 5c4f4c0..bc4b991 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 * 2; + final long length = 2097152; if (size > length) { - return new ResultData(ErrorCode.PICTURE_FOUR_SIZE_EXCEED); + return new ResultData(ErrorCode.PICTURE_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 cea1147..396d159 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/PhotoSpeakVideoController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/PhotoSpeakVideoController.java @@ -472,8 +472,8 @@ public class PhotoSpeakVideoController extends BaseController { @ApiOperation("获取视频是否生成成功") @GetMapping("/checkVideoStatus") - public ResultData checkVideoStatus() { - photoSpeakVideoService.checkVideoStatus(getMemberId()); - return new ResultData(); + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) + public ResultData checkVideoStatus(String time) { + return photoSpeakVideoService.checkVideoStatus(getMemberId(),time); } } diff --git a/suimangCApi/src/main/java/com/iformall/controller/UploadController.java b/suimangCApi/src/main/java/com/iformall/controller/UploadController.java index 8687965..12e1f49 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/UploadController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/UploadController.java @@ -75,9 +75,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/VideoCallbackController.java b/suimangCApi/src/main/java/com/iformall/controller/VideoCallbackController.java index 789b210..6fc7b82 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/VideoCallbackController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/VideoCallbackController.java @@ -56,18 +56,23 @@ public class VideoCallbackController extends BaseController { @AuthIgnore @ApiOperation("新增接口") - @PostMapping("/photo/speak") + @PostMapping(value = "/photo/speak") public ResultData photoSpeak(@RequestBody Map paranMap) { logger.debug("[" + getIpAddr() + "] VideoCallbackController::photoSpeak"); logger.info("照片生成视频结果通知{}"+JSONObject.toJSONString(paranMap)); - String task_id = (String) paranMap.get("task_id");//任务ID + Long task_id = (Long) paranMap.get("task_id");//任务ID Integer code = (Integer) paranMap.get("code");//code String msg = (String) paranMap.get("msg"); + String data = (String)paranMap.get("data"); - Map data = (HashMap) paranMap.get("data"); - String url = (String) data.get("url"); - String save_dir = (String) data.get("save_dir"); - Boolean sr = (Boolean) data.get("sr");//判断 sr=True 就是超分的, False 是没超分的 + Map dataMap = JSONObject.parseObject(data,Map.class); + String url = (String) dataMap.get("url"); + String save_dir = (String) dataMap.get("save_dir"); + Boolean sr = (Boolean) dataMap.get("sr");//判断 sr=True 就是超分的, False 是没超分的 + + if (task_id == null){ + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"任务ID不能为空"); + } PhotoSpeakVideo photoSpeakVideo = photoSpeakVideoService.getById(Long.valueOf(task_id)); if (photoSpeakVideo == null){ @@ -89,10 +94,6 @@ public class VideoCallbackController extends BaseController { return new ResultData(ErrorCode.SYS_SERVER_ERROR.getCode(),returnMsg); } - if (StringUtils.isEmpty(task_id)){ - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"任务ID不能为空"); - } - if (StringUtils.isEmpty(url)){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"视频URL不能为空"); } diff --git a/suimangService/src/main/java/com/iformall/mapper/PhotoSpeakVideoMapper.java b/suimangService/src/main/java/com/iformall/mapper/PhotoSpeakVideoMapper.java index d7977af..be9f46e 100644 --- a/suimangService/src/main/java/com/iformall/mapper/PhotoSpeakVideoMapper.java +++ b/suimangService/src/main/java/com/iformall/mapper/PhotoSpeakVideoMapper.java @@ -23,5 +23,5 @@ public interface PhotoSpeakVideoMapper extends CommonMapper getSortList(PhotoSpeakVideo record); - Integer checkVideoStatus(@Param("userId") Long userId); + Integer checkVideoStatus(@Param("userId") Long userId,@Param("time") String time); } 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 4212d42..7510533 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/PhotoSpeakVideoService.java +++ b/suimangService/src/main/java/com/iformall/service/sm/PhotoSpeakVideoService.java @@ -3,10 +3,8 @@ package com.iformall.service.sm; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.po.sm.PhotoSpeakVideo; -import com.iformall.domain.po.sm.UserMouldVideo; import java.util.List; -import java.util.concurrent.Future; public interface PhotoSpeakVideoService { @@ -67,5 +65,5 @@ public interface PhotoSpeakVideoService { List getNotHyUploadList(); - ResultData checkVideoStatus(Long userId); + ResultData checkVideoStatus(Long userId, String time); } 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 9b8cb95..393f2c3 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 @@ -188,16 +188,18 @@ public class PhotoSpeakVideoServiceImpl implements PhotoSpeakVideoService { param.setTask_id(photoSpeakVideo.getId()); param.setCallback_url(callbackUrl + "/callback/photo/speak"); param.setImg(Base64Util.imageUrlToBase64(photoSpeakVideo.getPersonPhotoUrl())); - param.setVoice_id(photoSpeakVideo.getVoiceMouldSm() == null ? "default" : photoSpeakVideo.getVoiceMouldSm()); String voiceMouldSm = photoSpeakVideo.getVoiceMouldSm(); Integer sex = 1; - String speakType = null; + Integer speakType = 0; + String mouldSmId = null; if (!StringUtils.isBlank(voiceMouldSm)) { JSONObject jsonObject = JSON.parseObject(voiceMouldSm); - speakType = jsonObject.getString("speakType"); + speakType = jsonObject.getInteger("speakType"); sex = jsonObject.getInteger("sex"); + mouldSmId = jsonObject.getString("mouldSmId"); } param.setVoice_style(speakType == null ? "default" : EnumSpeakType.getEnum(speakType).getType()); + param.setVoice_id(mouldSmId == null ? "default" : mouldSmId); Integer voiceFrom = photoSpeakVideo.getVoiceFrom(); String voiceMaterialUrl = photoSpeakVideo.getVoiceMaterialUrl(); @@ -228,16 +230,16 @@ public class PhotoSpeakVideoServiceImpl implements PhotoSpeakVideoService { this.updateById(photoSpeakVideo); return new ResultData(); } - photoSpeakVideo.setVideoStatus(EnumVideoStatus.draft.getCode()); + photoSpeakVideo.setVideoStatus(EnumVideoStatus.fail.getCode()); photoSpeakVideo.setVideoMsg(video.getMsg()); this.updateById(photoSpeakVideo); - return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"接口请求异常"); + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"生成视频失败"); } catch (Exception e) { e.printStackTrace(); - photoSpeakVideo.setVideoStatus(EnumVideoStatus.draft.getCode()); + photoSpeakVideo.setVideoStatus(EnumVideoStatus.fail.getCode()); photoSpeakVideo.setVideoMsg("接口请求异常"); this.updateById(photoSpeakVideo); - return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"接口请求异常"); + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"生成视频失败"); } } @@ -381,8 +383,8 @@ public class PhotoSpeakVideoServiceImpl implements PhotoSpeakVideoService { } @Override - public ResultData checkVideoStatus(Long userId) { - Integer integer = photoSpeakVideoMapper.checkVideoStatus(userId); + public ResultData checkVideoStatus(Long userId, String time) { + Integer integer = photoSpeakVideoMapper.checkVideoStatus(userId,time); if (integer > 0){ return new ResultData("生成视频成功"); } diff --git a/suimangService/src/main/java/com/iformall/sm/AiPhotoSpeakResult.java b/suimangService/src/main/java/com/iformall/sm/AiPhotoSpeakResult.java index 0318a9c..a313797 100644 --- a/suimangService/src/main/java/com/iformall/sm/AiPhotoSpeakResult.java +++ b/suimangService/src/main/java/com/iformall/sm/AiPhotoSpeakResult.java @@ -11,7 +11,7 @@ public class AiPhotoSpeakResult { private String saveDir; public String getMsgInfo(Integer code, String msg) { - if (code == 4000 && msg.equals("success")) { + if (code == 4000 && msg.equals("img_talk success")) { return "成功"; } else if (code == 3006 && msg.equals("miss parameter")) { return "却少参数"; diff --git a/suimangService/src/main/resources/mapper/PhotoSpeakVideoMapper.xml b/suimangService/src/main/resources/mapper/PhotoSpeakVideoMapper.xml index 923bfee..c4824e9 100644 --- a/suimangService/src/main/resources/mapper/PhotoSpeakVideoMapper.xml +++ b/suimangService/src/main/resources/mapper/PhotoSpeakVideoMapper.xml @@ -159,7 +159,7 @@