no change.

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

@@ -32,21 +32,21 @@ public class AudioTimeConfigController extends ControllerSupport {
     @PostMapping(value = "/audioTimeConfig/{examId}/{courseCode}")
     public ResponseEntity<Object> findAudioTimeConfig(@PathVariable String examId, @PathVariable String courseCode) {
         List<AudioTimeConfig> audioTimeConfigs = audioTimeConfigService.findAudioTimeConfigByExamId(examId, courseCode);
-        return new ResponseEntity<Object>(audioTimeConfigs, HttpStatus.OK);
+        return new ResponseEntity<>(audioTimeConfigs, HttpStatus.OK);
     }
 
     @ApiOperation(value = "根据传入的对象查询音频题", notes = "根据传入的对象查询音频题")
     @PostMapping("/audioTimeConfig/all")
     public ResponseEntity<Object> findAudioTimeConfigList(@RequestBody List<AudioTimeConfig> audioTimeConfigModelList) {
         List<AudioTimeConfig> list = audioTimeConfigService.findAudioTimeConfigList(audioTimeConfigModelList);
-        return new ResponseEntity<Object>(list, HttpStatus.OK);
+        return new ResponseEntity<>(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);
+        return new ResponseEntity<>(list, HttpStatus.OK);
     }
 
     @ApiOperation(value = "新增音频播放次数", notes = "新增音频播放次数")
@@ -55,9 +55,9 @@ public class AudioTimeConfigController extends ControllerSupport {
         User user = getAccessUser();
         if (user != null) {
             audioTimeConfigService.saveAudioTimeConfig(audioTimeConfigList, user);
-            return new ResponseEntity<Object>(HttpStatus.OK);
+            return new ResponseEntity<>(HttpStatus.OK);
         }
-        return new ResponseEntity<Object>(HttpStatus.NOT_FOUND);
+        return new ResponseEntity<>(HttpStatus.NOT_FOUND);
     }
 
     @ApiOperation(value = "清理音频播放次数设置", notes = "清理音频播放次数设置")
@@ -66,9 +66,9 @@ public class AudioTimeConfigController extends ControllerSupport {
         User user = getAccessUser();
         if (user != null) {
             audioTimeConfigService.deleteByExamIdAndCourseCode(examId, courseCode);
-            return new ResponseEntity<Object>(HttpStatus.OK);
+            return new ResponseEntity<>(HttpStatus.OK);
         }
-        return new ResponseEntity<Object>(HttpStatus.NOT_FOUND);
+        return new ResponseEntity<>(HttpStatus.NOT_FOUND);
     }
 
     @ApiOperation(value = "根据examID，courseCode，groupCode，paperDetailUnit的ID查询音频次数", notes = "查询音频次数")
@@ -78,7 +78,7 @@ public class AudioTimeConfigController extends ControllerSupport {
                                                        @PathVariable String groupCode,
                                                        @PathVariable String paperDetailUnitId) {
         Map<String, String> map = audioTimeConfigService.findAudioTimeConfig(examId, courseCode, groupCode, paperDetailUnitId);
-        return new ResponseEntity<Object>(map, HttpStatus.OK);
+        return new ResponseEntity<>(map, HttpStatus.OK);
     }
 }
 

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

@@ -38,9 +38,9 @@ public class CoursePropertyController extends ControllerSupport {
         User user = getAccessUser();
         if (user != null) {
             List<CourseProperty> courseProperties = coursePropertyService.findAllByOrgId(user.getRootOrgId());
-            return new ResponseEntity<Object>(courseProperties, HttpStatus.OK);
+            return new ResponseEntity<>(courseProperties, HttpStatus.OK);
         }
-        return new ResponseEntity<Object>(HttpStatus.NOT_FOUND);
+        return new ResponseEntity<>(HttpStatus.NOT_FOUND);
     }
 
     @ApiOperation(value = "根据orgId查询所有课程属性", notes = "带分页")
@@ -50,11 +50,11 @@ public class CoursePropertyController extends ControllerSupport {
                                                  @PathVariable Integer pageSize) {
         User user = getAccessUser();
         if (user == null) {
-            return new ResponseEntity<Object>(HttpStatus.NOT_FOUND);
+            return new ResponseEntity<>(HttpStatus.NOT_FOUND);
         }
         coursePropertyDto.setOrgId(user.getRootOrgId());
         Page<CourseProperty> coursePropertiesPage = coursePropertyService.findAllByOrg(coursePropertyDto, new PageRequest(curPage - 1, pageSize, new Sort(Direction.DESC, "id")));
-        return new ResponseEntity<Object>(coursePropertiesPage, HttpStatus.OK);
+        return new ResponseEntity<>(coursePropertiesPage, HttpStatus.OK);
     }
 
     @ApiOperation(value = "新增课程属性", notes = "新增课程属性")
@@ -66,7 +66,7 @@ public class CoursePropertyController extends ControllerSupport {
                 coursePropertyDto.setOrgId(user.getRootOrgId());
                 coursePropertyService.saveCourseProperty(coursePropertyDto);
             } catch (Exception e) {
-                return new ResponseEntity<Object>(HttpStatus.INTERNAL_SERVER_ERROR);
+                return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
             }
             return new ResponseEntity<Object>(HttpStatus.OK);
         }

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

@@ -30,7 +30,7 @@ public class ExamFileController {
     @PostMapping(value = "/findExamFile")
     public ResponseEntity<Object> findExamFile(@RequestBody ExamFile examFile) {
         List<ExamFile> examFiles = examFileService.findExamFileListByExamFile(examFile);
-        return new ResponseEntity<Object>(examFiles, HttpStatus.OK);
+        return new ResponseEntity<>(examFiles, HttpStatus.OK);
     }
 }
 

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

@@ -33,9 +33,9 @@ public class ExportStructureController extends ControllerSupport {
         try {
             User user = getAccessUser();
             exportStructureService.saveExportStructure(exportStructure, user);
-            return new ResponseEntity<Object>(HttpStatus.OK);
+            return new ResponseEntity<>(HttpStatus.OK);
         } catch (Exception e) {
-            return new ResponseEntity<Object>(HttpStatus.INTERNAL_SERVER_ERROR);
+            return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
         }
     }
 
@@ -47,9 +47,9 @@ public class ExportStructureController extends ControllerSupport {
             User user = getAccessUser();
             exportStructure.setOrgId(user.getRootOrgId() + "");
             Page<ExportStructure> pageExportStructure = exportStructureService.findPageByExportStructure(exportStructure, curPage, pageSize);
-            return new ResponseEntity<Object>(pageExportStructure, HttpStatus.OK);
+            return new ResponseEntity<>(pageExportStructure, HttpStatus.OK);
         } catch (Exception e) {
-            return new ResponseEntity<Object>(HttpStatus.INTERNAL_SERVER_ERROR);
+            return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
         }
     }
 
@@ -58,7 +58,7 @@ public class ExportStructureController extends ControllerSupport {
     public ResponseEntity<Object> findExportStructure(@PathVariable String examId) {
         User user = getAccessUser();
         ExportStructure exportStructure = exportStructureService.findByExportStructure(user.getRootOrgId() + "", examId);
-        return new ResponseEntity<Object>(exportStructure, HttpStatus.OK);
+        return new ResponseEntity<>(exportStructure, HttpStatus.OK);
     }
 
     @ApiOperation(value = "根据考试类型查询考试id", notes = "根据考试类型查询考试id")
@@ -66,14 +66,14 @@ public class ExportStructureController extends ControllerSupport {
     public ResponseEntity<Object> findExportStructureByExamType(@PathVariable String examType) {
         User user = getAccessUser();
         List<String> list = exportStructureService.findExportStructureByExamType(examType, user);
-        return new ResponseEntity<Object>(list, HttpStatus.OK);
+        return new ResponseEntity<>(list, HttpStatus.OK);
     }
 
     @ApiOperation(value = "根据导出结构id删除", notes = "根据导出结构删除")
     @DeleteMapping(value = "/deleteExportStructure/{id}")
     public ResponseEntity<Object> deleteExportStructure(@PathVariable String id) {
         exportStructureService.deleteExportStructure(id);
-        return new ResponseEntity<Object>(HttpStatus.OK);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 }
 

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

@@ -59,7 +59,7 @@ public class ExtractConfigController extends ControllerSupport {
         try {
             User user = getAccessUser();
             Page<ExtractConfig> extractConfigPageList = extractConfigService.findPageExtractConfig(currentPage, pageSize, examId, courseNo, String.valueOf(user.getRootOrgId()));
-            return new ResponseEntity<Object>(extractConfigPageList, HttpStatus.OK);
+            return new ResponseEntity<>(extractConfigPageList, HttpStatus.OK);
         } catch (Exception e) {
             log.error(e.getMessage(), e);
             throw new StatusException("Q-050065", e.getMessage());
@@ -74,7 +74,7 @@ public class ExtractConfigController extends ControllerSupport {
             extractConfig.setOrgId(user.getRootOrgId() + "");
             extractConfig.setOrgName(user.getRootOrgName());
             extractConfigFileService.saveExtractConfigAndBuildPaperFile(extractConfig, isbuildFile, user);
-            return new ResponseEntity<Object>(HttpStatus.OK);
+            return new ResponseEntity<>(HttpStatus.OK);
         } catch (Exception e) {
             logger.error(e.getMessage(), e);
             throw new StatusException("Q-050099", e.getMessage());
@@ -96,7 +96,7 @@ public class ExtractConfigController extends ControllerSupport {
             throw new StatusException("Q-", "user is null");
         }
         List<CouresInfo> courseCodeList = extractConfigService.findCourseByExtractConfig(examId, user.getRootOrgId().toString());
-        return new ResponseEntity<Object>(courseCodeList, HttpStatus.OK);
+        return new ResponseEntity<>(courseCodeList, HttpStatus.OK);
     }
 
     @ApiOperation(value = "根据考试ID和课程ID获取调卷规则", notes = "根据考试ID和课程ID获取调卷规则")
@@ -117,13 +117,13 @@ public class ExtractConfigController extends ControllerSupport {
             Map<String, Object> returnMap = extractConfigService.extractExamPaper(exam_id, course_code, group_code);
             if (returnMap.get("errorMsg") == null) {
                 PaperDto paperDto = (PaperDto) returnMap.get("paperDto");
-                return new ResponseEntity<Object>(paperDto, HttpStatus.OK);
+                return new ResponseEntity<>(paperDto, HttpStatus.OK);
             } else {
-                return new ResponseEntity<Object>(returnMap.get("errorMsg") + "", HttpStatus.OK);
+                return new ResponseEntity<>(returnMap.get("errorMsg") + "", HttpStatus.OK);
             }
         } catch (Exception e) {
             logger.error("抽卷失败", e);
-            return new ResponseEntity<Object>(HttpStatus.INTERNAL_SERVER_ERROR);
+            return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
         }
     }
 
@@ -136,10 +136,10 @@ public class ExtractConfigController extends ControllerSupport {
                                                   @PathVariable String paperDetailUnitId) {
         try {
             QuestionDto questionDto = extractConfigService.extractExamQuestion(examId, courseCode, groupCode, paperDetailUnitId);
-            return new ResponseEntity<Object>(questionDto, HttpStatus.OK);
+            return new ResponseEntity<>(questionDto, HttpStatus.OK);
         } catch (Exception e) {
             logger.error("抽题失败", e);
-            return new ResponseEntity<Object>("抽题失败:" + e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
+            return new ResponseEntity<>("抽题失败:" + e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
         }
 
     }
@@ -205,7 +205,7 @@ public class ExtractConfigController extends ControllerSupport {
         exportModel.setExamId(examId);
         try {
             extractConfigFileService.exportExamPaperInfoCheck(exportModel, response);
-            return new ResponseEntity<Object>(HttpStatus.OK);
+            return new ResponseEntity<>(HttpStatus.OK);
         } catch (Exception e) {
             log.error(e.getMessage(), e);
             throw new StatusException("Q-050200", e.getMessage());
@@ -245,13 +245,13 @@ public class ExtractConfigController extends ControllerSupport {
             Map<String, Object> returnMap = extractConfigService.extractPaper(paperId);
             if (returnMap.get("errorMsg") == null) {
                 PaperDto paperDto = (PaperDto) returnMap.get("paperDto");
-                return new ResponseEntity<Object>(paperDto, HttpStatus.OK);
+                return new ResponseEntity<>(paperDto, HttpStatus.OK);
             } else {
-                return new ResponseEntity<Object>(returnMap.get("errorMsg") + "", HttpStatus.OK);
+                return new ResponseEntity<>(returnMap.get("errorMsg") + "", HttpStatus.OK);
             }
         } catch (Exception e) {
             logger.error("抽卷失败", e);
-            return new ResponseEntity<Object>(HttpStatus.INTERNAL_SERVER_ERROR);
+            return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
         }
     }
 
@@ -261,10 +261,10 @@ public class ExtractConfigController extends ControllerSupport {
     public ResponseEntity<Object> getPaperDto(@PathVariable String paperId) {
         try {
             PaperDto paperDto = extractConfigService.getPaperDtoByPaperNew(paperId);
-            return new ResponseEntity<Object>(paperDto, HttpStatus.OK);
+            return new ResponseEntity<>(paperDto, HttpStatus.OK);
         } catch (Exception e) {
             logger.error("获取试卷Dto失败", e);
-            return new ResponseEntity<Object>(HttpStatus.INTERNAL_SERVER_ERROR);
+            return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
         }
     }
 
@@ -273,7 +273,7 @@ public class ExtractConfigController extends ControllerSupport {
     @GetMapping(value = "/extract/getAnswerHtml/{paperId}")
     public ResponseEntity<Object> getAnswerHtml(@PathVariable String paperId) {
         String answerHtml = extractConfigService.getAnswerHtml(paperId);
-        return new ResponseEntity<Object>(answerHtml, HttpStatus.OK);
+        return new ResponseEntity<>(answerHtml, HttpStatus.OK);
     }
 
 }	

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

@@ -52,14 +52,14 @@ public class GenPaperController extends ControllerSupport {
                     result = paperService.checkPaperName(genPaperDto.getPaperName(), PaperType.GENERATE, user.getRootOrgId() + "");
                     if (!result) {
                         paperMap.put("msg", "考试试卷:" + genPaperDto.getPaperName() + "已经存在");
-                        return new ResponseEntity<Object>(paperMap, HttpStatus.INTERNAL_SERVER_ERROR);
+                        return new ResponseEntity<>(paperMap, HttpStatus.INTERNAL_SERVER_ERROR);
                     }
                 }
             }
             result = paperService.checkPaperName(genPaperDto.getPaperName(), PaperType.GENERATE, user.getRootOrgId() + "");
             if (!result) {
                 paperMap.put("msg", "考试试卷:" + genPaperDto.getPaperName() + "已经存在");
-                return new ResponseEntity<Object>(paperMap, HttpStatus.INTERNAL_SERVER_ERROR);
+                return new ResponseEntity<>(paperMap, HttpStatus.INTERNAL_SERVER_ERROR);
             }
             //如果是组一套试卷
             if (genPaperDto.getGenNumber() == 1) {
@@ -84,12 +84,12 @@ public class GenPaperController extends ControllerSupport {
                 }
             }
             if (!paperMap.get("msg").equals("success")) {
-                return new ResponseEntity<Object>(paperMap, HttpStatus.INTERNAL_SERVER_ERROR);
+                return new ResponseEntity<>(paperMap, HttpStatus.INTERNAL_SERVER_ERROR);
             }
         } catch (Exception e) {
-            return new ResponseEntity<Object>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
+            return new ResponseEntity<>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
         }
-        return new ResponseEntity<Object>(paperMap, HttpStatus.OK);
+        return new ResponseEntity<>(paperMap, HttpStatus.OK);
     }
 
     @ApiOperation(value = "精细组卷", notes = "精细组卷")
@@ -110,17 +110,17 @@ public class GenPaperController extends ControllerSupport {
                     result = paperService.checkPaperName(genPaperDto.getPaperName(), PaperType.GENERATE, user.getRootOrgId() + "");
                     if (!result) {
                         paperMap.put("msg", "考试试卷:" + genPaperDto.getPaperName() + "已经存在");
-                        return new ResponseEntity<Object>(paperMap, HttpStatus.INTERNAL_SERVER_ERROR);
+                        return new ResponseEntity<>(paperMap, HttpStatus.INTERNAL_SERVER_ERROR);
                     }
                 }
             }
             result = paperService.checkPaperName(genPaperDto.getPaperName(), PaperType.GENERATE, user.getRootOrgId() + "");
             if (!result) {
                 paperMap.put("msg", "考试试卷:" + genPaperDto.getPaperName() + "已经存在");
-                return new ResponseEntity<Object>(paperMap, HttpStatus.INTERNAL_SERVER_ERROR);
+                return new ResponseEntity<>(paperMap, HttpStatus.INTERNAL_SERVER_ERROR);
             }
         } catch (Exception e) {
-            return new ResponseEntity<Object>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
+            return new ResponseEntity<>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
         }
         if (genPaperDto.getGenNumber() > 1) {
             for (int i = 1; i <= genPaperDto.getGenNumber(); i++) {
@@ -134,9 +134,9 @@ public class GenPaperController extends ControllerSupport {
             paperMap = genPaperService.genPaper(genPaperDto);
         }
         if (paperMap.get("msg").equals("success")) {
-            return new ResponseEntity<Object>(paperMap, HttpStatus.OK);
+            return new ResponseEntity<>(paperMap, HttpStatus.OK);
         } else {
-            return new ResponseEntity<Object>(paperMap, HttpStatus.INTERNAL_SERVER_ERROR);
+            return new ResponseEntity<>(paperMap, HttpStatus.INTERNAL_SERVER_ERROR);
         }
     }
 
@@ -158,17 +158,17 @@ public class GenPaperController extends ControllerSupport {
                     result = paperService.checkPaperName(genPaperDto.getPaperName(), PaperType.GENERATE, user.getRootOrgId() + "");
                     if (!result) {
                         paperMap.put("msg", "考试试卷:" + genPaperDto.getPaperName() + "已经存在");
-                        return new ResponseEntity<Object>(paperMap, HttpStatus.INTERNAL_SERVER_ERROR);
+                        return new ResponseEntity<>(paperMap, HttpStatus.INTERNAL_SERVER_ERROR);
                     }
                 }
             }
             result = paperService.checkPaperName(genPaperDto.getPaperName(), PaperType.GENERATE, user.getRootOrgId() + "");
             if (!result) {
                 paperMap.put("msg", "考试试卷:" + genPaperDto.getPaperName() + "已经存在");
-                return new ResponseEntity<Object>(paperMap, HttpStatus.INTERNAL_SERVER_ERROR);
+                return new ResponseEntity<>(paperMap, HttpStatus.INTERNAL_SERVER_ERROR);
             }
         } catch (Exception e) {
-            return new ResponseEntity<Object>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
+            return new ResponseEntity<>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
         }
         if (genPaperDto.getGenNumber() > 1) {
             for (int i = 1; i <= genPaperDto.getGenNumber(); i++) {
@@ -182,9 +182,9 @@ public class GenPaperController extends ControllerSupport {
             paperMap = genPaperService.genBluePaper(genPaperDto);
         }
         if (paperMap.get("msg").equals("success")) {
-            return new ResponseEntity<Object>(paperMap, HttpStatus.OK);
+            return new ResponseEntity<>(paperMap, HttpStatus.OK);
         } else {
-            return new ResponseEntity<Object>(paperMap, HttpStatus.INTERNAL_SERVER_ERROR);
+            return new ResponseEntity<>(paperMap, HttpStatus.INTERNAL_SERVER_ERROR);
         }
     }
 

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

@@ -57,7 +57,7 @@ public class ImportPaperController extends ControllerSupport {
         try {
             tempFile = importPaperService.getUploadFile(file);
             Paper newPaper = importPaperService.importPaper(paper, user, tempFile);
-            return new ResponseEntity<Object>(newPaper, HttpStatus.OK);
+            return new ResponseEntity<>(newPaper, HttpStatus.OK);
         } catch (Exception e) {
             log.error("导入异常:" + e.getMessage());
             throw new StatusException("Q-090072", e.getMessage());
@@ -79,9 +79,9 @@ public class ImportPaperController extends ControllerSupport {
         User user = getAccessUser();
         Map<String, Object> returnMap = importPaperService.saveBlankPaper(courseNo, paperName, user);
         if (returnMap.get("msg").equals("success")) {
-            return new ResponseEntity<Object>(returnMap, HttpStatus.OK);
+            return new ResponseEntity<>(returnMap, HttpStatus.OK);
         } else {
-            return new ResponseEntity<Object>(returnMap, HttpStatus.INTERNAL_SERVER_ERROR);
+            return new ResponseEntity<>(returnMap, HttpStatus.INTERNAL_SERVER_ERROR);
         }
     }
 
@@ -99,10 +99,10 @@ public class ImportPaperController extends ControllerSupport {
         try {
             clonePaperService.clonePaper(paperId, paperName, courseNo, user);
             map.put("msg", "success");
-            return new ResponseEntity<Object>(map, HttpStatus.OK);
+            return new ResponseEntity<>(map, HttpStatus.OK);
         } catch (PaperException e) {
             map.put("msg", e.getMessage());
-            return new ResponseEntity<Object>(map, HttpStatus.INTERNAL_SERVER_ERROR);
+            return new ResponseEntity<>(map, HttpStatus.INTERNAL_SERVER_ERROR);
         }
     }
 

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

@@ -70,7 +70,7 @@ public class PaperDetailController extends ControllerSupport {
         User user = getAccessUser();
         //AccessUser user = (AccessUser) request.getAttribute("accessUser");
         PaperDetail paperDetail = paperDetailService.savePaperDetail(pd, paperId, user);
-        return new ResponseEntity<Object>(paperDetail, HttpStatus.OK);
+        return new ResponseEntity<>(paperDetail, HttpStatus.OK);
 
     }
 
@@ -84,7 +84,7 @@ public class PaperDetailController extends ControllerSupport {
     @PostMapping(value = "/paperDetail")
     public ResponseEntity<Object> addPaperDetail(@RequestBody PaperDetail pd) {
         PaperDetail paperDetail = paperDetailRepo.save(pd);
-        return new ResponseEntity<Object>(paperDetail, HttpStatus.OK);
+        return new ResponseEntity<>(paperDetail, HttpStatus.OK);
     }
 
     /**
@@ -97,7 +97,7 @@ public class PaperDetailController extends ControllerSupport {
     @DeleteMapping(value = "/paperDetail/{detailId}")
     public ResponseEntity<Object> removePaperDetail(@PathVariable String detailId) {
         paperDetailService.deletePaperDetail(detailId);
-        return new ResponseEntity<Object>(detailId, HttpStatus.OK);
+        return new ResponseEntity<>(detailId, HttpStatus.OK);
     }
 
     /**
@@ -109,7 +109,7 @@ public class PaperDetailController extends ControllerSupport {
     @ApiOperation(value = "根据试卷ID得到所有大题", notes = "根据试卷ID得到所有大题")
     @GetMapping(value = "/paperDetail/paper/{paperId}")
     public ResponseEntity<Object> getPaperDetailsByPaperId(@PathVariable String paperId) {
-        return new ResponseEntity<Object>(paperService.findPaperDetailsById(paperId), HttpStatus.OK);
+        return new ResponseEntity<>(paperService.findPaperDetailsById(paperId), HttpStatus.OK);
     }
 
 }

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

@@ -58,7 +58,7 @@ public class PaperDetailUnitController extends ControllerSupport {
     public ResponseEntity<Object> updatePaperDetailUnit(@RequestBody PaperDetailUnitExp pdu) {
         User user = getAccessUser();
         unitService.savePaperDetailUnit(pdu, user);
-        return new ResponseEntity<Object>(HttpStatus.OK);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 
     /**
@@ -72,7 +72,7 @@ public class PaperDetailUnitController extends ControllerSupport {
     public ResponseEntity<Object> addPaperDetailUnit(@RequestBody PaperDetailUnitExp pdu) {
         User user = getAccessUser();
         PaperDetailUnit pdUnit = unitService.savePaperDetailUnit(pdu, user);
-        return new ResponseEntity<Object>(pdUnit, HttpStatus.OK);
+        return new ResponseEntity<>(pdUnit, HttpStatus.OK);
     }
 
     /**
@@ -85,7 +85,7 @@ public class PaperDetailUnitController extends ControllerSupport {
     public ResponseEntity<Object> removePaperDetailUnit(@PathVariable String unitId) {
         User user = getAccessUser();
         unitService.deletePaperDetailUnit(unitId, user);
-        return new ResponseEntity<Object>(HttpStatus.OK);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 
 }

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

@@ -49,7 +49,7 @@ public class PaperStructController extends ControllerSupport {
             searchInfo.setOrgId(user.getRootOrgId().toString());
         }
         Page<PaperStruct> paperStructs = paperStructService.getPaperStructs(searchInfo, curPage, pageSize);
-        return new ResponseEntity<Object>(paperStructs, HttpStatus.OK);
+        return new ResponseEntity<>(paperStructs, HttpStatus.OK);
     }
 
     /**
@@ -66,7 +66,7 @@ public class PaperStructController extends ControllerSupport {
             searchInfo.setOrgId(user.getRootOrgId().toString());
         }
         List<PaperStruct> paperStructs = paperStructService.getPaperStructs(searchInfo);
-        return new ResponseEntity<Object>(paperStructs, HttpStatus.OK);
+        return new ResponseEntity<>(paperStructs, HttpStatus.OK);
     }
 
     /**
@@ -78,7 +78,7 @@ public class PaperStructController extends ControllerSupport {
     @ApiOperation(value = "获取试卷结构", notes = "获取试卷结构")
     @GetMapping(value = "/paperStruct/{id}")
     public ResponseEntity<Object> getPaperStructById(@PathVariable String id) {
-        return new ResponseEntity<Object>(cn.com.qmth.examcloud.core.questions.base.Model.of(paperStructRepo.findById(id)), HttpStatus.OK);
+        return new ResponseEntity<>(cn.com.qmth.examcloud.core.questions.base.Model.of(paperStructRepo.findById(id)), HttpStatus.OK);
     }
 
     /**
@@ -93,9 +93,9 @@ public class PaperStructController extends ControllerSupport {
         User user = getAccessUser();
         PaperStruct paperStruct = paperStructService.save(ps, user);
         if (paperStruct == null) {
-            return new ResponseEntity<Object>(HttpStatus.INTERNAL_SERVER_ERROR);
+            return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
         } else {
-            return new ResponseEntity<Object>(paperStruct, HttpStatus.OK);
+            return new ResponseEntity<>(paperStruct, HttpStatus.OK);
         }
     }
 
@@ -111,10 +111,10 @@ public class PaperStructController extends ControllerSupport {
         User user = getAccessUser();
         PaperStruct paperStructTemp = paperStructService.checkNameUnique(ps.getName(), user.getRootOrgId().toString(), ps.getType());
         if (paperStructTemp != null) {
-            return new ResponseEntity<Object>("试卷结构名称重复，请重新命名！", HttpStatus.INTERNAL_SERVER_ERROR);
+            return new ResponseEntity<>("试卷结构名称重复，请重新命名！", HttpStatus.INTERNAL_SERVER_ERROR);
         } else {
             PaperStruct paperStruct = paperStructService.save(ps, user);
-            return new ResponseEntity<Object>(paperStruct, HttpStatus.OK);
+            return new ResponseEntity<>(paperStruct, HttpStatus.OK);
         }
     }
 
@@ -129,7 +129,7 @@ public class PaperStructController extends ControllerSupport {
     public ResponseEntity<Object> removePaperStruct(@PathVariable String ids) {
         List<String> paperList = Stream.of(ids.split(",")).collect(Collectors.toList());
         paperStructRepo.deleteAll(paperStructRepo.findAllById(paperList));
-        return new ResponseEntity<Object>(HttpStatus.OK);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 
     /**
@@ -147,6 +147,6 @@ public class PaperStructController extends ControllerSupport {
         if (user != null) {
             quesNameDtos = paperStructService.getQuesNameList(user.getRootOrgId().toString(), courseNo, quesType);
         }
-        return new ResponseEntity<Object>(quesNameDtos, HttpStatus.OK);
+        return new ResponseEntity<>(quesNameDtos, HttpStatus.OK);
     }
 }

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

@@ -33,13 +33,13 @@ public class PropertyController extends ControllerSupport {
         if (user != null) {
             try {
                 propertyService.saveProperty(property, user);
-                return new ResponseEntity<Object>(HttpStatus.OK);
+                return new ResponseEntity<>(HttpStatus.OK);
             } catch (Exception e) {
                 log.error(e.getMessage(), e);
-                return new ResponseEntity<Object>(HttpStatus.INTERNAL_SERVER_ERROR);
+                return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
             }
         }
-        return new ResponseEntity<Object>(HttpStatus.NOT_FOUND);
+        return new ResponseEntity<>(HttpStatus.NOT_FOUND);
     }
 
     @ApiOperation(value = "查询所有属性dto", notes = "树形结构")
@@ -47,10 +47,10 @@ public class PropertyController extends ControllerSupport {
     public ResponseEntity<Object> findAllProperty(@PathVariable String coursePropertyId) {
         User user = getAccessUser();
         if (user == null) {
-            return new ResponseEntity<Object>(HttpStatus.NOT_FOUND);
+            return new ResponseEntity<>(HttpStatus.NOT_FOUND);
         }
         List<PropertyDto> propertyDtos = propertyService.propertyDtos(Long.parseLong(coursePropertyId), user);
-        return new ResponseEntity<Object>(propertyDtos, HttpStatus.OK);
+        return new ResponseEntity<>(propertyDtos, HttpStatus.OK);
     }
 
     @ApiOperation(value = "更新属性", notes = "更新属性")
@@ -60,13 +60,13 @@ public class PropertyController extends ControllerSupport {
         if (user != null) {
             try {
                 propertyService.saveProperty(property, user);
-                return new ResponseEntity<Object>(HttpStatus.OK);
+                return new ResponseEntity<>(HttpStatus.OK);
             } catch (Exception e) {
                 log.error(e.getMessage(), e);
-                return new ResponseEntity<Object>(HttpStatus.INTERNAL_SERVER_ERROR);
+                return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
             }
         }
-        return new ResponseEntity<Object>(HttpStatus.NOT_FOUND);
+        return new ResponseEntity<>(HttpStatus.NOT_FOUND);
     }
 
     @ApiOperation(value = "删除属性", notes = "删除属性")
@@ -75,9 +75,9 @@ public class PropertyController extends ControllerSupport {
         User user = getAccessUser();
         if (user != null) {
             propertyService.deleteProperty(propertyId, coursePropertyId, user);
-            return new ResponseEntity<Object>(HttpStatus.OK);
+            return new ResponseEntity<>(HttpStatus.OK);
         }
-        return new ResponseEntity<Object>(HttpStatus.NOT_FOUND);
+        return new ResponseEntity<>(HttpStatus.NOT_FOUND);
     }
 
     @ApiOperation(value = "查询所有属性", notes = "查询所有属性")
@@ -86,9 +86,9 @@ public class PropertyController extends ControllerSupport {
         User user = getAccessUser();
         if (user != null) {
             List<Property> properties = propertyService.findAll(Long.parseLong(coursePropertyId), user);
-            return new ResponseEntity<Object>(properties, HttpStatus.OK);
+            return new ResponseEntity<>(properties, HttpStatus.OK);
         }
-        return new ResponseEntity<Object>(HttpStatus.NOT_FOUND);
+        return new ResponseEntity<>(HttpStatus.NOT_FOUND);
     }
 
     @ApiOperation(value = "根据一级查询二级所有属性", notes = "查询所有属性")
@@ -97,9 +97,9 @@ public class PropertyController extends ControllerSupport {
         User user = getAccessUser();
         if (user != null) {
             List<Property> properties = propertyService.findPropertySons(propertyId);
-            return new ResponseEntity<Object>(properties, HttpStatus.OK);
+            return new ResponseEntity<>(properties, HttpStatus.OK);
         }
-        return new ResponseEntity<Object>(HttpStatus.NOT_FOUND);
+        return new ResponseEntity<>(HttpStatus.NOT_FOUND);
     }
 
     @ApiOperation(value = "根据课程属性id所有一级属性", notes = "查询所有属性")
@@ -108,9 +108,9 @@ public class PropertyController extends ControllerSupport {
         User user = getAccessUser();
         if (user != null) {
             List<Property> properties = propertyService.findPropertyParents(coursePropertyId, user.getRootOrgId());
-            return new ResponseEntity<Object>(properties, HttpStatus.OK);
+            return new ResponseEntity<>(properties, HttpStatus.OK);
         }
-        return new ResponseEntity<Object>(HttpStatus.NOT_FOUND);
+        return new ResponseEntity<>(HttpStatus.NOT_FOUND);
     }
 
     @ApiOperation(value = "上移", notes = "上移")
@@ -121,13 +121,13 @@ public class PropertyController extends ControllerSupport {
             try {
                 property.setOrgId(user.getRootOrgId());
                 propertyService.moveUp(property);
-                return new ResponseEntity<Object>(HttpStatus.OK);
+                return new ResponseEntity<>(HttpStatus.OK);
             } catch (Exception e) {
                 log.error(e.getMessage(), e);
-                return new ResponseEntity<Object>(HttpStatus.INTERNAL_SERVER_ERROR);
+                return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
             }
         }
-        return new ResponseEntity<Object>(HttpStatus.NOT_FOUND);
+        return new ResponseEntity<>(HttpStatus.NOT_FOUND);
     }
 
     @ApiOperation(value = "下移", notes = "下移")
@@ -138,12 +138,12 @@ public class PropertyController extends ControllerSupport {
             try {
                 property.setOrgId(user.getRootOrgId());
                 propertyService.moveDown(property);
-                return new ResponseEntity<Object>(HttpStatus.OK);
+                return new ResponseEntity<>(HttpStatus.OK);
             } catch (Exception e) {
                 log.error(e.getMessage(), e);
-                return new ResponseEntity<Object>(HttpStatus.INTERNAL_SERVER_ERROR);
+                return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
             }
         }
-        return new ResponseEntity<Object>(HttpStatus.NOT_FOUND);
+        return new ResponseEntity<>(HttpStatus.NOT_FOUND);
     }
 }

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

@@ -51,7 +51,7 @@ public class QuesController extends ControllerSupport {
     public ResponseEntity<Object> getQuesById(@PathVariable String id) {
         Question ques = cn.com.qmth.examcloud.core.questions.base.Model.of(quesRepo.findById(id));
         quesService.formatQues(ques);
-        return new ResponseEntity<Object>(ques, HttpStatus.OK);
+        return new ResponseEntity<>(ques, HttpStatus.OK);
     }
 
     /**
@@ -66,7 +66,7 @@ public class QuesController extends ControllerSupport {
                                                  @PathVariable int pageSize) {
         User user = getAccessUser();
         searchCondition.setOrgId(user.getRootOrgId().toString());
-        return new ResponseEntity<Object>(quesService.findAll(searchCondition, curPage, pageSize), HttpStatus.OK);
+        return new ResponseEntity<>(quesService.findAll(searchCondition, curPage, pageSize), HttpStatus.OK);
     }
 
     /**
@@ -83,7 +83,7 @@ public class QuesController extends ControllerSupport {
         //清除缓存
         this.clearQuestionCache(question.getId());
 
-        return new ResponseEntity<Object>(HttpStatus.OK);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 
     /**
@@ -95,7 +95,7 @@ public class QuesController extends ControllerSupport {
     @ApiOperation(value = "新增试题", notes = "新增试题")
     @PostMapping(value = "/question")
     public ResponseEntity<Object> addQuestion(@RequestBody Question question) {
-        return new ResponseEntity<Object>(quesService.saveQues(question), HttpStatus.CREATED);
+        return new ResponseEntity<>(quesService.saveQues(question), HttpStatus.CREATED);
     }
 
     /**
@@ -112,7 +112,7 @@ public class QuesController extends ControllerSupport {
         //清除缓存
         this.clearQuestionCache(id);
 
-        return new ResponseEntity<Object>(HttpStatus.OK);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 
     /**
@@ -132,7 +132,7 @@ public class QuesController extends ControllerSupport {
         //清除缓存
         this.clearQuestionCache(id);
 
-        return new ResponseEntity<Object>(question, HttpStatus.OK);
+        return new ResponseEntity<>(question, HttpStatus.OK);
     }
 
     @ApiOperation(value = "查询题目数量", notes = "查询题目数量")
@@ -141,7 +141,7 @@ public class QuesController extends ControllerSupport {
         User user = getAccessUser();
         searchCondition.setOrgId(user.getRootOrgId().toString());
         long count = quesService.findQuesCount(searchCondition);
-        return new ResponseEntity<Object>(count, HttpStatus.OK);
+        return new ResponseEntity<>(count, HttpStatus.OK);
     }
 
     @ApiOperation(value = "根据试卷ids更新试题属性", notes = "根据试卷ids更新试题属性")
@@ -152,7 +152,7 @@ public class QuesController extends ControllerSupport {
         User user = getAccessUser();
         List<String> paperList = Stream.of(ids.split(",")).collect(Collectors.toList());
         quesService.updateProByPapers(paperList, difficultyDegree, publicity, user);
-        return new ResponseEntity<Object>(HttpStatus.OK);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 
     @ApiOperation(value = "根据课程代码更新试题属性", notes = "根据课程代码更新试题属性")
@@ -162,7 +162,7 @@ public class QuesController extends ControllerSupport {
                                                     @PathVariable Boolean publicity,
                                                     @PathVariable String orgId) {
         quesService.updateProByCourse(courseCode, difficultyDegree, publicity, orgId);
-        return new ResponseEntity<Object>(HttpStatus.OK);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 
     private void clearQuestionCache(String questionId) {

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

@@ -32,7 +32,7 @@ public class QuestionAudioController {
     @GetMapping(value = "/questionAudio/{fileName}/{questionId}")
     public ResponseEntity<Object> findQuestionAudio(@PathVariable String fileName, @PathVariable String questionId) {
         QuestionAudio questionAudio = questionAudioService.findByQuestionIdAndFileName(questionId, fileName);
-        return new ResponseEntity<Object>(questionAudio, HttpStatus.OK);
+        return new ResponseEntity<>(questionAudio, HttpStatus.OK);
     }
 
     @Naked

examcloud-core-questions-api-provider/src/test/java/org/examcloud/core/questions/api/provider/AppTest.java

@@ -5,7 +5,7 @@ import org.junit.Test;
 public class AppTest {
 
     @Test
-    public void shouldAnswerWithTrue() {
+    public void test() throws Exception {
 
     }
 

examcloud-core-questions-service/src/test/java/org/examcloud/core/questions/service/AppTest.java

@@ -1,18 +0,0 @@
-package org.examcloud.core.questions.service;
-
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest {
-    /**
-     * Rigorous Test :-)
-     */
-    @Test
-    public void shouldAnswerWithTrue() {
-        assertTrue(true);
-    }
-}