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 9bbb01534..df71e617f 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 @@ -118,7 +118,7 @@ public class AvController extends BaseController { try{ // if(srcFile!=null && sampleFile!=null && // srcFile.getSize()>0 && sampleFile.getSize()>0){ - if(srcFile!=null && srcFile.getSize()>0){ + if(srcFile!=null && srcFile.getSize()>0 && entity!=null){ String sep = System.getProperty("file.separator"); String srcFilePath = Constants.AV_FILE_PATH+entity.getCfgType()+sep+"srcFile";//源文件保存路径 String sampleFilePath = Constants.AV_FILE_PATH+entity.getCfgType()+sep+"sampleFile";//样例文件保存路径 @@ -159,7 +159,8 @@ public class AvController extends BaseController { // entity.setSampleMd5(sampleMd5); } - avCfgService.saveOrUpdateAvFileSample(entity); + avCfgService.saveOrUpdateAvFileSample(entity, srcFile); + addMessage(redirectAttributes,"save_success"); }catch(Exception e){ logger.error("文件上传失败",e); @@ -178,6 +179,7 @@ public class AvController extends BaseController { public String saveAudioSignSample(Model model,HttpServletRequest request,HttpServletResponse response, RedirectAttributes redirectAttributes,String ids,AvSignSampleCfg entity){ try{ avCfgService.saveOrUpdateAvSignSample(entity); + addMessage(redirectAttributes,"save_success"); }catch(Exception e){ logger.error("saveAudioSignSample failed",e); e.printStackTrace(); @@ -191,8 +193,9 @@ public class AvController extends BaseController { } //修改文件样例配置状态 @RequestMapping(value = {"/sample/updateAvFileSampleValid"}) - public String updateAvFileSampleValid(Integer isAudit,Integer isValid,String ids,Integer functionId){ + public String updateAvFileSampleValid(Integer isAudit,Integer isValid,String ids,Integer functionId,RedirectAttributes redirectAttributes){ avCfgService.updateAvFileSampleValid(isAudit,isValid,ids); + addMessage(redirectAttributes,"delete_failed"); return "redirect:" + adminPath +"/ntc/av/sample/fileSampleList?functionId="+functionId; } //修改文件样例配置审核状态 diff --git a/src/main/java/com/nis/web/service/configuration/AvCfgService.java b/src/main/java/com/nis/web/service/configuration/AvCfgService.java index 26766af66..819d30360 100644 --- a/src/main/java/com/nis/web/service/configuration/AvCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/AvCfgService.java @@ -16,6 +16,7 @@ import org.apache.commons.lang.StringEscapeUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; import com.nis.domain.Page; import com.nis.domain.configuration.AvFileSampleCfg; @@ -77,7 +78,7 @@ public class AvCfgService extends BaseService{ List list = avCfgDao.getAvSignSampleList(entity); return list; } - public void saveOrUpdateAvFileSample(AvFileSampleCfg entity){ + public void saveOrUpdateAvFileSample(AvFileSampleCfg entity,MultipartFile srcFile){ //设置区域运营商信息 setAreaEffectiveIds(entity); if(entity.getCfgId()==null){ @@ -116,7 +117,7 @@ public class AvCfgService extends BaseService{ entity.setEditTime(new Date()); entity.setIsValid(0); entity.setIsAudit(0); - if(!oldEntity.getSrcMd5().equals(entity.getSrcMd5())){ + if(null!=srcFile){ //删除旧的文件 FileUtils.deleteFile(oldEntity.getSrcPath()); FileUtils.deleteFile(oldEntity.getSamplePath());