Browse Source

no change

deason 5 years ago
parent
commit
c51bfc4313

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

@@ -68,9 +68,9 @@ public class CoursePropertyController extends ControllerSupport {
             } catch (Exception e) {
                 return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
             }
-            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 = "启用")
@@ -79,9 +79,9 @@ public class CoursePropertyController extends ControllerSupport {
         User user = getAccessUser();
         if (user != null) {
             coursePropertyService.openCourseProperty(id);
-            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 = "启用")
@@ -91,9 +91,9 @@ public class CoursePropertyController extends ControllerSupport {
         if (user != null) {
             List<String> idList = Stream.of(ids.split(",")).collect(Collectors.toList());
             coursePropertyService.opensCourseProperty(idList);
-            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 = "禁用")
@@ -102,9 +102,9 @@ public class CoursePropertyController extends ControllerSupport {
         User user = getAccessUser();
         if (user != null) {
             coursePropertyService.closeCourseProperty(id);
-            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 = "禁用")
@@ -114,9 +114,9 @@ public class CoursePropertyController extends ControllerSupport {
         if (user != null) {
             List<String> idList = Stream.of(ids.split(",")).collect(Collectors.toList());
             coursePropertyService.closesCourseProperty(idList);
-            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 = "根据courseId查询所有课程属性", notes = "不带分页")
@@ -125,9 +125,9 @@ public class CoursePropertyController extends ControllerSupport {
         User user = getAccessUser();
         if (user != null) {
             List<CourseProperty> courseProperties = coursePropertyService.findAllByCourseId(courseId);
-            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 = "根据courseCode查询所有课程属性", notes = "不带分页")
@@ -136,9 +136,9 @@ public class CoursePropertyController extends ControllerSupport {
         User user = getAccessUser();
         if (user != null) {
             List<CourseProperty> courseProperties = coursePropertyService.findAllByCourseCode(courseCode);
-            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 = "根据courseCode查询所有开启的课程属性", notes = "不带分页")
@@ -147,8 +147,8 @@ public class CoursePropertyController extends ControllerSupport {
         User user = getAccessUser();
         if (user != null) {
             List<CourseProperty> courseProperties = coursePropertyService.findAllEnable(courseCode, true);
-            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);
     }
 }

+ 30 - 30
examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/core/questions/api/PaperController.java

@@ -80,7 +80,7 @@ public class PaperController extends ControllerSupport {
     @ApiOperation(value = "根据Id获取试卷", notes = "根据Id获取试卷")
     @GetMapping(value = "/paper/{paperId}")
     public ResponseEntity<Object> getPaperById(@PathVariable String paperId) {
-        return new ResponseEntity<Object>(paperService.getPaperDto(paperId), HttpStatus.OK);
+        return new ResponseEntity<>(paperService.getPaperDto(paperId), HttpStatus.OK);
     }
 
     /**
@@ -96,9 +96,9 @@ public class PaperController extends ControllerSupport {
         User user = getAccessUser();
         Map<String, Object> msgMap = paperService.savePaper(paper, user);
         if ("success".equals(msgMap.get("msg"))) {
-            return new ResponseEntity<Object>(msgMap, HttpStatus.OK);
+            return new ResponseEntity<>(msgMap, HttpStatus.OK);
         } else {
-            return new ResponseEntity<Object>(msgMap, HttpStatus.INTERNAL_SERVER_ERROR);
+            return new ResponseEntity<>(msgMap, HttpStatus.INTERNAL_SERVER_ERROR);
         }
     }
 
@@ -118,7 +118,7 @@ public class PaperController extends ControllerSupport {
                                                   @PathVariable int pageSize) {
         User user = getAccessUser();
         paperSearchInfo.setOrgId(user.getRootOrgId().toString());
-        return new ResponseEntity<Object>(paperService.getImportPapers(paperSearchInfo, curPage, pageSize), HttpStatus.OK);
+        return new ResponseEntity<>(paperService.getImportPapers(paperSearchInfo, curPage, pageSize), HttpStatus.OK);
     }
 
     @ResponseBody
@@ -127,7 +127,7 @@ public class PaperController extends ControllerSupport {
     public ResponseEntity<Object> getImportPapersNotSuccess(@ModelAttribute PaperSearchInfo paperSearchInfo, @PathVariable int curPage, @PathVariable int pageSize) {
         User user = getAccessUser();
         paperSearchInfo.setOrgId(user.getRootOrgId().toString());
-        return new ResponseEntity<Object>(paperService.getImportPapersNotSuccess(paperSearchInfo, curPage, pageSize),
+        return new ResponseEntity<>(paperService.getImportPapersNotSuccess(paperSearchInfo, curPage, pageSize),
                 HttpStatus.OK);
     }
 
@@ -164,7 +164,7 @@ public class PaperController extends ControllerSupport {
                                                @PathVariable int curPage, @PathVariable int pageSize) {
         User user = getAccessUser();
         paperSearchInfo.setOrgId(user.getRootOrgId().toString());
-        return new ResponseEntity<Object>(paperService.getGenPapers(paperSearchInfo, curPage, pageSize), HttpStatus.OK);
+        return new ResponseEntity<>(paperService.getGenPapers(paperSearchInfo, curPage, pageSize), HttpStatus.OK);
     }
 
     /**
@@ -182,10 +182,10 @@ public class PaperController extends ControllerSupport {
         User user = getAccessUser();
         paperSearchInfo.setOrgId(user.getRootOrgId().toString());
         if (ids != null && ids.length > 0) {
-            return new ResponseEntity<Object>(paperService.getPapersNotInIds(paperSearchInfo, ids, curPage, pageSize, PaperType.GENERATE),
+            return new ResponseEntity<>(paperService.getPapersNotInIds(paperSearchInfo, ids, curPage, pageSize, PaperType.GENERATE),
                     HttpStatus.OK);
         } else {
-            return new ResponseEntity<Object>(paperService.getGenPapers(paperSearchInfo, curPage, pageSize), HttpStatus.OK);
+            return new ResponseEntity<>(paperService.getGenPapers(paperSearchInfo, curPage, pageSize), HttpStatus.OK);
         }
     }
 
@@ -202,9 +202,9 @@ public class PaperController extends ControllerSupport {
         List<String> paperList = Stream.of(paperIds.split(",")).collect(Collectors.toList());
         Map<String, Object> msgMap = paperService.deletePapers(paperList);
         if (msgMap.get("msg").equals("success")) {
-            return new ResponseEntity<Object>(msgMap, HttpStatus.OK);
+            return new ResponseEntity<>(msgMap, HttpStatus.OK);
         } else {
-            return new ResponseEntity<Object>(msgMap, HttpStatus.INTERNAL_SERVER_ERROR);
+            return new ResponseEntity<>(msgMap, HttpStatus.INTERNAL_SERVER_ERROR);
         }
 
     }
@@ -220,7 +220,7 @@ public class PaperController extends ControllerSupport {
     @PutMapping(value = "/paper/pass")
     public ResponseEntity<Object> passPapers(@RequestBody PaperSearchInfo paperSearchInfo) {
         paperService.passPapers(Arrays.asList(paperSearchInfo.getPaperIds()));
-        return new ResponseEntity<Object>(HttpStatus.OK);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 
     /**
@@ -234,7 +234,7 @@ public class PaperController extends ControllerSupport {
     @PutMapping(value = "/paper/noPass")
     public ResponseEntity<Object> noPassPapers(@RequestBody PaperSearchInfo paperSearchInfo) {
         paperService.noPassPapers(Arrays.asList(paperSearchInfo.getPaperIds()));
-        return new ResponseEntity<Object>(HttpStatus.OK);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 
     /**
@@ -248,7 +248,7 @@ public class PaperController extends ControllerSupport {
     @PutMapping(value = "/paper/draft")
     public ResponseEntity<Object> initPapers(@RequestBody PaperSearchInfo paperSearchInfo) {
         paperService.backPapers(Arrays.asList(paperSearchInfo.getPaperIds()));
-        return new ResponseEntity<Object>(HttpStatus.OK);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 
     /**
@@ -282,7 +282,7 @@ public class PaperController extends ControllerSupport {
     public ResponseEntity<Object> joinExamPaper(@PathVariable String examId, @PathVariable String courseCode,
                                                 @PathVariable String groupCode, @PathVariable String paperId) {
         paperService.joinToExamPaper(Long.parseLong(examId), courseCode, groupCode, paperId);
-        return new ResponseEntity<Object>(HttpStatus.OK);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 
     /**
@@ -301,7 +301,7 @@ public class PaperController extends ControllerSupport {
                                                    @PathVariable String groupCode, @PathVariable String paperId) {
 
         paperService.releaseExamPaper(Long.parseLong(examId), courseCode, groupCode, paperId);
-        return new ResponseEntity<Object>(HttpStatus.OK);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 
     /**
@@ -332,7 +332,7 @@ public class PaperController extends ControllerSupport {
     public ResponseEntity<Object> deleteGroup(@PathVariable String examId, @PathVariable String courseCode,
                                               @PathVariable String groupCode) {
         paperService.deletGroupCode(Long.parseLong(examId), courseCode, groupCode);
-        return new ResponseEntity<Object>(HttpStatus.OK);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 
     /**
@@ -347,7 +347,7 @@ public class PaperController extends ControllerSupport {
     public ResponseEntity<Object> deleteImportPaperQuestion(@PathVariable String questionId) {
         User user = getAccessUser();
         List<String> paperNames = paperService.deleteImportQuestionById(questionId, user);
-        return new ResponseEntity<Object>(paperNames, HttpStatus.OK);
+        return new ResponseEntity<>(paperNames, HttpStatus.OK);
     }
 
     /**
@@ -364,7 +364,7 @@ public class PaperController extends ControllerSupport {
     public ResponseEntity<Object> insertQuestionToPaper(@PathVariable String paperId,
                                                         @PathVariable String paperDetailId, @RequestBody Question question) {
         User user = getAccessUser();
-        return new ResponseEntity<Object>(paperService.insertQuestionToPaper(paperId, paperDetailId, question, user),
+        return new ResponseEntity<>(paperService.insertQuestionToPaper(paperId, paperDetailId, question, user),
                 HttpStatus.OK);
 
     }
@@ -430,7 +430,7 @@ public class PaperController extends ControllerSupport {
                 }
             }
         }
-        return new ResponseEntity<Object>(reduplicateId, HttpStatus.OK);
+        return new ResponseEntity<>(reduplicateId, HttpStatus.OK);
     }
 
     /**
@@ -443,7 +443,7 @@ public class PaperController extends ControllerSupport {
     @ApiOperation(value = "获取试题所在的试卷名称", notes = "获取试题所在的试卷名称")
     @GetMapping(value = "/paper/listNames/{questionId}")
     public ResponseEntity<Object> getPaperNamesByQuesId(@PathVariable String questionId) {
-        return new ResponseEntity<Object>(paperService.getPaperNamesByQuestionId(questionId), HttpStatus.OK);
+        return new ResponseEntity<>(paperService.getPaperNamesByQuestionId(questionId), HttpStatus.OK);
     }
 
     /**
@@ -462,14 +462,14 @@ public class PaperController extends ControllerSupport {
                                                         @RequestParam(name = "quesBody") String quesBody) {
         User user = getAccessUser();
         if (user == null) {
-            return new ResponseEntity<Object>(new PageImpl<Question>(new ArrayList<Question>()), HttpStatus.OK);
+            return new ResponseEntity<>(new PageImpl<Question>(new ArrayList<Question>()), HttpStatus.OK);
         }
         QuesStructType quesStructType = null;
         if (StringUtils.isNotEmpty(quesType)) {
             quesStructType = QuesStructType.valueOf(quesType);
         }
         Page<Question> questionPageList = paperService.listQuestionforSelect(paperId, curPage, pageSize, quesStructType, user, quesBody);
-        return new ResponseEntity<Object>(questionPageList, HttpStatus.OK);
+        return new ResponseEntity<>(questionPageList, HttpStatus.OK);
     }
 
     /**
@@ -486,7 +486,7 @@ public class PaperController extends ControllerSupport {
     public ResponseEntity<Object> selectQuestionsToPaper(@PathVariable String paperId,
                                                          @PathVariable String paperDetailId, @RequestBody List<Question> questions) {
         User user = getAccessUser();
-        return new ResponseEntity<Object>(paperService.selectQuestionsToPaper(paperId, paperDetailId, questions, user),
+        return new ResponseEntity<>(paperService.selectQuestionsToPaper(paperId, paperDetailId, questions, user),
                 HttpStatus.OK);
 
     }
@@ -506,10 +506,10 @@ public class PaperController extends ControllerSupport {
         User user = getAccessUser();
         paperSearchInfo.setOrgId(user.getRootOrgId().toString());
         if (ids != null && ids.length > 0) {
-            return new ResponseEntity<Object>(paperService.getPapersNotInIds(paperSearchInfo, ids, curPage, pageSize, PaperType.IMPORT),
+            return new ResponseEntity<>(paperService.getPapersNotInIds(paperSearchInfo, ids, curPage, pageSize, PaperType.IMPORT),
                     HttpStatus.OK);
         } else {
-            return new ResponseEntity<Object>(paperService.getImportPapers(paperSearchInfo, curPage, pageSize), HttpStatus.OK);
+            return new ResponseEntity<>(paperService.getImportPapers(paperSearchInfo, curPage, pageSize), HttpStatus.OK);
         }
     }
 
@@ -526,7 +526,7 @@ public class PaperController extends ControllerSupport {
         paperService.formatPaperSearchInfo(paperSearchInfo);
         Paper importPaper = BeanCopierUtil.copyProperties(paperSearchInfo, Paper.class);
         importPaper.setPaperType(PaperType.IMPORT);
-        return new ResponseEntity<Object>(paperRepo.findAll(Example.of(importPaper)), HttpStatus.OK);
+        return new ResponseEntity<>(paperRepo.findAll(Example.of(importPaper)), HttpStatus.OK);
 
     }
 
@@ -551,7 +551,7 @@ public class PaperController extends ControllerSupport {
                 }
             }
             paperService.useBasePaper(paperIds, user.getDisplayName());
-            return new ResponseEntity<Object>(HttpStatus.OK);
+            return new ResponseEntity<>(HttpStatus.OK);
         } catch (Exception e) {
             throw new StatusException("Q-160537", e.getMessage());
         }
@@ -653,7 +653,7 @@ public class PaperController extends ControllerSupport {
                                             @PathVariable String orgId,
                                             @PathVariable String examId) {
         paperService.sendPrint(paperId, orgId, examId);
-        return new ResponseEntity<Object>(HttpStatus.OK);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 
     @ResponseBody
@@ -663,7 +663,7 @@ public class PaperController extends ControllerSupport {
                                                   @PathVariable Integer publicityType,
                                                   @PathVariable Integer difficultyType) {
         int total = paperService.getQuestionTypeNumbers(paperId, publicityType, difficultyType);
-        return new ResponseEntity<Object>(total, HttpStatus.OK);
+        return new ResponseEntity<>(total, HttpStatus.OK);
     }
 
     @ResponseBody
@@ -673,6 +673,6 @@ public class PaperController extends ControllerSupport {
                                                  @PathVariable Integer publicityType,
                                                  @PathVariable Integer difficultyType) {
         double total = paperService.getQuestionTypeScore(paperId, publicityType, difficultyType);
-        return new ResponseEntity<Object>(total, HttpStatus.OK);
+        return new ResponseEntity<>(total, HttpStatus.OK);
     }
 }

+ 4 - 4
examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/core/questions/api/SettingController.java

@@ -32,7 +32,7 @@ public class SettingController {
     @ApiOperation(value = "获取全部设置", notes = "获取全部设置")
     @GetMapping(value = "/setting")
     public ResponseEntity<Object> getAllSetting() {
-        return new ResponseEntity<Object>(settingRepo.findAll(), HttpStatus.OK);
+        return new ResponseEntity<>(settingRepo.findAll(), HttpStatus.OK);
     }
 
     /**
@@ -44,7 +44,7 @@ public class SettingController {
     @ApiOperation(value = "更新设置", notes = "更新设置")
     @PutMapping(value = "/setting")
     public ResponseEntity<Object> updateSetting(@RequestBody SettingDto settingDto) {
-        return new ResponseEntity<Object>(settingRepo.saveAll(settingDto.getSettingList()), HttpStatus.OK);
+        return new ResponseEntity<>(settingRepo.saveAll(settingDto.getSettingList()), HttpStatus.OK);
     }
 
     /**
@@ -56,7 +56,7 @@ public class SettingController {
     @ApiOperation(value = "新增设置", notes = "新增设置")
     @PostMapping(value = "/setting")
     public ResponseEntity<Object> addSetting(@RequestBody SettingDto settingDto) {
-        return new ResponseEntity<Object>(settingRepo.saveAll(settingDto.getSettingList()), HttpStatus.OK);
+        return new ResponseEntity<>(settingRepo.saveAll(settingDto.getSettingList()), HttpStatus.OK);
     }
 
     /**
@@ -69,7 +69,7 @@ public class SettingController {
     @DeleteMapping(value = "/setting/{id}")
     public ResponseEntity<Object> removeSetting(@PathVariable String id) {
         settingRepo.deleteById(id);
-        return new ResponseEntity<Object>(HttpStatus.OK);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 
 }

+ 4 - 4
examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/core/questions/api/controller/DefaultPaperController.java

@@ -42,7 +42,7 @@ public class DefaultPaperController extends ControllerSupport {
         }
         //组卷
         String paperId = paperProviderService.genPaper(req.getQuestionIds(), req.getMap(), req.getName(), user.getRootOrgId().toString(), user.getDisplayName());
-        return new ResponseEntity<Object>(paperId, HttpStatus.OK);
+        return new ResponseEntity<>(paperId, HttpStatus.OK);
     }
 
     @ApiOperation(value = "外部接口查询试卷", notes = "外部接口查询试卷")
@@ -53,7 +53,7 @@ public class DefaultPaperController extends ControllerSupport {
             throw new StatusException("Q-016057", "paperId is null");
         }
         DefaultPaper defaultPaper = paperProviderService.findPaper(paperId);
-        return new ResponseEntity<Object>(defaultPaper, HttpStatus.OK);
+        return new ResponseEntity<>(defaultPaper, HttpStatus.OK);
     }
 
     @ApiOperation(value = "外部接口查询试卷", notes = "外部接口查询试卷")
@@ -68,7 +68,7 @@ public class DefaultPaperController extends ControllerSupport {
             throw new StatusException("Q-016073", "examId is null");
         }
         DefaultPaper defaultPaper = paperProviderService.findExamPaper(rootOrgId, examId);
-        return new ResponseEntity<Object>(defaultPaper, HttpStatus.OK);
+        return new ResponseEntity<>(defaultPaper, HttpStatus.OK);
     }
 
     @ApiOperation(value = "外部接口组卷并绑定考卷", notes = "外部接口组卷并绑定考卷")
@@ -85,7 +85,7 @@ public class DefaultPaperController extends ControllerSupport {
         //组卷
         String paperId = paperProviderService.genPaper(req.getQuestionIds(), req.getMap(), req.getPaperName(), req.getRootOrgId(), req.getUserName());
         paperProviderService.examPaper(req.getRootOrgId(), paperId, req.getExamId());
-        return new ResponseEntity<Object>(HttpStatus.OK);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 
 }

+ 5 - 5
examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/core/questions/api/controller/DefaultQuesionController.java

@@ -50,7 +50,7 @@ public class DefaultQuesionController extends ControllerSupport {
             throw new StatusException("Q-013045", "rootOrgId is null");
         }
         String id = questionProviderService.save(defaultQuestion);
-        return new ResponseEntity<Object>(id, HttpStatus.OK);
+        return new ResponseEntity<>(id, HttpStatus.OK);
     }
 
     @ApiOperation(value = "修改试题")
@@ -65,7 +65,7 @@ public class DefaultQuesionController extends ControllerSupport {
             throw new StatusException("Q-013061", "rootOrgId is null");
         }
         String id = questionProviderService.save(defaultQuestion);
-        return new ResponseEntity<Object>(id, HttpStatus.OK);
+        return new ResponseEntity<>(id, HttpStatus.OK);
     }
 
     @ApiOperation(value = "查询试题")
@@ -80,7 +80,7 @@ public class DefaultQuesionController extends ControllerSupport {
             throw new StatusException("Q-011079", "rootOrgId is null");
         }
         Page<DefaultQuestion> defaultQuestions = questionProviderService.findQustions(rootOrgId, req.getProperties(), req.getCurPage(), req.getPageSize());
-        return new ResponseEntity<Object>(defaultQuestions, HttpStatus.OK);
+        return new ResponseEntity<>(defaultQuestions, HttpStatus.OK);
     }
 
     @ApiOperation(value = "查询试题")
@@ -91,7 +91,7 @@ public class DefaultQuesionController extends ControllerSupport {
             throw new StatusException("Q-011089", "questionId is null");
         }
         List<DefaultQuestion> defaultQuestions = questionProviderService.findQuestions(questionIds);
-        return new ResponseEntity<Object>(defaultQuestions, HttpStatus.OK);
+        return new ResponseEntity<>(defaultQuestions, HttpStatus.OK);
     }
 
     @ApiOperation(value = "查询试题")
@@ -114,6 +114,6 @@ public class DefaultQuesionController extends ControllerSupport {
             throw new StatusException("Q-010090", "questionId is null");
         }
         DefaultQuestion defaultQuestion = extractConfigExamService.getDefaultQuestion(examId, courseCode, groupCode, questionId);
-        return new ResponseEntity<Object>(defaultQuestion, HttpStatus.OK);
+        return new ResponseEntity<>(defaultQuestion, HttpStatus.OK);
     }
 }

+ 1 - 1
examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/service/core/api/initQuesHash/InitQuesHashController.java

@@ -29,6 +29,6 @@ public class InitQuesHashController extends ControllerSupport {
     @GetMapping(value = "/initQuesHash/{orgId}")
     public ResponseEntity<Object> initQuesHash(@PathVariable String orgId) {
         initQuesHashService.initHash(orgId);
-        return new ResponseEntity<Object>(HttpStatus.OK);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 }