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:
zhanghongqing
2018-09-12 16:27:16 +08:00
parent 04b3d4dc62
commit fc8c9951c8
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -118,7 +118,7 @@ public class AvController extends BaseController {
try{ try{
// if(srcFile!=null && sampleFile!=null && // if(srcFile!=null && sampleFile!=null &&
// srcFile.getSize()>0 && sampleFile.getSize()>0){ // 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 sep = System.getProperty("file.separator");
String srcFilePath = Constants.AV_FILE_PATH+entity.getCfgType()+sep+"srcFile";//源文件保存路径 String srcFilePath = Constants.AV_FILE_PATH+entity.getCfgType()+sep+"srcFile";//源文件保存路径
String sampleFilePath = Constants.AV_FILE_PATH+entity.getCfgType()+sep+"sampleFile";//样例文件保存路径 String sampleFilePath = Constants.AV_FILE_PATH+entity.getCfgType()+sep+"sampleFile";//样例文件保存路径
@@ -159,7 +159,8 @@ public class AvController extends BaseController {
// entity.setSampleMd5(sampleMd5); // entity.setSampleMd5(sampleMd5);
} }
avCfgService.saveOrUpdateAvFileSample(entity); avCfgService.saveOrUpdateAvFileSample(entity, srcFile);
addMessage(redirectAttributes,"save_success");
}catch(Exception e){ }catch(Exception e){
logger.error("文件上传失败",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){ public String saveAudioSignSample(Model model,HttpServletRequest request,HttpServletResponse response, RedirectAttributes redirectAttributes,String ids,AvSignSampleCfg entity){
try{ try{
avCfgService.saveOrUpdateAvSignSample(entity); avCfgService.saveOrUpdateAvSignSample(entity);
addMessage(redirectAttributes,"save_success");
}catch(Exception e){ }catch(Exception e){
logger.error("saveAudioSignSample failed",e); logger.error("saveAudioSignSample failed",e);
e.printStackTrace(); e.printStackTrace();
@@ -191,8 +193,9 @@ public class AvController extends BaseController {
} }
//修改文件样例配置状态 //修改文件样例配置状态
@RequestMapping(value = {"/sample/updateAvFileSampleValid"}) @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); avCfgService.updateAvFileSampleValid(isAudit,isValid,ids);
addMessage(redirectAttributes,"delete_failed");
return "redirect:" + adminPath +"/ntc/av/sample/fileSampleList?functionId="+functionId; return "redirect:" + adminPath +"/ntc/av/sample/fileSampleList?functionId="+functionId;
} }
//修改文件样例配置审核状态 //修改文件样例配置审核状态

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

@@ -16,6 +16,7 @@ import org.apache.commons.lang.StringEscapeUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import com.nis.domain.Page; import com.nis.domain.Page;
import com.nis.domain.configuration.AvFileSampleCfg; import com.nis.domain.configuration.AvFileSampleCfg;
@@ -77,7 +78,7 @@ public class AvCfgService extends BaseService{
List<AvSignSampleCfg> list = avCfgDao.getAvSignSampleList(entity); List<AvSignSampleCfg> list = avCfgDao.getAvSignSampleList(entity);
return list; return list;
} }
public void saveOrUpdateAvFileSample(AvFileSampleCfg entity){ public void saveOrUpdateAvFileSample(AvFileSampleCfg entity,MultipartFile srcFile){
//设置区域运营商信息 //设置区域运营商信息
setAreaEffectiveIds(entity); setAreaEffectiveIds(entity);
if(entity.getCfgId()==null){ if(entity.getCfgId()==null){
@@ -116,7 +117,7 @@ public class AvCfgService extends BaseService{
entity.setEditTime(new Date()); entity.setEditTime(new Date());
entity.setIsValid(0); entity.setIsValid(0);
entity.setIsAudit(0); entity.setIsAudit(0);
if(!oldEntity.getSrcMd5().equals(entity.getSrcMd5())){ if(null!=srcFile){
//删除旧的文件 //删除旧的文件
FileUtils.deleteFile(oldEntity.getSrcPath()); FileUtils.deleteFile(oldEntity.getSrcPath());
FileUtils.deleteFile(oldEntity.getSamplePath()); FileUtils.deleteFile(oldEntity.getSamplePath());