代码优化

cqb-paper/src/main/java/com/qmth/cqb/paper/dao/AudioTimeConfigRepo.java

@@ -24,7 +24,5 @@ public interface AudioTimeConfigRepo  extends MongoRepository<AudioTimeConfig,St
 	
 	List<AudioTimeConfig> findByExamIdAndCourseCode(String examId,String courseCode);
 	
-	AudioTimeConfig findAudioTimeConfigByExamIdAndCourseCodeAndGroupCodeAndPaperDetailUnit(String examId,String courseCode,String groupCode,PaperDetailUnit paperDetailUnit);
-
 }
 

cqb-paper/src/main/java/com/qmth/cqb/paper/service/AudioTimeConfigService.java

@@ -51,6 +51,6 @@ public interface AudioTimeConfigService {
 	 */
 	public List<AudioTimeConfig> findAudioTimeConfigByExamId(String examId,String courseCode);
 	
-	public Map findAudioTimeConfigByExamIdAndCourseCodeAndGroupCodeAndPaperDetailUnit(String examId,String courseCode,String groupCode,String paperDetailUnitId);
+	public Map<String, String> findAudioTimeConfigByExamIdAndCourseCodeAndGroupCodeAndPaperDetailUnit(String examId,String courseCode,String groupCode,String paperDetailUnitId);
 }
 

cqb-paper/src/main/java/com/qmth/cqb/paper/service/impl/AudioTimeConfigServiceImpl.java

@@ -6,6 +6,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Example;
 import org.springframework.stereotype.Service;
@@ -109,29 +110,38 @@ public class AudioTimeConfigServiceImpl implements AudioTimeConfigService{
 	}
 
 	@Override
-	public Map findAudioTimeConfigByExamIdAndCourseCodeAndGroupCodeAndPaperDetailUnit(
+	public Map<String, String> findAudioTimeConfigByExamIdAndCourseCodeAndGroupCodeAndPaperDetailUnit(
 			String examId, String courseCode, String groupCode,String paperDetailUnitId) {
-		Map map = new HashMap();
-		if(examId == null || examId.length() <= 0){
+		Map<String, String> map = new HashMap<String, String>();
+		if(StringUtils.isNotBlank(examId)){
 			map.put("errMessage", "examId为空");
 			return map;
 		}
-		if(courseCode == null || examId.length() <= 0){
+		if(StringUtils.isNotBlank(courseCode)){
 			map.put("errMessage", "courseCode为空");
 			return map;
 		}
-		if(groupCode == null || examId.length() <= 0){
+		if(StringUtils.isNotBlank(groupCode)){
 			map.put("errMessage", "groupCode为空");
 			return map;
 		}
-		if(paperDetailUnitId == null || examId.length() <= 0){
+		if(StringUtils.isNotBlank(paperDetailUnitId)){
 			map.put("errMessage", "paperDetailUnitId为空");
 			return map;
 		}
 		PaperDetailUnit paperDetailUnit = paperDetailUnitRepo.findOne(paperDetailUnitId);
-		AudioTimeConfig audioTimeConfig = audioTimeConfigRepo.findAudioTimeConfigByExamIdAndCourseCodeAndGroupCodeAndPaperDetailUnit(examId, courseCode, groupCode, paperDetailUnit);
-	    Integer playTime = audioTimeConfig.getPlayTime();
-	    map.put("playTime", playTime);
+		AudioTimeConfig audioTime = new AudioTimeConfig();
+		audioTime.setCourseCode(courseCode);
+		audioTime.setExamId(examId);
+		audioTime.setGroupCode(groupCode);
+		audioTime.setPaperDetailUnit(paperDetailUnit);
+		AudioTimeConfig audioTimeConfig = audioTimeConfigRepo.findOne(Example.of(audioTime));
+	    if(audioTimeConfig == null){
+	    	map.put("errMessage", "没有音频");
+	    	return map;
+	    }
+		Integer playTime = audioTimeConfig.getPlayTime();
+	    map.put("playTime", playTime.toString());
 	    return map;
 	}
 

cqb-paper/src/main/java/com/qmth/cqb/paper/web/AudioTimeConfigController.java

@@ -70,7 +70,7 @@ public class AudioTimeConfigController {
 											   @PathVariable String courseCode,
 											   @PathVariable String groupCode,
 											   @PathVariable String paperDetailUnitId){
-		Map map = audioTimeConfigService.findAudioTimeConfigByExamIdAndCourseCodeAndGroupCodeAndPaperDetailUnit(examId, courseCode, groupCode, paperDetailUnitId);
+		Map<String, String> map = audioTimeConfigService.findAudioTimeConfigByExamIdAndCourseCodeAndGroupCodeAndPaperDetailUnit(examId, courseCode, groupCode, paperDetailUnitId);
 		return new ResponseEntity(map,HttpStatus.OK);
 	}
 }