修复MarkGroup图片坐标保存与读取的bug

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/common/domain/card/CardFile.java

@@ -1,9 +1,11 @@
 package cn.com.qmth.stmms.biz.common.domain.card;
 
+import cn.com.qmth.stmms.biz.mark.model.MarkConfigItem;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.lang3.StringUtils;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -94,7 +96,7 @@ public class CardFile {
             configItem.width = configItem.width + position;
             configItem.height = configItem.height + position;
         }
-        return list.toString();
+        return StringUtils.join(list, MarkConfigItem.DB_ITEM_JOINER);
     }
 
     /**

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/common/domain/card/MarkConfig.java

@@ -1,5 +1,6 @@
 package cn.com.qmth.stmms.biz.common.domain.card;
 
+import cn.com.qmth.stmms.biz.mark.model.MarkConfigItem;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.*;
@@ -39,7 +40,7 @@ public class MarkConfig {
 
         @Override
         public String toString() {
-            return StringUtils.join(Arrays.asList(index, left, top, width, height), ":");
+            return StringUtils.join(Arrays.asList(index, left, top, width, height), MarkConfigItem.DB_FIELD_JOINER);
         }
     }
 }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/model/MarkConfigItem.java

@@ -1,14 +1,12 @@
 package cn.com.qmth.stmms.biz.mark.model;
 
+import org.apache.commons.lang3.StringUtils;
+
 import java.util.LinkedList;
 import java.util.List;
 
-import org.apache.commons.lang3.StringUtils;
-
 /**
  * 单个评卷区设置模型
- * 
- *
  */
 public class MarkConfigItem {
 
@@ -41,18 +39,18 @@ public class MarkConfigItem {
         text = StringUtils.trimToEmpty(text);
         String[] values = StringUtils.split(text, DB_FIELD_JOINER);
         try {
-            i = Integer.valueOf(values[0]);
+            i = Integer.parseInt(values[0]);
             if (values.length > 1) {
-                x = Integer.valueOf(values[1]);
+                x = Double.parseDouble(values[1]);
             }
             if (values.length > 2) {
-                y = Integer.valueOf(values[2]);
+                y = Double.parseDouble(values[2]);
             }
             if (values.length > 3) {
-                w = Integer.valueOf(values[3]);
+                w = Double.parseDouble(values[3]);
             }
             if (values.length > 4) {
-                h = Integer.valueOf(values[4]);
+                h = Double.parseDouble(values[4]);
             }
         } catch (Exception e) {
             throw new IllegalArgumentException("Invalid PictureConfigItem init text:" + text);