gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改视频关键帧图片生成时缺省不打开图片列表界面

Browse Source
This commit is contained in:
zhangwei
2018-11-02 11:14:03 +08:00
parent ae191e4a41
commit bb3fbdcd25
3 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/nis/web/controller/configuration/ntc/AvController.java
View File

@@ -560,8 +560,8 @@ public class AvController extends BaseController {
if(validateAvDuration(uploadSrcFile)){
String shellName = Constants.VEDIO_TO_PICTURE_PROC;
// String params = srcFileAllPath+" "+picFilePath+" 0.95 90.0 0.5";
String params = srcFileAllPath+" "+picFilePath;
logger.info("调用视频转关键帧图片程序："+shellName+" " +params);
String[] params = new String[]{srcFileAllPath,picFilePath};
logger.info("调用视频转关键帧图片程序："+shellName+" " +StringUtils.join(params," "));
Map resultMap = avCfgService.execShell(shellName, params);
if(resultMap.get("exitStatus").equals(0)){//调用外部程序成功
String out = resultMap.get("out").toString();//输出参数
@@ -572,6 +572,18 @@ public class AvController extends BaseController {
if(state==1){
//关键帧图片生成成功，删除原视频文件
FileUtils.deleteFile(srcFileAllPath);
//获取图片列表
Collection<File> files = FileUtils.listFiles(new File(picFilePath), null, true);
String srcPath = null;
for(File f:files){
if(srcPath==null){
srcPath = f.getName();
}else{
srcPath += "|"+f.getName();
}
}
//将图片文件列表赋值给生成样例的源文件路径参数
map.put("srcPath", srcPath);
map.put("status", 1);
map.put("msg", "success");
}else{

2
src/main/java/com/nis/web/service/configuration/AvCfgService.java
View File

@@ -535,7 +535,7 @@ public class AvCfgService extends BaseService{
}
result.put("error", out.toString());//错误信息
int waitFor = exec.waitFor();
logger.info("调用脚本:"+shellName+",执行返回状态值："+waitFor);
logger.info("调用脚本:"+sb.toString()+",执行返回状态值："+waitFor);
result.put("exitStatus", waitFor);//执行状态
} catch (Exception e) {
e.printStackTrace();