upgrade & fix jpa.

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

@@ -543,7 +543,7 @@ public class PaperController extends ControllerSupport {
         try {
             String[] paperIdArray = paperIds.split(",");
             for (int i = 0; i < paperIdArray.length; i++) {
-                Paper oldpaper = paperRepo.findOne(paperIdArray[i]);
+                Paper oldpaper =cn.com.qmth.examcloud.core.questions.base.Model.of(paperRepo.findById(paperIdArray[i]));
                 boolean result = paperService.checkPaperName(oldpaper.getName(), PaperType.GENERATE, user.getRootOrgId() + "");
                 if (!result) {
                     throw new StatusException("Q-160565", "考试试卷:" + oldpaper.getName() + "已经存在");
@@ -588,7 +588,7 @@ public class PaperController extends ControllerSupport {
     @ApiOperation(value = "预览试卷页面")
     @GetMapping(value = "/paper/pdf/{paperId}")
     public String viewPaper(Model model, @PathVariable String paperId) {
-        Paper paperBase = paperRepo.findOne(paperId);
+        Paper paperBase = cn.com.qmth.examcloud.core.questions.base.Model.of(paperRepo.findById(paperId));
         ExportServiceManage esm = exportServiceManageRepo.findByOrgId(paperBase.getOrgId());
         if (esm == null) {
             esm = exportServiceManageRepo.findByOrgName("山东大学");
@@ -606,7 +606,7 @@ public class PaperController extends ControllerSupport {
     @ApiOperation(value = "预览试卷答案页面")
     @GetMapping(value = "/paper/answer/pdf/{paperId}")
     public String viewPaperAnswer(Model model, @PathVariable String paperId) {
-        Paper paperBase = paperRepo.findOne(paperId);
+        Paper paperBase = cn.com.qmth.examcloud.core.questions.base.Model.of(paperRepo.findById(paperId));
         ExportServiceManage esm = exportServiceManageRepo.findByOrgId(paperBase.getOrgId());
         if (esm == null) {
             esm = exportServiceManageRepo.findByOrgName("山东大学");

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

@@ -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>(paperStructRepo.findOne(id), HttpStatus.OK);
+        return new ResponseEntity<Object>(cn.com.qmth.examcloud.core.questions.base.Model.of(paperStructRepo.findById(id)), HttpStatus.OK);
     }
 
     /**
@@ -128,7 +128,7 @@ public class PaperStructController extends ControllerSupport {
     @DeleteMapping(value = "/paperStruct/{ids}")
     public ResponseEntity<Object> removePaperStruct(@PathVariable String ids) {
         List<String> paperList = Stream.of(ids.split(",")).collect(Collectors.toList());
-        paperStructRepo.delete(paperStructRepo.findAll(paperList));
+        paperStructRepo.deleteAll(paperStructRepo.findAllById(paperList));
         return new ResponseEntity<Object>(HttpStatus.OK);
     }
 

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 {
     @ApiOperation(value = "获取试题", notes = "获取试题")
     @GetMapping(value = "/question/{id}")
     public ResponseEntity<Object> getQuesById(@PathVariable String id) {
-        Question ques = quesRepo.findOne(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);
     }
@@ -101,7 +101,7 @@ public class QuesController extends ControllerSupport {
     @ApiOperation(value = "删除试题", notes = "删除试题")
     @DeleteMapping(value = "/question/{id}")
     public ResponseEntity<Object> removeQuestion(@PathVariable String id) {
-        quesRepo.delete(id);
+        quesRepo.deleteById(id);
         return new ResponseEntity<Object>(HttpStatus.OK);
     }
 
@@ -113,7 +113,7 @@ public class QuesController extends ControllerSupport {
     @ApiOperation(value = "删除套题子题", notes = "删除套题子题")
     @PutMapping(value = "/question/{id}/{number}")
     public ResponseEntity<Object> removeQuestion(@PathVariable String id, @PathVariable String number) {
-        Question question = quesRepo.findOne(id);
+        Question question = cn.com.qmth.examcloud.core.questions.base.Model.of(quesRepo.findById(id));
         List<Question> subQuestions = question.getSubQuestions();
         subQuestions.remove(Integer.parseInt(number));
         return new ResponseEntity<Object>(quesRepo.save(question), HttpStatus.OK);

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

@@ -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.save(settingDto.getSettingList()),HttpStatus.OK);
+    	return new ResponseEntity<Object>(settingRepo.saveAll(settingDto.getSettingList()),HttpStatus.OK);
     }
 
     /**
@@ -55,7 +55,7 @@ public class SettingController {
     @ApiOperation(value="新增设置",notes="新增设置")
     @PostMapping(value = "/setting")
     public ResponseEntity<Object> addSetting(@RequestBody SettingDto settingDto){
-    	return new ResponseEntity<Object>(settingRepo.save(settingDto.getSettingList()),HttpStatus.OK);
+    	return new ResponseEntity<Object>(settingRepo.saveAll(settingDto.getSettingList()),HttpStatus.OK);
     }
 
     /**
@@ -66,7 +66,7 @@ public class SettingController {
     @ApiOperation(value="删除设置",notes="删除设置")
     @DeleteMapping(value = "/setting/{id}")
     public ResponseEntity<Object> removeSetting(@PathVariable String id){
-        settingRepo.delete(id);
+        settingRepo.deleteById(id);
     	return new ResponseEntity<Object>(HttpStatus.OK);
     }
 

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

@@ -116,7 +116,7 @@ public class HandleSyncCloudServiceProvider extends ControllerSupport implements
 		        }
 		        i++;
 		    }
-		    extractConfigRepo.save(extractConfigs);
+		    extractConfigRepo.saveAll(extractConfigs);
 		    log.debug("调卷规则同步完成，已经同步数量："+ i);
 		}
 		//同步试卷
@@ -143,7 +143,7 @@ public class HandleSyncCloudServiceProvider extends ControllerSupport implements
                 }
                 i++;
             }
-            paperRepo.save(papers);
+            paperRepo.saveAll(papers);
             log.debug("试卷同步完成，已经同步数量："+ i);
         }
         //同步试题
@@ -173,7 +173,7 @@ public class HandleSyncCloudServiceProvider extends ControllerSupport implements
                 }
                 i++;
             }
-            quesRepo.save(questions);
+            quesRepo.saveAll(questions);
             log.debug("试题同步完成，已经同步数量："+ i);
         }
         SyncCourseResp resp = new SyncCourseResp();
@@ -238,7 +238,7 @@ public class HandleSyncCloudServiceProvider extends ControllerSupport implements
 		    	extractConfig.setExamType(examType);
 		    	extractConfig.setExamType(examType);
 		    }
-		    extractConfigRepo.save(extractConfigs);
+		    extractConfigRepo.saveAll(extractConfigs);
 		    log.debug("调卷规则同步完成，已经同步数量："+ i);
 		}
 		SyncExamResp resp = new SyncExamResp();