From f2d013ec70b4f4e6b71c488225a332ced8ab9c2c Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei2@iie.ac.cn>
Date: Thu, 25 Oct 2018 17:29:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=86=E9=A2=91=E6=A0=B7=E5=BC=8F=E8=BD=AC?=
 =?UTF-8?q?=E5=85=B3=E9=94=AE=E5=B8=A7=E5=9B=BE=E7=89=87=E8=BF=87=E7=A8=8B?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=9B=9E=E5=8F=82=E6=95=B0=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../configuration/ntc/AvController.java       | 31 ++++++-
 .../WEB-INF/views/cfg/av/fileSampleForm.jsp   | 85 ++++++++++---------
 2 files changed, 71 insertions(+), 45 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java b/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java
index 16b6b9eac..8ccef1cea 100644
--- a/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java
+++ b/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java
@@ -15,6 +15,9 @@ import java.util.UUID;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+
 import org.apache.commons.io.filefilter.IOFileFilter;
 import org.apache.tools.zip.ZipOutputStream;
 import org.springframework.mock.web.MockMultipartFile;
@@ -557,12 +560,32 @@ public class AvController extends BaseController  {
 				String shellName = Constants.VEDIO_TO_PICTURE_PROC;
 //				String params = srcFileAllPath+" "+picFilePath+" 0.95 90.0 0.5";
 				String params = srcFileAllPath+" "+picFilePath;
+				logger.info("调用视频转关键帧图片程序输入参数："+params);
 				Map resultMap = avCfgService.execShell(shellName, params);
 				if(resultMap.get("exitStatus").equals(0)){//调用外部程序成功
-					//关键帧图片生成成功，删除原视频文件
-					FileUtils.deleteFile(srcFileAllPath);
-					map.put("status", 1);
-					map.put("msg", "success");
+					String out = resultMap.get("out").toString();//输出参数
+					JSONArray resArray =JSONArray.fromObject(out);
+					JSONObject resObject = resArray.getJSONObject(0);
+					logger.info("调用视频转关键帧图片程序输出参数："+resObject);
+					int state = resObject.getInt("state");
+					if(state==1){
+						//关键帧图片生成成功，删除原视频文件
+						FileUtils.deleteFile(srcFileAllPath);
+						map.put("status", 1);
+						map.put("msg", "success");
+					}else{
+						if(StringUtil.isEmpty(resObject.getString("message"))){
+							map.put("status", 0);
+							map.put("msg", getMsgProp().getProperty("call_external_procedures_failed", "Call external procedures failed"));
+						}else{
+							map.put("status", 0);
+							map.put("msg", resObject.getString("message"));
+						}
+					}
+					
+				}else{
+					map.put("status", 0);
+					map.put("msg", getMsgProp().getProperty("call_external_procedures_failed", "Call external procedures failed"));
 				}
 			}else{
 				map.put("status", 0);
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp
index cb2d8dbe8..7affa9247 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp
@@ -47,47 +47,50 @@ $(function(){
 	});
 
 	$("#srcFile").on('change',function(){
-		sampleFileValidate(fileType,$("#srcFile").val());
-		$("#srcFileInfo").val($("#srcFile").val());
-		var videoToPicture = $("#videoToPicture").val();
-		if(videoToPicture=="true"){
-			
-	    	var fd = new FormData($('#cfgFrom')[0]);
-	    	$.ajax({
-	    		url: "${ctx}/ntc/av/sample/videoToPicture",
-	    		type: "POST",
-	    		processData: false,
-	    		contentType: false,
-	    		data: fd,
-	    		async: true,  
-	            cache: false, 
-	            beforeSend: function(){
-	            	loading('onloading...');
-	            },
-	    		success: function(data) {
-	    			top.$.jBox.closeTip();
-	    			if(data.status==1){
-	    				$("#picPath").val(data.picFilePath);
-	    				$("#showPicture").removeClass("hidden");
-		    			var url = "${ctx}/ntc/av/sample/selectVedioPicture?picFilePath="+encodeURIComponent(data.picFilePath);
-		    			$.jBox("iframe:"+url, {
-		    			    title: "",
-		    			    width: 1350,
-		    			    height:800,
-		    			    dragLimit: true,
-		    			    buttons: { 'close': true,"ok":"ok" }
-		    			});
-	    			}else{
-	    				alert(data.msg);
-	    			}
-	    			
-	    		},
-				error:function(jqXHR, textStatus, errorThrown){ 
-					top.$.jBox.closeTip();
-					alert(errorThrown);
-					return false;
-				} 
-	    	});
+		if(sampleFileValidate(fileType,$("#srcFile").val())){
+			//样例文件类型正确进行后续处理
+			$("#srcFileInfo").val($("#srcFile").val());
+			var videoToPicture = $("#videoToPicture").val();
+			if(videoToPicture=="true"){
+				
+		    	var fd = new FormData($('#cfgFrom')[0]);
+		    	$.ajax({
+		    		url: "${ctx}/ntc/av/sample/videoToPicture",
+		    		type: "POST",
+		    		processData: false,
+		    		contentType: false,
+		    		data: fd,
+		    		async: true,  
+		            cache: false, 
+		            beforeSend: function(){
+		            	loading('onloading...');
+		            },
+		    		success: function(data) {
+		    			top.$.jBox.closeTip();
+		    			if(data.status==1){
+		    				$("#picPath").val(data.picFilePath);
+		    				$("#showPicture").removeClass("hidden");
+			    			var url = "${ctx}/ntc/av/sample/selectVedioPicture?picFilePath="+encodeURIComponent(data.picFilePath);
+			    			$.jBox("iframe:"+url, {
+			    			    title: "",
+			    			    top: '1%',
+			    			    draggable:false,
+			    			    width: 1000,
+			    			    height:500,
+			    			    buttons: { 'close': true }
+			    			});
+		    			}else{
+		    				alert(data.msg);
+		    			}
+		    			
+		    		},
+					error:function(jqXHR, textStatus, errorThrown){ 
+						top.$.jBox.closeTip();
+						alert(errorThrown);
+						return false;
+					} 
+		    	});
+			}
 		}
 	});
 	/* $("#uploadSample,#sampleFileInfo").on('click',function(){