优化

2026-09-01 20:07:38 +08:00
parent 539030d2b6
commit 8e17401f37
34 changed files with 244 additions and 501 deletions
@@ -5015,10 +5015,6 @@ CREATE TABLE IF NOT EXISTS fl_loading_plan (
  container_booking_id BIGINT UNSIGNED NOT NULL COMMENT '货柜预订ID',
  plan_status VARCHAR(24) NOT NULL DEFAULT 'EDITING'
    COMMENT '装柜计划状态：EDITING编辑中、LOADING装柜中、COMPLETED装柜完成；建议须经人工确认',
-  push_idempotency_key VARCHAR(128) NULL COMMENT '推送预装幂等键',
-  preload_pushed_by BIGINT UNSIGNED NULL COMMENT '推送预装操作人ID',
-  preload_pushed_by_name VARCHAR(64) NULL COMMENT '推送预装操作人名称快照',
-  preload_pushed_at DATETIME(3) NULL COMMENT '开始装柜并进入LOADING的时间',
  preload_completed_by BIGINT UNSIGNED NULL COMMENT '预装完成操作人ID',
  preload_completed_by_name VARCHAR(64) NULL COMMENT '预装完成操作人名称快照',
  preload_completed_at DATETIME(3) NULL COMMENT '预装完成时间',
@@ -5037,7 +5033,6 @@ CREATE TABLE IF NOT EXISTS fl_loading_plan (
  PRIMARY KEY (id),
  UNIQUE KEY uk_loading_plan_no (plan_no),
  UNIQUE KEY uk_loading_plan_booking (container_booking_id),
-  UNIQUE KEY uk_loading_plan_push_key (push_idempotency_key),
  KEY idx_loading_plan_status (plan_status, updated_at, id),
  CONSTRAINT fk_loading_plan_booking FOREIGN KEY (container_booking_id)
    REFERENCES fl_container_booking (id),
@@ -5589,10 +5584,6 @@ BEGIN
  IF OLD.plan_status = 'LOADING' AND (
       NOT (OLD.id <=> NEW.id) OR NOT (OLD.plan_no <=> NEW.plan_no)
    OR NOT (OLD.container_booking_id <=> NEW.container_booking_id)
-    OR NOT (OLD.push_idempotency_key <=> NEW.push_idempotency_key)
-    OR NOT (OLD.preload_pushed_by <=> NEW.preload_pushed_by)
-    OR NOT (OLD.preload_pushed_by_name <=> NEW.preload_pushed_by_name)
-    OR NOT (OLD.preload_pushed_at <=> NEW.preload_pushed_at)
    OR NOT (OLD.remark <=> NEW.remark)
    OR NOT (OLD.created_by <=> NEW.created_by)
    OR NOT (OLD.created_by_name <=> NEW.created_by_name)
@@ -5612,12 +5603,7 @@ BEGIN
  ) THEN
    SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = '同状态乐观锁触碰不得修改阶段审计字段';
  END IF;
-  IF OLD.plan_status = 'EDITING' AND NEW.plan_status = 'LOADING' THEN
-    IF NEW.push_idempotency_key IS NULL OR CHAR_LENGTH(TRIM(NEW.push_idempotency_key)) = 0 THEN
-      SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = '开始装柜必须提供幂等键';
-    END IF;
-    SET NEW.preload_pushed_at = COALESCE(NEW.preload_pushed_at, CURRENT_TIMESTAMP(3));
-  ELSEIF OLD.plan_status = 'LOADING' AND NEW.plan_status = 'COMPLETED' THEN
+  IF OLD.plan_status = 'LOADING' AND NEW.plan_status = 'COMPLETED' THEN
    IF EXISTS (SELECT 1 FROM fl_loading_plan_item item
              WHERE item.loading_plan_id = OLD.id AND item.deleted = 0
                AND NOT EXISTS (
@@ -5998,6 +5984,13 @@ DELIMITER ;
 CALL assert_smart_loading_permission_ids_available();
 DROP PROCEDURE assert_smart_loading_permission_ids_available;

+DELETE role_permission FROM iam_role_permission role_permission
+JOIN iam_permission permission ON permission.id = role_permission.permission_id
+WHERE permission.tenant_id = 0 AND permission.permission_code IN (
+  'platform:firstleg:smart-loading:create', 'platform:firstleg:smart-loading:push');
+DELETE FROM iam_permission WHERE tenant_id = 0 AND permission_code IN (
+  'platform:firstleg:smart-loading:create', 'platform:firstleg:smart-loading:push');
+
 INSERT INTO iam_permission
  (id, tenant_id, app_code, permission_type, parent_id, permission_code,
   permission_name, route_path, http_method, sort_no, status, built_in, deleted)
@@ -6012,14 +6005,10 @@ VALUES
   '编辑货柜', NULL, 'PUT', 30, 'ACTIVE', 1, 0),
  (5102094, 0, 'PLATFORM', 'MENU', 5102000, 'platform:firstleg:smart-loading:list',
   '智能装柜', '/first-leg/smart-loading', 'GET', 50, 'ACTIVE', 1, 0),
-  (5102096, 0, 'PLATFORM', 'BUTTON', 5102094, 'platform:firstleg:smart-loading:create',
-   '创建智能装柜计划', NULL, 'POST', 20, 'ACTIVE', 1, 0),
  (5102097, 0, 'PLATFORM', 'BUTTON', 5102094, 'platform:firstleg:smart-loading:assign',
   '分配装柜明细', NULL, 'POST', 30, 'ACTIVE', 1, 0),
  (5102098, 0, 'PLATFORM', 'BUTTON', 5102094, 'platform:firstleg:smart-loading:delete',
   '删除装柜明细', NULL, 'DELETE', 40, 'ACTIVE', 1, 0),
-  (5102099, 0, 'PLATFORM', 'BUTTON', 5102094, 'platform:firstleg:smart-loading:push',
-   '推送预装', NULL, 'POST', 50, 'ACTIVE', 1, 0),
  (5102100, 0, 'PLATFORM', 'MENU', 5102000, 'platform:firstleg:preload:list',
   '预装清单', '/first-leg/preload-list', 'GET', 60, 'ACTIVE', 1, 0),
  (5102102, 0, 'PLATFORM', 'BUTTON', 5102100, 'platform:firstleg:preload:view',
@@ -6049,8 +6038,7 @@ FROM iam_role role
   'platform:firstleg:container:list', 'platform:firstleg:container:view',
   'platform:firstleg:container:create',
   'platform:firstleg:container:edit', 'platform:firstleg:smart-loading:list',
-   'platform:firstleg:smart-loading:create', 'platform:firstleg:smart-loading:assign',
-   'platform:firstleg:smart-loading:delete', 'platform:firstleg:smart-loading:push',
+         'platform:firstleg:smart-loading:assign', 'platform:firstleg:smart-loading:delete',
   'platform:firstleg:preload:list', 'platform:firstleg:preload:view',
   'platform:firstleg:preload:edit', 'platform:firstleg:preload:complete',
   'platform:firstleg:preload:confirm', 'platform:firstleg:loading-list:list',
@@ -6174,12 +6162,11 @@ BEGIN
         AND permission_code IN (
           'platform:firstleg:container:list', 'platform:firstleg:container:view',
           'platform:firstleg:container:create', 'platform:firstleg:container:edit',
-           'platform:firstleg:smart-loading:list', 'platform:firstleg:smart-loading:create',
-           'platform:firstleg:smart-loading:assign', 'platform:firstleg:smart-loading:delete',
-           'platform:firstleg:smart-loading:push', 'platform:firstleg:preload:list',
+           'platform:firstleg:smart-loading:list', 'platform:firstleg:smart-loading:assign',
+           'platform:firstleg:smart-loading:delete', 'platform:firstleg:preload:list',
           'platform:firstleg:preload:view', 'platform:firstleg:preload:edit',
           'platform:firstleg:preload:complete', 'platform:firstleg:preload:confirm',
-           'platform:firstleg:loading-list:list', 'platform:firstleg:loading-list:view')) <> 16 THEN
+           'platform:firstleg:loading-list:list', 'platform:firstleg:loading-list:view')) <> 14 THEN
    SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = '智能装柜迁移失败：平台权限资源未完整创建';
  END IF;
  IF (SELECT COUNT(DISTINCT CONCAT(role.role_code, ':', permission.permission_code))
@@ -6192,12 +6179,11 @@ BEGIN
           'platform:firstleg:container:list', 'platform:firstleg:container:view',
           'platform:firstleg:container:create',
           'platform:firstleg:container:edit', 'platform:firstleg:smart-loading:list',
-           'platform:firstleg:smart-loading:create', 'platform:firstleg:smart-loading:assign',
-           'platform:firstleg:smart-loading:delete', 'platform:firstleg:smart-loading:push',
+           'platform:firstleg:smart-loading:assign', 'platform:firstleg:smart-loading:delete',
           'platform:firstleg:preload:list', 'platform:firstleg:preload:view',
           'platform:firstleg:preload:edit', 'platform:firstleg:preload:complete',
           'platform:firstleg:preload:confirm', 'platform:firstleg:loading-list:list',
-           'platform:firstleg:loading-list:view')) <> 32 THEN
+           'platform:firstleg:loading-list:view')) <> 28 THEN
    SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = '智能装柜迁移失败：平台角色授权未完整写入';
  END IF;
 END$$
@@ -7795,10 +7781,8 @@ VALUES
  (5102092, 0, 'PLATFORM', 'BUTTON', 5102090, 'platform:firstleg:container:create', '建立货柜', NULL, 'POST', 20, 'ACTIVE', 1, 0),
  (5102093, 0, 'PLATFORM', 'BUTTON', 5102090, 'platform:firstleg:container:edit', '编辑货柜', NULL, 'PUT', 30, 'ACTIVE', 1, 0),
  (5102094, 0, 'PLATFORM', 'MENU', 5102000, 'platform:firstleg:smart-loading:list', '智能装柜', '/first-leg/smart-loading', 'GET', 50, 'ACTIVE', 1, 0),
-  (5102096, 0, 'PLATFORM', 'BUTTON', 5102094, 'platform:firstleg:smart-loading:create', '创建智能装柜计划', NULL, 'POST', 20, 'ACTIVE', 1, 0),
  (5102097, 0, 'PLATFORM', 'BUTTON', 5102094, 'platform:firstleg:smart-loading:assign', '分配装柜明细', NULL, 'POST', 30, 'ACTIVE', 1, 0),
-  (5102098, 0, 'PLATFORM', 'BUTTON', 5102094, 'platform:firstleg:smart-loading:delete', '删除装柜明细', NULL, 'DELETE', 40, 'ACTIVE', 1, 0),
-  (5102099, 0, 'PLATFORM', 'BUTTON', 5102094, 'platform:firstleg:smart-loading:push', '推送预装', NULL, 'POST', 50, 'ACTIVE', 1, 0)
+  (5102098, 0, 'PLATFORM', 'BUTTON', 5102094, 'platform:firstleg:smart-loading:delete', '删除装柜明细', NULL, 'DELETE', 40, 'ACTIVE', 1, 0)
 ON DUPLICATE KEY UPDATE
  permission_type = VALUES(permission_type), parent_id = VALUES(parent_id),
  permission_name = VALUES(permission_name), route_path = VALUES(route_path),
@@ -7866,8 +7850,7 @@ SELECT role.id, permission.id, role.tenant_id
   AND permission.permission_code IN (
     'platform:firstleg:container:view', 'platform:firstleg:container:create',
     'platform:firstleg:container:edit', 'platform:firstleg:smart-loading:list',
-     'platform:firstleg:smart-loading:create', 'platform:firstleg:smart-loading:assign',
-     'platform:firstleg:smart-loading:delete', 'platform:firstleg:smart-loading:push'
+     'platform:firstleg:smart-loading:assign', 'platform:firstleg:smart-loading:delete'
   )
 WHERE role.tenant_id = 0 AND role.role_code IN ('PLATFORM_ADMIN', 'ORDER_OPERATOR');

@@ -13536,10 +13519,6 @@ CALL queue_column_comment('baiyue_firstleg', 'fl_loading_plan', 'plan_status', '
 CALL queue_column_comment('baiyue_firstleg', 'fl_loading_plan', 'preload_completed_at', '预装完成时间');
 CALL queue_column_comment('baiyue_firstleg', 'fl_loading_plan', 'preload_completed_by', '预装完成操作人ID');
 CALL queue_column_comment('baiyue_firstleg', 'fl_loading_plan', 'preload_completed_by_name', '预装完成操作人名称快照');
-CALL queue_column_comment('baiyue_firstleg', 'fl_loading_plan', 'preload_pushed_at', '开始装柜并进入LOADING的时间');
-CALL queue_column_comment('baiyue_firstleg', 'fl_loading_plan', 'preload_pushed_by', '推送预装操作人ID');
-CALL queue_column_comment('baiyue_firstleg', 'fl_loading_plan', 'preload_pushed_by_name', '推送预装操作人名称快照');
-CALL queue_column_comment('baiyue_firstleg', 'fl_loading_plan', 'push_idempotency_key', '推送预装幂等键');
 CALL queue_column_comment('baiyue_firstleg', 'fl_loading_plan', 'remark', '平台装柜计划备注');
 CALL queue_column_comment('baiyue_firstleg', 'fl_loading_plan', 'updated_at', '装柜计划最后更新时间');
 CALL queue_column_comment('baiyue_firstleg', 'fl_loading_plan', 'updated_by', '最后修改人ID');
@@ -14974,10 +14953,9 @@ BEGIN
           OR (id = 5102092 AND permission_code = 'platform:firstleg:container:create' AND parent_id = 5102090)
           OR (id = 5102093 AND permission_code = 'platform:firstleg:container:edit' AND parent_id = 5102090)
           OR (id = 5102094 AND permission_code = 'platform:firstleg:smart-loading:list' AND parent_id = 5102000)
-           OR (id = 5102096 AND permission_code = 'platform:firstleg:smart-loading:create' AND parent_id = 5102094)
           OR (id = 5102097 AND permission_code = 'platform:firstleg:smart-loading:assign' AND parent_id = 5102094)
           OR (id = 5102098 AND permission_code = 'platform:firstleg:smart-loading:delete' AND parent_id = 5102094)
-           OR (id = 5102099 AND permission_code = 'platform:firstleg:smart-loading:push' AND parent_id = 5102094))) <> 8 THEN
+          )) <> 6 THEN
    SIGNAL SQLSTATE '45000'
      SET MESSAGE_TEXT = '统一迁移失败：智能装柜权限 ID 或父子关系不正确';
  END IF;