Browse Source

增加字段名的处理,避免mysql关键字冲突

luoshi 2 năm trước cách đây
mục cha
commit
6aee67f74c

+ 2 - 0
src/main/java/com/qmth/ops/biz/domain/ConfigItem.java

@@ -1,5 +1,6 @@
 package com.qmth.ops.biz.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import java.io.Serializable;
@@ -17,6 +18,7 @@ public class ConfigItem implements Serializable {
 
     private Long envId;
 
+    @TableField("`key`")
     private String key;
 
     private String value;

+ 5 - 10
src/main/java/com/qmth/ops/biz/service/ConfigService.java

@@ -15,10 +15,7 @@ import javax.annotation.Resource;
 import javax.validation.constraints.NotNull;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -79,9 +76,8 @@ public class ConfigService extends ServiceImpl<ConfigItemDao, ConfigItem> {
                 item.setMode(base.getMode());
                 item.setComment(base.getComment());
             }
-            configItemDao.insert(item);
         }
-        //saveBatch(list);
+        saveBatch(list);
         List<ConfigItem> baseline = listBaseline(app.getId(), version.getId(), module.getId());
         baseMap.clear();
         baseline.forEach(item -> baseMap.put(item.getKey(), item));
@@ -111,17 +107,16 @@ public class ConfigService extends ServiceImpl<ConfigItemDao, ConfigItem> {
             long time = System.currentTimeMillis();
             List<ConfigItem> inheritList = listConfigItem(app.getId(), inheritVersion.getId(), module.getId(),
                     env.getId());
-            //List<ConfigItem> saveList = new LinkedList<>();
+            List<ConfigItem> saveList = new LinkedList<>();
             for (ConfigItem item : inheritList) {
                 if (accept(item, baseMap)) {
                     item.setVersionId(version.getId());
                     item.setCreateTime(time);
                     item.setUpdateTime(time);
-                    configItemDao.insert(item);
-                    //saveList.add(item);
+                    saveList.add(item);
                 }
             }
-            //saveBatch(saveList);
+            saveBatch(saveList);
         }
     }