Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/videomanager/action/VideoFileAction.java =================================================================== diff -u -r25547 -r25548 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/videomanager/action/VideoFileAction.java (.../VideoFileAction.java) (revision 25547) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/videomanager/action/VideoFileAction.java (.../VideoFileAction.java) (revision 25548) @@ -145,22 +145,32 @@ String uuidName = StrutsParamUtils.getPraramValue("videoName", null); //获取医院配置的路径 SupplyRoomConfig supplyRoomConfig = supplyRoomConfigManager.getSystemParamsObj(); - String path = supplyRoomConfig.getSaveImagePath() + "/packingTeacherVideo"; - String result = videoFileManager.deleteVideo(objectId,uuidName,path); + String path = supplyRoomConfig.getSaveImagePath() + "/packingTeacherVideo"; TousseDefinition definition = tousseDefinitionManager.get(objectId); String uuid_vedioNames = definition.getUuid_vedioNames(); if(StringUtils.isNotBlank(uuidName) && StringUtils.isNotBlank(uuid_vedioNames)){ //uuid_vedioNames规则:ad.mp4;df.mp4;df3.mp4 or df3.mp4 or null + if(uuid_vedioNames.indexOf(uuidName) == -1){ + try { + String result = "视频不存在"; + StrutsParamUtils.getResponse().getWriter().write("{'success':" + false + ",'msg':'" + result + "'}"); + return; + } catch (Exception e) { + + } + + } String delUuidNameEndWithSemicolon = uuidName + ";"; String delUuidNameStartWithSemicolon = ";" + uuidName; if(uuid_vedioNames.indexOf(delUuidNameEndWithSemicolon) != -1){//删除的视频字符串不在第一个分号前 uuid_vedioNames = uuid_vedioNames.replaceFirst(delUuidNameEndWithSemicolon, ""); }else if(uuid_vedioNames.indexOf(delUuidNameStartWithSemicolon) != -1){//删除的视频字符串在第一个分号前 uuid_vedioNames = uuid_vedioNames.replaceFirst(delUuidNameStartWithSemicolon, ""); - }else{//视频字符段中无分号 + }else if(uuid_vedioNames.indexOf(";")==-1){//视频字符段中无分号 uuid_vedioNames = null; } } + String result = videoFileManager.deleteVideo(objectId,uuidName,path); definition.setUuid_vedioNames(uuid_vedioNames); tousseDefinitionManager.saveOrUpdate(definition); try {