From 3f56614df8fce21fed91acb46be9b0228d7b774c Mon Sep 17 00:00:00 2001
From: YANGJIANKUAN <tim.yee@hotmail.com>
Date: Thu, 5 Mar 2026 15:39:28 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AF=B9=E6=8E=A5=E5=9B=BD=E9=99=85?=
 =?UTF-8?q?=E8=BF=9B=E6=B8=AF=E7=94=B5=E6=8A=A5=E8=A7=A3=E6=9E=90=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .../com/lukouguoji/module_base/http/net/Api.kt   |  6 +++---
 .../gjj/viewModel/IntImpMsgParseViewModel.kt     | 16 +++++++++++-----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/module_base/src/main/java/com/lukouguoji/module_base/http/net/Api.kt b/module_base/src/main/java/com/lukouguoji/module_base/http/net/Api.kt
index 7d44dcc..e22c05a 100644
--- a/module_base/src/main/java/com/lukouguoji/module_base/http/net/Api.kt
+++ b/module_base/src/main/java/com/lukouguoji/module_base/http/net/Api.kt
@@ -1714,10 +1714,10 @@ interface Api {
     suspend fun getIntImpMsgList(@Body data: RequestBody): PageInfo<MsgReceivePool>
 
     /**
-     * 批量生成电报
+     * 解析电报（电报生成）
      */
-    @POST("IntImpMsg/batchGenerate")
-    suspend fun batchGenerateMsg(@Body data: RequestBody): BaseResultBean<SimpleResultBean>
+    @POST("IntImpMsg/analyseMsg")
+    suspend fun analyseMsg(@Body data: RequestBody): BaseResultBean<Boolean>
 
     ///////////////////////////////////////////////////////////////////////////
     // 国际进港-原始舱单
diff --git a/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpMsgParseViewModel.kt b/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpMsgParseViewModel.kt
index ad84834..902ecf0 100644
--- a/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpMsgParseViewModel.kt
+++ b/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpMsgParseViewModel.kt
@@ -152,7 +152,7 @@ class IntImpMsgParseViewModel : BasePageViewModel() {
     }
 
     /**
-     * 电报生成（批量操作）
+     * 电报生成（解析电报）
      */
     fun generateMsg() {
         val list = pageModel.rv?.commonAdapter()?.items as? List<MsgReceivePool> ?: return
@@ -163,11 +163,17 @@ class IntImpMsgParseViewModel : BasePageViewModel() {
             return
         }
 
-        // 提取选中项的ID列表
-        val ids = selectedItems.mapNotNull { it.id }
-        val requestData = mapOf("ids" to ids).toRequestBody()
+        if (fid.isEmpty()) {
+            showToast("请先查询航班信息")
+            return
+        }
 
-        launchLoadingCollect({ NetApply.api.batchGenerateMsg(requestData) }) {
+        val requestData = mapOf(
+            "fid" to fid.toLongOrNull(),
+            "msgList" to selectedItems
+        ).toRequestBody()
+
+        launchLoadingCollect({ NetApply.api.analyseMsg(requestData) }) {
             onSuccess = {
                 showToast("电报生成成功")
                 viewModelScope.launch {