From b3a7fc3b8153d73ccfcd5c3c20d52493ff3d1f02 Mon Sep 17 00:00:00 2001 From: lrh <1585126058@qq.com> Date: Thu, 6 Jul 2023 15:19:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E7=A4=BA=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/VideoCallbackController.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/suimangCApi/src/main/java/com/iformall/controller/VideoCallbackController.java b/suimangCApi/src/main/java/com/iformall/controller/VideoCallbackController.java index 2804c08..1c2b3f8 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/VideoCallbackController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/VideoCallbackController.java @@ -66,9 +66,12 @@ public class VideoCallbackController extends BaseController { String jsonString = JSONObject.toJSONString(data); 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 是没超分的 + String url = (String) dataMap.get("url"); + String save_dir = null; + if (!sr){ + save_dir = (String) dataMap.get("save_dir"); + } if (task_id == null){ 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不能为空"); } - 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参数不一致"); }