uuid replaceAll '-'

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

@@ -0,0 +1,11 @@
+package cn.com.qmth.examcloud.core.questions.base;
+
+import java.util.UUID;
+
+public class IdUtils {
+
+    public static String uuid() {
+        return UUID.randomUUID().toString().replaceAll("-", "");
+    }
+
+}

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

@@ -1,6 +1,7 @@
 package cn.com.qmth.examcloud.core.questions.base.word;
 
 import cn.com.qmth.examcloud.core.questions.base.CommonUtils;
+import cn.com.qmth.examcloud.core.questions.base.IdUtils;
 import cn.com.qmth.examcloud.core.questions.base.IoUtils;
 import cn.com.qmth.examcloud.core.questions.base.ZipUtils;
 import cn.com.qmth.examcloud.core.questions.base.enums.QuesUnit;
@@ -61,7 +62,10 @@ import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 import java.awt.image.BufferedImage;
 import java.io.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.zip.ZipOutputStream;
@@ -243,7 +247,7 @@ public final class DocxProcessUtil {
         htmlSettings.setImageDirPath(TEMP_FILE_IMP + "_files");
         htmlSettings.setImageTargetUri(TEMP_FILE_IMP.substring(TEMP_FILE_IMP.lastIndexOf("/") + 1) + "_files");
         htmlSettings.setWmlPackage(wordMLPackage);
-        String tmpHtmlPath = TEMP_FILE_IMP + UUID.randomUUID().toString() + ".html";
+        String tmpHtmlPath = TEMP_FILE_IMP + IdUtils.uuid() + ".html";
         File tmpHtml = new File(tmpHtmlPath);
         OutputStream os = new FileOutputStream(tmpHtml);
         Docx4J.toHTML(htmlSettings, os, Docx4J.FLAG_EXPORT_PREFER_XSL);
@@ -500,8 +504,8 @@ public final class DocxProcessUtil {
         File imgFile = null;
         FileOutputStream xmlFos = null;
         byte[] base64Byte = new byte[0];
-        xmlFile = new File(TEMP_FILE_IMP, UUID.randomUUID().toString());
-        imgFile = new File(TEMP_FILE_IMP, UUID.randomUUID().toString());
+        xmlFile = new File(TEMP_FILE_IMP, IdUtils.uuid());
+        imgFile = new File(TEMP_FILE_IMP, IdUtils.uuid());
         xmlFos = new FileOutputStream(xmlFile);
         IOUtils.write(mathMlStr, xmlFos, ENCODING);
         xmlFos.flush();

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

@@ -2,10 +2,7 @@ package cn.com.qmth.examcloud.core.questions.service;
 
 import cn.com.qmth.examcloud.api.commons.security.bean.User;
 import cn.com.qmth.examcloud.commons.exception.StatusException;
-import cn.com.qmth.examcloud.core.questions.base.BeanCopierUtil;
-import cn.com.qmth.examcloud.core.questions.base.CommonUtils;
-import cn.com.qmth.examcloud.core.questions.base.IoUtils;
-import cn.com.qmth.examcloud.core.questions.base.Model;
+import cn.com.qmth.examcloud.core.questions.base.*;
 import cn.com.qmth.examcloud.core.questions.base.enums.PaperStatus;
 import cn.com.qmth.examcloud.core.questions.base.enums.PaperType;
 import cn.com.qmth.examcloud.core.questions.base.enums.QuesUnit;
@@ -1254,7 +1251,7 @@ public class ImportPaperService {
                     throw new PaperException(importPaperCheck.getErrorInfo());
                 }
                 subQues = new Question();
-                subQues.setId(UUID.randomUUID().toString());
+                subQues.setId(IdUtils.uuid());
                 subQues.setQuestionType(getQuesStructType(nestedQuesType));
                 if (StringUtils.isNumeric(importPaperCheck.getQuesScore())) {
                     subQues.setScore(Double.parseDouble(importPaperCheck.getQuesScore()));
@@ -1469,7 +1466,7 @@ public class ImportPaperService {
         paper.setCourseNo(courseNo);
         initPaper(paper, paperName, user);
         PaperDetail pd = new PaperDetail();
-        pd.setId(UUID.randomUUID().toString());
+        pd.setId(IdUtils.uuid());
         pd.setNumber(1);
         pd.setPaper(paper);
         pd.setCreator(user.getDisplayName());

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

@@ -1,5 +1,6 @@
 package cn.com.qmth.examcloud.core.questions.service.bean.context;
 
+import cn.com.qmth.examcloud.core.questions.base.IdUtils;
 import cn.com.qmth.examcloud.core.questions.dao.entity.*;
 import cn.com.qmth.examcloud.core.questions.service.bean.condition.Condition;
 
@@ -40,7 +41,7 @@ public class DetailContext extends Context {
         Map<PaperDetail, List<PaperDetailUnit>> detailMap = new HashMap<>();
         PaperDetail pd = new PaperDetail();
         List<PaperDetailUnit> unitList = new ArrayList<>();
-        pd.setId(UUID.randomUUID().toString());
+        pd.setId(IdUtils.uuid());
         for (int i = 0; i < units.size(); i++) {
             UnitContext uc = units.get(i);
             PaperDetailUnit pdu = uc.build(uc.getUnitStruct());

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

@@ -1,10 +1,14 @@
 package cn.com.qmth.examcloud.core.questions.service.bean.context;
 
+import cn.com.qmth.examcloud.core.questions.base.IdUtils;
 import cn.com.qmth.examcloud.core.questions.base.enums.PaperType;
 import cn.com.qmth.examcloud.core.questions.dao.entity.*;
 import cn.com.qmth.examcloud.core.questions.service.bean.condition.Condition;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
 
 public class PaperContext extends Context {
 
@@ -32,7 +36,7 @@ public class PaperContext extends Context {
     public List<Object> build(PaperStruct paperStruct) {
         List<Object> list = new ArrayList<>();
         Paper paper = new Paper();
-        paper.setId(UUID.randomUUID().toString());
+        paper.setId(IdUtils.uuid());
         paper.setPaperDetailCount(details.size());
         paper.setTotalScore(paperStruct.getTotalScore());
         paper.setPaperType(PaperType.GENERATE);

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

@@ -1,5 +1,6 @@
 package cn.com.qmth.examcloud.core.questions.service.bean.context;
 
+import cn.com.qmth.examcloud.core.questions.base.IdUtils;
 import cn.com.qmth.examcloud.core.questions.base.enums.PaperType;
 import cn.com.qmth.examcloud.core.questions.dao.entity.PaperDetailUnit;
 import cn.com.qmth.examcloud.core.questions.dao.entity.PaperDetailUnitStruct;
@@ -7,7 +8,6 @@ import cn.com.qmth.examcloud.core.questions.dao.entity.Question;
 import cn.com.qmth.examcloud.core.questions.service.bean.condition.Condition;
 
 import java.util.List;
-import java.util.UUID;
 
 public class UnitContext extends Context {
 
@@ -37,7 +37,7 @@ public class UnitContext extends Context {
 
     public PaperDetailUnit build(PaperDetailUnitStruct unitStruct) {
         PaperDetailUnit pdu = new PaperDetailUnit();
-        pdu.setId(UUID.randomUUID().toString());
+        pdu.setId(IdUtils.uuid());
         pdu.setQuestionType(unitStruct.getQuestionType());
         pdu.setScore(unitStruct.getScore());
         pdu.setNumber(unitStruct.getNumber());

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

@@ -4,6 +4,7 @@ import cn.com.qmth.examcloud.api.commons.security.bean.User;
 import cn.com.qmth.examcloud.commons.logging.ExamCloudLog;
 import cn.com.qmth.examcloud.commons.logging.ExamCloudLogFactory;
 import cn.com.qmth.examcloud.core.questions.base.CommonUtils;
+import cn.com.qmth.examcloud.core.questions.base.IdUtils;
 import cn.com.qmth.examcloud.core.questions.base.Model;
 import cn.com.qmth.examcloud.core.questions.base.enums.PaperStructType;
 import cn.com.qmth.examcloud.core.questions.base.enums.PaperType;
@@ -781,7 +782,7 @@ public class GenPaperService {
                 BigDecimal b2 = BigDecimal.valueOf(pd.getScore() == null ? 0d : pd.getScore());
                 b1 = b1.add(b2);
             }
-            paper.setId(UUID.randomUUID().toString());
+            paper.setId(IdUtils.uuid());
             paper.setName(genPaperDto.getPaperName());
             paper.setCourseNo(genPaperDto.getCourseNo());
             paper.setCourseName(genPaperDto.getCourseName());

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

@@ -2,6 +2,7 @@ package cn.com.qmth.examcloud.core.questions.service.impl;
 
 import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.core.questions.base.CommonUtils;
+import cn.com.qmth.examcloud.core.questions.base.IdUtils;
 import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
 import cn.com.qmth.examcloud.core.questions.dao.QuesRepo;
 import cn.com.qmth.examcloud.core.questions.dao.entity.Course;
@@ -102,7 +103,7 @@ public class QuestionProviderServiceImpl implements QuestionProviderService {
             List<Question> subList = new ArrayList<>();
             for (DefaultQuestionUnit defaultQuestionUnit : questionUnitList) {
                 Question subQues = new Question();
-                subQues.setId(UUID.randomUUID().toString());
+                subQues.setId(IdUtils.uuid());
                 subQues.setDifficulty("中");
                 subQues.setDifficultyDegree(0.5);
                 subQues.setPublicity(true);
@@ -483,7 +484,7 @@ public class QuestionProviderServiceImpl implements QuestionProviderService {
                     List<Question> subList = new ArrayList<>();
                     for (DefaultQuestionUnit defaultQuestionUnit : questionUnitList) {
                         Question subQues = new Question();
-                        subQues.setId(UUID.randomUUID().toString());
+                        subQues.setId(IdUtils.uuid());
                         subQues.setDifficulty("中");
                         subQues.setDifficultyDegree(0.5);
                         subQues.setPublicity(true);

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

@@ -1,6 +1,7 @@
 package cn.com.qmth.examcloud.core.questions.service.temp;
 
 import cn.com.qmth.examcloud.core.questions.base.CommonUtils;
+import cn.com.qmth.examcloud.core.questions.base.IdUtils;
 import cn.com.qmth.examcloud.core.questions.base.enums.PaperStatus;
 import cn.com.qmth.examcloud.core.questions.base.enums.PaperType;
 import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
@@ -25,7 +26,10 @@ import javax.xml.parsers.DocumentBuilderFactory;
 import java.io.File;
 import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -447,7 +451,7 @@ public class CqdxService {
                     for (int s = 0; s < subQuesCount; s++) {
                         QuestionsTemp subQuesTmp = (QuestionsTemp) quesTemp.getSubQues().get(String.valueOf(s + 1));
                         Question subQuestion = new Question();
-                        subQuestion.setId(UUID.randomUUID().toString());
+                        subQuestion.setId(IdUtils.uuid());
                         subQuestion.setQuestionType(subQuesTmp.getType());
                         subQuestion.setDifficulty("中");
                         subQuestion.setDifficultyDegree(0.5);

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

@@ -1388,7 +1388,7 @@ public class DdCollegeUtilService {
     		//int number = 1;
     		for(TestFillAnswer testFillAnswer:blanks){
     			Question question = new Question();
-    			question.setId(UUID.randomUUID().toString());
+    			question.setId(IdUtils.uuid());
     			question.setQuestionType(QuesStructType.SINGLE_ANSWER_QUESTION);
     			question.setDifficulty("中");
     	    	question.setDifficultyDegree(0.5);
@@ -1433,7 +1433,7 @@ public class DdCollegeUtilService {
     		List<TestFillAnswer> blanks = testQuestionInfo.getBlanks();
     		for(TestFillAnswer testFillAnswer:blanks){
     			Question subQuestion = new Question();
-    			subQuestion.setId(UUID.randomUUID().toString());
+    			subQuestion.setId(IdUtils.uuid());
     			subQuestion.setQuestionType(QuesStructType.SINGLE_ANSWER_QUESTION);
     			subQuestion.setDifficulty("中");
     			subQuestion.setDifficultyDegree(0.5);