简化代码

Boris · Boris · commit 52191e99b884 · 2021-03-17T22:52:42.000+08:00
diff --git a/feapder/buffer/item_buffer.py b/feapder/buffer/item_buffer.py
@@ -236,19 +236,19 @@ def __export_to_db(self, tab_item, datas, is_update=False, update_keys=()):
                 for item in setting.ADD_ITEM_TO_MYSQL:
                     if item in item_name:
                         export_success = (
-                            self._export_data.export_items(tab_item, datas)
+                            self._export_data.export_items(to_table, datas)
                             if not is_update
                             else self._export_data.update_items(
-                                tab_item, datas, update_keys=update_keys
+                                to_table, datas, update_keys=update_keys
                             )
                         )
 
             else:
                 export_success = (
-                    self._export_data.export_items(tab_item, datas)
+                    self._export_data.export_items(to_table, datas)
                     if not is_update
                     else self._export_data.update_items(
-                        tab_item, datas, update_keys=update_keys
+                        to_table, datas, update_keys=update_keys
                     )
                 )
 
diff --git a/feapder/utils/export_data.py b/feapder/utils/export_data.py
@@ -115,51 +115,46 @@ def every_table_per_export_callback(to_table, auto_update, batch_count):
             )
             self.export(from_table, to_table, auto_update, batch_count)
 
-    def export_items(self, tab_item, items_data):
+    def export_items(self, table, items_data):
         """
         @summary:
         ---------
-        @param tab_item: redis中items的表名
+        @param table: 表名
         @param items_data: [item.to_dict] 数据
         ---------
         @result:
         """
 
-        to_table = tools.get_info(tab_item, ":s_(.*?)_item$", fetch_one=True)
-        sql, datas = tools.make_batch_sql(to_table, items_data)
+        sql, datas = tools.make_batch_sql(table, items_data)
         add_count = self.to_db.add_batch(sql, datas)
         datas_size = len(datas)
         if add_count is None:
-            log.error("导出数据到表 %s 失败" % (to_table))
+            log.error("导出数据到表 %s 失败" % (table))
         else:
             log.info(
-                "共导出 %s 条数据 到 %s, 重复 %s 条"
-                % (datas_size, to_table, datas_size - add_count)
+                "共导出 %s 条数据 到 %s, 重复 %s 条" % (datas_size, table, datas_size - add_count)
             )
 
         return add_count != None
 
-    def update_items(self, tab_item, items_data, update_keys=()):
+    def update_items(self, table, items_data, update_keys=()):
         """
         @summary:
         ---------
-        @param tab_item: redis中items的表名
+        @param table: 表名
         @param items_data: [item.to_dict] 数据
         @param update_keys: 更新的字段
         ---------
         @result:
         """
-        to_table = tools.get_info(tab_item, ":s_(.*?)_item$", fetch_one=True)
         sql, datas = tools.make_batch_sql(
-            to_table,
-            items_data,
-            update_columns=update_keys or list(items_data[0].keys()),
+            table, items_data, update_columns=update_keys or list(items_data[0].keys())
         )
         update_count = self.to_db.add_batch(sql, datas)
         if update_count is None:
-            log.error("更新表 %s 数据失败" % (to_table))
+            log.error("更新表 %s 数据失败" % (table))
         else:
-            msg = "共更新 %s 条数据 到 %s" % (update_count // 2, to_table)
+            msg = "共更新 %s 条数据 到 %s" % (update_count // 2, table)
             if update_keys:
                 msg += " 更新字段为 {}".format(update_keys)
             log.info(msg)

Original file line number	Diff line number	Diff line change
`@@ -236,19 +236,19 @@ def __export_to_db(self, tab_item, datas, is_update=False, update_keys=()):`
`236`	`236`	`for item in setting.ADD_ITEM_TO_MYSQL:`
`237`	`237`	`if item in item_name:`
`238`	`238`	`export_success = (`
`239`		`- self._export_data.export_items(tab_item, datas)`
	`239`	`+ self._export_data.export_items(to_table, datas)`
`240`	`240`	`if not is_update`
`241`	`241`	`else self._export_data.update_items(`
`242`		`- tab_item, datas, update_keys=update_keys`
	`242`	`+ to_table, datas, update_keys=update_keys`
`243`	`243`	`)`
`244`	`244`	`)`
`245`	`245`
`246`	`246`	`else:`
`247`	`247`	`export_success = (`
`248`		`- self._export_data.export_items(tab_item, datas)`
	`248`	`+ self._export_data.export_items(to_table, datas)`
`249`	`249`	`if not is_update`
`250`	`250`	`else self._export_data.update_items(`
`251`		`- tab_item, datas, update_keys=update_keys`
	`251`	`+ to_table, datas, update_keys=update_keys`
`252`	`252`	`)`
`253`	`253`	`)`
`254`	`254`