update

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

@@ -5,14 +5,14 @@ import java.util.List;
 
 public class CombinationUtils {
 
-    private static List<String> combineList = new ArrayList<String>();
+    private static List<String> combineList = new ArrayList<>();
 
     public static List<Integer> combiantion(List<Integer> numbers, int needNum, int needNestNum) {
-        List<Integer> returnList = new ArrayList<Integer>();
+        List<Integer> returnList = new ArrayList<>();
         if (numbers == null || numbers.size() == 0) {
             return null;
         }
-        List<Integer> list = new ArrayList<Integer>();
+        List<Integer> list = new ArrayList<>();
         for (int i = 1; i <= numbers.size(); i++) {
             combine(numbers, 0, i, list);
         }
@@ -49,16 +49,17 @@ public class CombinationUtils {
     }
 
     private static List<Integer> sum(String str, int needNum, int needNestNum) {
-        List<Integer> list = new ArrayList<Integer>();
-        List<Integer> tempList = new ArrayList<Integer>();
+        List<Integer> list = new ArrayList<>();
+        List<Integer> tempList = new ArrayList<>();
         String[] strs = str.replaceAll("\\[", "").replaceAll("\\]", "").split(",");
         Integer sum = 0;
         if (strs.length == needNestNum) {
             for (String intStr : strs) {
-                intStr = intStr.trim();
-                sum += Integer.valueOf(intStr);
-                tempList.add(Integer.valueOf(intStr));
+                Integer val = Integer.parseInt(intStr.trim());
 
+                sum += val;
+
+                tempList.add(val);
             }
             if (sum <= needNum) {
                 list.addAll(tempList);
@@ -67,4 +68,5 @@ public class CombinationUtils {
 
         return list;
     }
+
 }

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

@@ -344,6 +344,7 @@ public final class CommonUtils {
     public static String toCHNum(int inputNum) {
         String resultNum = "";
         String numStr = String.valueOf(inputNum);
+
         int len = numStr.length();
         for (int i = 0; i < len; i++) {
             int tmpNum = numStr.charAt(i) - '0';
@@ -353,6 +354,7 @@ public final class CommonUtils {
                 resultNum += CN_SMALL_NUM[tmpNum];
             }
         }
+
         if (resultNum.contains("零")) {
             resultNum = resultNum.replaceAll("零{1,}", "零");
         }
@@ -362,14 +364,16 @@ public final class CommonUtils {
         if (resultNum.startsWith("一十")) {
             resultNum = resultNum.replaceFirst("一十", "十");
         }
+
         while (StringUtils.countMatches(resultNum, "万") > 1) {
             resultNum = resultNum.replaceFirst("万", "");
         }
+
         while (StringUtils.countMatches(resultNum, "亿") > 1) {
             resultNum = resultNum.replaceFirst("亿", "");
         }
-        return resultNum;
 
+        return resultNum;
     }
 
     /**
@@ -459,18 +463,18 @@ public final class CommonUtils {
      * @throws DocumentException
      */
     public static List<String> getAttrValueFromString(String htmlString, String flagName, String attrName) {
-        List<String> idValues = new ArrayList<String>();
+        List<String> idValues = new ArrayList<>();
         try {
             Document document = DocumentHelper.parseText(htmlString);
             Element rootElement = document.getRootElement();
-            List<Element> nodes = new ArrayList<Element>();
+            List<Element> nodes = new ArrayList<>();
             if (flagName.equals(rootElement.getName())) {
                 nodes.add(rootElement);
             } else {
                 nodes = rootElement.elements(flagName);
             }
             for (Iterator<Element> itr = nodes.iterator(); itr.hasNext(); ) {
-                Element element = (Element) itr.next();
+                Element element = itr.next();
                 Attribute attr = element.attribute(attrName);
                 idValues.add(attr.getValue());
             }
@@ -487,7 +491,7 @@ public final class CommonUtils {
      * @return
      */
     public static List<String> getTagANames(String htmlString) {
-        List<String> list = new ArrayList<String>();
+        List<String> list = new ArrayList<>();
         Pattern p = Pattern.compile("<a[^<>]*\\s+id=\"([0-9A-Za-z-_.]+)\"\\s*");
         Matcher m = p.matcher(htmlString);
         while (m.find()) {
@@ -504,7 +508,7 @@ public final class CommonUtils {
      * @return
      */
     public static List<String> getTagANames2(String htmlString) {
-        List<String> list = new ArrayList<String>();
+        List<String> list = new ArrayList<>();
         Pattern p = Pattern.compile("<a[^<>]*\\s+name=\"([0-9A-Za-z-_.]+)\"\\s*");
         Matcher m = p.matcher(htmlString);
         while (m.find()) {

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

@@ -16,7 +16,7 @@ import java.util.Optional;
 public class Model {
 
     public static <T> T of(Optional<T> optional) {
-        if (optional != null && optional.isPresent()) {
+        if (optional.isPresent()) {
             return optional.get();
         }
         return null;

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

@@ -438,18 +438,21 @@ public final class DocxProcessUtil {
         if (!htmlStr.startsWith("<p>")) {
             return htmlStr;
         }
+
         try {
             org.jsoup.nodes.Document doc = Jsoup.parse(htmlStr);
-            String textStr = "";
+            StringBuilder textStr = new StringBuilder();
             Elements links = doc.select("p").removeAttr("img");
 
             for (Element link : links) {
-                textStr += link.text().trim();
+                textStr.append(link.text().trim());
             }
-            return textStr;
+
+            return textStr.toString();
         } catch (Exception e) {
             logger.error(e.getMessage(), e);
         }
+
         return htmlStr;
     }
 
@@ -734,7 +737,7 @@ public final class DocxProcessUtil {
             RelationshipsPart rp = wp.getMainDocumentPart().getRelationshipsPart();
             List<Relationship> relationships = rp.getRelationshipsByType(Namespaces.IMAGE);
 
-            List<Part> parts = new ArrayList<Part>();
+            List<Part> parts = new ArrayList<>();
             for (Relationship relationship : relationships) {
                 parts.add(rp.getPart(relationship));
             }
@@ -973,7 +976,7 @@ public final class DocxProcessUtil {
             }
         }
         //向子Word中添加资源
-        List<Part> parts = new ArrayList<Part>();
+        List<Part> parts = new ArrayList<>();
         for (Relationship relationship : subRelationships) {
             if (mainRelationshipsPart.getPart(relationship) != null) {
                 parts.add(mainRelationshipsPart.getPart(relationship));