| @@ -66,9 +66,12 @@ public class VideoCallbackController extends BaseController { | |||||
| String jsonString = JSONObject.toJSONString(data); | String jsonString = JSONObject.toJSONString(data); | ||||
| Map dataMap = JSONObject.parseObject(jsonString,Map.class); | Map dataMap = JSONObject.parseObject(jsonString,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 是没超分的 | Boolean sr = (Boolean) dataMap.get("sr");//判断 sr=True 就是超分的, False 是没超分的 | ||||
| String url = (String) dataMap.get("url"); | |||||
| String save_dir = null; | |||||
| if (!sr){ | |||||
| save_dir = (String) dataMap.get("save_dir"); | |||||
| } | |||||
| if (task_id == null){ | if (task_id == null){ | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"任务ID不能为空"); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"任务ID不能为空"); | ||||
| @@ -98,7 +101,7 @@ public class VideoCallbackController extends BaseController { | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"视频URL不能为空"); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"视频URL不能为空"); | ||||
| } | } | ||||
| if (!save_dir.equals(photoSpeakVideo.getSaveDir())){ | |||||
| if (save_dir != null && !save_dir.equals(photoSpeakVideo.getSaveDir())){ | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"save_dir参数不一致"); | return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"save_dir参数不一致"); | ||||
| } | } | ||||