fix

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/bean/randompaper/PaperDetailDto.java

@@ -1,7 +1,7 @@
 package cn.com.qmth.examcloud.core.questions.service.bean.randompaper;
 
 public class PaperDetailDto {
-	public String id;
+	private String id;
 
     private Integer number;// 大题序号
 

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/bean/randompaper/PaperDetailUnitDto.java

@@ -23,8 +23,6 @@ public class PaperDetailUnitDto extends MongoBaseEntity {
 	@DBRef(lazy = true)
 	private QuestionDto question;// 关联试题
 
-	private String questionId;// 关联试题
-
 	private String creator;// 创建人id
 
 	private String createTime;// 创建时间
@@ -113,12 +111,5 @@ public class PaperDetailUnitDto extends MongoBaseEntity {
 		this.timeLimit = timeLimit;
 	}
 
-	public String getQuestionId() {
-		return questionId;
-	}
-
-	public void setQuestionId(String questionId) {
-		this.questionId = questionId;
-	}
 
 }

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/bean/randompaper/QuestionDto.java

@@ -9,7 +9,7 @@ import cn.com.qmth.examcloud.question.commons.core.question.AnswerType;
 
 public class QuestionDto {
 
-	public String id;
+	private String id;
 
 	private QuesStructType questionType;// 试题结构类型
 	/*

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

@@ -22,6 +22,8 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
+import javax.annotation.Resource;
+
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.ArrayUtils;
@@ -172,7 +174,8 @@ public class PaperServiceImpl implements PaperService {
 
 	@Autowired
 	private MongoTemplate mongoTemplate;
-
+	@Resource(name="mongoTemplate2")
+	private MongoTemplate mongoTemplate2;
 	@Autowired
 	private QuestionAudioServiceImpl questionAudioService;
 
@@ -668,7 +671,7 @@ public class PaperServiceImpl implements PaperService {
 		}
 		Query query = new Query();
 		query.addCriteria(Criteria.where("paper.$id").is(id));
-		List<PaperDetailUnitDto> units = this.mongoTemplate.find(query, PaperDetailUnitDto.class, "paperDetailUnit");
+		List<PaperDetailUnitDto> units = this.mongoTemplate2.find(query, PaperDetailUnitDto.class, "paperDetailUnit");
 		return units;
 	}
 	private boolean existGenerateQuestion(List<String> questionIds) {
@@ -723,7 +726,7 @@ public class PaperServiceImpl implements PaperService {
 				if(CollectionUtils.isEmpty(paperUnits)) {
 					continue;
 				}
-				List<String> questionIds=paperUnits.stream().map(e->e.getQuestion().id).collect(Collectors.toList());
+				List<String> questionIds=paperUnits.stream().map(e->e.getQuestion().getId()).collect(Collectors.toList());
 				if(existGenerateQuestion(questionIds)) {
 					throw new StatusException("试卷[" + paper.getName() + "]中有试题被组卷使用，不能删除");
 				}

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

@@ -9,6 +9,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import javax.annotation.Resource;
+
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.bson.types.ObjectId;
@@ -83,6 +85,8 @@ public class RandomPaperServiceImpl implements RandomPaperService {
 	private static int cacheTimeOut = 2 * 60 * 60;
 	@Autowired
 	private MongoTemplate mongoTemplate;
+	@Resource(name="mongoTemplate2")
+	private MongoTemplate mongoTemplate2;
 	@Autowired
 	private PaperStructService paperStructService;
 	@Autowired
@@ -378,7 +382,7 @@ public class RandomPaperServiceImpl implements RandomPaperService {
 
                 @Override
                 protected void setData(List<PaperDetailUnitDto> dataList) {
-                    List<String> ids = dataList.stream().map(p -> p.getQuestion().id).collect(Collectors.toList());
+                    List<String> ids = dataList.stream().map(p -> p.getQuestion().getId()).collect(Collectors.toList());
                     List<QuestionDto> temList = findQuestionByIds(ids);
                     if (CollectionUtils.isNotEmpty(temList)) {
                         Map<String, QuestionDto> map = new HashMap<>();
@@ -386,10 +390,10 @@ public class RandomPaperServiceImpl implements RandomPaperService {
                             map.put(vo.getId(), vo);
                         }
                         for (PaperDetailUnitDto dto : dataList) {
-                        	dto.setQuestion(map.get(dto.getQuestion().id));
+                        	dto.setQuestion(map.get(dto.getQuestion().getId()));
                         }
                     }
-                    ids = dataList.stream().map(p -> p.getPaperDetail().id).collect(Collectors.toList());
+                    ids = dataList.stream().map(p -> p.getPaperDetail().getId()).collect(Collectors.toList());
                     List<PaperDetailDto> details=findDetailByIds(ids);
                     if (CollectionUtils.isNotEmpty(temList)) {
                         Map<String, PaperDetailDto> map = new HashMap<>();
@@ -397,7 +401,7 @@ public class RandomPaperServiceImpl implements RandomPaperService {
                             map.put(vo.getId(), vo);
                         }
                         for (PaperDetailUnitDto dto : dataList) {
-                        	dto.setPaperDetail(map.get(dto.getPaperDetail().id));
+                        	dto.setPaperDetail(map.get(dto.getPaperDetail().getId()));
                         }
                     }
                 }
@@ -704,7 +708,7 @@ public class RandomPaperServiceImpl implements RandomPaperService {
 		}
 		Query query = new Query();
 		query.addCriteria(Criteria.where("paper.$id").in(ids));
-		List<PaperDetailUnitDto> units = this.mongoTemplate.find(query, PaperDetailUnitDto.class, "paperDetailUnit");
+		List<PaperDetailUnitDto> units = this.mongoTemplate2.find(query, PaperDetailUnitDto.class, "paperDetailUnit");
 		return units;
 	}