增加求和采集和细节修改

2026-07-14 14:24:21 +08:00
parent 42c319877c
commit ccc041604a
12 changed files with 1438 additions and 108 deletions
--- a/lib/api/init.py
+++ b/lib/api/init.py
@@ -21,8 +21,11 @@ init_bp = Blueprint('init', __name__, url_prefix='/api')
 # 文件下载蓝图
 download_bp = Blueprint('download', __name__, url_prefix='/api')

+# 求和数据管理蓝图
+sum_data_bp = Blueprint('sum_data', __name__, url_prefix='/api')
+
 # 导入各模块的路由
-from . import config_api, entity_api, field_api, report_api, init_api, download_api
+from . import config_api, entity_api, field_api, report_api, init_api, download_api, sum_data_api


 def register_blueprints(app):
@@ -33,3 +36,4 @@ def register_blueprints(app):
    app.register_blueprint(report_bp)
    app.register_blueprint(init_bp)
    app.register_blueprint(download_bp)
+    app.register_blueprint(sum_data_bp)
--- a/lib/api/config_api.py
+++ b/lib/api/config_api.py
@@ -208,50 +208,60 @@ def move_config(config_id):
    """移动配置排序"""
    try:
        direction = request.json.get('direction')  # up 或 down
+        print(f"[move_config] 开始移动 config_id={config_id}, direction={direction}")
        
-        # 获取当前配置
-        current = execute_query(
-            'SELECT sort_order FROM t_daily_report_config WHERE id = %s',
-            (config_id,)
+        # 查出所有配置，按 sort_order, id 排序
+        all_configs = execute_query(
+            'SELECT id, sort_order FROM t_daily_report_config ORDER BY sort_order ASC, id ASC'
        )
-        if not current:
+        print(f"[move_config] 所有配置数量: {len(all_configs)}")
+        for idx, c in enumerate(all_configs):
+            print(f"  [{idx}] id={c['id']}, sort_order={c['sort_order']}")
+        
+        # 找到当前配置的索引
+        current_index = None
+        for i, c in enumerate(all_configs):
+            if c['id'] == config_id:
+                current_index = i
+                break
+        
+        if current_index is None:
+            print(f"[move_config] 未找到配置 id={config_id}")
            return jsonify({'success': False, 'message': '配置不存在'}), 404
        
-        current_order = current[0]['sort_order']
+        print(f"[move_config] 当前配置索引: {current_index}")
        
+        # 计算目标索引
        if direction == 'up':
-            # 找到上一个配置
-            prev = execute_query(
-                'SELECT id, sort_order FROM t_daily_report_config WHERE sort_order < %s ORDER BY sort_order DESC LIMIT 1',
-                (current_order,)
-            )
-            if prev:
-                # 交换排序
-                execute_update(
-                    'UPDATE t_daily_report_config SET sort_order = %s WHERE id = %s',
-                    (prev[0]['sort_order'], config_id)
-                )
-                execute_update(
-                    'UPDATE t_daily_report_config SET sort_order = %s WHERE id = %s',
-                    (current_order, prev[0]['id'])
-                )
+            target_index = current_index - 1
        elif direction == 'down':
-            # 找到下一个配置
-            next_config = execute_query(
-                'SELECT id, sort_order FROM t_daily_report_config WHERE sort_order > %s ORDER BY sort_order ASC LIMIT 1',
-                (current_order,)
-            )
-            if next_config:
-                # 交换排序
-                execute_update(
-                    'UPDATE t_daily_report_config SET sort_order = %s WHERE id = %s',
-                    (next_config[0]['sort_order'], config_id)
-                )
-                execute_update(
-                    'UPDATE t_daily_report_config SET sort_order = %s WHERE id = %s',
-                    (current_order, next_config[0]['id'])
-                )
+            target_index = current_index + 1
+        else:
+            return jsonify({'success': False, 'message': '无效的移动方向'}), 400
        
+        # 边界检查
+        if target_index < 0 or target_index >= len(all_configs):
+            print(f"[move_config] 已到边界，无法移动 target_index={target_index}")
+            return jsonify({'success': True, 'message': '已到边界'})
+        
+        # 在内存数组中交换位置
+        all_configs[current_index], all_configs[target_index] = all_configs[target_index], all_configs[current_index]
+        
+        print(f"[move_config] 交换后顺序: {[c['id'] for c in all_configs]}")
+        
+        # 全量重排：按新顺序给每个配置重新赋值 sort_order
+        for idx, cfg in enumerate(all_configs):
+            new_sort = idx + 1
+            print(f"  更新 id={cfg['id']}: sort_order {cfg['sort_order']} -> {new_sort}")
+            execute_update(
+                'UPDATE t_daily_report_config SET sort_order = %s WHERE id = %s',
+                (new_sort, cfg['id'])
+            )
+        
+        print("[move_config] 重排完成")
        return jsonify({'success': True, 'message': '移动成功'})
    except Exception as e:
+        import traceback
+        traceback.print_exc()
+        print(f"[move_config] 异常: {e}")
        return jsonify({'success': False, 'message': str(e)}), 500
--- a/lib/api/init_api.py
+++ b/lib/api/init_api.py
@@ -2,7 +2,7 @@
 数据库初始化 API
 """
 from flask import jsonify
-from lib.db import execute_update
+from lib.db_init import init_database_tables
 from . import init_bp


@@ -10,61 +10,10 @@ from . import init_bp
 def init_tables():
    """初始化数据库表"""
    try:
-        # 创建配置表
-        create_config_table = """
-            CREATE TABLE IF NOT EXISTS t_daily_report_config (
-                id BIGINT NOT NULL COMMENT '配置 ID',
-                config_name VARCHAR(100) NOT NULL COMMENT '配置名称',
-                split_type VARCHAR(20) NOT NULL COMMENT '拆分方式',
-                split_value VARCHAR(100) NOT NULL COMMENT '拆分值',
-                split_name VARCHAR(200) NULL COMMENT '拆分显示名称',
-                selected_fields VARCHAR(3000) NOT NULL COMMENT '选择的字段列表',
-                sum_fields VARCHAR(3000) NULL COMMENT '求和字段列表',
-                is_active TINYINT NULL COMMENT '是否启用',
-                sort_order INT NULL COMMENT '排序顺序',
-                create_time DATETIME NULL COMMENT '创建时间',
-                update_time DATETIME NULL COMMENT '更新时间'
-            )
-            UNIQUE KEY(id)
-            DISTRIBUTED BY HASH(id) BUCKETS 1
-            PROPERTIES("replication_num" = "1")
-        """
-        execute_update(create_config_table)
-        
-        # 创建历史表
-        create_history_table = """
-            CREATE TABLE IF NOT EXISTS t_daily_report_history (
-                id BIGINT NOT NULL COMMENT '历史 ID',
-                report_date VARCHAR(20) NULL COMMENT '报表日期',
-                start_time VARCHAR(50) NULL COMMENT '开始时间',
-                end_time VARCHAR(50) NULL COMMENT '结束时间',
-                split_type VARCHAR(20) NULL COMMENT '拆分方式',
-                split_value VARCHAR(100) NULL COMMENT '拆分值',
-                split_name VARCHAR(200) NULL COMMENT '拆分显示名称',
-                config_id BIGINT NULL COMMENT '配置 ID',
-                config_name VARCHAR(200) NULL COMMENT '配置名称',
-                total_orders INT NULL COMMENT '订单总数',
-                total_amount DECIMAL(10,2) NULL COMMENT '总金额',
-                sum_results VARCHAR(2000) NULL COMMENT '求和结果',
-                file_path VARCHAR(500) NULL COMMENT '文件路径',
-                status TINYINT NULL COMMENT '状态',
-                create_time DATETIME NULL COMMENT '创建时间'
-            )
-            UNIQUE KEY(id)
-            DISTRIBUTED BY HASH(id) BUCKETS 1
-            PROPERTIES("replication_num" = "1")
-        """
-        execute_update(create_history_table)
-        
-        # 为已存在的表添加 config_name 字段（如果不存在）
-        try:
-            execute_update("""
-                ALTER TABLE t_daily_report_history 
-                ADD COLUMN IF NOT EXISTS config_name VARCHAR(200) NULL COMMENT '配置名称'
-            """)
-        except Exception as e:
-            print(f"[数据库] 添加 config_name 字段时出错（可能已存在）: {e}")
-        
-        return jsonify({'success': True, 'message': '数据库表初始化成功'})
+        success = init_database_tables()
+        if success:
+            return jsonify({'success': True, 'message': '数据库表初始化成功'})
+        else:
+            return jsonify({'success': False, 'message': '数据库表初始化失败'}), 500
    except Exception as e:
        return jsonify({'success': False, 'message': str(e)}), 500
--- a/lib/api/sum_data_api.py
+++ b/lib/api/sum_data_api.py
@@ -0,0 +1,130 @@
+"""
+求和数据管理 API
+"""
+from flask import request, jsonify
+from lib.sum_data_collector import (
+    collect_sum_data_from_history,
+    get_sum_data_list,
+    add_sum_data,
+    update_sum_data,
+    delete_sum_data,
+    batch_delete_sum_data
+)
+from . import sum_data_bp
+
+
+@sum_data_bp.route('/sum-data/collect', methods=['POST'])
+def collect_sum_data():
+    """从历史记录采集求和数据"""
+    try:
+        data = request.json or {}
+        history_id = data.get('history_id')
+        
+        result = collect_sum_data_from_history(history_id)
+        if result['success']:
+            return jsonify(result)
+        else:
+            return jsonify(result), 400
+    except Exception as e:
+        import traceback
+        traceback.print_exc()
+        return jsonify({'success': False, 'message': str(e)}), 500
+
+
+@sum_data_bp.route('/sum-data', methods=['GET'])
+def list_sum_data():
+    """查询求和数据列表"""
+    try:
+        page = int(request.args.get('page', 1))
+        page_size = int(request.args.get('page_size', 20))
+        report_date = request.args.get('report_date')
+        config_id = request.args.get('config_id')
+        config_name = request.args.get('config_name')
+        sum_field_key = request.args.get('sum_field_key')
+        data_source = request.args.get('data_source')
+        
+        result = get_sum_data_list(
+            page=page,
+            page_size=page_size,
+            report_date=report_date,
+            config_id=config_id,
+            config_name=config_name,
+            sum_field_key=sum_field_key,
+            data_source=data_source
+        )
+        
+        if result['success']:
+            return jsonify(result)
+        else:
+            return jsonify(result), 400
+    except Exception as e:
+        import traceback
+        traceback.print_exc()
+        return jsonify({'success': False, 'message': str(e)}), 500
+
+
+@sum_data_bp.route('/sum-data', methods=['POST'])
+def create_sum_data():
+    """手动添加求和数据"""
+    try:
+        data = request.json
+        result = add_sum_data(data)
+        if result['success']:
+            return jsonify(result)
+        else:
+            return jsonify(result), 400
+    except Exception as e:
+        import traceback
+        traceback.print_exc()
+        return jsonify({'success': False, 'message': str(e)}), 500
+
+
+@sum_data_bp.route('/sum-data/<int:sum_data_id>', methods=['PUT'])
+def update_sum_data_api(sum_data_id):
+    """更新求和数据"""
+    try:
+        data = request.json
+        result = update_sum_data(sum_data_id, data)
+        if result['success']:
+            return jsonify(result)
+        else:
+            return jsonify(result), 400
+    except Exception as e:
+        import traceback
+        traceback.print_exc()
+        return jsonify({'success': False, 'message': str(e)}), 500
+
+
+@sum_data_bp.route('/sum-data/<int:sum_data_id>', methods=['DELETE'])
+def delete_sum_data_api(sum_data_id):
+    """删除求和数据"""
+    try:
+        result = delete_sum_data(sum_data_id)
+        if result['success']:
+            return jsonify(result)
+        else:
+            return jsonify(result), 400
+    except Exception as e:
+        import traceback
+        traceback.print_exc()
+        return jsonify({'success': False, 'message': str(e)}), 500
+
+
+@sum_data_bp.route('/sum-data/batch-delete', methods=['POST'])
+def batch_delete_sum_data_api():
+    """批量删除求和数据"""
+    try:
+        data = request.json
+        ids = data.get('ids', [])
+        if not ids:
+            return jsonify({'success': False, 'message': '请选择要删除的记录'}), 400
+        
+        result = batch_delete_sum_data(ids)
+        if result['success']:
+            return jsonify(result)
+        else:
+            return jsonify(result), 400
+    except Exception as e:
+        import traceback
+        traceback.print_exc()
+        return jsonify({'success': False, 'message': str(e)}), 500