From 8052785b8f8c423b3ba62b2c546d628b801b18dc Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期二, 30 十二月 2025 08:41:31 +0800
Subject: [PATCH] 新增 动态补片功能
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/GlassOptimizeController.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/GlassOptimizeController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/GlassOptimizeController.java
index 3ab6258..4c0c3be 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/GlassOptimizeController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/GlassOptimizeController.java
@@ -1,5 +1,6 @@
package com.example.erp.controller.pp;
+import com.example.erp.dto.pp.MesCalculateDTO;
import org.springframework.core.io.InputStreamResource;
import com.example.erp.common.Constants;
import com.example.erp.common.Result;
@@ -26,6 +27,7 @@
import java.sql.Date;
import java.util.HashMap;
import java.util.Map;
+import java.util.concurrent.CompletableFuture;
@RestController
@Api(value="浼樺寲绠＄悊controller",tags={"浼樺寲绠＄悊鎿嶄綔鎺ュ彛"})
@@ -230,7 +232,7 @@
@PostMapping("/mesCalculate")
public ResponseEntity<Map<String, Object>> receiveOptimizeRequest(
- @RequestBody Map<String, Object> requestData) {
+ @RequestBody MesCalculateDTO mesCalculateDTO) {
Map<String, Object> response = new HashMap<>();
@@ -238,17 +240,22 @@
// 绔嬪嵆杩斿洖鎺ユ敹鎴愬姛鐨勫搷搴�
response.put("code", "200");
response.put("msg", "success");
- response.put("data", "");
+ response.put("data", true);
- // todo 寮傛澶勭悊璁＄畻浠诲姟
-// glassOptimizeService.processExternalOptimizeRequest(requestData);
- System.out.println(requestData);
-
+ // 浣跨敤CompletableFuture 寮傛澶勭悊璁＄畻浠诲姟
+ CompletableFuture.runAsync(() -> {
+ try {
+ glassOptimizeService.processExternalOptimizeRequest(mesCalculateDTO);
+ } catch (Exception e) {
+ System.err.println("寮傛澶勭悊浼樺寲璇锋眰鏃跺彂鐢熼敊璇�: " + e.getMessage());
+ e.printStackTrace();
+ }
+ });
return ResponseEntity.ok(response);
} catch (Exception e) {
response.put("code", 201);
- response.put("msg", "false: " + e.getMessage());
- response.put("data", "");
+ response.put("msg", e.getMessage());
+ response.put("data", false);
return ResponseEntity.status(500).body(response);
}
}
@@ -256,6 +263,7 @@
+
//鍒涘缓宸ョ▼鏌ヨ娴佺▼鍗℃槑缁�
@ApiOperation("鍒涘缓宸ョ▼鏌ヨ娴佺▼鍗℃槑缁�")
@PostMapping ("/getProcessCardDetail/{processId}/{technologyNumber}")
--
Gitblit v1.8.0