PythonLinWencai
diff --git a/‎feapder/commands/create/create_table.py‎
Lines changed: 35 additions & 20 deletions b/‎feapder/commands/create/create_table.py‎
Lines changed: 35 additions & 20 deletions
@@ -22,7 +22,7 @@ class CreateTable:
     def __init__(self):
         self._db = MysqlDB()
 
-    def is_vaild_date(self, date):
+    def is_valid_date(self, date):
         try:
             if ":" in date:
                 time.strptime(date, "%Y-%m-%d %H:%M:%S")
@@ -44,15 +44,17 @@ def get_key_type(self, value):
         elif isinstance(value, float):
             key_type = "double"
         elif isinstance(value, str):
-            if self.is_vaild_date(value):
+            if self.is_valid_date(value):
                 if ":" in value:
                     key_type = "datetime"
                 else:
                     key_type = "date"
-            elif len(value) > 255:
+            elif len(value) > 50:
                 key_type = "text"
             else:
                 key_type = "varchar(255)"
+        elif isinstance(value, (dict, list)):
+            key_type = "longtext"
 
         return key_type
 
@@ -80,21 +82,26 @@ def create(self, table_name):
         # 拼接表结构
         sql = """
             CREATE TABLE `{db}`.`{table_name}` (
-                `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'id 自动递增',
+                `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'id主键',
                 {other_key}
-                `gtime` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '抓取时间',
-                PRIMARY KEY (`id`),
+                `crawl_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '采集时间',
                 {unique}
+                PRIMARY KEY (`id`)
             ) COMMENT='';
         """
 
-        print("请设置注释 回车跳过")
+        # print("请设置注释 回车跳过")
         other_key = ""
         for key, value in data.items():
             key = key2underline(key)
+            comment = ""
+            if key == "id":
+                key = "data_id"
+                comment = "原始数据id"
+
             key_type = self.get_key_type(value)
 
-            comment = input("%s : %s  -> comment：" % (key, key_type))
+            # comment = input("%s : %s  -> comment：" % (key, key_type))
 
             other_key += (
                 "`{key}` {key_type} COMMENT '{comment}',\n                ".format(
@@ -105,34 +112,42 @@ def create(self, table_name):
         print("\n")
 
         while True:
-            is_need_batch_date = input("是否添加batch_date 字段 （y/n）:")
-            if is_need_batch_date == "y":
+            yes = input("是否添加批次字段 batch_date（y/n）:")
+            if yes == "y":
                 other_key += (
                     "`{key}` {key_type} COMMENT '{comment}',\n                ".format(
                         key="batch_date", key_type="date", comment="批次时间"
                     )
                 )
                 break
-            elif is_need_batch_date == "n":
+            elif yes == "n":
                 break
 
         print("\n")
 
         while True:
-            unique = input("请设置唯一索引, 多个逗号间隔\n等待输入：\n").replace("，", ",")
-            if unique:
+            yes = input("是否设置唯一索引（y/n）:")
+            if yes == "y":
+                unique = input("请设置唯一索引, 多个逗号间隔\n等待输入：\n").replace("，", ",")
+                if unique:
+                    unique = "UNIQUE `idx` USING BTREE (`%s`) comment ''," % "`,`".join(
+                        unique.split(",")
+                    )
+                    break
+            elif yes == "n":
+                unique = ""
                 break
-        unique = "UNIQUE `idx` USING BTREE (`%s`) comment ''" % "`,`".join(
-            unique.split(",")
-        )
 
         sql = sql.format(
             db=setting.MYSQL_DB,
             table_name=table_name,
-            other_key=other_key,
+            other_key=other_key.strip(),
             unique=unique,
         )
         print(sql)
-        self._db.execute(sql)
-        print("\n%s 创建成功" % table_name)
-        print("注意手动检查下字段类型，确保无误！！！")
+
+        if self._db.execute(sql):
+            print("\n%s 创建成功" % table_name)
+            print("注意手动检查下字段类型，确保无误！！！")
+        else:
+            print("\n%s 创建失败" % table_name)