Răsfoiți Sursa

fix:修改创建表表默认字段,查询数据结构过滤字段

xuezizhuo 1 an în urmă
părinte
comite
8a38f358c3

+ 4 - 3
zkqy-datamodeling/src/main/java/com/zkqy/datamodeling/service/impl/TableInfoServiceImpl.java

@@ -52,7 +52,8 @@ public class TableInfoServiceImpl implements ITableInfoService {
         List<String> list = filedList.stream().map(filed -> {
             if(filed.getFieldName().equals("remark") || filed.getFieldName().equals("create_by_id") || filed.getFieldName().equals("create_by")
             || filed.getFieldName().equals("create_time") || filed.getFieldName().equals("update_by_id") || filed.getFieldName().equals("update_by")
-            || filed.getFieldName().equals("update_time") || filed.getFieldName().equals("del_flag")){
+            || filed.getFieldName().equals("update_time") || filed.getFieldName().equals("del_flag") || filed.getFieldName().equals("task_process_key")
+                    || filed.getFieldName().equals("task_node_key")){
                 return null;
             }
             StringBuilder stringBuilder = new StringBuilder();
@@ -79,7 +80,7 @@ public class TableInfoServiceImpl implements ITableInfoService {
         list.add("update_by varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '' COMMENT '更新者'");
         list.add("update_time datetime NULL DEFAULT NULL COMMENT '更新时间'");
         list.add("del_flag char(1) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '' COMMENT '删除标志(0代表存在 2代表删除)'");
-        list.add("task_key varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '' COMMENT '任务编码'");
+        list.add("task_process_key varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '' COMMENT '任务编码'");
         list.add("task_node_key varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '' COMMENT '任务节点编码'");
         tableInfoMapper.createMysqlTable(tableName, tableComment, list, SecurityUtils.getDatabaseName());
     }
@@ -336,7 +337,7 @@ public class TableInfoServiceImpl implements ITableInfoService {
 //            DataSource dataSource =JSON.parseObject(redisTemplate.opsForValue().get("DataSource").toString(),DataSource.class);
         if (databaseType.equals(DataSourceType.MYSQL.getDataSourceName())) {
             return tableInfoMapper.mysqlTableFieldInfo(databaseName, tableName).stream().filter(d ->
-                    !d.getFieldName().equals("task_key") && !d.getFieldName().equals("task_node_key")).collect(Collectors.toList());
+                    !d.getFieldName().equals("task_process_key") && !d.getFieldName().equals("task_node_key")).collect(Collectors.toList());
         } else if (databaseType.equals(DataSourceType.SQLSERVER.getDataSourceName())) {
             return tableInfoMapper.sqlserverTableFieldInfo(tableName);
         } else if (databaseType.equals(DataSourceType.DM.getDataSourceName())) {