From 5e6c3ac5d7c7a2702a0bad5195e954c9e95d2306 Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期日, 15 六月 2025 17:55:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/CutterController.java |   28 ++++++++++++++++++++++++++++
 1 files changed, 28 insertions(+), 0 deletions(-)

diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/CutterController.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/CutterController.java
index 186190a..0c59cb5 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/CutterController.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/CutterController.java
@@ -95,4 +95,32 @@
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, Cutter.class);
     }
+
+    /**
+     * 鎻愬彇鍒�鍏�
+     * @param docId 鏂囨。Id
+     * @return
+     */
+    @AutoLog(value = "鍒�鍏蜂俊鎭�-鎻愬彇鍒�鍏�")
+    @ApiOperation(value = "鍒�鍏蜂俊鎭�-鎻愬彇鍒�鍏�", notes = "鍒�鍏蜂俊鎭�-鎻愬彇鍒�鍏�")
+    @GetMapping("/extractCutterInfo/{docId}/{attributionType}/{attributionId}")
+    public Result<?> extractCutterInfo(@PathVariable("docId") String docId
+            ,@PathVariable("attributionType") Integer attributionType
+            ,@PathVariable("attributionId") String attributionId) {
+        return service.extractAndSaveFromContent(docId,attributionId,attributionType);
+    }
+
+    /**
+     * 鍙戦�佸垁鍏风郴缁�
+     * @param docId 鏂囨。Id
+     * @return
+     */
+    @AutoLog(value = "鍒�鍏蜂俊鎭�-鍙戦�佸垁鍏风郴缁�")
+    @ApiOperation(value = "鍒�鍏蜂俊鎭�-鍙戦�佸垁鍏风郴缁�", notes = "鍒�鍏蜂俊鎭�-鍙戦�佸垁鍏风郴缁�")
+    @GetMapping("/sendCutterInfo/{docId}/{attributionType}/{attributionId}")
+    public Result<?> sendCutterInfo(@PathVariable("docId") String docId
+            ,@PathVariable("attributionType") Integer attributionType
+            ,@PathVariable("attributionId") String attributionId) {
+        return service.sendToCutterSystem(docId,attributionId,attributionType);
+    }
 }

--
Gitblit v1.9.3