增加与ai大模型对话

huimv-employment/fe-api/src/main/java/com/huimv/employment/controller/mcp/McpDraftController.java

@@ -2,6 +2,7 @@ package com.huimv.employment.controller.mcp;
 
 import com.huimv.employment.common.web.R;
 import com.huimv.employment.service.draft.McpDraftService;
+import com.huimv.employment.service.draft.dto.McpDraftCalculateRequest;
 import com.huimv.employment.service.draft.dto.McpDraftCalculateResponse;
 import com.huimv.employment.service.draft.dto.McpDraftGenerateRequest;
 import com.huimv.employment.service.draft.dto.McpDraftGenerateResponse;
@@ -19,25 +20,22 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
  * MCP 草稿接口（交互规则 v2 §6.3）。
  * <p>
- * 通过 {@code X-Session-Id} + {@code X-Agent-Id} 自动关联会话与草稿，Agent 无需传递 draft_id。
+ * 通过请求体/查询参数 {@code session_id}（= conversation_no）自动关联会话与草稿，Agent 无需传递 draft_id。
  * 鉴权见 {@code fe.internal.ai-key} 与 {@link com.huimv.employment.security.McpAuthFilter}。
  * </p>
  */
 @RestController
 @RequestMapping("/api/mcp/draft")
-@Tag(name = "MCP-草稿", description = "智能体草稿 generate/update/info，需 X-Fe-Ai-Key + X-Session-Id")
+@Tag(name = "MCP-草稿", description = "智能体草稿 generate/update/info，需 X-Fe-Ai-Key + session_id")
 public class McpDraftController {
 
-    public static final String HEADER_SESSION_ID = "X-Session-Id";
-    public static final String HEADER_AGENT_ID = "X-Agent-Id";
-
     private final McpDraftService mcpDraftService;
 
     public McpDraftController(McpDraftService mcpDraftService) {
@@ -48,40 +46,32 @@ public class McpDraftController {
     @Operation(summary = "生成初始草稿结构",
             description = "后端生成含 Schema、默认值与 missing_fields 的草稿骨架。同会话已有 pending 草稿时幂等返回。",
             parameters = {
-                    @Parameter(name = HEADER_SESSION_ID, in = ParameterIn.HEADER, required = true,
-                            description = "会话标识，与 AI chat session_id / conversation_no 一致"),
-                    @Parameter(name = HEADER_AGENT_ID, in = ParameterIn.HEADER,
-                            description = "智能体标识，默认 default"),
                     @Parameter(name = "X-Fe-Ai-Key", in = ParameterIn.HEADER,
                             description = "内网服务密钥")
             })
-    public R<McpDraftGenerateResponse> generate(
-            @RequestHeader(HEADER_SESSION_ID) String sessionId,
-            @Validated @RequestBody McpDraftGenerateRequest request) {
-        return R.ok(mcpDraftService.generate(sessionId, request));
+    public R<McpDraftGenerateResponse> generate(@Validated @RequestBody McpDraftGenerateRequest request) {
+        return R.ok(mcpDraftService.generate(request.getSessionId(), request));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新草稿数据",
             description = "根据用户回答或画像预填字段；不可编辑时返回 status=ban。",
             parameters = {
-                    @Parameter(name = HEADER_SESSION_ID, in = ParameterIn.HEADER, required = true),
                     @Parameter(name = "X-Fe-Ai-Key", in = ParameterIn.HEADER)
             })
-    public R<McpDraftUpdateResponse> update(
-            @RequestHeader(HEADER_SESSION_ID) String sessionId,
-            @Validated @RequestBody McpDraftUpdateRequest request) {
-        return R.ok(mcpDraftService.update(sessionId, request));
+    public R<McpDraftUpdateResponse> update(@Validated @RequestBody McpDraftUpdateRequest request) {
+        return R.ok(mcpDraftService.update(request.getSessionId(), request));
     }
 
     @GetMapping("/info")
     @Operation(summary = "获取草稿详情与状态",
             description = "返回 status（incomplete/ready/submitted）、data、editable、missing_fields。",
             parameters = {
-                    @Parameter(name = HEADER_SESSION_ID, in = ParameterIn.HEADER, required = true),
+                    @Parameter(name = "session_id", in = ParameterIn.QUERY, required = true,
+                            description = "会话标识，与 AI chat session_id / conversation_no 一致"),
                     @Parameter(name = "X-Fe-Ai-Key", in = ParameterIn.HEADER)
             })
-    public R<McpDraftInfoResponse> info(@RequestHeader(HEADER_SESSION_ID) String sessionId) {
+    public R<McpDraftInfoResponse> info(@RequestParam("session_id") String sessionId) {
         return R.ok(mcpDraftService.getInfo(sessionId));
     }
 
@@ -89,23 +79,19 @@ public class McpDraftController {
     @Operation(summary = "成本测算",
             description = "草稿 status=ready 后调用，返回 SCHEME_A/SCHEME_B 多套合规方案。",
             parameters = {
-                    @Parameter(name = HEADER_SESSION_ID, in = ParameterIn.HEADER, required = true),
                     @Parameter(name = "X-Fe-Ai-Key", in = ParameterIn.HEADER)
             })
-    public R<McpDraftCalculateResponse> calculate(@RequestHeader(HEADER_SESSION_ID) String sessionId) {
-        return R.ok(mcpDraftService.calculate(sessionId));
+    public R<McpDraftCalculateResponse> calculate(@Validated @RequestBody McpDraftCalculateRequest request) {
+        return R.ok(mcpDraftService.calculate(request.getSessionId()));
     }
 
     @PostMapping("/submit")
     @Operation(summary = "确认并提交草稿",
             description = "用户选定方案后转化为正式订单，需先调用 calculate。",
             parameters = {
-                    @Parameter(name = HEADER_SESSION_ID, in = ParameterIn.HEADER, required = true),
                     @Parameter(name = "X-Fe-Ai-Key", in = ParameterIn.HEADER)
             })
-    public R<McpDraftSubmitResponse> submit(
-            @RequestHeader(HEADER_SESSION_ID) String sessionId,
-            @Validated @RequestBody McpDraftSubmitRequest request) {
-        return R.ok(mcpDraftService.submit(sessionId, request));
+    public R<McpDraftSubmitResponse> submit(@Validated @RequestBody McpDraftSubmitRequest request) {
+        return R.ok(mcpDraftService.submit(request.getSessionId(), request));
     }
 }

huimv-employment/fe-api/src/main/java/com/huimv/employment/controller/mcp/McpEnterpriseProfileController.java

@@ -13,24 +13,22 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
  * MCP 企业画像接口（交互规则 v2 §6.2）。
  * <p>
- * 通过 {@code X-Session-Id} 自动关联会话与企业，Agent 无需传递 enterprise_id。
+ * 通过请求体/查询参数 {@code session_id} 自动关联会话与企业，Agent 无需传递 enterprise_id。
  * 鉴权见 {@code fe.internal.ai-key} 与 {@link com.huimv.employment.security.McpAuthFilter}。
  * </p>
  */
 @RestController
 @RequestMapping("/api/mcp/enterprise")
-@Tag(name = "MCP-企业画像", description = "智能体加载/更新企业画像，需 X-Fe-Ai-Key + X-Session-Id")
+@Tag(name = "MCP-企业画像", description = "智能体加载/更新企业画像，需 X-Fe-Ai-Key + session_id")
 public class McpEnterpriseProfileController {
 
-    public static final String HEADER_SESSION_ID = "X-Session-Id";
-
     private final McpEnterpriseProfileService mcpEnterpriseProfileService;
 
     public McpEnterpriseProfileController(McpEnterpriseProfileService mcpEnterpriseProfileService) {
@@ -41,12 +39,12 @@ public class McpEnterpriseProfileController {
     @Operation(summary = "获取企业画像",
             description = "会话初始化时加载企业基础信息与偏好设置，供 Agent 注入上下文。",
             parameters = {
-                    @Parameter(name = HEADER_SESSION_ID, in = ParameterIn.HEADER, required = true,
+                    @Parameter(name = "session_id", in = ParameterIn.QUERY, required = true,
                             description = "会话标识，与 AI chat session_id / conversation_no 一致"),
                     @Parameter(name = "X-Fe-Ai-Key", in = ParameterIn.HEADER,
                             description = "内网服务密钥")
             })
-    public R<McpEnterpriseProfileResponse> getProfile(@RequestHeader(HEADER_SESSION_ID) String sessionId) {
+    public R<McpEnterpriseProfileResponse> getProfile(@RequestParam("session_id") String sessionId) {
         return R.ok(mcpEnterpriseProfileService.getProfile(sessionId));
     }
 
@@ -54,12 +52,10 @@ public class McpEnterpriseProfileController {
     @Operation(summary = "增量更新企业画像",
             description = "捕获对话中的新信息（如地址变更、结算偏好），支持 preferences.xxx 点路径。",
             parameters = {
-                    @Parameter(name = HEADER_SESSION_ID, in = ParameterIn.HEADER, required = true),
                     @Parameter(name = "X-Fe-Ai-Key", in = ParameterIn.HEADER)
             })
     public R<McpEnterpriseProfileUpdateResponse> updateProfile(
-            @RequestHeader(HEADER_SESSION_ID) String sessionId,
             @Validated @RequestBody McpEnterpriseProfileUpdateRequest request) {
-        return R.ok(mcpEnterpriseProfileService.updateProfile(sessionId, request));
+        return R.ok(mcpEnterpriseProfileService.updateProfile(request.getSessionId(), request));
     }
 }

huimv-employment/fe-api/src/main/java/com/huimv/employment/controller/mcp/McpOrderController.java

@@ -13,7 +13,6 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -23,11 +22,9 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/api/mcp/orders")
-@Tag(name = "MCP-订单", description = "订单查询与克隆至草稿，需 X-Fe-Ai-Key + X-Session-Id")
+@Tag(name = "MCP-订单", description = "订单查询与克隆至草稿，需 X-Fe-Ai-Key + session_id")
 public class McpOrderController {
 
-    public static final String HEADER_SESSION_ID = "X-Session-Id";
-
     private final McpOrderService mcpOrderService;
 
     public McpOrderController(McpOrderService mcpOrderService) {
@@ -38,7 +35,7 @@ public class McpOrderController {
     @Operation(summary = "统一订单查询",
             description = "按企业上下文查询历史/进行中订单，支持 status、limit 筛选，用于再来一单引导。",
             parameters = {
-                    @Parameter(name = HEADER_SESSION_ID, in = ParameterIn.HEADER, required = true,
+                    @Parameter(name = "session_id", in = ParameterIn.QUERY, required = true,
                             description = "会话标识，与 AI chat session_id / conversation_no 一致"),
                     @Parameter(name = "X-Fe-Ai-Key", in = ParameterIn.HEADER,
                             description = "内网服务密钥"),
@@ -48,7 +45,7 @@ public class McpOrderController {
                             description = "返回条数，默认 10，最大 50")
             })
     public R<McpOrderListResponse> listOrders(
-            @RequestHeader(HEADER_SESSION_ID) String sessionId,
+            @RequestParam("session_id") String sessionId,
             @RequestParam(required = false) String status,
             @RequestParam(required = false) Integer limit) {
         return R.ok(mcpOrderService.listOrders(sessionId, status, limit));
@@ -58,12 +55,9 @@ public class McpOrderController {
     @Operation(summary = "克隆历史订单至草稿",
             description = "将历史订单快照转化为新草稿并绑定当前会话，随后可 GET /api/mcp/draft/info 检查待补字段。",
             parameters = {
-                    @Parameter(name = HEADER_SESSION_ID, in = ParameterIn.HEADER, required = true),
                     @Parameter(name = "X-Fe-Ai-Key", in = ParameterIn.HEADER)
             })
-    public R<McpOrderCloneResponse> cloneToDraft(
-            @RequestHeader(HEADER_SESSION_ID) String sessionId,
-            @Validated @RequestBody McpOrderCloneRequest request) {
-        return R.ok(mcpOrderService.cloneToDraft(sessionId, request));
+    public R<McpOrderCloneResponse> cloneToDraft(@Validated @RequestBody McpOrderCloneRequest request) {
+        return R.ok(mcpOrderService.cloneToDraft(request.getSessionId(), request));
     }
 }

huimv-employment/fe-service/src/main/java/com/huimv/employment/service/conversation/ConversationService.java

@@ -120,7 +120,7 @@ public class ConversationService {
      */
     public FeConversation requireBySessionId(String sessionId) {
         if (!StringUtils.hasText(sessionId)) {
-            throw new BizException(ErrorCode.BAD_REQUEST, "X-Session-Id 不能为空");
+            throw new BizException(ErrorCode.BAD_REQUEST, "session_id 不能为空");
         }
         String conversationNo = normalizeConversationNo(sessionId.trim());
         FeConversation conversation = feConversationMapper.selectOne(new LambdaQueryWrapper<FeConversation>()

huimv-employment/fe-service/src/main/java/com/huimv/employment/service/draft/dto/McpDraftGenerateRequest.java

@@ -1,5 +1,6 @@
 package com.huimv.employment.service.draft.dto;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 
 import javax.validation.constraints.NotBlank;
@@ -7,6 +8,12 @@ import javax.validation.constraints.NotBlank;
 @Schema(description = "MCP 生成初始草稿请求")
 public class McpDraftGenerateRequest {
 
+    @NotBlank(message = "session_id 不能为空")
+    @JsonProperty("session_id")
+    @Schema(description = "会话标识，与 AI chat session_id / conversation_no 一致",
+            example = "a1b2c3d4e5f6", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String sessionId;
+
     @Schema(description = "来源类型：intent / clone / button", example = "intent", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotBlank(message = "source_type 不能为空")
     private String sourceType;
@@ -17,6 +24,14 @@ public class McpDraftGenerateRequest {
     @Schema(description = "历史订单 ID（source_type=clone 时使用）")
     private String historyOrderId;
 
+    public String getSessionId() {
+        return sessionId;
+    }
+
+    public void setSessionId(String sessionId) {
+        this.sessionId = sessionId;
+    }
+
     public String getSourceType() {
         return sourceType;
     }

huimv-employment/fe-service/src/main/java/com/huimv/employment/service/draft/dto/McpDraftSubmitRequest.java

@@ -8,11 +8,25 @@ import javax.validation.constraints.NotBlank;
 @Schema(description = "MCP 确认提交草稿请求（v2 §6.3.5）")
 public class McpDraftSubmitRequest {
 
+    @NotBlank(message = "session_id 不能为空")
+    @JsonProperty("session_id")
+    @Schema(description = "会话标识，与 AI chat session_id / conversation_no 一致",
+            example = "a1b2c3d4e5f6", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String sessionId;
+
     @NotBlank(message = "selected_scheme_code 不能为空")
     @JsonProperty("selected_scheme_code")
     @Schema(description = "用户选定的方案编码", example = "SCHEME_A", requiredMode = Schema.RequiredMode.REQUIRED)
     private String selectedSchemeCode;
 
+    public String getSessionId() {
+        return sessionId;
+    }
+
+    public void setSessionId(String sessionId) {
+        this.sessionId = sessionId;
+    }
+
     public String getSelectedSchemeCode() {
         return selectedSchemeCode;
     }

huimv-employment/fe-service/src/main/java/com/huimv/employment/service/draft/dto/McpDraftUpdateRequest.java

@@ -1,18 +1,34 @@
 package com.huimv.employment.service.draft.dto;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 import java.util.Map;
 
 @Schema(description = "MCP 更新草稿请求")
 public class McpDraftUpdateRequest {
 
+    @NotBlank(message = "session_id 不能为空")
+    @JsonProperty("session_id")
+    @Schema(description = "会话标识，与 AI chat session_id / conversation_no 一致",
+            example = "a1b2c3d4e5f6", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String sessionId;
+
     @Schema(description = "待更新字段（snake_case 键名）", requiredMode = Schema.RequiredMode.REQUIRED,
             example = "{\"worker_count\": 10, \"total_amount\": 3000}")
     @NotEmpty(message = "fields 不能为空")
     private Map<String, Object> fields;
 
+    public String getSessionId() {
+        return sessionId;
+    }
+
+    public void setSessionId(String sessionId) {
+        this.sessionId = sessionId;
+    }
+
     public Map<String, Object> getFields() {
         return fields;
     }

huimv-employment/fe-service/src/main/java/com/huimv/employment/service/enterprise/dto/McpEnterpriseProfileUpdateRequest.java

@@ -1,18 +1,34 @@
 package com.huimv.employment.service.enterprise.dto;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 import java.util.Map;
 
 @Schema(description = "MCP 企业画像增量更新请求（v2 §6.2.2）")
 public class McpEnterpriseProfileUpdateRequest {
 
+    @NotBlank(message = "session_id 不能为空")
+    @JsonProperty("session_id")
+    @Schema(description = "会话标识，与 AI chat session_id / conversation_no 一致",
+            example = "a1b2c3d4e5f6", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String sessionId;
+
     @NotEmpty(message = "updates 不能为空")
     @Schema(description = "增量更新字段，支持点路径如 preferences.settlement_cycle",
             example = "{\"preferences.settlement_cycle\":\"monthly\",\"company_address\":\"上海市浦东新区...\"}")
     private Map<String, Object> updates;
 
+    public String getSessionId() {
+        return sessionId;
+    }
+
+    public void setSessionId(String sessionId) {
+        this.sessionId = sessionId;
+    }
+
     public Map<String, Object> getUpdates() {
         return updates;
     }

huimv-employment/fe-service/src/main/java/com/huimv/employment/service/order/dto/McpOrderCloneRequest.java

@@ -8,11 +8,25 @@ import javax.validation.constraints.NotBlank;
 @Schema(description = "MCP 克隆订单至草稿请求（v2 §6.3.7）")
 public class McpOrderCloneRequest {
 
+    @NotBlank(message = "session_id 不能为空")
+    @JsonProperty("session_id")
+    @Schema(description = "会话标识，与 AI chat session_id / conversation_no 一致",
+            example = "a1b2c3d4e5f6", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String sessionId;
+
     @NotBlank(message = "order_id 不能为空")
     @JsonProperty("order_id")
     @Schema(description = "历史订单编号", example = "ord_111", requiredMode = Schema.RequiredMode.REQUIRED)
     private String orderId;
 
+    public String getSessionId() {
+        return sessionId;
+    }
+
+    public void setSessionId(String sessionId) {
+        this.sessionId = sessionId;
+    }
+
     public String getOrderId() {
         return orderId;
     }