增加与ai大模型对话

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

@@ -27,13 +27,14 @@ import org.springframework.web.bind.annotation.RestController;
 /**
  * MCP 草稿接口（交互规则 v2 §6.3）。
  * <p>
- * 通过请求体/查询参数 {@code session_id}（= conversation_no）自动关联会话与草稿，Agent 无需传递 draft_id。
+ * generate 通过 session_id 创建/复用草稿并返回 draft_id；
+ * update/info/calculate/submit 须同时传入 session_id 与 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 + session_id")
+@Tag(name = "MCP-草稿", description = "智能体草稿 generate/update/info/calculate/submit，需 X-Fe-Ai-Key + session_id；后四者另需 draft_id")
 public class McpDraftController {
 
     private final McpDraftService mcpDraftService;
@@ -44,7 +45,8 @@ public class McpDraftController {
 
     @PostMapping("/generate")
     @Operation(summary = "生成初始草稿结构",
-            description = "后端生成含 Schema、默认值与 missing_fields 的草稿骨架。同会话已有 pending 草稿时幂等返回。",
+            description = "后端生成含 Schema、默认值与 missing_fields 的草稿骨架，返回 draft_id。"
+                    + "同会话已有 pending 草稿时幂等返回。",
             parameters = {
                     @Parameter(name = "X-Fe-Ai-Key", in = ParameterIn.HEADER,
                             description = "内网服务密钥")
@@ -55,7 +57,7 @@ public class McpDraftController {
 
     @PutMapping("/update")
     @Operation(summary = "更新草稿数据",
-            description = "根据用户回答或画像预填字段；不可编辑时返回 status=ban。",
+            description = "根据用户回答或画像预填字段；须传 draft_id；不可编辑时返回 status=ban。",
             parameters = {
                     @Parameter(name = "X-Fe-Ai-Key", in = ParameterIn.HEADER)
             })
@@ -65,31 +67,35 @@ public class McpDraftController {
 
     @GetMapping("/info")
     @Operation(summary = "获取草稿详情与状态",
-            description = "返回 status（incomplete/ready/submitted）、data、editable、missing_fields。",
+            description = "返回 draft_id、status（incomplete/ready/submitted）、data、editable、missing_fields。",
             parameters = {
                     @Parameter(name = "session_id", in = ParameterIn.QUERY, required = true,
                             description = "会话标识，与 AI chat session_id / conversation_no 一致"),
+                    @Parameter(name = "draft_id", in = ParameterIn.QUERY, required = true,
+                            description = "草稿 ID（generate 返回）"),
                     @Parameter(name = "X-Fe-Ai-Key", in = ParameterIn.HEADER)
             })
-    public R<McpDraftInfoResponse> info(@RequestParam("session_id") String sessionId) {
-        return R.ok(mcpDraftService.getInfo(sessionId));
+    public R<McpDraftInfoResponse> info(@RequestParam("session_id") String sessionId,
+                                        @RequestParam("draft_id") Long draftId) {
+        return R.ok(mcpDraftService.getInfo(sessionId, draftId));
     }
 
     @PostMapping("/calculate")
     @Operation(summary = "成本测算",
-            description = "当前会话草稿就绪后调用。"
+            description = "须传 draft_id；草稿就绪后测算。"
                     + "按 fe_service_plan（status=active，排除 current）及 fe_service_plan_fee_rule 预置规则测算，"
                     + "返回成本方案列表（如 SCHEME_A / SCHEME_B），并落库 fe_draft_cost_snapshot。",
             parameters = {
                     @Parameter(name = "X-Fe-Ai-Key", in = ParameterIn.HEADER)
             })
     public R<McpDraftCalculateResponse> calculate(@Validated @RequestBody McpDraftCalculateRequest request) {
-        return R.ok(mcpDraftService.calculate(request.getSessionId()));
+        return R.ok(mcpDraftService.calculate(request.getSessionId(), request.getDraftId()));
     }
 
     @PostMapping("/submit")
     @Operation(summary = "确认并提交草稿",
-            description = "用户选定方案后转化为正式订单，并创建登记批次、立刻生成小程序码（fe_registration_batch.qr_code_url）。需先调用 calculate。",
+            description = "须传 draft_id；用户选定方案后转化为正式订单，并创建登记批次、立刻生成小程序码。"
+                    + "需先调用 calculate。",
             parameters = {
                     @Parameter(name = "X-Fe-Ai-Key", in = ParameterIn.HEADER)
             })

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

@@ -168,7 +168,9 @@ public class DraftService {
         List<DraftCostCalculationEngine.CalculatedScheme> schemes = draftCostCalculationEngine.calculate(draft);
         persistCostSnapshots(draft, schemes);
         updateDraftEstimates(draft, schemes, LocalDateTime.now());
-        return draftCostCalculationEngine.toApiResponse(schemes);
+        McpDraftCalculateResponse response = draftCostCalculationEngine.toApiResponse(schemes);
+        response.setDraftId(draft.getId());
+        return response;
     }
 
     /**

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

@@ -48,7 +48,7 @@ import java.util.UUID;
 
 /**
  * MCP 草稿接口业务（对齐交互规则 v2 §6.3）。
- * <p>通过 {@code X-Session-Id}（= conversation_no）自动关联会话与草稿，Agent 无需传递 draft_id。</p>
+ * <p>通过 session_id 关联会话；update/info/calculate/submit 须传入 draft_id，并校验草稿归属当前会话。</p>
  */
 @Service
 public class McpDraftService {
@@ -134,9 +134,9 @@ public class McpDraftService {
     @Transactional(rollbackFor = Exception.class)
     public McpDraftUpdateResponse update(String sessionId, McpDraftUpdateRequest request) {
         FeConversation conversation = conversationService.requireBySessionId(sessionId);
-        FeEmploymentDraft draft = requirePendingDraft(conversation.getId());
+        FeEmploymentDraft draft = requireDraftInConversation(conversation.getId(), request.getDraftId());
         if (!isDbEditable(draft)) {
-            return banResponse();
+            return banResponse(draft.getId());
         }
         try {
             LocalDateTime now = LocalDateTime.now();
@@ -145,38 +145,39 @@ public class McpDraftService {
             feEmploymentDraftMapper.updateById(draft);
             syncFieldMetadata(draft.getId(), updatedKeys, draft, now, SOURCE_AI_INFERRED);
             recalculateMissingFields(draft, now);
-            return successResponse();
+            return successResponse(draft.getId());
         } catch (BizException ex) {
-            log.debug("MCP 草稿更新失败 sessionId={}: {}", sessionId, ex.getMessage());
+            log.debug("MCP 草稿更新失败 sessionId={} draftId={}: {}",
+                    sessionId, request.getDraftId(), ex.getMessage());
             McpDraftUpdateResponse response = new McpDraftUpdateResponse();
+            response.setDraftId(request.getDraftId());
             response.setStatus(MCP_UPDATE_FAIL);
             return response;
         }
     }
 
-    public McpDraftInfoResponse getInfo(String sessionId) {
+    public McpDraftInfoResponse getInfo(String sessionId, Long draftId) {
         FeConversation conversation = conversationService.requireBySessionId(sessionId);
-        FeEmploymentDraft draft = findLatestDraft(conversation.getId());
-        if (draft == null) {
-            throw new BizException(ErrorCode.NOT_FOUND, "当前会话暂无草稿，请先调用 generate");
-        }
+        FeEmploymentDraft draft = requireDraftInConversation(conversation.getId(), draftId);
         return toInfoResponse(draft);
     }
 
     @Transactional(rollbackFor = Exception.class)
-    public McpDraftCalculateResponse calculate(String sessionId) {
+    public McpDraftCalculateResponse calculate(String sessionId, Long draftId) {
         FeConversation conversation = conversationService.requireBySessionId(sessionId);
-        FeEmploymentDraft draft = requireReadyDraft(conversation.getId());
+        FeEmploymentDraft draft = requireReadyDraft(conversation.getId(), draftId);
         List<DraftCostCalculationEngine.CalculatedScheme> schemes = draftCostCalculationEngine.calculate(draft);
         persistCostSnapshots(draft, schemes);
         updateDraftEstimates(draft, schemes, LocalDateTime.now());
-        return draftCostCalculationEngine.toApiResponse(schemes);
+        McpDraftCalculateResponse response = draftCostCalculationEngine.toApiResponse(schemes);
+        response.setDraftId(draft.getId());
+        return response;
     }
 
     @Transactional(rollbackFor = Exception.class)
     public McpDraftSubmitResponse submit(String sessionId, McpDraftSubmitRequest request) {
         FeConversation conversation = conversationService.requireBySessionId(sessionId);
-        FeEmploymentDraft draft = requireReadyDraft(conversation.getId());
+        FeEmploymentDraft draft = requireReadyDraft(conversation.getId(), request.getDraftId());
         String schemeCode = request.getSelectedSchemeCode().trim().toUpperCase();
         if (!draftCostCalculationEngine.isAllowedSchemeCode(schemeCode)) {
             throw new BizException(ErrorCode.BAD_REQUEST, "不支持的方案编码：" + request.getSelectedSchemeCode());
@@ -210,14 +211,34 @@ public class McpDraftService {
         FeRegistrationBatch batch = registrationBatchService.createForOrder(order, draft, now);
 
         McpDraftSubmitResponse response = new McpDraftSubmitResponse();
+        response.setDraftId(draft.getId());
         response.setStatus(SUBMIT_SUCCESS);
         response.setOrderId(order.getOrderNo());
         response.setBatchId(batch.getBatchNo());
         return response;
     }
 
-    private FeEmploymentDraft requireReadyDraft(Long conversationId) {
-        FeEmploymentDraft draft = requirePendingDraft(conversationId);
+    private FeEmploymentDraft requireDraftInConversation(Long conversationId, Long draftId) {
+        if (draftId == null) {
+            throw new BizException(ErrorCode.BAD_REQUEST, "draft_id 不能为空");
+        }
+        FeEmploymentDraft draft = feEmploymentDraftMapper.selectById(draftId);
+        if (draft == null || !conversationId.equals(draft.getConversationId())) {
+            throw new BizException(ErrorCode.NOT_FOUND, "草稿不存在或不属于当前会话");
+        }
+        return draft;
+    }
+
+    private FeEmploymentDraft requirePendingDraft(Long conversationId, Long draftId) {
+        FeEmploymentDraft draft = requireDraftInConversation(conversationId, draftId);
+        if (!DB_STATUS_PENDING.equals(draft.getStatus())) {
+            throw new BizException(ErrorCode.BAD_REQUEST, "草稿已提交，不可继续操作");
+        }
+        return draft;
+    }
+
+    private FeEmploymentDraft requireReadyDraft(Long conversationId, Long draftId) {
+        FeEmploymentDraft draft = requirePendingDraft(conversationId, draftId);
         List<String> missing = parseMissingFields(draft.getMissingFields());
         if (!missing.isEmpty()) {
             throw new BizException(ErrorCode.BAD_REQUEST,
@@ -371,21 +392,6 @@ public class McpDraftService {
                 .last("LIMIT 1"));
     }
 
-    private FeEmploymentDraft findLatestDraft(Long conversationId) {
-        return feEmploymentDraftMapper.selectOne(new LambdaQueryWrapper<FeEmploymentDraft>()
-                .eq(FeEmploymentDraft::getConversationId, conversationId)
-                .orderByDesc(FeEmploymentDraft::getCreateTime)
-                .last("LIMIT 1"));
-    }
-
-    private FeEmploymentDraft requirePendingDraft(Long conversationId) {
-        FeEmploymentDraft draft = findPendingDraft(conversationId);
-        if (draft == null) {
-            throw new BizException(ErrorCode.NOT_FOUND, "当前会话暂无待完善草稿，请先调用 generate");
-        }
-        return draft;
-    }
-
     private Set<String> applyMcpFields(FeEmploymentDraft draft, Map<String, Object> fields) {
         if (fields == null || fields.isEmpty()) {
             throw new BizException(ErrorCode.BAD_REQUEST, "fields 不能为空");
@@ -510,6 +516,7 @@ public class McpDraftService {
         List<String> missing = parseMissingFields(draft.getMissingFields());
         boolean editable = isDbEditable(draft);
         McpDraftInfoResponse response = new McpDraftInfoResponse();
+        response.setDraftId(draft.getId());
         response.setData(toDataMap(draft));
         response.setMissingFields(missing);
         response.setEditable(editable);
@@ -552,14 +559,16 @@ public class McpDraftService {
         return DB_STATUS_PENDING.equals(draft.getStatus());
     }
 
-    private McpDraftUpdateResponse successResponse() {
+    private McpDraftUpdateResponse successResponse(Long draftId) {
         McpDraftUpdateResponse response = new McpDraftUpdateResponse();
+        response.setDraftId(draftId);
         response.setStatus(MCP_UPDATE_SUCCESS);
         return response;
     }
 
-    private McpDraftUpdateResponse banResponse() {
+    private McpDraftUpdateResponse banResponse(Long draftId) {
         McpDraftUpdateResponse response = new McpDraftUpdateResponse();
+        response.setDraftId(draftId);
         response.setStatus(MCP_UPDATE_BAN);
         return response;
     }

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

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 @Schema(description = "MCP 成本测算请求")
 public class McpDraftCalculateRequest {
@@ -14,6 +15,11 @@ public class McpDraftCalculateRequest {
             example = "a1b2c3d4e5f6", requiredMode = Schema.RequiredMode.REQUIRED)
     private String sessionId;
 
+    @NotNull(message = "draft_id 不能为空")
+    @JsonProperty("draft_id")
+    @Schema(description = "草稿 ID（generate 返回）", example = "1", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Long draftId;
+
     public String getSessionId() {
         return sessionId;
     }
@@ -21,4 +27,12 @@ public class McpDraftCalculateRequest {
     public void setSessionId(String sessionId) {
         this.sessionId = sessionId;
     }
+
+    public Long getDraftId() {
+        return draftId;
+    }
+
+    public void setDraftId(Long draftId) {
+        this.draftId = draftId;
+    }
 }

huimv-employment/fe-service/src/main/java/com/huimv/employment/service/draft/dto/McpDraftCalculateResponse.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 java.util.ArrayList;
@@ -8,9 +9,21 @@ import java.util.List;
 @Schema(description = "MCP 成本测算响应（v2 §6.3.4）")
 public class McpDraftCalculateResponse {
 
+    @JsonProperty("draft_id")
+    @Schema(description = "草稿 ID")
+    private Long draftId;
+
     @Schema(description = "合规方案列表")
     private List<McpDraftSchemeResponse> schemes = new ArrayList<>();
 
+    public Long getDraftId() {
+        return draftId;
+    }
+
+    public void setDraftId(Long draftId) {
+        this.draftId = draftId;
+    }
+
     public List<McpDraftSchemeResponse> getSchemes() {
         return schemes;
     }

huimv-employment/fe-service/src/main/java/com/huimv/employment/service/draft/dto/McpDraftGenerateResponse.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 java.util.List;
@@ -7,6 +8,7 @@ import java.util.List;
 @Schema(description = "MCP 生成初始草稿响应")
 public class McpDraftGenerateResponse {
 
+    @JsonProperty("draft_id")
     @Schema(description = "草稿 ID")
     private Long draftId;
 

huimv-employment/fe-service/src/main/java/com/huimv/employment/service/draft/dto/McpDraftInfoResponse.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 java.util.List;
@@ -8,6 +9,10 @@ import java.util.Map;
 @Schema(description = "MCP 草稿详情与状态")
 public class McpDraftInfoResponse {
 
+    @JsonProperty("draft_id")
+    @Schema(description = "草稿 ID")
+    private Long draftId;
+
     @Schema(description = "草稿状态：incomplete / ready / submitted", example = "incomplete")
     private String status;
 
@@ -20,6 +25,14 @@ public class McpDraftInfoResponse {
     @Schema(description = "待补充字段")
     private List<String> missingFields;
 
+    public Long getDraftId() {
+        return draftId;
+    }
+
+    public void setDraftId(Long draftId) {
+        this.draftId = draftId;
+    }
+
     public String getStatus() {
         return status;
     }

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

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 @Schema(description = "MCP 确认提交草稿请求（v2 §6.3.5）")
 public class McpDraftSubmitRequest {
@@ -14,6 +15,11 @@ public class McpDraftSubmitRequest {
             example = "a1b2c3d4e5f6", requiredMode = Schema.RequiredMode.REQUIRED)
     private String sessionId;
 
+    @NotNull(message = "draft_id 不能为空")
+    @JsonProperty("draft_id")
+    @Schema(description = "草稿 ID（generate 返回）", example = "1", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Long draftId;
+
     @NotBlank(message = "selected_scheme_code 不能为空")
     @JsonProperty("selected_scheme_code")
     @Schema(description = "用户选定的方案编码", example = "SCHEME_A", requiredMode = Schema.RequiredMode.REQUIRED)
@@ -27,6 +33,14 @@ public class McpDraftSubmitRequest {
         this.sessionId = sessionId;
     }
 
+    public Long getDraftId() {
+        return draftId;
+    }
+
+    public void setDraftId(Long draftId) {
+        this.draftId = draftId;
+    }
+
     public String getSelectedSchemeCode() {
         return selectedSchemeCode;
     }

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

@@ -6,6 +6,10 @@ import io.swagger.v3.oas.annotations.media.Schema;
 @Schema(description = "MCP 确认提交草稿响应（v2 §6.3.5）")
 public class McpDraftSubmitResponse {
 
+    @JsonProperty("draft_id")
+    @Schema(description = "草稿 ID")
+    private Long draftId;
+
     @Schema(description = "提交结果", example = "success")
     private String status;
 
@@ -25,6 +29,14 @@ public class McpDraftSubmitResponse {
     @Schema(description = "小程序码图片 URL")
     private String qrCodeUrl;
 
+    public Long getDraftId() {
+        return draftId;
+    }
+
+    public void setDraftId(Long draftId) {
+        this.draftId = draftId;
+    }
+
     public String getStatus() {
         return status;
     }

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

@@ -5,6 +5,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import java.util.Map;
 
 @Schema(description = "MCP 更新草稿请求")
@@ -16,6 +17,11 @@ public class McpDraftUpdateRequest {
             example = "a1b2c3d4e5f6", requiredMode = Schema.RequiredMode.REQUIRED)
     private String sessionId;
 
+    @NotNull(message = "draft_id 不能为空")
+    @JsonProperty("draft_id")
+    @Schema(description = "草稿 ID（generate 返回）", example = "1", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Long draftId;
+
     @Schema(description = "待更新字段（snake_case 键名）", requiredMode = Schema.RequiredMode.REQUIRED,
             example = "{\"worker_count\": 10, \"total_amount\": 3000}")
     @NotEmpty(message = "fields 不能为空")
@@ -29,6 +35,14 @@ public class McpDraftUpdateRequest {
         this.sessionId = sessionId;
     }
 
+    public Long getDraftId() {
+        return draftId;
+    }
+
+    public void setDraftId(Long draftId) {
+        this.draftId = draftId;
+    }
+
     public Map<String, Object> getFields() {
         return fields;
     }

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

@@ -1,13 +1,26 @@
 package com.huimv.employment.service.draft.dto;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 
 @Schema(description = "MCP 更新草稿响应")
 public class McpDraftUpdateResponse {
 
+    @JsonProperty("draft_id")
+    @Schema(description = "草稿 ID")
+    private Long draftId;
+
     @Schema(description = "更新结果：success / fail / ban", example = "success")
     private String status;
 
+    public Long getDraftId() {
+        return draftId;
+    }
+
+    public void setDraftId(Long draftId) {
+        this.draftId = draftId;
+    }
+
     public String getStatus() {
         return status;
     }