format code.

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

@@ -50,6 +50,18 @@ import io.swagger.annotations.ApiOperation;
  * @return 根据课程编号获取课程信息
  * @param courseNo
  * @return 查询所有课程
+ * @return 获取全部课程
+ * @return 更新课程
+ * @param course
+ * @return 新增课程
+ * @param course
+ * @return 删除课程
+ * @param coruse_id
+ * @return 根据课程名称或者课程编号获取课程信息
+ * @param keyword
+ * @return 根据课程编号获取课程信息
+ * @param courseNo
+ * @return 查询所有课程
  * @return
  *//*
 

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

@@ -149,21 +149,21 @@ public class ExtractConfigController extends ControllerSupport {
             notes = "判断试卷中的题是否都为客观题(单选、多选、判断)，包括套题中的小题")
     @GetMapping(value = "/checkObjective/{paperId}")
     public ResponseEntity<Map<String, Object>> checkIsAllObjectiveQuestion(@PathVariable String paperId) {
-        Map<String, Object> quesMap = new HashMap<String, Object>();
+        Map<String, Object> quesMap = new HashMap<>();
         try {
             if (StringUtils.isBlank(paperId)) {
                 quesMap.put("message", "paperId不能为空");
-                return new ResponseEntity<Map<String, Object>>(HttpStatus.INTERNAL_SERVER_ERROR);
+                return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
             }
             boolean result = extractConfigService.checkIsAllQbjectiveQuestion(paperId);
             quesMap.put("result", result);
             quesMap.put("message", result ? "全为客观题" : "不全为客观题");
-            return new ResponseEntity<Map<String, Object>>(quesMap, HttpStatus.OK);
+            return new ResponseEntity<>(quesMap, HttpStatus.OK);
         } catch (Exception e) {
             logger.error("调用checkIsAllQbjectiveQuestion失败", e);
             quesMap.put("result", "error");
             quesMap.put("message", "调用失败");
-            return new ResponseEntity<Map<String, Object>>(HttpStatus.INTERNAL_SERVER_ERROR);
+            return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
         }
     }
 
@@ -183,7 +183,7 @@ public class ExtractConfigController extends ControllerSupport {
         exportModel.setExamId(examId);
         exportModel.setCourseId(courseId);
         String[] exportContentArray = exportContentList.split(",");
-        List<String> list = new ArrayList<String>();
+        List<String> list = new ArrayList<>();
         for (int i = 0; i < exportContentArray.length; i++) {
             list.add(exportContentArray[i]);
         }
@@ -225,7 +225,7 @@ public class ExtractConfigController extends ControllerSupport {
         exportModel.setExportWay(ExportWay.strToEnum(exportWay));
         exportModel.setExamId(examId);
         String[] exportContentArray = exportContentList.split(",");
-        List<String> list = new ArrayList<String>();
+        List<String> list = new ArrayList<>();
         for (int i = 0; i < exportContentArray.length; i++) {
             list.add(exportContentArray[i]);
         }

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

@@ -41,7 +41,7 @@ public class GenPaperController extends ControllerSupport {
         User user = getAccessUser();
         genPaperDto.setOrgId(user.getRootOrgId().toString());
         genPaperDto.setCreator(user.getDisplayName());
-        Map<String, Object> paperMap = new HashMap<String, Object>();
+        Map<String, Object> paperMap = new HashMap<>();
         String paperName = genPaperDto.getPaperName();
         try {
             //判断试卷名称是否一样
@@ -98,7 +98,7 @@ public class GenPaperController extends ControllerSupport {
         User user = getAccessUser();
         genPaperDto.setOrgId(user.getRootOrgId().toString());
         genPaperDto.setCreator(user.getDisplayName());
-        Map<String, Object> paperMap = new HashMap<String, Object>();
+        Map<String, Object> paperMap = new HashMap<>();
         String paperName = genPaperDto.getPaperName();
         //判断试卷名称是否一样
         try {
@@ -146,7 +146,7 @@ public class GenPaperController extends ControllerSupport {
         User user = getAccessUser();
         genPaperDto.setOrgId(user.getRootOrgId().toString());
         genPaperDto.setCreator(user.getDisplayName());
-        Map<String, Object> paperMap = new HashMap<String, Object>();
+        Map<String, Object> paperMap = new HashMap<>();
         String paperName = genPaperDto.getPaperName();
         //判断试卷名称是否一样
         try {

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

@@ -462,7 +462,7 @@ public class PaperController extends ControllerSupport {
                                                         @RequestParam(name = "quesBody") String quesBody) {
         User user = getAccessUser();
         if (user == null) {
-            return new ResponseEntity<>(new PageImpl<Question>(new ArrayList<Question>()), HttpStatus.OK);
+            return new ResponseEntity<>(new PageImpl<Question>(new ArrayList<>()), HttpStatus.OK);
         }
         QuesStructType quesStructType = null;
         if (StringUtils.isNotEmpty(quesType)) {

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

@@ -166,25 +166,21 @@ public class HandleSyncCloudServiceProvider extends ControllerSupport implements
 
     @Override
     public SyncOrgResp syncOrg(SyncOrgReq req) {
-        // TODO Auto-generated method stub
         return null;
     }
 
     @Override
     public SyncStudentResp syncStudent(SyncStudentReq req) {
-        // TODO Auto-generated method stub
         return null;
     }
 
     @Override
     public SyncExamStudentResp syncExamStudent(SyncExamStudentReq req) {
-        // TODO Auto-generated method stub
         return null;
     }
 
     @Override
     public SyncSpecialtyResp syncSpecialty(SyncSpecialtyReq req) {
-        // TODO Auto-generated method stub
         return null;
     }
 
@@ -231,7 +227,6 @@ public class HandleSyncCloudServiceProvider extends ControllerSupport implements
 
     @Override
     public SyncUserResp syncUser(SyncUserReq req) {
-        // TODO Auto-generated method stub
         return null;
     }
 

examcloud-core-questions-base/src/main/java/cn/com/qmth/examcloud/core/questions/base/CombinationUtils.java

@@ -41,7 +41,7 @@ public class CombinationUtils {
     }
 
     public static void main(String args[]) {
-        // List<Integer> list = new ArrayList<Integer>();
+        // List<Integer> list = new ArrayList<>();
         // list.add(3);
         // list.add(4);
         // list.add(5);

examcloud-core-questions-base/src/main/java/cn/com/qmth/examcloud/core/questions/base/StringSimilarityUtils.java

@@ -23,7 +23,7 @@ public class StringSimilarityUtils {
      * @author songyue
      */
     public static List<String> segmentText(String str) {
-        List<String> segResult = new ArrayList<String>();// 分词结果
+        List<String> segResult = new ArrayList<>();// 分词结果
         Result result = ToAnalysis.parse(str);
         List<Term> terms = result.getTerms();
         for (Term term : terms) {

examcloud-core-questions-base/src/main/java/cn/com/qmth/examcloud/core/questions/base/excel/ExcelReader.java

@@ -32,7 +32,7 @@ public class ExcelReader extends ExcelUtils {
      * @return 错误信息集合
      */
     public List<ExcelError> reader(InputStream inputStream, ExcelReaderHandle handle) {
-        List<ExcelError> excelErrors = new ArrayList<ExcelError>();
+        List<ExcelError> excelErrors = new ArrayList<>();
         Workbook wb = null;
         try {
             wb = WorkbookFactory.create(inputStream);

examcloud-core-questions-base/src/main/java/cn/com/qmth/examcloud/core/questions/base/word/DocxProcessUtil.java

@@ -357,7 +357,7 @@ public final class DocxProcessUtil {
      */
     public static List<Object> getAllElementFromObject(Object obj, Class<?> toSearch) {
 
-        List<Object> result = new ArrayList<Object>();
+        List<Object> result = new ArrayList<>();
         if (obj instanceof JAXBElement)
             obj = ((JAXBElement<?>) obj).getValue();
         if (obj.getClass().equals(toSearch))

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

@@ -1335,7 +1335,7 @@ public class ImportPaperService {
             BigDecimal b = BigDecimal.valueOf(sum / totalDouble);
             Double difficulty = b.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
             //给属性去重
-            Set<QuesProperty> ts = new HashSet<QuesProperty>();
+            Set<QuesProperty> ts = new HashSet<>();
             ts.addAll(subQuesProperties);
             subQuesProperties.clear();
             subQuesProperties.addAll(ts);

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

@@ -165,7 +165,7 @@ public class PaperStructService {
                 if (oldStructs != null && oldStructs.size() > 0) {
                     oldStructs.clear();
                 }
-                List<PaperDetailUnitStruct> unitStructs = new ArrayList<PaperDetailUnitStruct>();
+                List<PaperDetailUnitStruct> unitStructs = new ArrayList<>();
                 for (PaperDetailUnitStructDto unitStructDto : paperDetailStruct.getUnitStructs()) {
                     //公开简单总数
                     for (int i = 0; i < unitStructDto.getPublicSimple(); i++) {
@@ -263,7 +263,7 @@ public class PaperStructService {
                 if (oldStructs != null && oldStructs.size() > 0) {
                     oldStructs.clear();
                 }
-                List<PaperDetailUnitStruct> unitStructs = new ArrayList<PaperDetailUnitStruct>();
+                List<PaperDetailUnitStruct> unitStructs = new ArrayList<>();
                 for (CoursePropertyNumberDto coursePropertyNumberDto : paperDetailStruct.getCoursePropertyNumberDtos()) {
                     //取到子节点上的题目
                     if (!coursePropertyNumberDto.getDisable()) {

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

@@ -25,7 +25,7 @@ public class PaperDetailUnitDtoAssembler {
         paperDetailUnitDto.setSubScoreList(paperDetailUnit.getSubScoreList());
         paperDetailUnitDto.setQuesBody(paperDetailUnit.getQuestion().getQuesBody());
         if (paperDetailUnit.getQuestion().getQuesOptions() != null && paperDetailUnit.getQuestion().getQuesOptions().size() > 0) {
-            List<QuesOptionDto> quesOptionDtos = new ArrayList<QuesOptionDto>();
+            List<QuesOptionDto> quesOptionDtos = new ArrayList<>();
             for (QuesOption quesOption : paperDetailUnit.getQuestion().getQuesOptions()) {
                 QuesOptionDto quesOptionDto = new QuesOptionDto();
                 quesOptionDto.setNumber(quesOption.getNumber());

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

@@ -39,7 +39,7 @@ public class PropertyAssembler {
         Property property = null;
         List<PropertyDto> propertyDtos = propertyDto.getPropertyDtos();
         if (propertyDtos != null && propertyDtos.size() > 0) {
-            List<Property> properties = new ArrayList<Property>();
+            List<Property> properties = new ArrayList<>();
             for (PropertyDto propertyDto2 : propertyDtos) {
                 property = toProperty(propertyDto2);
                 properties.add(property);

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/bean/context/DetailContext.java

@@ -39,7 +39,7 @@ public class DetailContext extends Context {
     public Map<PaperDetail, List<PaperDetailUnit>> build(PaperDetailStruct detailStruct) {
         Map<PaperDetail, List<PaperDetailUnit>> detailMap = new HashMap<>();
         PaperDetail pd = new PaperDetail();
-        List<PaperDetailUnit> unitList = new ArrayList<PaperDetailUnit>();
+        List<PaperDetailUnit> unitList = new ArrayList<>();
         pd.setId(UUID.randomUUID().toString());
         for (int i = 0; i < units.size(); i++) {
             UnitContext uc = units.get(i);

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/bean/context/PaperContext.java

@@ -30,14 +30,14 @@ public class PaperContext extends Context {
     }
 
     public List<Object> build(PaperStruct paperStruct) {
-        List<Object> list = new ArrayList<Object>();
+        List<Object> list = new ArrayList<>();
         Paper paper = new Paper();
         paper.setId(UUID.randomUUID().toString());
         paper.setPaperDetailCount(details.size());
         paper.setTotalScore(paperStruct.getTotalScore());
         paper.setPaperType(PaperType.GENERATE);
-        List<PaperDetailUnit> units = new ArrayList<PaperDetailUnit>();
-        List<PaperDetail> detailList = new ArrayList<PaperDetail>();
+        List<PaperDetailUnit> units = new ArrayList<>();
+        List<PaperDetail> detailList = new ArrayList<>();
         for (DetailContext dc : details) {
             Map<PaperDetail, List<PaperDetailUnit>> tempMap = dc.build(dc.getDetailStruct());
             PaperDetail pd = tempMap.keySet().iterator().next();

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/BuildComputerTestJsonService.java

@@ -158,7 +158,7 @@ public class BuildComputerTestJsonService {
             //判断是否有图片
             if (questionRowStrings[i].startsWith("img")) {
                 questionRowStrings[i] = "<" + questionRowStrings[i] + ">";
-                Map<String, Object> param = new HashMap<String, Object>();
+                Map<String, Object> param = new HashMap<>();
                 //需要继续做截取，取到Parma
                 block.setType("image");
                 //获取图片的路径

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/DzkdExportPaperService.java

@@ -216,7 +216,7 @@ public class DzkdExportPaperService extends ExportPaperAbstractService {
      */
     protected String checkPaperDetailUnitblanksScore(PaperDetailExp paperDetailExp) {
         List<PaperDetailUnitExp> paperDetailUnitExps = paperDetailExp.getPaperDetailUnits();
-        Set<Double> scoreSet = new HashSet<Double>();
+        Set<Double> scoreSet = new HashSet<>();
         for (PaperDetailUnitExp unitExp : paperDetailUnitExps) {
             int blanksNumbers = blanksNumbers(unitExp);
             double everyBlank = unitExp.getScore() / blanksNumbers;

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/ExportPaperAbstractService.java

@@ -402,7 +402,7 @@ public abstract class ExportPaperAbstractService {
         List<Object> pList = body.getContent();
         int index = 0;
         int cur = 0;
-        Map<Integer, String> curMap = new HashMap<Integer, String>();
+        Map<Integer, String> curMap = new HashMap<>();
         for (Object pObj : pList) {
             if (pObj.getClass().equals(P.class)) {
                 List<Object> pContent = ((P) pObj).getContent();
@@ -1112,11 +1112,11 @@ public abstract class ExportPaperAbstractService {
      */
     public List<PaperDetailExp> fillObjectiveQuestions(List<PaperDetailExp> objectiveDetails, List<QuestionTypeNum> questionTypeNums) {
         //1.得到所有客观题大题的类型
-        Set<QuesStructType> types = new HashSet<QuesStructType>();
+        Set<QuesStructType> types = new HashSet<>();
         for (PaperDetailExp paperDetailExp : objectiveDetails) {
             types.add(QuesStructType.getQuesStructTypeById(paperDetailExp.getSortNumber()));
         }
-        List<PaperDetailExp> paperDetailExps = new ArrayList<PaperDetailExp>();
+        List<PaperDetailExp> paperDetailExps = new ArrayList<>();
         //如果没有单选
         if (!types.contains(QuesStructType.SINGLE_ANSWER_QUESTION)) {
             buildObjectiveQuestion(paperDetailExps, questionTypeNums, QuesStructType.SINGLE_ANSWER_QUESTION);

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/InitPaperExpService.java

@@ -142,15 +142,15 @@ public class InitPaperExpService {
      * @return
      */
     private List<PaperDetailExp> separatePaperDetailUntils(List<PaperDetail> paperDetails, PaperExp paperExpDto) {
-        List<PaperDetailExp> paperDetailExps = new ArrayList<PaperDetailExp>();
+        List<PaperDetailExp> paperDetailExps = new ArrayList<>();
         //循环大题
         for (PaperDetail paperDetail : paperDetails) {
             //获取小题
             List<PaperDetailUnit> paperDetailUnits = paperDetailUnitRepo.findByPaperDetailOrderByNumber(paperDetail);
             //set集合用来将小题分类
-            Set<Long> questionTypes = new HashSet<Long>();
+            Set<Long> questionTypes = new HashSet<>();
             //大题的临时集合，用来区分原卷每个大题
-            List<PaperDetailExp> subPaperDetailExps = new ArrayList<PaperDetailExp>();
+            List<PaperDetailExp> subPaperDetailExps = new ArrayList<>();
             //第一次循环小题，分成大题类型
             for (PaperDetailUnit paperDetailUnit : paperDetailUnits) {
                 //判断该试卷是否为音频试卷
@@ -267,7 +267,7 @@ public class InitPaperExpService {
      */
     public String checkPaperDetailUnitScore(PaperDetailExp paperDetailExp) {
         List<PaperDetailUnitExp> paperDetailUnitExps = paperDetailExp.getPaperDetailUnits();
-        Set<Double> scoreSet = new HashSet<Double>();
+        Set<Double> scoreSet = new HashSet<>();
         for (PaperDetailUnitExp unitExp : paperDetailUnitExps) {
             //判断套路
             if (unitExp.getQuestionType() == QuesStructType.NESTED_ANSWER_QUESTION) {
@@ -299,7 +299,7 @@ public class InitPaperExpService {
         PaperDetailUnitExp paperDetailUnitExp = BeanCopierUtil.copyProperties(paperDetailUnit, PaperDetailUnitExp.class);
         //得到套题下面所有小题
         List<Question> questions = paperDetailUnit.getQuestion().getSubQuestions();
-        Set<Long> subQuestionType = new HashSet<Long>();
+        Set<Long> subQuestionType = new HashSet<>();
         for (Question subQuestion : questions) {
             subQuestionType.add(subQuestion.getQuestionType().getId());
         }
@@ -346,7 +346,7 @@ public class InitPaperExpService {
     private void isSubQuestion(PaperDetailUnit paperDetailUnit, Set<Long> questionType) {
         //得到套题下面所有小题
         List<Question> questions = paperDetailUnit.getQuestion().getSubQuestions();
-        Set<Long> subQuestionType = new HashSet<Long>();
+        Set<Long> subQuestionType = new HashSet<>();
         for (Question subQuestion : questions) {
             subQuestionType.add(subQuestion.getQuestionType().getId());
         }
@@ -457,7 +457,7 @@ public class InitPaperExpService {
         List<Object> pList = body.getContent();
         int index = 0;
         int cur = 0;
-        Map<Integer, String> curMap = new HashMap<Integer, String>();
+        Map<Integer, String> curMap = new HashMap<>();
         for (Object pObj : pList) {
             if (pObj.getClass().equals(P.class)) {
                 List<Object> pContent = ((P) pObj).getContent();

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

@@ -66,7 +66,7 @@ public class AudioTimeConfigServiceImpl implements AudioTimeConfigService {
 
     @Override
     public List<AudioTimeConfig> findAudioTimeConfigList(List<AudioTimeConfig> audioTimeConfigModelList) {
-        List<AudioTimeConfig> audioTimeConfigList = new ArrayList<AudioTimeConfig>();
+        List<AudioTimeConfig> audioTimeConfigList = new ArrayList<>();
         for (AudioTimeConfig audioTimeConfig : audioTimeConfigModelList) {
             Paper paper = Model.of(paperRepo.findById(audioTimeConfig.getPaper().getId()));
             //根据试卷查询所有小题
@@ -103,7 +103,7 @@ public class AudioTimeConfigServiceImpl implements AudioTimeConfigService {
     }
 
     private void addAudioTimeConfig(String examId, String courseCode, List<AudioTimeConfig> audioTimeConfigList) {
-        List<String> questionIds = new ArrayList<String>();
+        List<String> questionIds = new ArrayList<>();
         for (AudioTimeConfig audioTimeConfig : audioTimeConfigList) {
             questionIds.add(audioTimeConfig.getQuestionId());
         }
@@ -137,7 +137,7 @@ public class AudioTimeConfigServiceImpl implements AudioTimeConfigService {
      * @param audioTimeConfigList
      */
     private void deleteAudioTimeConfig(List<AudioTimeConfig> audioTimeConfigList) {
-        List<AudioTimeConfig> configs = new ArrayList<AudioTimeConfig>();
+        List<AudioTimeConfig> configs = new ArrayList<>();
         for (AudioTimeConfig audioTimeConfig : audioTimeConfigList) {
             Question question = audioTimeConfig.getPaperDetailUnit().getQuestion();
             if (question.getHasAudio() == null || !question.getHasAudio()) {
@@ -151,7 +151,7 @@ public class AudioTimeConfigServiceImpl implements AudioTimeConfigService {
 
     @Override
     public Map<String, String> findAudioTimeConfig(String examId, String courseCode, String groupCode, String paperDetailUnitId) {
-        Map<String, String> map = new HashMap<String, String>();
+        Map<String, String> map = new HashMap<>();
         if (StringUtils.isNotBlank(examId)) {
             map.put("errMessage", "examId为空");
             return map;
@@ -187,7 +187,7 @@ public class AudioTimeConfigServiceImpl implements AudioTimeConfigService {
     @Override
     public List<AudioTimeConfig> findUpdateAudioTimeConfigList(List<AudioTimeConfig> audioTimeConfigModelList) {
         List<AudioTimeConfig> list = findAudioTimeConfigList(audioTimeConfigModelList);
-        List<AudioTimeConfig> newList = new ArrayList<AudioTimeConfig>();
+        List<AudioTimeConfig> newList = new ArrayList<>();
         if (list != null && list.size() > 0) {
             for (AudioTimeConfig audioTimeConfig : list) {
                 AudioTimeConfig oldAudioTimeConfig = Model.of(audioTimeConfigRepo.findOne(Example.of(audioTimeConfig)));

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

@@ -258,12 +258,12 @@ public class ExportPaperServiceImpl implements ExportPaperService {
         List<PaperDetail> paperDetails = paperService.findPaperDetailsById(paper.getId());
         //通过 paper 对象 ，生成新的  ComputerTestPaper 对象
         ComputerTestPaper computerTestPaper = new ComputerTestPaper(paper, "");
-        List<ComputerTestPaperDetail> details = new ArrayList<ComputerTestPaperDetail>();
+        List<ComputerTestPaperDetail> details = new ArrayList<>();
         //遍历所有旧大题对象，得到小题对象的集合
         for (PaperDetail paperDetail : paperDetails) {
             List<PaperDetailUnit> paperDetailUnits = paperDetailService.getUnitsByPaperDetailId(paperDetail.getId());
             ComputerTestPaperDetail computerTestPaperDetail = new ComputerTestPaperDetail(paperDetail);
-            List<ComputerTestQuestion> questions = new ArrayList<ComputerTestQuestion>();
+            List<ComputerTestQuestion> questions = new ArrayList<>();
             //遍历所有的小题对象
             for (int i = 0; i < paperDetailUnits.size(); i++) {
                 PaperDetailUnit paperDetailUnit = paperDetailUnits.get(i);
@@ -281,7 +281,7 @@ public class ExportPaperServiceImpl implements ExportPaperService {
                 List<Question> subQuestionsList = paperDetailUnit.getQuestion().getSubQuestions();
                 //判断这个小题中是否有套题
                 if (subQuestionsList != null && subQuestionsList.size() > 0) {
-                    List<ComputerTestQuestion> subQuestions = new ArrayList<ComputerTestQuestion>();
+                    List<ComputerTestQuestion> subQuestions = new ArrayList<>();
                     //遍历每个套题
                     for (int j = 0; j < subQuestionsList.size(); j++) {
                         Question subQuestion = subQuestionsList.get(j);
@@ -308,7 +308,7 @@ public class ExportPaperServiceImpl implements ExportPaperService {
 
     private Sections getBodyOrAnswer(String str, ComputerTestPaper computerTestPaper) {
         Sections body = new Sections();
-        List<Section> sections = new ArrayList<Section>();
+        List<Section> sections = new ArrayList<>();
         //得到小题题干或者答案行数
         if (StringUtils.isBlank(str)) {
             return body;
@@ -330,7 +330,7 @@ public class ExportPaperServiceImpl implements ExportPaperService {
     private List<ComputerTestOption> getOption(Question question, ComputerTestPaper computerTestPaper) {
         //得到小题选项
         List<QuesOption> quesOptions = question.getQuesOptions();
-        List<ComputerTestOption> options = new ArrayList<ComputerTestOption>();
+        List<ComputerTestOption> options = new ArrayList<>();
         //遍历小题选项
         if (quesOptions != null && quesOptions.size() > 0) {
             for (QuesOption quesOption : quesOptions) {
@@ -339,7 +339,7 @@ public class ExportPaperServiceImpl implements ExportPaperService {
                 option.setCorrect(quesOption.getIsCorrect() == 1 ? true : false);
                 Sections body = new Sections();
 
-                List<Section> sections = new ArrayList<Section>();
+                List<Section> sections = new ArrayList<>();
                 //得到小题选项
                 String optionString = quesOption.getOptionBody();
                 String[] optionStrings = optionString.split("</p>");
@@ -360,7 +360,7 @@ public class ExportPaperServiceImpl implements ExportPaperService {
     }
 
     private List<Block> disposeQuestionBodyOrOption(String questionRow, ComputerTestPaper computerTestPaper) {
-        List<Block> blocks = new ArrayList<Block>();
+        List<Block> blocks = new ArrayList<>();
         //去掉每行里面的<p>,<span>,</span>标签
         questionRow = questionRow.replaceAll("<p>", "")
                 .replaceAll("</p>", "")
@@ -375,7 +375,7 @@ public class ExportPaperServiceImpl implements ExportPaperService {
             //判断是否有图片
             if (rowStr.startsWith("img")) {
                 rowStr = "<" + rowStr + ">";
-                Map<String, Object> param = new HashMap<String, Object>();
+                Map<String, Object> param = new HashMap<>();
                 //需要继续做截取，取到Parma
                 block.setType("image");
                 //获取图片的路径
@@ -431,7 +431,7 @@ public class ExportPaperServiceImpl implements ExportPaperService {
      */
     private List<String> getImg(String s, String str) {
         String regex;
-        List<String> list = new ArrayList<String>();
+        List<String> list = new ArrayList<>();
         regex = str + "=\"(.*?)\"";
         Pattern pa = Pattern.compile(regex, Pattern.DOTALL);
         Matcher ma = pa.matcher(s);

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

@@ -375,8 +375,8 @@ public class ExtractConfigFileServiceImpl implements ExtractConfigFileService {
      * @param examId
      */
     private Map<String, String> checkAllCourseByExamId(String examId, ExportType exportType) {
-        Map<String, String> paperIdMap = new HashMap<String, String>();
-        List<ExamCourseRelationBean> examCourseDtoList = new ArrayList<ExamCourseRelationBean>();
+        Map<String, String> paperIdMap = new HashMap<>();
+        List<ExamCourseRelationBean> examCourseDtoList = new ArrayList<>();
         GetExamCourseListReq req = new GetExamCourseListReq();
         req.setExamId(Long.valueOf(examId));
         //req.setExamId(299L);//for export test
@@ -485,9 +485,9 @@ public class ExtractConfigFileServiceImpl implements ExtractConfigFileService {
         logger.info("正在批量生成试卷结构...");
         List<QuestionTypeNum> questionTypeNums = exportStructure.getQuestionTypeNums();
         //客观题集合
-        List<ObjectiveQuestionStructure> objectiveQuestionStructureList = new ArrayList<ObjectiveQuestionStructure>();
+        List<ObjectiveQuestionStructure> objectiveQuestionStructureList = new ArrayList<>();
         //主观题集合
-        List<SubjectiveQuestionStructure> subjectiveQuestionStructureList = new ArrayList<SubjectiveQuestionStructure>();
+        List<SubjectiveQuestionStructure> subjectiveQuestionStructureList = new ArrayList<>();
 
         ExportServiceManage esm = exportServiceManageRepo.findByOrgName(exportStructure.getOrgName());
         if (esm == null) {

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

@@ -643,7 +643,7 @@ public class ExtractConfigProviderServiceImpl implements ExtractConfigProviderSe
 
     @Override
     public Map<String, DefaultQuestion> getDefaultQuestions(Set<String> questionIds) {
-        Map<String, DefaultQuestion> map = new HashMap<String, DefaultQuestion>();
+        Map<String, DefaultQuestion> map = new HashMap<>();
         List<Question> questions = quesRepo.findByIdIn(questionIds);
         if (CollectionUtils.isEmpty(questions)) {
             log.error("根据试题id的集合没有查询到试题结合");
@@ -658,7 +658,7 @@ public class ExtractConfigProviderServiceImpl implements ExtractConfigProviderSe
 
     @Override
     public List<String> getAnswer(String questionId) {
-        List<String> list = new ArrayList<String>();
+        List<String> list = new ArrayList<>();
         Question question = Model.of(quesRepo.findById(questionId));
         if (question.getQuestionType() == QuesStructType.NESTED_ANSWER_QUESTION) {
             List<Question> subList = question.getSubQuestions();

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

@@ -175,7 +175,7 @@ public class ExtractConfigServiceImpl implements ExtractConfigService {
 
     @Override
     public Map<String, Object> extractExamPaper(Long exam_id, String course_code, String group_code) {
-        Map<String, Object> returnMap = new HashMap<String, Object>();
+        Map<String, Object> returnMap = new HashMap<>();
         logger.info("调卷开始...");
         long beginTime = System.currentTimeMillis();
         logger.info("开始根据examId:" + exam_id + "和courseCode:" + course_code + "获取调卷规则");
@@ -398,16 +398,16 @@ public class ExtractConfigServiceImpl implements ExtractConfigService {
      * @return
      */
     private Map<String, Paper> getExamPaperByProbability(List<ExamPaper> examPaperList) {
-        Map<String, Paper> paperByTypeMap = new HashMap<String, Paper>();
+        Map<String, Paper> paperByTypeMap = new HashMap<>();
         if (examPaperList == null || examPaperList.size() == 0) {
             throw new RuntimeException("可供抽取的试卷集合为空,无法抽取试卷");
         }
-        Map<String, List<ExamPaper>> examPaperMap = new HashMap<String, List<ExamPaper>>();
+        Map<String, List<ExamPaper>> examPaperMap = new HashMap<>();
         for (int i = 0; i < examPaperList.size(); i++) {
             ExamPaper examPaper = examPaperList.get(i);
             if (!examPaperMap.containsKey(examPaper.getGroupCode())) {
                 if (examPaper.getPaper() != null) {
-                    List<ExamPaper> epList = new ArrayList<ExamPaper>();
+                    List<ExamPaper> epList = new ArrayList<>();
                     epList.add(examPaper);
                     examPaperMap.put(examPaper.getGroupCode(), epList);
                 }
@@ -752,7 +752,7 @@ public class ExtractConfigServiceImpl implements ExtractConfigService {
     @Override
     public QuestionDto extractExamQuestion(String examId, String courseCode, String groupCode, String paperDetailUnitId) {
         PaperDetailUnit paperDetailUnit = Model.of(paperDetailUnitRepo.findById(paperDetailUnitId));
-        List<PaperDetailUnit> paperDetailUnits = new ArrayList<PaperDetailUnit>();
+        List<PaperDetailUnit> paperDetailUnits = new ArrayList<>();
         paperDetailUnits.add(paperDetailUnit);
         //设置答案
         setSelectQuestoionAnswer(paperDetailUnits);
@@ -765,7 +765,7 @@ public class ExtractConfigServiceImpl implements ExtractConfigService {
         dto.setQuesOptions(buildQuestionOptionDto(ques.getQuesOptions()));
         if (ques.getQuestionType() == QuesStructType.NESTED_ANSWER_QUESTION) {
             List<Question> subQuesList = ques.getSubQuestions();
-            List<SubQuestionDto> subQuesDtos = new ArrayList<SubQuestionDto>();
+            List<SubQuestionDto> subQuesDtos = new ArrayList<>();
             for (Question question : subQuesList) {
                 SubQuestionDto subQuestionDto = new SubQuestionDto();
                 BeanUtils.copyProperties(question, subQuestionDto);
@@ -794,7 +794,7 @@ public class ExtractConfigServiceImpl implements ExtractConfigService {
         if (quesOptions == null) {
             return null;
         }
-        List<QuesOptionDto> optionDtos = new ArrayList<QuesOptionDto>();
+        List<QuesOptionDto> optionDtos = new ArrayList<>();
         for (QuesOption option : quesOptions) {
             QuesOptionDto optionDto = new QuesOptionDto();
             optionDto.setNumber(option.getNumber());
@@ -900,7 +900,7 @@ public class ExtractConfigServiceImpl implements ExtractConfigService {
      * @return
      */
     private List<QuesOption> reorderOptionCore(List<QuesOption> quesOptions, String optionOrder) {
-        List<QuesOption> newQuesOptions = new ArrayList<QuesOption>();
+        List<QuesOption> newQuesOptions = new ArrayList<>();
         if (StringUtil.isBlank(optionOrder) || quesOptions.isEmpty()) {
             return null;
         }
@@ -948,7 +948,7 @@ public class ExtractConfigServiceImpl implements ExtractConfigService {
 
     @Override
     public Map<String, Object> extractPaper(String paperId) {
-        Map<String, Object> returnMap = new HashMap<String, Object>();
+        Map<String, Object> returnMap = new HashMap<>();
         Paper paper = Model.of(paperRepo.findById(paperId));
         if (paper == null) {
             returnMap.put("errorMsg", "该试卷不存在");
@@ -1090,7 +1090,7 @@ public class ExtractConfigServiceImpl implements ExtractConfigService {
             throw new StatusException("Q-", "examId is null");
         }
         //从考务查询改考试下的所有开启课程
-        List<CouresInfo> courseInfoList = new ArrayList<CouresInfo>();
+        List<CouresInfo> courseInfoList = new ArrayList<>();
         GetExamCourseListReq req = new GetExamCourseListReq();
         req.setExamId(Long.valueOf(examId));
         req.setCourseEnable(true);

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

@@ -62,8 +62,8 @@ public class GenPaperService {
     public Map<String, Object> genPaper(GenPaperDto genPaperDto) {
         log.debug("开始组卷.....");
         String msg = "";
-        Map<String, Object> paperMsgMap = new HashMap<String, Object>();
-        LinkedList<Question> questions = new LinkedList<Question>();
+        Map<String, Object> paperMsgMap = new HashMap<>();
+        LinkedList<Question> questions = new LinkedList<>();
         //查询试卷结构
         long start = System.currentTimeMillis();
         PaperStruct paperStruct = Model.of(paperStructRepo.findById(genPaperDto.getPaperStructId()));
@@ -72,20 +72,20 @@ public class GenPaperService {
             return paperMsgMap;
         }
         PaperContext paperContext = new PaperContext(paperStruct, genPaperDto.getConditions());
-        List<UnitContext> unitContexts = new LinkedList<UnitContext>();
+        List<UnitContext> unitContexts = new LinkedList<>();
         List<DetailContext> detailContexts = paperContext.getDetails();
         for (DetailContext dc : detailContexts) {
             unitContexts.addAll(dc.getUnits());
         }
-        List<Paper> papers = (List<Paper>) paperRepo.findByIdIn(genPaperDto.getPaperIds());
-        List<PaperDetailUnit> unitList = new ArrayList<PaperDetailUnit>();
+        List<Paper> papers = paperRepo.findByIdIn(genPaperDto.getPaperIds());
+        List<PaperDetailUnit> unitList = new ArrayList<>();
         for (Paper oldPaper : papers) {
             //unitList.addAll(unitRepo.findByPaperOrderByNumber(oldPaper));
             for (PaperDetailUnit paperDetailUnit : unitRepo.findByPaperOrderByNumber(oldPaper)) {
                 unitList.add(paperDetailUnit);
             }
         }
-        Set<PaperDetailUnit> spareUnits = new HashSet<PaperDetailUnit>();
+        Set<PaperDetailUnit> spareUnits = new HashSet<>();
         spareUnits.addAll(unitList);
         long total = (System.currentTimeMillis() - start) / 1000;
         log.debug("total:" + total);
@@ -105,7 +105,7 @@ public class GenPaperService {
             questions.add(question);
         }*/
 
-        List<String> oIds = new ArrayList<String>();
+        List<String> oIds = new ArrayList<>();
         for (PaperDetailUnit unit : spareUnits) {
             oIds.add(unit.getQuestion().getId());
         }
@@ -239,13 +239,13 @@ public class GenPaperService {
 
     //通过题目分数组卷
     private Map<String, Object> extractByQuestioScore(GenPaperDto genPaperDto, User user) {
-        Map<String, Object> paperMsgMap = new HashMap<String, Object>();
+        Map<String, Object> paperMsgMap = new HashMap<>();
         //获取所有试卷与分数
         //Map<String, Double> paperMap = genPaperDto.getSimpleParams();
         Map<String, NumberDto> paperMap = genPaperDto.getSimpleParams();
         if (paperMap != null && paperMap.size() > 0) {
             //定义随机选中的小题集合
-            List<PaperDetailUnit> selectedUnits = new ArrayList<PaperDetailUnit>();
+            List<PaperDetailUnit> selectedUnits = new ArrayList<>();
             //将所有小题按questionId去重，并按试卷分类
             Map<String, List<PaperDetailUnit>> unitMap = sortUnitsByPaper(paperMap);
             //随机抽题
@@ -268,7 +268,7 @@ public class GenPaperService {
                 }
                 //将所有试题按照 公开度  和  难度   进行分类
                 Map<String, List<PaperDetailUnit>> paperUnitMap = sortUnitsByProperty(unitList);
-                List<PaperDetailUnit> newDetailUnits = new ArrayList<PaperDetailUnit>();
+                List<PaperDetailUnit> newDetailUnits = new ArrayList<>();
                 //获取公开简单数量
                 if (numberDto.getPublicSimple() > 0) {
                     Double needUnitScore = numberDto.getPublicSimple();
@@ -342,7 +342,7 @@ public class GenPaperService {
                     newDetailUnits = commonScoreList(needUnitScore, units, newDetailUnits, genPaperDto.getCreator());
                 }
                 //生成随机抽取的题号
-    		  /*List<Integer> questionsIndex = new ArrayList<Integer>();
+    		  /*List<Integer> questionsIndex = new ArrayList<>();
     			questionsIndex = CommonUtils.getRandom(questionsIndex, unitList.size(), unitList.size());
     			//定义随机抽题的数量
     			double lastScore = 0;
@@ -392,12 +392,12 @@ public class GenPaperService {
 
     //通过题目数量组卷
     private Map<String, Object> extractByQuestionNum(GenPaperDto genPaperDto, User user) {
-        Map<String, Object> paperMsgMap = new HashMap<String, Object>();
+        Map<String, Object> paperMsgMap = new HashMap<>();
         //获取所有试卷与抽题数
         Map<String, NumberDto> paperMap = genPaperDto.getSimpleParams();
         if (paperMap != null && paperMap.size() > 0) {
             //定义随机选中的小题集合
-            List<PaperDetailUnit> selectedUnits = new ArrayList<PaperDetailUnit>();
+            List<PaperDetailUnit> selectedUnits = new ArrayList<>();
             //将所有小题按questionId去重，并按试卷分类
             Map<String, List<PaperDetailUnit>> unitMap = sortUnitsByPaper(paperMap);
             //随机抽题
@@ -420,7 +420,7 @@ public class GenPaperService {
                 }
                 //将所有试题按照 公开度  和  难度   进行分类
                 Map<String, List<PaperDetailUnit>> paperUnitMap = sortUnitsByProperty(unitList);
-                List<PaperDetailUnit> newDetailUnits = new ArrayList<PaperDetailUnit>();
+                List<PaperDetailUnit> newDetailUnits = new ArrayList<>();
                 //获取公开简单数量
                 if (numberDto.getPublicSimple() > 0) {
                     Integer needUnits = Integer.valueOf(numberDto.getPublicSimple().intValue());
@@ -482,7 +482,7 @@ public class GenPaperService {
                     newDetailUnits = commonNumList(needUnits, units, newDetailUnits, genPaperDto.getCreator());
                 }
                 //生成随机抽取的题号
-    			/*List<Integer> questionsIndex = new ArrayList<Integer>();
+    			/*List<Integer> questionsIndex = new ArrayList<>();
     			questionsIndex = CommonUtils.getRandom(questionsIndex, unitList.size(), unitList.size());*/
                 //定义随机抽题的数量
     			/*int lastNumber = 0;
@@ -587,7 +587,7 @@ public class GenPaperService {
     private Map<String, List<PaperDetailUnit>> sortUnitsByPaper(Map<String, NumberDto> paperMap) {
         if (paperMap != null && paperMap.size() > 0) {
             //所有小题集合
-            List<PaperDetailUnit> oldUnits = new ArrayList<PaperDetailUnit>();
+            List<PaperDetailUnit> oldUnits = new ArrayList<>();
             //取到试卷id
             for (String paperId : paperMap.keySet()) {
                 //取到所有小题
@@ -596,13 +596,13 @@ public class GenPaperService {
                 oldUnits.addAll(unitList);
             }
             //如果是卷库来源，进行questionId去重
-            Set<PaperDetailUnit> spareUnits = new HashSet<PaperDetailUnit>();
+            Set<PaperDetailUnit> spareUnits = new HashSet<>();
             spareUnits.addAll(oldUnits);
-            Map<String, List<PaperDetailUnit>> map = new HashMap<String, List<PaperDetailUnit>>();
+            Map<String, List<PaperDetailUnit>> map = new HashMap<>();
             List<PaperDetailUnit> units = null;
             for (PaperDetailUnit unit : spareUnits) {
                 if (map.get(unit.getPaper().getId()) == null) {
-                    units = new ArrayList<PaperDetailUnit>();
+                    units = new ArrayList<>();
                 } else {
                     units = map.get(unit.getPaper().getId());
                 }
@@ -616,7 +616,7 @@ public class GenPaperService {
 
     //将试卷下面的所有小题按照 公开度  和   难度  进行分类
     private Map<String, List<PaperDetailUnit>> sortUnitsByProperty(List<PaperDetailUnit> units) {
-        Map<String, List<PaperDetailUnit>> map = new HashMap<String, List<PaperDetailUnit>>();
+        Map<String, List<PaperDetailUnit>> map = new HashMap<>();
         if (units != null && units.size() > 0) {
             for (PaperDetailUnit unit : units) {
                 Question question = unit.getQuestion();
@@ -631,7 +631,7 @@ public class GenPaperService {
                 if (map.get(key) != null && map.get(key).size() > 0) {
                     units2 = map.get(key);
                 } else {
-                    units2 = new ArrayList<PaperDetailUnit>();
+                    units2 = new ArrayList<>();
                 }
                 units2.add(unit);
                 map.put(key, units2);
@@ -727,7 +727,7 @@ public class GenPaperService {
 
     //把集合里面相同大题的小题分类
     private Map<String, List<PaperDetailUnit>> sortPaperDeatilUnit(List<PaperDetailUnit> selectedUnits) {
-        Map<String, List<PaperDetailUnit>> map = new HashMap<String, List<PaperDetailUnit>>();
+        Map<String, List<PaperDetailUnit>> map = new HashMap<>();
         List<PaperDetailUnit> units = null;
         if (selectedUnits != null && selectedUnits.size() > 0) {
             for (PaperDetailUnit unit : selectedUnits) {
@@ -735,7 +735,7 @@ public class GenPaperService {
                 if (map.get(name) != null) {
                     units = map.get(name);
                 } else {
-                    units = new ArrayList<PaperDetailUnit>();
+                    units = new ArrayList<>();
                 }
                 units.add(unit);
                 map.put(name, units);
@@ -886,8 +886,8 @@ public class GenPaperService {
     public Map<String, Object> genBluePaper(GenPaperDto genPaperDto) {
         log.debug("开始蓝图组卷.....");
         String msg = "";
-        Map<String, Object> paperMsgMap = new HashMap<String, Object>();
-        LinkedList<Question> questions = new LinkedList<Question>();
+        Map<String, Object> paperMsgMap = new HashMap<>();
+        LinkedList<Question> questions = new LinkedList<>();
         //查询试卷结构
         long start = System.currentTimeMillis();
         PaperStruct paperStruct = Model.of(paperStructRepo.findById(genPaperDto.getPaperStructId()));
@@ -896,20 +896,20 @@ public class GenPaperService {
             return paperMsgMap;
         }
         PaperContext paperContext = new PaperContext(paperStruct, genPaperDto.getConditions());
-        List<UnitContext> unitContexts = new LinkedList<UnitContext>();
+        List<UnitContext> unitContexts = new LinkedList<>();
         List<DetailContext> detailContexts = paperContext.getDetails();
         for (DetailContext dc : detailContexts) {
             unitContexts.addAll(dc.getUnits());
         }
         List<Paper> papers = (List<Paper>) paperRepo.findByIdIn(genPaperDto.getPaperIds());
-        List<PaperDetailUnit> unitList = new ArrayList<PaperDetailUnit>();
+        List<PaperDetailUnit> unitList = new ArrayList<>();
         for (Paper oldPaper : papers) {
             //unitList.addAll(unitRepo.findByPaperOrderByNumber(oldPaper));
             for (PaperDetailUnit paperDetailUnit : unitRepo.findByPaperOrderByNumber(oldPaper)) {
                 unitList.add(paperDetailUnit);
             }
         }
-        Set<PaperDetailUnit> spareUnits = new HashSet<PaperDetailUnit>();
+        Set<PaperDetailUnit> spareUnits = new HashSet<>();
         spareUnits.addAll(unitList);
         long total = (System.currentTimeMillis() - start) / 1000;
         log.debug("total:" + total);
@@ -929,7 +929,7 @@ public class GenPaperService {
             questions.add(question);
         }*/
 
-        List<String> oIds = new ArrayList<String>();
+        List<String> oIds = new ArrayList<>();
         for (PaperDetailUnit unit : spareUnits) {
             oIds.add(unit.getQuestion().getId());
         }
@@ -1023,7 +1023,7 @@ public class GenPaperService {
      * @return
      */
     private List<String> bulidGroup(Question question) {
-        List<String> propertyGroups = new ArrayList<String>();
+        List<String> propertyGroups = new ArrayList<>();
         propertyGroups.add(String.valueOf(question.getPublicity()) + "-" + question.getDifficulty());
         return propertyGroups;
     }
@@ -1035,7 +1035,7 @@ public class GenPaperService {
      */
     private List<String> bulidPropertyGroup(Question question) {
         String propertyGroup = null;
-        List<String> propertyGroups = new ArrayList<String>();
+        List<String> propertyGroups = new ArrayList<>();
         //获取试题关联的多组属性
         List<QuesProperty> quesProperties = question.getQuesProperties();
         if (quesProperties != null && quesProperties.size() > 0) {

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

@@ -356,7 +356,7 @@ public class PaperServiceImpl implements PaperService {
     }
 
     public Set<String> listGroupCodes(long examId, String courseCode) {
-        Set<String> groupSet = new HashSet<String>();
+        Set<String> groupSet = new HashSet<>();
         ExamPaper examPaper = new ExamPaper();
         examPaper.setExamId(examId);
         examPaper.setCourseCode(courseCode);
@@ -392,11 +392,11 @@ public class PaperServiceImpl implements PaperService {
      */
     @SuppressWarnings("unchecked")
     public Map<String, Object> deletePapers(List<String> paperIds) {
-        Map<String, Object> msgMap = new HashMap<String, Object>();
+        Map<String, Object> msgMap = new HashMap<>();
         String msg = "";
         List<Paper> papers = CommonUtils.toList(paperRepo.findByIdIn(paperIds));
         if (papers.get(0).getPaperType() == PaperType.IMPORT) {
-            List<Question> quesList = new ArrayList<Question>();
+            List<Question> quesList = new ArrayList<>();
             for (Paper paper : papers) {
                 List<PaperDetailUnit> paperUnits = paperDetailUnitRepo.findByPaperOrderByNumber(paper);
                 for (PaperDetailUnit pdu : paperUnits) {
@@ -597,7 +597,7 @@ public class PaperServiceImpl implements PaperService {
                         if (subQuesList != null && subQuesList.size() > 0) {
                             int index = 0;
                             for (Question subQues : subQuesList) {
-                                Map<String, String> params = new HashMap<String, String>();
+                                Map<String, String> params = new HashMap<>();
                                 params.put("number", String.valueOf(++index));
                                 subQues.setQuesParams(params);
                                 quesService.formatQuesUnit(subQues);
@@ -745,7 +745,7 @@ public class PaperServiceImpl implements PaperService {
      * @param paper
      */
     private Map<String, Object> reSetPaperDetail(Paper paper) {
-        Map<String, Object> paperInfoMap = new HashMap<String, Object>();
+        Map<String, Object> paperInfoMap = new HashMap<>();
         int allQuesCount = 0;
         List<PaperDetail> paperDetails = paperDetailRepo.findByPaperOrderByNumber(paper);
         // 计算各大题总分和小题数量
@@ -1102,7 +1102,7 @@ public class PaperServiceImpl implements PaperService {
                 if (messageMap != null) {
                     return messageMap;
                 }
-                messageMap = new HashMap<String, String>();
+                messageMap = new HashMap<>();
             } else {
                 messageMap.put("errorMsg", fileName + "文件名称不对，无法识别为题干或选项 ");
                 return messageMap;
@@ -1115,7 +1115,7 @@ public class PaperServiceImpl implements PaperService {
 
     //判断选项
     public Map<String, String> checkOptions(List<PaperDetailUnit> paperDetailUnits, String fileNames[], String fileName) {
-        Map<String, String> messageMap = new HashMap<String, String>();
+        Map<String, String> messageMap = new HashMap<>();
         for (PaperDetailUnit paperDetailUnit : paperDetailUnits) {
             if (paperDetailUnit.getNumber().toString().equals(fileNames[0])) {
                 //判断是否为选择题
@@ -1310,10 +1310,10 @@ public class PaperServiceImpl implements PaperService {
     @Override
     public Map<String, Object> getPaperPDF(String paperId, String type) {
         PaperExp paperExp = getPaperDto(paperId);
-        Map<String, Object> map = new HashMap<String, Object>();
+        Map<String, Object> map = new HashMap<>();
         map.put("courseName", paperExp.getCourseName());
         map.put("courseNo", paperExp.getCourseNo());
-        List<String> htmlList = new ArrayList<String>();
+        List<String> htmlList = new ArrayList<>();
         if (paperExp.getPaperDetails() != null && paperExp.getPaperDetails().size() > 0) {
             for (PaperDetailExp paperDetail : paperExp.getPaperDetails()) {
                 //添加大题标题
@@ -1440,7 +1440,7 @@ public class PaperServiceImpl implements PaperService {
 
     public List<PaperDetailExp> buildPaperDetailExp(List<PaperDetailExp> objectiveDetails) {
         //1.得到所有客观题大题的类型
-        Set<QuesStructType> types = new HashSet<QuesStructType>();
+        Set<QuesStructType> types = new HashSet<>();
         for (PaperDetailExp paperDetailExp : objectiveDetails) {
             types.add(QuesStructType.getQuesStructTypeById(paperDetailExp.getSortNumber()));
         }

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

@@ -46,7 +46,7 @@ public class PropertyServiceImpl implements PropertyService {
 
     @Override
     public List<PropertyDto> propertyDtos(Long coursePropertyId, User user) {
-        List<PropertyDto> propertyDtos = new ArrayList<PropertyDto>();
+        List<PropertyDto> propertyDtos = new ArrayList<>();
         //查询所有父节点对象
         List<Property> propertieParents = propertyRepo.findByOrgIdAndCoursePropertyIdAndParentIdOrderByNumber(user.getRootOrgId(), coursePropertyId, 0l);
         if (propertieParents != null && propertieParents.size() > 0) {
@@ -55,7 +55,7 @@ public class PropertyServiceImpl implements PropertyService {
                 //查询所有子节点对象
                 List<Property> propertiesSons = propertyRepo.findByOrgIdAndCoursePropertyIdAndParentIdOrderByNumber(user.getRootOrgId(), coursePropertyId, property.getId());
                 if (propertiesSons != null && propertiesSons.size() > 0) {
-                    List<PropertyDto> propertyDtosSons = new ArrayList<PropertyDto>();
+                    List<PropertyDto> propertyDtosSons = new ArrayList<>();
                     for (Property property2 : propertiesSons) {
                         PropertyDto propertyDto2 = new PropertyDto(property2);
                         propertyDtosSons.add(propertyDto2);
@@ -113,7 +113,7 @@ public class PropertyServiceImpl implements PropertyService {
     @Override
     public List<Property> findAll(Long coursePropertyId, User user) {
         List<PropertyDto> propertyDtos = propertyDtos(coursePropertyId, user);
-        List<Property> properties = new ArrayList<Property>();
+        List<Property> properties = new ArrayList<>();
         if (propertyDtos != null && propertyDtos.size() > 0) {
             for (PropertyDto propertyDto : propertyDtos) {
                 Property property = new Property(propertyDto);

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

@@ -114,7 +114,7 @@ public class QuestionAudioServiceImpl implements QuestionAudioService {
     }
 
     private String getFileNames(String str, Question question) {
-        Map<String, String> map = new LinkedHashMap<String, String>();
+        Map<String, String> map = new LinkedHashMap<>();
         Pattern p = Pattern.compile("<a\\s+[^<>]*\\s+name=\"([^<>\"]*)\"[^<>]*>");
         Matcher m = p.matcher(str);
         int i = 1;

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

@@ -99,7 +99,7 @@ public class QuestionProviderServiceImpl implements QuestionProviderService {
             question.setQuesBody(defaultQuestionStructure.getBody());
             question.setQuestionType(QuesStructType.NESTED_ANSWER_QUESTION);
             //生成子题
-            List<Question> subList = new ArrayList<Question>();
+            List<Question> subList = new ArrayList<>();
             for (DefaultQuestionUnit defaultQuestionUnit : questionUnitList) {
                 Question subQues = new Question();
                 subQues.setId(UUID.randomUUID().toString());
@@ -157,7 +157,7 @@ public class QuestionProviderServiceImpl implements QuestionProviderService {
 
     //构建选择题选项
     private List<QuesOption> buildOptions(List<DefaultQuestionOption> questionOptionList, String[] rightAnswer) {
-        List<QuesOption> quesOptions = new ArrayList<QuesOption>();
+        List<QuesOption> quesOptions = new ArrayList<>();
         for (int i = 0; i < questionOptionList.size(); i++) {
             DefaultQuestionOption defaultQuestionOption = questionOptionList.get(i);
             QuesOption option = new QuesOption();
@@ -263,7 +263,7 @@ public class QuestionProviderServiceImpl implements QuestionProviderService {
     }
 
     private List<DefaultQuestion> buildDefaultQuestions(List<Question> questionList) {
-        List<DefaultQuestion> defaultQuestions = new ArrayList<DefaultQuestion>();
+        List<DefaultQuestion> defaultQuestions = new ArrayList<>();
         if (questionList != null && questionList.size() > 0) {
             for (Question question : questionList) {
                 DefaultQuestion defaultQuestion = getDefaultQuestion(question);
@@ -278,7 +278,7 @@ public class QuestionProviderServiceImpl implements QuestionProviderService {
         if (question != null) {
             DefaultQuestionStructure defaultQuestionStructure = new DefaultQuestionStructure();
             //生成新的题单元集合
-            List<DefaultQuestionUnit> questionUnitList = new ArrayList<DefaultQuestionUnit>();
+            List<DefaultQuestionUnit> questionUnitList = new ArrayList<>();
             if (question.getQuestionType() == QuesStructType.NESTED_ANSWER_QUESTION) {
                 defaultQuestionStructure.setBody(question.getQuesBody());
                 //获取套题下面所有子题
@@ -319,7 +319,7 @@ public class QuestionProviderServiceImpl implements QuestionProviderService {
         defaultQuestionUnit.setAnswerType(question.getAnswerType());//作答类型
         //如果是单选或者多选，添加选项和答案转换
         if (question.getQuestionType() == QuesStructType.SINGLE_ANSWER_QUESTION || question.getQuestionType() == QuesStructType.MULTIPLE_ANSWER_QUESTION) {
-            List<DefaultQuestionOption> defaultQuestionOptions = new ArrayList<DefaultQuestionOption>();
+            List<DefaultQuestionOption> defaultQuestionOptions = new ArrayList<>();
             List<QuesOption> quesOptions = question.getQuesOptions();
             if (quesOptions != null && quesOptions.size() > 0) {
                 for (int i = 0; i < quesOptions.size(); i++) {
@@ -371,7 +371,7 @@ public class QuestionProviderServiceImpl implements QuestionProviderService {
      */
     private String[] getSelectQuestionAnswer(List<QuesOption> quesOptions) {
         String[] rightAnswer = null;
-        List<String> list = new ArrayList<String>();
+        List<String> list = new ArrayList<>();
         if (quesOptions != null && quesOptions.size() > 0) {
             for (int i = 0; i < quesOptions.size(); i++) {
                 QuesOption quesOption = quesOptions.get(i);
@@ -419,7 +419,7 @@ public class QuestionProviderServiceImpl implements QuestionProviderService {
     @Override
     public String saveList(List<DefaultQuestion> defaultQuestions) {
         if (defaultQuestions != null && defaultQuestions.size() > 0) {
-            List<Question> questions = new ArrayList<Question>();
+            List<Question> questions = new ArrayList<>();
             for (DefaultQuestion defaultQuestion : defaultQuestions) {
                 Question question = new Question();
                 if (!StringUtils.isBlank(defaultQuestion.getId())) {
@@ -480,7 +480,7 @@ public class QuestionProviderServiceImpl implements QuestionProviderService {
                     question.setQuesBody(defaultQuestionStructure.getBody());
                     question.setQuestionType(QuesStructType.NESTED_ANSWER_QUESTION);
                     //生成子题
-                    List<Question> subList = new ArrayList<Question>();
+                    List<Question> subList = new ArrayList<>();
                     for (DefaultQuestionUnit defaultQuestionUnit : questionUnitList) {
                         Question subQues = new Question();
                         subQues.setId(UUID.randomUUID().toString());
@@ -529,7 +529,7 @@ public class QuestionProviderServiceImpl implements QuestionProviderService {
         if (questions == null || questions.size() < 1) {
             throw new StatusException("Q-012515", "questions is null");
         }
-        List<DefaultQuestion> defaultQuestions = new ArrayList<DefaultQuestion>();
+        List<DefaultQuestion> defaultQuestions = new ArrayList<>();
         for (Question question : questions) {
             DefaultQuestion defaultQuestion = getDefaultQuestion(question);
             defaultQuestions.add(defaultQuestion);

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/temp/DdCollegeUtilService.java

@@ -751,6 +751,69 @@ import cn.com.qmth.examcloud.core.questions.service.temp.vo.TestQuestionInfo;
  * @param str
  * @return
  * @throws UnsupportedEncodingException
+ * <p>
+ * 根据课程代码查询所有试卷
+ * @param codeName
+ * @return
+ * @throws UnsupportedEncodingException
+ * <p>
+ * 根据考试id查询所有试题
+ * @param testPaperContentId
+ * @return 根据父ID查询子题
+ * @param parentId
+ * @return 初始化试卷对象
+ * @param paper
+ * @param paperName
+ * @param user
+ * <p>
+ * 初始化大题对象
+ * @param testQuestion
+ * @return 初始化试题对象
+ * @param testQuestionInfo
+ * @param testQuestion
+ * @param course
+ * @param map
+ * @return
+ * @throws Exception
+ * <p>
+ * 初始化题干，答案，选项,资源
+ * @param question
+ * @param testQuestionInfo
+ * @param map
+ * @throws Exception
+ * <p>
+ * 初始化选项
+ * @param testOption
+ * @param number
+ * @param isCorrect
+ * @param wordMLPackage
+ * @return
+ * @throws Exception
+ * <p>
+ * 完形填空初始化所有子题
+ * @param blanks
+ * @param wordMLPackage
+ * @return
+ * @throws Exception
+ * <p>
+ * 初始化小题对象
+ * @param question
+ * @return 将大题和小题分类
+ * @param questions
+ * @return 去除图片中有下划线的图片，并补全图片下载地址
+ * @param str
+ * @return
+ * @throws Exception
+ * <p>
+ * 去除<span>标签中lang=EN-US
+ * @param str
+ * @return 替换img标签，补全图片
+ * @param imgList
+ * @param str
+ * @return 將url路徑中的中文转码
+ * @param str
+ * @return
+ * @throws UnsupportedEncodingException
  *//*
 @Service("ddCollegeUtilService")
 public class DdCollegeUtilService {
@@ -780,7 +843,7 @@ public class DdCollegeUtilService {
 	public void importPaper(String orgId,String courseCode,int type) throws Exception {
 		//查询课程
 		Course course = courseRepo.findFirstByCodeAndOrgId(courseCode,orgId);
-		List<TestPaper> papers = new ArrayList<TestPaper>();
+		List<TestPaper> papers = new ArrayList<>();
 		if(type == 1){
 			
 			TestPaper testPaper2  = new TestPaper();
@@ -804,11 +867,11 @@ public class DdCollegeUtilService {
 					//初始化试卷
 					Paper paper = initPaper(testPaper,orgId,course,map);
 					//定义大题集合
-					List<PaperDetail> paperDetails = new ArrayList<PaperDetail>();
+					List<PaperDetail> paperDetails = new ArrayList<>();
 					//定义小题集合
-					List<PaperDetailUnit> paperDetailUnits = new ArrayList<PaperDetailUnit>();
+					List<PaperDetailUnit> paperDetailUnits = new ArrayList<>();
 					//试题---资源 对应关系
-					Map<Question, QuestionPkgPath> map2 = new HashMap<Question, QuestionPkgPath>();
+					Map<Question, QuestionPkgPath> map2 = new HashMap<>();
 					//定义试卷难度
 					double difficulty = 0;
 					int error = 1;
@@ -845,13 +908,13 @@ public class DdCollegeUtilService {
 					Double difficultyDegree = b.setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue();
 					paper.setDifficultyDegree(0.5);
 					//重新计算试题序号
-					Map<PaperDetail, List<PaperDetailUnit>> map3 = new LinkedHashMap<PaperDetail, List<PaperDetailUnit>>();
+					Map<PaperDetail, List<PaperDetailUnit>> map3 = new LinkedHashMap<>();
 					List<PaperDetailUnit> newList = null;
 					for(PaperDetail paperDetail:paperDetails){
 						for(PaperDetailUnit paperDetailUnit:paperDetailUnits){
 							if(paperDetail.getName().equals(paperDetailUnit.getPaperDetail().getName())){
 								if(map3.get(paperDetail) == null){
-									newList = new ArrayList<PaperDetailUnit>();
+									newList = new ArrayList<>();
 									newList.add(paperDetailUnit);
 								}else {
 									newList = map3.get(paperDetail);
@@ -1433,7 +1496,7 @@ public class DdCollegeUtilService {
  *//*
     public Map<Integer, List<TestQuestion>> sortPaperDetail(List<TestQuestion> questions){
     	if(questions != null && questions.size()>0){
-    		Map<Integer, List<TestQuestion>> map = new HashMap<Integer, List<TestQuestion>>();
+    		Map<Integer, List<TestQuestion>> map = new HashMap<>();
     		List<TestQuestion> sortQuestions = null;
     		for(TestQuestion testQuestion:questions){
     			if(map.get(testQuestion.getdNumber()) == null){
@@ -1457,7 +1520,7 @@ public class DdCollegeUtilService {
  * @throws Exception
  *//*
     public LinkedHashMap<String, String> imgList(String str) throws Exception{
-    	LinkedHashMap<String, String> map = new LinkedHashMap<String, String>();
+    	LinkedHashMap<String, String> map = new LinkedHashMap<>();
     	//获取img标签
 		List<String> srcList = ImgDataUtils.parseImages(str);
 		if(srcList!=null && srcList.size()>0){

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/temp/DdExcelService.java

@@ -578,7 +578,7 @@ public class DdExcelService {
             }
 
             //定义试卷集合
-            Set<String> ids = new HashSet<String>();
+            Set<String> ids = new HashSet<>();
 
             //获取试卷
             List<ExamPaper> examPaperList = tempConfig.getExamPaperList();