From 916d984d2628fd8d863183cf5ba9e5a0a7339871 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期三, 18 十二月 2024 11:03:53 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/rag-gateway
---
app/utils/excelmerge/conformity.py | 118 ++++++++++++++++++++++++++++++----------------------------
1 files changed, 61 insertions(+), 57 deletions(-)
diff --git a/app/utils/excelmerge/conformity.py b/app/utils/excelmerge/conformity.py
index 7276d06..128657d 100644
--- a/app/utils/excelmerge/conformity.py
+++ b/app/utils/excelmerge/conformity.py
@@ -1,73 +1,77 @@
from openpyxl import load_workbook
-from openpyxl.utils import get_column_letter
from datetime import datetime
import os
def run_conformity():
- # 鍔犺浇妯℃澘鏂囦欢
- template_path = os.path.join('app', 'utils', 'excelmerge', '鍥界綉涓婃捣鐢靛姏鏁村悎妯＄増.xlsx')
- template_excel = load_workbook(template_path)
- EXCEL_FILES_PATH = os.path.join('data', 'output')
+ try:
+ # 鍔犺浇妯℃澘鏂囦欢
+ template_path = os.path.join('app', 'utils', 'excelmerge', '鍥界綉涓婃捣鐢靛姏鏁村悎妯＄増.xlsx')
+ template_excel = load_workbook(template_path)
+ EXCEL_FILES_PATH = os.path.join('data', 'output')
- # 鑾峰彇宸ヤ綔琛�
- sheet1 = template_excel['鎶�鏈洃鐫ｅ伐浣滅粺璁¤〃']
- sheet2 = template_excel['鎶�鏈洃鐫ｅ憡锛堥锛夎鍗曠粺璁¤〃']
- sheet3 = template_excel['鎶曚骇鍓嶆妧鏈洃鐫ｆ姤鍛婄粺璁¤〃']
- sheet4 = template_excel['鎶�鏈洃鐫ｇ粏鍒欏畬鍠勫缓璁�']
- sheet5 = template_excel['鍏稿瀷缁忛獙浜ゆ祦']
+ # 鑾峰彇宸ヤ綔琛�
+ sheet1 = template_excel['鎶�鏈洃鐫ｅ伐浣滅粺璁¤〃']
+ sheet2 = template_excel['鎶�鏈洃鐫ｅ憡锛堥锛夎鍗曠粺璁¤〃']
+ sheet3 = template_excel['鎶曚骇鍓嶆妧鏈洃鐫ｆ姤鍛婄粺璁¤〃']
+ sheet4 = template_excel['鎶�鏈洃鐫ｇ粏鍒欏畬鍠勫缓璁�']
+ sheet5 = template_excel['鍏稿瀷缁忛獙浜ゆ祦']
- # 鑾峰彇婧愭枃浠惰矾寰�
- source_folder = os.path.join('data', 'source')
- source_files = [f for f in os.listdir(source_folder) if f.endswith('.xlsx') and not f.startswith('~$')]
+ # 鑾峰彇婧愭枃浠惰矾寰�
+ source_folder = os.path.join('data', 'source')
+ source_files = [f for f in os.listdir(source_folder) if f.endswith('.xlsx') and not f.startswith('~$')]
- for file in source_files:
- source_path = os.path.join(source_folder, file)
- source_excel = load_workbook(source_path)
+ for file in source_files:
+ source_path = os.path.join(source_folder, file)
+ source_excel = load_workbook(source_path)
- # 鑾峰彇婧愬伐浣滆〃
- ssheet1 = source_excel['鎶�鏈洃鐫ｅ伐浣滅粺璁¤〃']
- ssheet2 = source_excel['鎶�鏈洃鐫ｅ憡锛堥锛夎鍗曠粺璁¤〃']
- ssheet3 = source_excel['鎶曚骇鍓嶆妧鏈洃鐫ｆ姤鍛婄粺璁¤〃']
- ssheet4 = source_excel['鎶�鏈洃鐫ｇ粏鍒欏畬鍠勫缓璁�']
- ssheet5 = source_excel['鍏稿瀷缁忛獙浜ゆ祦']
+ # 鑾峰彇婧愬伐浣滆〃
+ ssheet1 = source_excel['鎶�鏈洃鐫ｅ伐浣滅粺璁¤〃']
+ ssheet2 = source_excel['鎶�鏈洃鐫ｅ憡锛堥锛夎鍗曠粺璁¤〃']
+ ssheet3 = source_excel['鎶曚骇鍓嶆妧鏈洃鐫ｆ姤鍛婄粺璁¤〃']
+ ssheet4 = source_excel['鎶�鏈洃鐫ｇ粏鍒欏畬鍠勫缓璁�']
+ ssheet5 = source_excel['鍏稿瀷缁忛獙浜ゆ祦']
- # 娓呴櫎鏃犳晥绌虹櫧琛�
- for ssheet in [ssheet1, ssheet2, ssheet3, ssheet4, ssheet5]:
- last_row = ssheet.max_row
- if last_row > 1:
- for row in range(last_row, 1, -1):
- if all(ssheet.cell(row=row, column=col).value is None or ssheet.cell(row=row,
- column=col).value == ''
- for col in range(1, ssheet.max_column + 1)):
- ssheet.delete_rows(row)
+ # 娓呴櫎鏃犳晥绌虹櫧琛�
+ for ssheet in [ssheet1, ssheet2, ssheet3, ssheet4, ssheet5]:
+ last_row = ssheet.max_row
+ if last_row > 1:
+ for row in range(last_row, 1, -1):
+ if all(ssheet.cell(row=row, column=col).value is None or ssheet.cell(row=row,
+ column=col).value == ''
+ for col in range(1, ssheet.max_column + 1)):
+ ssheet.delete_rows(row)
- # 澶嶅埗鏁版嵁
- for (ssheet, tsheet, start_point) in [
- (ssheet1, sheet1, 4),
- (ssheet2, sheet2, 3),
- (ssheet3, sheet3, 3),
- (ssheet4, sheet4, 4),
- (ssheet5, sheet5, 3),
- ]:
- for row in range(start_point, ssheet.max_row + 1):
- a_cell_value = ssheet.cell(row=row, column=1).value
- if isinstance(a_cell_value, (int, float)) and any(
- ssheet.cell(row=row, column=col).value for col in range(2, ssheet.max_column + 1)):
- tsheet.append([ssheet.cell(row=row, column=col).value for col in range(1, ssheet.max_column + 1)])
+ # 澶嶅埗鏁版嵁
+ for (ssheet, tsheet, start_point) in [
+ (ssheet1, sheet1, 4),
+ (ssheet2, sheet2, 3),
+ (ssheet3, sheet3, 3),
+ (ssheet4, sheet4, 4),
+ (ssheet5, sheet5, 3),
+ ]:
+ for row in range(start_point, ssheet.max_row + 1):
+ a_cell_value = ssheet.cell(row=row, column=1).value
+ if isinstance(a_cell_value, (int, float)) and any(
+ ssheet.cell(row=row, column=col).value for col in range(2, ssheet.max_column + 1)):
+ tsheet.append(
+ [ssheet.cell(row=row, column=col).value for col in range(1, ssheet.max_column + 1)])
- source_excel.close()
+ source_excel.close()
- # 鍦ㄧ洰鏍囧伐浣滆〃涓坊鍔犲簭鍙�
- for tsheet, start_point in [(sheet1, 4), (sheet2, 3), (sheet3, 3), (sheet4, 4), (sheet5, 3)]:
- last_row = tsheet.max_row
- for i in range(start_point, last_row + 1):
- tsheet.cell(row=i, column=1).value = i - start_point + 1
+ # 鍦ㄧ洰鏍囧伐浣滆〃涓坊鍔犲簭鍙�
+ for tsheet, start_point in [(sheet1, 4), (sheet2, 3), (sheet3, 3), (sheet4, 4), (sheet5, 3)]:
+ last_row = tsheet.max_row
+ for i in range(start_point, last_row + 1):
+ tsheet.cell(row=i, column=1).value = i - start_point + 1
- # 淇濆瓨鏂囦欢
- timestamp = datetime.now().strftime('%Y_%m_%d_%H_%M_%S')
- output_path = os.path.join(EXCEL_FILES_PATH, f'{timestamp}.xlsx')
- template_excel.save(output_path)
- template_excel.close()
+ # 淇濆瓨鏂囦欢
+ timestamp = datetime.now().strftime('%Y_%m_%d_%H_%M_%S')
+ output_path = os.path.join(EXCEL_FILES_PATH, f'{timestamp}.xlsx')
+ template_excel.save(output_path)
+ template_excel.close()
- return timestamp
+ return True
+ except Exception as e:
+ print(f"璇诲彇鏁版嵁鍙戠敓閿欒: {e}")
+ return False
--
Gitblit v1.8.0