chenken 7 tahun lalu
induk
melakukan
1bfaffc833

+ 9 - 0
cqb-paper/src/main/java/com/qmth/cqb/paper/model/AudioTimeConfig.java

@@ -60,6 +60,15 @@ public class AudioTimeConfig implements Serializable {
     
     private String createUser;
     
+    public AudioTimeConfig(){}
+    
+	public AudioTimeConfig(String examId, String courseCode, String groupCode,String questionId) {
+		super();
+		this.examId = examId;
+		this.courseCode = courseCode;
+		this.groupCode = groupCode;
+		this.questionId = questionId;
+	}
 	public String getId() {
 		return id;
 	}

+ 0 - 3
cqb-paper/src/main/java/com/qmth/cqb/paper/service/PaperService.java

@@ -2,7 +2,6 @@ package com.qmth.cqb.paper.service;
 
 import java.io.BufferedInputStream;
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
@@ -17,7 +16,6 @@ import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import com.qmth.cqb.base.model.Course;
 import com.qmth.cqb.utils.exception.PaperException;
 
 import main.java.com.UpYun;
@@ -56,7 +54,6 @@ import com.qmth.cqb.question.model.QuesOption;
 import com.qmth.cqb.question.model.Question;
 import com.qmth.cqb.question.model.QuestionAudio;
 import com.qmth.cqb.question.model.QuestionBak;
-import com.qmth.cqb.question.model.QuestionType;
 import com.qmth.cqb.question.service.QuesService;
 import com.qmth.cqb.question.service.impl.QuestionAudioServiceImpl;
 import com.qmth.cqb.utils.BeanCopierUtil;

+ 2 - 11
cqb-paper/src/main/java/com/qmth/cqb/paper/service/impl/ExtractConfigServiceImpl.java

@@ -592,17 +592,8 @@ public class ExtractConfigServiceImpl implements ExtractConfigService {
 	private void buildQuestionDto(QuestionDto questionDto, String examId,String courseCode,String groupCode){
 		//判断questionDto是否含有音频,如果有添加音频播放次数
 		if(questionDto.getHasAudio() != null && questionDto.getHasAudio() == true){
-			AudioTimeConfig audioTimeCon = new AudioTimeConfig();
-			audioTimeCon.setExamId(examId);
-			audioTimeCon.setCourseCode(courseCode);
-			audioTimeCon.setGroupCode(groupCode);
-			audioTimeCon.setQuestionId(questionDto.getId());
-			AudioTimeConfig audioTimeConfig = audioTimeConfigRepo.findOne(Example.of(audioTimeCon));
-			if(audioTimeConfig != null && audioTimeConfig.getPlayTime() != null){
-				questionDto.setPlayTime(audioTimeConfig.getPlayTime());
-			}else {
-				questionDto.setPlayTime(null);
-			}
+			AudioTimeConfig audioTimeConfig = audioTimeConfigRepo.findOne(Example.of(new AudioTimeConfig(examId,courseCode,groupCode,questionDto.getId())));
+			questionDto.setPlayTime(audioTimeConfig != null?audioTimeConfig.getPlayTime():null);
 		}else {
 			questionDto.setPlayTime(null);
 		}

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

@@ -2,8 +2,6 @@ package com.qmth.cqb.paper.web;
 
 import io.swagger.annotations.ApiOperation;
 
-import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -14,7 +12,6 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -22,7 +19,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 
 import cn.com.qmth.examcloud.common.uac.entity.AccessUser;
 
-import com.qmth.cqb.paper.dao.AudioTimeConfigRepo;
 import com.qmth.cqb.paper.model.AudioTimeConfig;
 import com.qmth.cqb.paper.service.AudioTimeConfigService;
 

+ 0 - 1
cqb-paper/src/main/java/com/qmth/cqb/paper/web/PaperController.java

@@ -1,6 +1,5 @@
 package com.qmth.cqb.paper.web;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;

+ 3 - 3
cqb-starter/src/main/resources/application-dev.properties

@@ -2,10 +2,10 @@
 spring.data.mongodb.uri=mongodb://192.168.1.99:27017/comm-ques-bank
 spring.data.mongodb.grid-fs-database=comm-ques-bank
 spring.data.mongodb.database=comm-ques-bank
-eureka.client.serviceUrl.defaultZone=http://localhost:1111/eureka/
-spring.application.name=ExamCloud-service-question
+eureka.client.serviceUrl.defaultZone=http://192.168.1.99:1111/eureka/
+spring.application.name=chenken-ExamCloud-service-question
 
-spring.redis.host=127.0.0.1
+spring.redis.host=192.168.1.99
 spring.redis.port=6379
 
 upyun.bucketName=exam-cloud-test