ting.yin 2 年之前
父节点
当前提交
f2a4f2c848

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

@@ -91,10 +91,10 @@ public class CardFile {
 
     public String getMarkConfigAdd(List<MarkConfig.ConfigItem> list, double position) {
         for (MarkConfig.ConfigItem configItem : list) {
-            configItem.left = configItem.left + position;
-            configItem.top = configItem.top + position;
-            configItem.width = configItem.width + position;
-            configItem.height = configItem.height + position;
+            configItem.left = configItem.left < position ? configItem.left : configItem.left - position;
+            configItem.top = configItem.top < position ? configItem.top : configItem.top - position;
+            configItem.width = configItem.width + position * 2;
+            configItem.height = configItem.height + position * 2;
         }
         return StringUtils.join(list, MarkConfigItem.DB_ITEM_JOINER);
     }

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

@@ -23,7 +23,7 @@ public class MarkConfig {
         item.top = top;
         item.width = width;
         item.height = height;
-        this.map.computeIfAbsent(mainNumber, key -> new LinkedList<>(Collections.singletonList(item)));
+        this.map.computeIfAbsent(mainNumber, key -> new LinkedList<>()).add(item);
     }
 
     public List<ConfigItem> getConfig(int mainNumber) {
@@ -32,10 +32,10 @@ public class MarkConfig {
 
     static class ConfigItem {
 
-        //对应的图片序号
+        // 对应的图片序号
         int index;
 
-        //坐标点与宽高的相对比例
+        // 坐标点与宽高的相对比例
         double left, top, width, height;
 
         @Override