[数据模块] 修复了一个ID生成的BUG

src/main/java/com/tykj/model_layer/service/impl/ModelImpl.java

@@ -473,22 +473,22 @@ public class ModelImpl implements ModelService {
             for (ColumnInfo originColumnInfo : columnsFordDelete) {
                 columnInfoDao.delete(originColumnInfo);
             }
-            columnInfoDao.deleteAllByDbId(updateTableInfoVO.getDbId());
-
-            List<ColumnInfo> dataList = updateTableInfoVO.getTableVO().getDataList().stream()
-                    .map(columnVO -> columnInfo(tableInfo.getId(), tableInfo.getModelName(), columnVO))
-                    .collect(Collectors.toList());
-            for (ColumnInfo columnInfo : dataList) {
-                columnInfo.setId(null);
-                columnInfo.setPrimaryKey(1);
-
-                columnInfoDao.save(columnInfo);
-            }
-            tableInfo.setUpdatedTime(new Date());
-            String xml2 = createTable(tableVO);
-//            重新存xml
-            tableInfo.setXml(xml2);
-            tableInfoDao.save(tableInfo);
+//            columnInfoDao.deleteAllByDbId(updateTableInfoVO.getDbId());
+//
+//            List<ColumnInfo> dataList = updateTableInfoVO.getTableVO().getDataList().stream()
+//                    .map(columnVO -> columnInfo(tableInfo.getId(), tableInfo.getModelName(), columnVO))
+//                    .collect(Collectors.toList());
+////            for (ColumnInfo columnInfo : dataList) {
+////                columnInfo.setId(null);
+////                columnInfo.setPrimaryKey(1);
+////
+////                columnInfoDao.save(columnInfo);
+////            }
+//            tableInfo.setUpdatedTime(new Date());
+//            String xml2 = createTable(tableVO);
+////            重新存xml
+//            tableInfo.setXml(xml2);
+//            tableInfoDao.save(tableInfo);
             return 1;
 
     }
@@ -508,6 +508,7 @@ public class ModelImpl implements ModelService {
         columnInfo.setDescription(columnVO.getDescription());
         columnInfo.setDbId(dbId);
         columnInfo.setDbName(dbName);
+        columnInfo.setPrimaryKey(columnVO.getPrimaryKey());
         return columnInfo;
     }
 
@@ -531,12 +532,15 @@ public class ModelImpl implements ModelService {
             }
         }
         for (ColumnInfo originColumnInfo : origin) {
-            boolean noneMatch = current.stream()
-                    .noneMatch(columnInfo1 -> Objects.equals(originColumnInfo.getId(), columnInfo1.getId()));
-            if (noneMatch) {
-                String sql = SqlUtil.deleteColumn(table, originColumnInfo.getFieldName());
-                result.add(sql);
+            if (!originColumnInfo.getFieldName().equals("id")){
+                boolean noneMatch = current.stream()
+                        .noneMatch(columnInfo1 -> Objects.equals(originColumnInfo.getId(), columnInfo1.getId()));
+                if (noneMatch) {
+                    String sql = SqlUtil.deleteColumn(table, originColumnInfo.getFieldName());
+                    result.add(sql);
+                }
             }
+
         }
         return result;
     }