Merge branch 'v1.3.1' into dev1130

cqb-paper/src/main/java/com/qmth/cqb/paper/model/PaperDetail.java

@@ -13,7 +13,7 @@ public class PaperDetail implements Serializable,Comparable<PaperDetail> {
     @Id
     private String id;
 
-    @DBRef(lazy = true)
+    @DBRef(lazy = false)
     private Paper paper;// 关联的试卷
 
     private Integer number;// 大题序号

cqb-paper/src/main/java/com/qmth/cqb/paper/model/PaperDetailUnit.java

@@ -23,7 +23,7 @@ public class PaperDetailUnit implements Serializable, Comparable<PaperDetailUnit
     @Id
     private String id;
 
-    @DBRef(lazy = true)
+    @DBRef(lazy = false)
     private Paper paper;// 关联的试卷
 
     private Integer number;// 小题序号
@@ -32,12 +32,12 @@ public class PaperDetailUnit implements Serializable, Comparable<PaperDetailUnit
 
     private List<Double> subScoreList;// 对应套题的情况下，各子题的分数分布
 
-    @DBRef(lazy = true)
+    @DBRef(lazy = false)
     private PaperDetail paperDetail;// 关联的大题
 
     private QuesStructType questionType;// 小题类型
 
-    @DBRef(lazy = true)
+    @DBRef(lazy = false)
     private Question question;// 关联试题
 
     /**

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

@@ -522,10 +522,10 @@ public class ExtractConfigServiceImpl implements ExtractConfigService {
 	private PaperDto getPaperDtoByPaper(Paper paper){
 
 		//优先从redis中获取缓存dto
-//		Object cacheDto = redisTemplate.opsForValue().get(paper.getId());
-//		if(cacheDto != null && cacheDto.getClass().equals(PaperDto.class)){
-//			return (PaperDto)cacheDto;
-//		}
+		Object cacheDto = redisTemplate.opsForValue().get(paper.getId());
+		if(cacheDto != null && cacheDto.getClass().equals(PaperDto.class)){
+			return (PaperDto)cacheDto;
+		}
 		long beginTime = System.currentTimeMillis();
 		//没有则重新组装
 		PaperDto paperDto = paperDtoAssembler.toDto(paper);
@@ -610,7 +610,7 @@ public class ExtractConfigServiceImpl implements ExtractConfigService {
 		long paperDetailUnitDtoEndTime = System.currentTimeMillis();
 		logger.info("单独组装paperDetailUnitDto耗时:"+(paperDetailUnitDtoEndTime - paperDetailDtoEndTime)+"ms");
         //将重新组装的dto放进缓存
-//        redisTemplate.opsForValue().set(paperDto.getId(),paperDto);
+        redisTemplate.opsForValue().set(paperDto.getId(),paperDto);
 		return paperDto;
 	}