提交本地

examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/core/questions/api/AudioTimeConfigController.java

@@ -49,6 +49,13 @@ public class AudioTimeConfigController extends ControllerSupport{
 		return new ResponseEntity<Object>(list,HttpStatus.OK);
 	}
 	
+	@ApiOperation(value="根据传入的对象查询已经保存的音频题",notes="根据传入的对象查询已经保存的音频题")
+	@PostMapping("/audioTimeConfig/update")
+	public ResponseEntity<Object> findUpdateList(@RequestBody List<AudioTimeConfig> audioTimeConfigModelList){
+		List<AudioTimeConfig> list = audioTimeConfigService.findUpdateAudioTimeConfigList(audioTimeConfigModelList);
+		return new ResponseEntity<Object>(list,HttpStatus.OK);
+	}
+	
 	@ApiOperation(value="新增音频播放次数",notes="新增音频播放次数")
 	@PostMapping("/addAudioTimeConfig")
 	public ResponseEntity<Object> addAudioTimeConfig(@RequestBody List<AudioTimeConfig> audioTimeConfigList,HttpServletRequest request){

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/AudioTimeConfigService.java

@@ -37,6 +37,13 @@ public interface AudioTimeConfigService {
 	 */
 	public List<AudioTimeConfig> findAudioTimeConfigList(List<AudioTimeConfig> audioTimeConfigModelList);
 	
+	/**
+	 * 
+	 * @param audioTimeConfigModelList
+	 * @return
+	 */
+	public List<AudioTimeConfig> findUpdateAudioTimeConfigList(List<AudioTimeConfig> audioTimeConfigModelList);
+	
 	/**
 	 * 新增音频播放次数
 	 * @param audioTimeConfig

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/ExportPaperAbstractService.java

@@ -1512,6 +1512,7 @@ public abstract class ExportPaperAbstractService {
 	public void downloadAudio(PaperExp paperExp, String zipFileName) {
 		//先判断是否是音频试卷
 		if(paperExp.getHasAudio() != null && paperExp.getHasAudio() == true){
+			UpYun upyun = new UpYun(bucketName,userName,password);
 			//取到所有大题
 			List<PaperDetailExp> paperDetailExps = paperExp.getPaperDetails();
 			if(paperDetailExps != null && paperDetailExps.size()>0){
@@ -1527,7 +1528,6 @@ public abstract class ExportPaperAbstractService {
 															+"_"+paperExp.getName()
 															+"_试卷_"
 															+"_"+getAudioFileName(audio,unit,paperDetailExp);
-									UpYun upyun = new UpYun(bucketName,userName,password);
 									File file = new File(TEMP_FILE_EXP+File.separator+zipFileName+File.separator+audioFileName);
 									upyun.readFile(audio.getFileUrl(), file);
 								}

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/impl/AudioTimeConfigServiceImpl.java

@@ -193,4 +193,19 @@ public class AudioTimeConfigServiceImpl implements AudioTimeConfigService{
 	    return map;
 	}
 
+	@Override
+	public List<AudioTimeConfig> findUpdateAudioTimeConfigList(List<AudioTimeConfig> audioTimeConfigModelList) {
+		List<AudioTimeConfig> list = findAudioTimeConfigList(audioTimeConfigModelList);
+		if(list != null && list.size()>0){
+			for(AudioTimeConfig audioTimeConfig:list){
+				AudioTimeConfig oldAudioTimeConfig = audioTimeConfigRepo.findOne(Example.of(audioTimeConfig));
+				if(oldAudioTimeConfig != null){
+					audioTimeConfig = oldAudioTimeConfig;
+				}
+			}
+			return list;
+		}
+		return list;
+	}
+
 }

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/impl/PaperProviderServiceImpl.java

@@ -232,13 +232,13 @@ public class PaperProviderServiceImpl implements PaperProviderService{
 		extractConfig.setOrgId(orgId);
 		ExtractConfig tempConfig = extractConfigService.findConfig(extractConfig);
 		if(tempConfig == null){
-    		throw new StatusException("Q-014249", "该场考试没有关联试卷");
+    		return null;
     	}
 		List<ExamPaper> list = tempConfig.getExamPaperList();
 		if(list == null || list.size()<1){
 			throw new StatusException("Q-014252", "该场考试关联试卷集合为空");
 		}
-		String paperId = list.get(0).getId();
+		String paperId = list.get(0).getPaper().getId();
 		if(StringUtils.isBlank(paperId)){
 			throw new StatusException("Q-014256", "该场考试关联的试卷id为空");
 		}