Przeglądaj źródła

增加与ai大模型对话

wwh 3 tygodni temu
rodzic
commit
af7247e038

+ 11 - 0
huimv-employment/fe-dao/src/main/java/com/huimv/employment/dao/entity/FeEmploymentDraft.java

@@ -22,6 +22,9 @@ public class FeEmploymentDraft {
22 22
 
23 23
     private Long enterpriseId;
24 24
 
25
+    /** 发起/归属用户,与 fe_conversation.user_id 一致 */
26
+    private Long userId;
27
+
25 28
     private Long conversationId;
26 29
 
27 30
     /** existing_worker_regularization / new_demand */
@@ -111,6 +114,14 @@ public class FeEmploymentDraft {
111 114
         this.enterpriseId = enterpriseId;
112 115
     }
113 116
 
117
+    public Long getUserId() {
118
+        return userId;
119
+    }
120
+
121
+    public void setUserId(Long userId) {
122
+        this.userId = userId;
123
+    }
124
+
114 125
     public Long getConversationId() {
115 126
         return conversationId;
116 127
     }

+ 11 - 0
huimv-employment/fe-dao/src/main/java/com/huimv/employment/dao/entity/FeEmploymentOrder.java

@@ -22,6 +22,9 @@ public class FeEmploymentOrder {
22 22
 
23 23
     private Long enterpriseId;
24 24
 
25
+    /** 下单用户,通常从草稿 user_id 复制 */
26
+    private Long userId;
27
+
25 28
     private Long draftId;
26 29
 
27 30
     private Long selectedPlanId;
@@ -84,6 +87,14 @@ public class FeEmploymentOrder {
84 87
         this.enterpriseId = enterpriseId;
85 88
     }
86 89
 
90
+    public Long getUserId() {
91
+        return userId;
92
+    }
93
+
94
+    public void setUserId(Long userId) {
95
+        this.userId = userId;
96
+    }
97
+
87 98
     public Long getDraftId() {
88 99
         return draftId;
89 100
     }

+ 1 - 0
huimv-employment/fe-service/src/main/java/com/huimv/employment/service/conversation/ConversationChatService.java

@@ -68,6 +68,7 @@ public class ConversationChatService {
68 68
         userTurn.set("content", content);
69 69
         input.add(userTurn);
70 70
         root.set("input", input);
71
+        root.put("order_id", conversation.getConversationNo());
71 72
         root.put("session_id", conversation.getConversationNo());
72 73
         root.put("user_id", String.valueOf(userId));
73 74
         root.put("channel", "console");

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

@@ -295,6 +295,7 @@ public class DraftService {
295 295
         response.setId(draft.getId());
296 296
         response.setDraftNo(draft.getDraftNo());
297 297
         response.setEnterpriseId(draft.getEnterpriseId());
298
+        response.setUserId(draft.getUserId());
298 299
         response.setConversationId(draft.getConversationId());
299 300
         response.setScenario(draft.getScenario());
300 301
         response.setTitle(draft.getTitle());

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

@@ -269,6 +269,7 @@ public class McpDraftService {
269 269
                                                   LocalDateTime now) {
270 270
         FeEmploymentOrder order = new FeEmploymentOrder();
271 271
         order.setEnterpriseId(draft.getEnterpriseId());
272
+        order.setUserId(draft.getUserId());
272 273
         order.setDraftId(draft.getId());
273 274
         order.setTitle(StringUtils.hasText(draft.getTitle()) ? draft.getTitle() : "用工订单");
274 275
         order.setWorkerCount(draft.getWorkerCount());
@@ -318,6 +319,7 @@ public class McpDraftService {
318 319
         FeEmploymentDraft draft = new FeEmploymentDraft();
319 320
         draft.setDraftNo(UUID.randomUUID().toString().replace("-", ""));
320 321
         draft.setEnterpriseId(enterprise.getId());
322
+        draft.setUserId(conversation.getUserId());
321 323
         draft.setConversationId(conversation.getId());
322 324
         draft.setScenario(resolveScenario(request));
323 325
         if (StringUtils.hasText(request.getIntentText())) {
@@ -514,6 +516,7 @@ public class McpDraftService {
514 516
         Map<String, Object> data = new LinkedHashMap<>();
515 517
         data.put("draft_id", draft.getId());
516 518
         data.put("draft_no", draft.getDraftNo());
519
+        data.put("user_id", draft.getUserId());
517 520
         data.put("scenario", draft.getScenario());
518 521
         data.put("title", draft.getTitle());
519 522
         data.put("worker_count", draft.getWorkerCount());

+ 11 - 0
huimv-employment/fe-service/src/main/java/com/huimv/employment/service/draft/dto/DraftDetailResponse.java

@@ -22,6 +22,9 @@ public class DraftDetailResponse {
22 22
     @Schema(description = "所属企业 ID")
23 23
     private Long enterpriseId;
24 24
 
25
+    @Schema(description = "发起用户 ID")
26
+    private Long userId;
27
+
25 28
     @Schema(description = "来源会话 ID")
26 29
     private Long conversationId;
27 30
 
@@ -127,6 +130,14 @@ public class DraftDetailResponse {
127 130
         this.enterpriseId = enterpriseId;
128 131
     }
129 132
 
133
+    public Long getUserId() {
134
+        return userId;
135
+    }
136
+
137
+    public void setUserId(Long userId) {
138
+        this.userId = userId;
139
+    }
140
+
130 141
     public Long getConversationId() {
131 142
         return conversationId;
132 143
     }

+ 1 - 0
huimv-employment/fe-service/src/main/java/com/huimv/employment/service/order/McpOrderService.java

@@ -143,6 +143,7 @@ public class McpOrderService {
143 143
         FeEmploymentDraft draft = new FeEmploymentDraft();
144 144
         draft.setDraftNo(UUID.randomUUID().toString().replace("-", ""));
145 145
         draft.setEnterpriseId(conversation.getEnterpriseId());
146
+        draft.setUserId(conversation.getUserId());
146 147
         draft.setConversationId(conversation.getId());
147 148
         draft.setScenario(SCENARIO_CLONE);
148 149
         draft.setStatus(DB_STATUS_PENDING);